@volter/supercode-orchestrator 0.5.213 → 0.5.215

package/board/workflow.mjs

@@ -1027,7 +1027,9 @@ const ACTIONS = {
       if (task.current_run_id) throw new Error('End the current run before moving its card.');
       if ((value ?? null) === task.machine) return;
       if (task.workspace_kind !== 'scratch' && (!task.workspace_anchor || isWorkspacePath(task.workspace_anchor))) throw new Error('declare the repository and branch with workflow specify --workspace before moving a legacy path card');
-      if ((value ?? null) !== task.machine) run(ctx.db, 'UPDATE tasks SET workspace_path=NULL WHERE id=?', ctx.id);
+      ACTIONS.forget_session(ctx, '*');
+      run(ctx.db, 'UPDATE tasks SET workspace_path=NULL WHERE id=?', ctx.id);
+      cardField(ctx, 'workspace_root', null);
       cardField(ctx, 'machine', value ?? null);
       return;
     }

package/board/workspace.mjs

@@ -78,8 +78,11 @@ export async function declareWorkspace(kind, value, machine, branch = null) {
   const info = await workspaceDoor(machine, 'inspect', value);
   if (kind === 'worktree' && info.linked) throw new Error('worktree workspace already names a linked worktree; name its repository for a solo worktree');
   if (kind === 'dir' && !info.branch && !branch) throw new Error('a detached checkout has no portable branch identity; name the repository and a solo worktree branch');
+  if (kind === 'dir' && info.linked && branch && branch !== info.branch) throw new Error(`worktree ${value} is on branch ${info.branch ?? '(detached)'}, not ${branch}`);
   const row = await workspaceDoor(machine, 'register', value);
-  return { repository: row.repository, branch: branch ?? (kind === 'dir' ? row.branch : null), path: kind === 'dir' ? row.path : null };
+  // A primary path plus another branch names that repository's checkout of the branch. A matching explicit
+  // checkout stays pinned to the path the manager supplied, even when another clone has the same branch mapped.
+  return { repository: row.repository, branch: branch ?? (kind === 'dir' ? row.branch : null), path: kind === 'dir' && (!branch || branch === row.branch) ? row.path : null };
 }
 /** The checkouts this machine keeps of any repository on `branch`: where an arc changing several repositories
  *  keeps its work in each of them (its own worktree aside). Another machine's map is not read from here. */
@@ -110,6 +113,14 @@ export async function resolveWorkspace(task, create = false) {
     if (info.linked) throw new Error('worktree declaration is already a linked worktree; name its repository instead');
     throw new Error('legacy worktree path needs registration and a repository declaration before launch');
   }
+  if (task.workspace_kind === 'dir' && task.workspace_path) {
+    const cached = await workspaceDoor(task.machine, 'inspect', task.workspace_path);
+    if (cached.repository !== repositoryId(declared) || (task.branch_name && cached.branch !== task.branch_name)) {
+      throw new Error(`card checkout ${task.workspace_path} does not match ${declared}, branch ${task.branch_name ?? '(primary)'}; retarget its workspace explicitly`);
+    }
+    if (create) await workspaceDoor(task.machine, 'register', cached.root);
+    return cached;
+  }
   // A primary checkout can change when another clone is registered. That does
   // not move an already allocated card worktree. Machine moves and workspace
   // retargets clear this runtime receipt; never borrow an arbitrary checkout.
@@ -119,6 +130,7 @@ export async function resolveWorkspace(task, create = false) {
     const cached = await workspaceDoor(task.machine, 'inspect', task.workspace_path);
     if (cached.linked && basename(cached.path) === worktreeFolder(task) && basename(dirname(cached.path)) === '.worktrees' &&
         cached.repository === repositoryId(declared) && cached.branch === worktreeBranch(task)) {
+      if (create) await workspaceDoor(task.machine, 'register', cached.root);
       return { ...cached, root: dirname(dirname(cached.path)) };
     }
     throw new Error(`card worktree ${task.workspace_path} does not match ${declared}, branch ${worktreeBranch(task)}; retarget its workspace explicitly`);

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.5.213",
+  "version": "0.5.215",
+  "gitHead": "8267b3766f01d81c1c3e2acd3451b36aa587bf47",
   "type": "module",
   "description": "The orchestrator runtime over the Volter Harness ontology: one typed operational model whose folder is its serialization, read and written through the harness orchestration doors (docs/ORCHESTRATOR-IR.md)",
   "exports": {
@@ -32,7 +33,7 @@
     "check-types": "node scripts/generate-types.mjs --check"
   },
   "dependencies": {
-    "@volter/supercode-teams": "^0.3.344",
+    "@volter/supercode-teams": "^0.3.350",
     "@volter/supercode-terminal": "^0.3.10",
     "@volter/supercode-harness-sdk": "^0.3.104",
     "@volter/teams": "0.2.99",
@@ -61,6 +62,5 @@
     "board",
     "apply",
     "README.md"
-  ],
-  "gitHead": "d017029f1b1d9293e295839a496be94a641b1ac0"
+  ]
 }