Recursive deploy ladder: Company + Org tiers, mesh mark, two-tier rail
Completes the scale ladder (single → team → company → org). Every tier is a
topology whose nodes are the tier below; running a parent recursively runs each
child's sub-topology down to the leaf claws.
Backend:
- migration 0011: companies/company_teams, orgs/org_companies, topology_runs.tier
- cm-db repos for companies + orgs (mirror teams)
- TurnRequest.attrs (forwarded from node.attrs) for child-id binding
- SubTopologyExecutor (recursive_exec.rs): a parent "turn" runs the child's
sub-topology; durability via parent updated_at keepalive + cancel propagation
+ depth cap; boxed future breaks the org→company recursion
- topology_worker selects executor by job.tier
- routes: /api/companies, /api/orgs (create/list/get/run) + unified
/api/structure/{level}/{id} for the zoom canvas
Frontend:
- MeshMark: node-mesh brand glyph (replaces the claw PNG), tier variants
- TopologyGraphView: optional onNodeClick/nodeMeta + dark-token theming
- StructureCanvas + Breadcrumb: one recursive zoom view for every tier
(drill down on node click, breadcrumb up); TeamRunPanel extracted + shared
- two-tier Discord-style rail: StructureRail (mesh mark + org/company/team
glyphs + tools popover + deploy + user) | RosterColumn (selected group's
children, or your claws); SecondaryNav for cross-cutting tools
- ComposeWizard (company/org) wired into DeployWizard; /companies + /orgs pages
Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
bba18a4687
commit
3eca4ed70c
@@ -44,11 +44,16 @@ async fn durable_run_lifecycle_enqueue_claim_checkpoint_complete() {
|
||||
assert!(claimed.checkpoint.is_none());
|
||||
|
||||
// A second claim finds nothing (the job is no longer queued).
|
||||
assert!(topology_runs::claim_next_queued(&pool).await.unwrap().is_none());
|
||||
assert!(topology_runs::claim_next_queued(&pool)
|
||||
.await
|
||||
.unwrap()
|
||||
.is_none());
|
||||
|
||||
// Checkpoint mid-run progress.
|
||||
let progress = json!({"completed": 1, "outputs": ["draft"], "records": [], "totals": {}});
|
||||
topology_runs::checkpoint(&pool, id, &progress, 1).await.unwrap();
|
||||
topology_runs::checkpoint(&pool, id, &progress, 1)
|
||||
.await
|
||||
.unwrap();
|
||||
let st = topology_runs::status(&pool, id, ws).await.unwrap();
|
||||
assert_eq!(st.status, "running");
|
||||
assert_eq!(st.last_event_id, 1);
|
||||
@@ -73,7 +78,10 @@ async fn stale_running_jobs_are_requeued_for_resume() {
|
||||
.await
|
||||
.unwrap();
|
||||
// Claim it → running.
|
||||
topology_runs::claim_next_queued(&pool).await.unwrap().unwrap();
|
||||
topology_runs::claim_next_queued(&pool)
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
|
||||
// Not stale yet (just claimed) → sweep is a no-op.
|
||||
assert_eq!(topology_runs::requeue_stale(&pool, 60.0).await.unwrap(), 0);
|
||||
@@ -83,7 +91,10 @@ async fn stale_running_jobs_are_requeued_for_resume() {
|
||||
assert_eq!(topology_runs::requeue_stale(&pool, 0.0).await.unwrap(), 1);
|
||||
let st = topology_runs::status(&pool, id, ws).await.unwrap();
|
||||
assert_eq!(st.status, "queued");
|
||||
assert!(topology_runs::claim_next_queued(&pool).await.unwrap().is_some());
|
||||
assert!(topology_runs::claim_next_queued(&pool)
|
||||
.await
|
||||
.unwrap()
|
||||
.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
@@ -100,15 +111,23 @@ async fn cancel_transitions_only_active_runs() {
|
||||
// A queued run cancels; the worker sees the new status (no workspace scope).
|
||||
assert!(topology_runs::cancel(&pool, id, ws).await.unwrap());
|
||||
assert_eq!(
|
||||
topology_runs::current_status(&pool, id).await.unwrap().as_deref(),
|
||||
topology_runs::current_status(&pool, id)
|
||||
.await
|
||||
.unwrap()
|
||||
.as_deref(),
|
||||
Some("cancelled")
|
||||
);
|
||||
assert_eq!(topology_runs::status(&pool, id, ws).await.unwrap().status, "cancelled");
|
||||
assert_eq!(
|
||||
topology_runs::status(&pool, id, ws).await.unwrap().status,
|
||||
"cancelled"
|
||||
);
|
||||
|
||||
// Already terminal → cannot cancel again; wrong workspace → no-op.
|
||||
assert!(!topology_runs::cancel(&pool, id, ws).await.unwrap());
|
||||
let other = seed_workspace(&pool).await;
|
||||
let id2 = Uuid::now_v7();
|
||||
topology_runs::enqueue_run(&pool, id2, ws, "t", &graph).await.unwrap();
|
||||
topology_runs::enqueue_run(&pool, id2, ws, "t", &graph)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(!topology_runs::cancel(&pool, id2, other).await.unwrap());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user