@arnilo/prism-tools 0.13.0 → 0.13.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.13.1] - 2026-11-12
+
+### ./coding
+
+#### Fixed
+
+- **`workspace.worktree.create({ sessionId })` keeps one live worktree per session.** Creating a worktree for a session that already holds one now fails with the new code `workspace_session_bound` and creates nothing. Previously a second record was created, and `bound(sessionId)` and tool routing became ambiguous. Two concurrent creates for one session bind once. `worktree.rebind` refuses a session that already holds a different worktree with the same code. Reuse the held worktree through `bound(sessionId)`, or dispose it first.
+
 ## [Unreleased]
 
 Consolidated seven tool packages into `@arnilo/prism-tools` with explicit subpaths.

package/coding/README.md

@@ -135,7 +135,7 @@ await wt.dispose({ force: true });
 
 | member | behavior |
 | --- | --- |
-| `worktree.create({ branch?, base?, sessionId? })` | Adds a linked worktree under `worktreeRoot` on a new branch (default `prism/<short id>`) from `base` (default `HEAD`), locks it with a `prism-workspace:` reason, and returns `{ path, branch, base, parentBranch, sessionId?, dispose }`. `base` is the resolved commit the branch started at. `parentBranch` is the main tree's checked-out branch at creation, recorded because `merge` only accepts a branch name; `HEAD` means the main tree was detached. `sessionId` binds the worktree for tool routing (see [Worktree roots for one session](#worktree-roots-for-one-session)); under a sandbox the binding fails with `workspace_sandbox_unsupported`. More than `maxWorktrees` active worktrees fails with `workspace_limit`; a destination outside `worktreeRoot` fails with `workspace_path_escape`. |
+| `worktree.create({ branch?, base?, sessionId? })` | Adds a linked worktree under `worktreeRoot` on a new branch (default `prism/<short id>`) from `base` (default `HEAD`), locks it with a `prism-workspace:` reason, and returns `{ path, branch, base, parentBranch, sessionId?, dispose }`. `base` is the resolved commit the branch started at. `parentBranch` is the main tree's checked-out branch at creation, recorded because `merge` only accepts a branch name; `HEAD` means the main tree was detached. `sessionId` binds the worktree for tool routing (see [Worktree roots for one session](#worktree-roots-for-one-session)); under a sandbox the binding fails with `workspace_sandbox_unsupported`. A session holds at most one live worktree: a second `create` (or a `rebind` of another path) for a session that already holds one fails with `workspace_session_bound` and creates nothing, so `bound(sessionId)` is never ambiguous. Reuse the held worktree through `bound`, or dispose it first. More than `maxWorktrees` active worktrees fails with `workspace_limit`; a destination outside `worktreeRoot` fails with `workspace_path_escape`. |
 | `worktree.bound(sessionId)` | The active worktree bound to that session, or `undefined`. |
 | `worktree.rebind({ path, sessionId, branch?, base? })` | Re-adopts a worktree a dead process left behind and binds it to `sessionId`, so a resumed workflow node runs in its recorded worktree. It fails closed with `workspace_unknown` unless the path is inside `worktreeRoot`, registered with git, locked with this service's `prism-workspace:` marker, and on `branch` when given. `base` defaults to the merge base of the branch and the main tree's `HEAD`. Idempotent for the same session; counts against `maxWorktrees`; refused under a sandbox. Never creates a worktree. |
 | `diff(path, bounds?)` | `{ changes, truncated }` for tracked changes against the worktree's `base` plus untracked files. Paths are worktree-relative and each entry is the driver kit's `FileActivity` shape. A file whose diff exceeds `maxBytes` is listed with no `diff`; more than `maxFiles` sets `truncated`. Overlay files never appear. |

package/coding/src/workspace/errors.ts

@@ -15,7 +15,8 @@ export type WorkspaceServiceErrorCode =
   | "workspace_identity_missing"
   | "workspace_git_unsupported"
   | "workspace_merge_failed"
-  | "workspace_sandbox_unsupported";
+  | "workspace_sandbox_unsupported"
+  | "workspace_session_bound";
 
 export class WorkspaceServiceError extends Error {
   readonly code: WorkspaceServiceErrorCode;

package/coding/src/workspace/service.ts

@@ -59,7 +59,8 @@ export interface WorkspaceWorktreeCreate {
   readonly base?: string;
   /**
    * Binds this worktree to a session for tool routing (plan 165 Task 7). A sandboxed service
-   * refuses the binding: the routed tools would leave the sandbox root.
+   * refuses the binding: the routed tools would leave the sandbox root. A session holds at most one
+   * live worktree: creating another for it fails with `workspace_session_bound` (use `bound(sessionId)`).
    */
   readonly sessionId?: string;
 }
@@ -204,6 +205,8 @@ export async function createWorkspaceService(options: WorkspaceServiceOptions):
 
   const emitter = createCodingLifecycleEmitter(options.onEvent === undefined ? {} : { onEvent: options.onEvent });
   const records = new Map<string, WorktreeRecord>();
+  /** Sessions with a create or rebind in flight, so two concurrent calls cannot both bind one session. */
+  const binding = new Set<string>();
   const ops = new Map<string, Promise<GitOperations>>();
   let identityPromise: Promise<{ name: string; email: string } | undefined> | undefined;
   let mainPath: string | undefined;
@@ -306,6 +309,34 @@ export async function createWorkspaceService(options: WorkspaceServiceOptions):
         "a sandboxed run cannot bind a worktree to a session: routed tool paths would leave the sandbox root",
       );
     }
+    if (request.sessionId === undefined) return await createRecord(request);
+    const sessionId = request.sessionId;
+    assertSessionFree(sessionId);
+    binding.add(sessionId);
+    try {
+      return await createRecord(request);
+    } finally {
+      binding.delete(sessionId);
+    }
+  }
+
+  /** One live worktree per session: a second one would make `bound()` and tool routing ambiguous. */
+  function assertSessionFree(sessionId: string, path?: string): void {
+    const held = liveFor(sessionId);
+    if (binding.has(sessionId) || (held !== undefined && held.path !== path)) {
+      throw new WorkspaceServiceError(
+        "workspace_session_bound",
+        `session ${sessionId} already holds a worktree; reuse it through bound(), or dispose it first`,
+      );
+    }
+  }
+
+  function liveFor(sessionId: string): WorktreeRecord | undefined {
+    for (const record of records.values()) if (record.sessionId === sessionId && !record.disposed) return record;
+    return undefined;
+  }
+
+  async function createRecord(request: WorkspaceWorktreeCreate): Promise<WorkspaceWorktree> {
     if (records.size >= maxWorktrees) {
       throw new WorkspaceServiceError("workspace_limit", `at most ${maxWorktrees} worktrees may be active at once`);
     }
@@ -351,6 +382,16 @@ export async function createWorkspaceService(options: WorkspaceServiceOptions):
       if (held.sessionId === request.sessionId && !held.disposed) return handle(held);
       throw new WorkspaceServiceError("workspace_unknown", `worktree ${path} is already held for another session`);
     }
+    assertSessionFree(request.sessionId, path);
+    binding.add(request.sessionId);
+    try {
+      return await adopt(request, path);
+    } finally {
+      binding.delete(request.sessionId);
+    }
+  }
+
+  async function adopt(request: WorkspaceWorktreeRebind, path: string): Promise<WorkspaceWorktree> {
     const repo = await gitFor(root);
     const listed = await repo.worktree({ action: "list" });
     const entry = listed.worktrees.find((worktree) => resolve(worktree.path) === path);
@@ -397,10 +438,8 @@ export async function createWorkspaceService(options: WorkspaceServiceOptions):
   }
 
   function bound(sessionId: string): WorkspaceWorktree | undefined {
-    for (const record of records.values()) {
-      if (record.sessionId === sessionId && !record.disposed) return handle(record);
-    }
-    return undefined;
+    const record = liveFor(sessionId);
+    return record === undefined ? undefined : handle(record);
   }
 
   async function disposeWorktree(record: WorktreeRecord, force: boolean): Promise<void> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arnilo/prism-tools",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Prism coding, web, browser, research, OpenAPI, computer-use and work tools. Import each package through its subpath.",
   "type": "module",
   "engines": {
@@ -104,7 +104,7 @@
   },
   "peerDependencies": {
     "@arnilo/prism": ">=0.13.0 <1.0.0",
-    "@arnilo/prism-extensions": "^0.13.0",
+    "@arnilo/prism-extensions": "^0.13.1",
     "@office-open/docx": "0.14.5",
     "@office-open/pptx": "0.14.5",
     "@office-open/xlsx": "0.14.5",
@@ -156,7 +156,7 @@
     "@types/diff": "^7.0.2",
     "@types/node": "^22.20.0",
     "typescript": "^7.0.2",
-    "@arnilo/prism-extensions": "0.13.0",
+    "@arnilo/prism-extensions": "0.13.1",
     "@types/turndown": "5.0.6",
     "playwright-core": "1.63.0",
     "@firecrawl/anydoc": "0.2.4",