@nuvin/session 0.2.0-rc.7 → 0.2.0-rc.8

package/dist/client/index.js

@@ -1,10 +1,10 @@
 import {
   createSessionViewState,
   reduceSessionEvent
-} from "../chunk-I5U3WU6B.js";
+} from "../chunk-2OTEZX2E.js";
 import {
   PROTOCOL_VERSION
-} from "../chunk-MRVGQ4DK.js";
+} from "../chunk-MPBST5DM.js";
 
 // src/client/endpoint.ts
 var TerminalEndpointError = class extends Error {
@@ -17,6 +17,13 @@ var TerminalEndpointError = class extends Error {
 };
 
 // src/client/http-data-client.ts
+var DataRpcClientError = class extends Error {
+  constructor(code, message) {
+    super(message);
+    this.code = code;
+    this.name = "DataRpcClientError";
+  }
+};
 function httpBaseFromWsUrl(wsUrl) {
   const u = new URL(wsUrl);
   const scheme = u.protocol === "wss:" ? "https:" : "http:";
@@ -46,6 +53,9 @@ async function throwFromResponse(response, fallback, terminal, onUnauthorized) {
       typeof body?.message === "string" ? body.message : mapped.message
     );
   }
+  if (body?.code === "invalid-history-cursor") {
+    throw new DataRpcClientError(body.code, body.message ?? fallback);
+  }
   throw new Error(
     typeof body?.message === "string" ? body.message : `${fallback} (HTTP ${response.status}).`
   );
@@ -173,10 +183,10 @@ function createHttpDataClient(options = {}) {
       const body = await response.json();
       return { url: body.wsUrl, credential: { grant: body.grant } };
     },
-    async fetchTranscript(daemonId, historyId, opts) {
-      const suffix = `/transcript/${encodeURIComponent(historyId)}${queryString({
-        workspace: opts?.workspace,
-        profile: opts?.profile
+    async fetchTranscript(daemonId, identity) {
+      const suffix = `/transcript/${encodeURIComponent(identity.sessionId)}${queryString({
+        workspace: identity.workspace,
+        profile: identity.profile
       })}`;
       const response = await daemonFetch(daemonId, suffix);
       if (response.status === 404) {
@@ -202,6 +212,35 @@ function createHttpDataClient(options = {}) {
         });
       return await response.json();
     },
+    async listHistoryWorkspaces(daemonId, opts) {
+      const suffix = `/history/workspaces${queryString({
+        profile: opts?.profile,
+        currentCwd: opts?.currentCwd,
+        query: opts?.query
+      })}`;
+      const response = await daemonFetch(daemonId, suffix, { signal: opts?.signal });
+      if (!response.ok)
+        await throwFromResponse(response, "Failed to load history workspaces", {
+          404: { reason: "daemon-revoked", message: "This daemon is no longer registered." }
+        });
+      return await response.json();
+    },
+    async listWorkspaceHistory(daemonId, opts) {
+      const suffix = `/history/workspace${queryString({
+        profile: opts?.profile,
+        workspace: opts?.workspace,
+        cwd: opts?.cwd,
+        query: opts?.query,
+        limit: opts?.limit,
+        cursor: opts?.cursor
+      })}`;
+      const response = await daemonFetch(daemonId, suffix, { signal: opts?.signal });
+      if (!response.ok)
+        await throwFromResponse(response, "Failed to load workspace history", {
+          404: { reason: "daemon-revoked", message: "This daemon is no longer registered." }
+        });
+      return await response.json();
+    },
     async listWorkspaces(daemonId, opts) {
       const suffix = `/workspaces${queryString({ profile: opts?.profile })}`;
       const response = await daemonFetch(daemonId, suffix);
@@ -224,10 +263,10 @@ function createHttpDataClient(options = {}) {
       if (!response.ok) await throwFromResponse(response, "Failed to create the workspace");
       return await response.json();
     },
-    async deleteSession(daemonId, historyId, opts) {
-      const suffix = `/sessions/${encodeURIComponent(historyId)}${queryString({
-        workspace: opts?.workspace,
-        profile: opts?.profile
+    async deleteSession(daemonId, identity) {
+      const suffix = `/sessions/${encodeURIComponent(identity.sessionId)}${queryString({
+        workspace: identity.workspace,
+        profile: identity.profile
       })}`;
       const response = await daemonFetch(daemonId, suffix, { method: "DELETE" });
       if (response.status === 404) {
@@ -540,22 +579,24 @@ function createSessionClient(transport) {
       })).then(() => {
       });
     },
-    decideApproval(toolCallId, decision, comment, grantDir) {
+    decideApproval(toolCallId, decision, comment, grantDir, parentToolCallId) {
       return sendCommand((id) => ({
         id,
         type: "decide-approval",
         toolCallId,
         decision,
         ...comment !== void 0 ? { comment } : {},
-        ...grantDir !== void 0 ? { grantDir } : {}
+        ...grantDir !== void 0 ? { grantDir } : {},
+        ...parentToolCallId !== void 0 ? { parentToolCallId } : {}
       })).then(() => {
       });
     },
-    persistBashPermission(toolCallId, request) {
+    persistBashPermission(toolCallId, request, parentToolCallId) {
       return sendCommand((id) => ({
         id,
         type: "persist-bash-permission",
         toolCallId,
+        ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
         request
       })).then(toPersistBashPermissionResult);
     },
@@ -994,11 +1035,13 @@ function throwCollectedErrors(errors, message) {
 }
 function bindDaemonDataClient(client, daemonId) {
   return {
-    fetchTranscript: (historyId, opts) => client.fetchTranscript(daemonId, historyId, opts),
+    fetchTranscript: (identity) => client.fetchTranscript(daemonId, identity),
     fetchHistory: (opts) => client.fetchHistory(daemonId, opts),
+    listHistoryWorkspaces: (opts) => client.listHistoryWorkspaces(daemonId, opts),
+    listWorkspaceHistory: (opts) => client.listWorkspaceHistory(daemonId, opts),
     listWorkspaces: (opts) => client.listWorkspaces(daemonId, opts),
     createWorkspace: (opts) => client.createWorkspace(daemonId, opts),
-    deleteSession: (historyId, opts) => client.deleteSession(daemonId, historyId, opts),
+    deleteSession: (identity) => client.deleteSession(daemonId, identity),
     listProfiles: () => client.listProfiles(daemonId),
     listProviders: (opts) => client.listProviders(daemonId, opts),
     addProvider: (input) => client.addProvider(daemonId, input),
@@ -1198,6 +1241,24 @@ function createDaemonClient(target, deps = {}) {
 }
 
 // src/client/directory.ts
+var DAEMON_REQUEST_ERROR_CODES = /* @__PURE__ */ new Set([
+  "transcript-unavailable",
+  "transcript-corrupt",
+  "history-state-conflict",
+  "ambiguous-session-identity"
+]);
+var DaemonRequestError = class extends Error {
+  code;
+  identity;
+  constructor(message, options) {
+    super(message);
+    this.name = "DaemonRequestError";
+    if (options?.code && DAEMON_REQUEST_ERROR_CODES.has(options.code)) {
+      this.code = options.code;
+    }
+    this.identity = options?.identity;
+  }
+};
 var toText2 = (data) => {
   if (typeof data === "string") return data;
   if (data instanceof Buffer) return data.toString("utf8");
@@ -1323,7 +1384,12 @@ function createServerDirectory(options) {
       if (!entry || entry.kind === "list") return;
       link.pending.delete(message.id);
       if (!message.ok) {
-        entry.reject(new Error(message.error?.message ?? "Command failed."));
+        entry.reject(
+          new DaemonRequestError(message.error?.message ?? "Command failed.", {
+            ...message.error?.code ? { code: message.error.code } : {},
+            ...message.error?.identity ? { identity: message.error.identity } : {}
+          })
+        );
         return;
       }
       if (entry.kind === "kill") {
@@ -1524,7 +1590,7 @@ function createServerDirectory(options) {
         );
       });
     },
-    resumeSession(server, historyId, resumeOptions) {
+    resumeSession(server, identity) {
       return new Promise((resolve, reject) => {
         const link = linkFor(server);
         if (link instanceof Error) {
@@ -1538,11 +1604,7 @@ function createServerDirectory(options) {
           JSON.stringify({
             id,
             type: "resume-session",
-            historyId,
-            cwd: resumeOptions.cwd,
-            ...resumeOptions.name !== void 0 ? { name: resumeOptions.name } : {},
-            ...resumeOptions.workspace !== void 0 ? { workspace: resumeOptions.workspace } : {},
-            ...resumeOptions.profile !== void 0 ? { profile: resumeOptions.profile } : {}
+            identity
           })
         );
       });
@@ -1590,6 +1652,8 @@ function createServerDirectory(options) {
   };
 }
 export {
+  DaemonRequestError,
+  DataRpcClientError,
   SessionCommandError,
   TerminalEndpointError,
   adaptWhatwgSocket,

package/dist/client/session-client.d.ts

@@ -18,8 +18,8 @@ export interface SessionClient {
     /** Raw frame hook for UI side-effects (e.g. close modals on state-reset). */
     onEvent(listener: (event: ServerEvent) => void): () => void;
     submit(input: AgentInput, opts: ClientSubmitOptions): Promise<void>;
-    decideApproval(toolCallId: string, decision: "a" | "n" | "y", comment?: string, grantDir?: string): Promise<void>;
-    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest): Promise<PersistBashPermissionResult>;
+    decideApproval(toolCallId: string, decision: "a" | "n" | "y", comment?: string, grantDir?: string, parentToolCallId?: string): Promise<void>;
+    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest, parentToolCallId?: string): Promise<PersistBashPermissionResult>;
     answerQuestion(questionId: string, answers: AskUserAnswers): Promise<void>;
     abort(): Promise<void>;
     /** Cancel a queued (not-yet-running) message by its `turn-status.queued` id. */

package/dist/client/session-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-client.d.ts","sourceRoot":"","sources":["../../src/client/session-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-client.d.ts","sourceRoot":"","sources":["../../src/client/session-client.ts"],"names":[],"mappings":"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"}

package/dist/controller/agent-channel.d.ts

@@ -36,7 +36,7 @@ export type ToolCallRequest = {
 export type AgentEventListener = (payload: AgentEventPayload) => void;
 export type SessionLoadedListener = (loaded: SessionLoadedPayload) => void;
 export type ToolCallDecider = (request: ToolCallRequest) => Promise<ToolRuntimeDispatchDecision> | ToolRuntimeDispatchDecision;
-export type UserQuestionHandler = (request: AskUserQuestionRequest) => Promise<AskUserAnswers> | AskUserAnswers;
+export type UserQuestionHandler = (request: AskUserQuestionRequest, scope?: DelegationScope) => Promise<AskUserAnswers> | AskUserAnswers;
 /**
  * In-process channel between the Agent (constructed in `main()`) and the
  * React UI (`<App />`). Two distinct shapes:
@@ -54,7 +54,7 @@ export declare class AgentChannel {
     publishEvent(event: AgentEvent, scope?: DelegationScope): void;
     publishSessionLoaded(loaded: SessionLoadedPayload): void;
     requestToolDecision(request: ToolCallRequest): Promise<ToolRuntimeDispatchDecision> | ToolRuntimeDispatchDecision;
-    requestUserQuestion(request: AskUserQuestionRequest): Promise<AskUserAnswers>;
+    requestUserQuestion(request: AskUserQuestionRequest, scope?: DelegationScope): Promise<AskUserAnswers>;
     onEvent(listener: AgentEventListener): () => void;
     onSessionLoaded(listener: SessionLoadedListener): () => void;
     setToolDecider(decider: ToolCallDecider | null): void;

package/dist/controller/agent-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-channel.d.ts","sourceRoot":"","sources":["../../src/controller/agent-channel.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,sBAAsB,EACtB,OAAO,EACP,mBAAmB,EACnB,2BAA2B,EAC3B,YAAY,EACb,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,kCAAkC,EAClC,4BAA4B,EAC5B,yBAAyB,EAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,8DAA8D;AAC9D,MAAM,MAAM,oBAAoB,GAAG;IACjC,aAAa,EAAE,OAAO,EAAE,CAAC;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,UAAU,EAAE,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,6BAA6B,CAAC;IAC3C,gFAAgF;IAChF,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,qBAAqB,CAAC,EAAE,CACtB,OAAO,EAAE,4BAA4B,KAClC,OAAO,CAAC,kCAAkC,CAAC,CAAC;IACjD,QAAQ,EAAE,YAAY,CAAC;IACvB,kBAAkB,CAAC,EAAE,yBAAyB,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;AACtE,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAE3E,MAAM,MAAM,eAAe,GAAG,CAC5B,OAAO,EAAE,eAAe,KACrB,OAAO,CAAC,2BAA2B,CAAC,GAAG,2BAA2B,CAAC;AAExE,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,sBAAsB,KAC5B,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;AAO9C;;;;;;;;;GASG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,eAAe,CAAoC;IAI3D,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAI9D,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAIxD,mBAAmB,CACjB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,2BAA2B,CAAC,GAAG,2BAA2B;IAOrE,mBAAmB,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,cAAc,CAAC;IAS7E,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,IAAI;IAOjD,eAAe,CAAC,QAAQ,EAAE,qBAAqB,GAAG,MAAM,IAAI;IAO5D,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,IAAI;IAIrD,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,GAAG,IAAI;CAG9D"}
+{"version":3,"file":"agent-channel.d.ts","sourceRoot":"","sources":["../../src/controller/agent-channel.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,sBAAsB,EACtB,OAAO,EACP,mBAAmB,EACnB,2BAA2B,EAC3B,YAAY,EACb,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,kCAAkC,EAClC,4BAA4B,EAC5B,yBAAyB,EAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,8DAA8D;AAC9D,MAAM,MAAM,oBAAoB,GAAG;IACjC,aAAa,EAAE,OAAO,EAAE,CAAC;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,UAAU,EAAE,CAAC;CACxB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,6BAA6B,CAAC;IAC3C,gFAAgF;IAChF,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,qBAAqB,CAAC,EAAE,CACtB,OAAO,EAAE,4BAA4B,KAClC,OAAO,CAAC,kCAAkC,CAAC,CAAC;IACjD,QAAQ,EAAE,YAAY,CAAC;IACvB,kBAAkB,CAAC,EAAE,yBAAyB,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;AACtE,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAE3E,MAAM,MAAM,eAAe,GAAG,CAC5B,OAAO,EAAE,eAAe,KACrB,OAAO,CAAC,2BAA2B,CAAC,GAAG,2BAA2B,CAAC;AAExE,MAAM,MAAM,mBAAmB,GAAG,CAChC,OAAO,EAAE,sBAAsB,EAC/B,KAAK,CAAC,EAAE,eAAe,KACpB,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;AAO9C;;;;;;;;;GASG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,eAAe,CAAoC;IAI3D,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI;IAI9D,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAIxD,mBAAmB,CACjB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,2BAA2B,CAAC,GAAG,2BAA2B;IAOrE,mBAAmB,CACjB,OAAO,EAAE,sBAAsB,EAC/B,KAAK,CAAC,EAAE,eAAe,GACtB,OAAO,CAAC,cAAc,CAAC;IAS1B,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,MAAM,IAAI;IAOjD,eAAe,CAAC,QAAQ,EAAE,qBAAqB,GAAG,MAAM,IAAI;IAO5D,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,GAAG,IAAI;IAIrD,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,GAAG,IAAI;CAG9D"}

package/dist/controller/index.js

@@ -6,8 +6,9 @@ import {
   createMessageStateFromMessages,
   createSessionViewState,
   isToolAutoApprovedForMode,
-  reduceSessionEvent
-} from "../chunk-I5U3WU6B.js";
+  reduceSessionEvent,
+  scopedToolKey
+} from "../chunk-2OTEZX2E.js";
 
 // src/controller/agent-channel.ts
 import { EventEmitter } from "events";
@@ -32,11 +33,11 @@ var AgentChannel = class {
     }
     return this.decider(request);
   }
-  requestUserQuestion(request) {
+  requestUserQuestion(request, scope) {
     if (!this.questionHandler) {
       return Promise.reject(new Error("UI is not ready to handle user questions."));
     }
-    return Promise.resolve(this.questionHandler(request));
+    return Promise.resolve(this.questionHandler(request, scope));
   }
   // ---------- UI-side (subscribers) ----------
   onEvent(listener) {
@@ -86,6 +87,10 @@ function createSessionController(deps) {
   let seq = 0;
   let approvalMode = deps.approvalMode ?? "readOnly";
   let abortController = null;
+  let activeTurnPromise = null;
+  let closePromise = null;
+  let closing = false;
+  let detached = false;
   let activeTurnId;
   let activePolicyDenial;
   let hostBusyCount = 0;
@@ -246,7 +251,7 @@ function createSessionController(deps) {
     const descriptor = {
       agentId,
       permissionClass,
-      summary: findToolSummary(toolCall.id),
+      summary: findToolSummary(toolCall.id, parentToolCallId),
       toolCallId: toolCall.id,
       toolName: toolCall.name,
       ...dirAccess !== void 0 ? { dirAccess } : {},
@@ -257,8 +262,13 @@ function createSessionController(deps) {
       ...request.workflowBashPolicy !== void 0 ? { workflowBashPolicy: request.workflowBashPolicy } : {}
     };
     return new Promise((resolve) => {
-      approvalResolvers.set(toolCall.id, resolve);
-      privateApprovals.set(toolCall.id, {
+      const toolKey = scopedToolKey(parentToolCallId, toolCall.id);
+      approvalResolvers.set(toolKey, {
+        resolve,
+        toolCallId: toolCall.id,
+        ...parentToolCallId !== void 0 ? { parentToolCallId } : {}
+      });
+      privateApprovals.set(toolKey, {
         approvalKey,
         bashPolicy: hasBashPolicy,
         ...!dirAccess && toolCall.name === "Bash" && bashPolicy?.persistence.eligible && request.persistBashPermission !== void 0 ? { persistBashPermission: request.persistBashPermission } : {}
@@ -266,7 +276,7 @@ function createSessionController(deps) {
       emit({ type: "approval-requested", approval: descriptor });
     });
   });
-  deps.channel.setQuestionHandler((request) => {
+  deps.channel.setQuestionHandler((request, scope) => {
     if (deps.headless) {
       activePolicyDenial = "Questions are unavailable in headless mode.";
       return Promise.reject(new Error(activePolicyDenial));
@@ -275,31 +285,47 @@ function createSessionController(deps) {
     const questionId = `question-${questionCounter}`;
     return new Promise((resolve, reject) => {
       questionResolvers.set(questionId, { resolve, reject });
-      emit({ type: "question-asked", question: { questionId, request } });
+      const nickname = nicknameFor(scope?.parentToolCallId);
+      emit({
+        type: "question-asked",
+        question: {
+          questionId,
+          request,
+          ...scope?.agentId !== void 0 ? { agentId: scope.agentId } : {},
+          ...scope?.parentToolCallId !== void 0 ? { parentToolCallId: scope.parentToolCallId } : {},
+          ...nickname !== void 0 ? { nickname } : {}
+        }
+      });
     });
   });
-  function findToolSummary(toolCallId) {
-    const messageId = state.messages.toolMessageIds[toolCallId];
+  function findToolSummary(toolCallId, parentToolCallId) {
+    const messageId = state.messages.toolMessageIds[scopedToolKey(parentToolCallId, toolCallId)];
     const message = state.messages.messages.find((entry) => entry.id === messageId);
     return message?.role === "tool" ? message.summary : "";
   }
   function nicknameFor(parentToolCallId) {
     if (!parentToolCallId) return void 0;
-    const parentMessageId = state.messages.toolMessageIds[parentToolCallId];
+    const parentMessageId = state.messages.toolMessageIds[scopedToolKey(void 0, parentToolCallId)];
     const parentMessage = state.messages.messages.find((entry) => entry.id === parentMessageId);
     if (parentMessage?.role !== "tool") return void 0;
     const nickname = parentMessage.input?.nickname;
     return typeof nickname === "string" ? nickname : void 0;
   }
-  function findDescriptor(toolCallId) {
+  function findDescriptor(toolCallId, parentToolCallId) {
     return [state.approval.active, ...state.approval.pending].find(
-      (entry) => entry?.toolCallId === toolCallId
+      (entry) => entry?.toolCallId === toolCallId && entry.parentToolCallId === parentToolCallId
     );
   }
   function rejectAllPending(reason) {
-    for (const [toolCallId, resolve] of approvalResolvers) {
-      resolve({ action: "reject", reason });
-      emit({ type: "approval-settled", toolCallId, status: "rejected", by: "abort" });
+    for (const pending of approvalResolvers.values()) {
+      pending.resolve({ action: "reject", reason });
+      emit({
+        type: "approval-settled",
+        toolCallId: pending.toolCallId,
+        ...pending.parentToolCallId === void 0 ? {} : { parentToolCallId: pending.parentToolCallId },
+        status: "rejected",
+        by: "abort"
+      });
     }
     approvalResolvers.clear();
     privateApprovals.clear();
@@ -323,7 +349,7 @@ function createSessionController(deps) {
     }
   }
   function startNextQueuedSubmission() {
-    if (abortController || hostBusyCount > 0) return;
+    if (closing || abortController || hostBusyCount > 0) return;
     const next = queue.shift();
     if (!next) return;
     if (!next.opts.silent) {
@@ -336,7 +362,7 @@ function createSessionController(deps) {
         next.opts.turnId
       );
     }
-    void runTurn(next.input, {
+    void startTrackedTurn(next.input, {
       turnId: next.opts.turnId,
       allowSteering: next.opts.turnId === void 0
     });
@@ -486,10 +512,28 @@ function createSessionController(deps) {
       if (ownedTurn) startNextQueuedSubmission();
     }
   }
+  function startTrackedTurn(input, opts) {
+    let tracked;
+    tracked = runTurn(input, opts).finally(() => {
+      if (activeTurnPromise === tracked) activeTurnPromise = null;
+    });
+    activeTurnPromise = tracked;
+    return tracked;
+  }
+  function detachController() {
+    if (detached) return;
+    detached = true;
+    unsubscribeEvents();
+    unsubscribeLoaded();
+    deps.channel.setToolDecider(null);
+    deps.channel.setQuestionHandler(null);
+    listeners.clear();
+  }
   return {
     abort() {
       queue.length = 0;
       abortController?.abort(new Error("User aborted the current turn."));
+      rejectAllPending("User aborted the current turn.");
     },
     attachHostHooks(hooks) {
       if (hooks.compaction) compaction = hooks.compaction;
@@ -510,14 +554,21 @@ function createSessionController(deps) {
       emit({ type: "info", message });
     },
     close() {
+      if (closePromise) return closePromise;
+      closing = true;
+      const shouldEmitTurnStatus = queue.length > 0 || abortController !== null || hostBusyCount > 0;
       queue.length = 0;
       abortController?.abort(new Error("Session closed."));
       rejectAllPending("Session closed.");
-      unsubscribeEvents();
-      unsubscribeLoaded();
-      deps.channel.setToolDecider(null);
-      deps.channel.setQuestionHandler(null);
-      listeners.clear();
+      if (shouldEmitTurnStatus) emitTurnStatus();
+      const active = activeTurnPromise;
+      if (!active) {
+        detachController();
+        closePromise = Promise.resolve();
+        return closePromise;
+      }
+      closePromise = active.then(detachController, detachController);
+      return closePromise;
     },
     dequeue(queuedId) {
       const index = queue.findIndex((q) => q.id === queuedId);
@@ -526,17 +577,18 @@ function createSessionController(deps) {
       emitTurnStatus();
       return true;
     },
-    decideApproval(toolCallId, decision, comment, grantDir) {
-      if (persistenceInFlight.has(toolCallId)) {
+    decideApproval(toolCallId, decision, comment, grantDir, parentToolCallId) {
+      const toolKey = scopedToolKey(parentToolCallId, toolCallId);
+      if (persistenceInFlight.has(toolKey)) {
         return false;
       }
-      const resolve = approvalResolvers.get(toolCallId);
-      if (!resolve) return false;
-      approvalResolvers.delete(toolCallId);
-      persistenceInFlight.delete(toolCallId);
-      const descriptor = findDescriptor(toolCallId);
-      const privateApproval = privateApprovals.get(toolCallId);
-      privateApprovals.delete(toolCallId);
+      const pending = approvalResolvers.get(toolKey);
+      if (!pending) return false;
+      approvalResolvers.delete(toolKey);
+      persistenceInFlight.delete(toolKey);
+      const descriptor = findDescriptor(toolCallId, parentToolCallId);
+      const privateApproval = privateApprovals.get(toolKey);
+      privateApprovals.delete(toolKey);
       if (decision === "a" && descriptor && !descriptor.dirAccess) {
         alwaysApproved.add(
           privateApproval?.approvalKey ?? `${descriptor.agentId}:${descriptor.toolName}`
@@ -545,9 +597,12 @@ function createSessionController(deps) {
       const rejected = decision === "n";
       if (rejected) {
         const baseReason = `User rejected tool execution (${descriptor?.toolName ?? "unknown tool"})`;
-        resolve({ action: "reject", reason: comment ? `${baseReason}: ${comment}` : baseReason });
+        pending.resolve({
+          action: "reject",
+          reason: comment ? `${baseReason}: ${comment}` : baseReason
+        });
       } else if (descriptor?.dirAccess) {
-        resolve({
+        pending.resolve({
           action: "run",
           grantDir: {
             dir: resolveGrantDir(
@@ -563,30 +618,32 @@ function createSessionController(deps) {
           } : {}
         });
       } else if (descriptor?.toolName === "Bash" && privateApproval?.bashPolicy) {
-        resolve({
+        pending.resolve({
           action: "run",
           approvalDecision: decision,
           approvalSource: "user"
         });
       } else {
-        resolve({ action: "run" });
+        pending.resolve({ action: "run" });
       }
       emit({
         type: "approval-settled",
         toolCallId,
+        ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
         status: rejected ? "rejected" : "approved",
         by: "client"
       });
       return true;
     },
-    async persistBashPermission(toolCallId, request) {
+    async persistBashPermission(toolCallId, request, parentToolCallId) {
+      const toolKey = scopedToolKey(parentToolCallId, toolCallId);
       const descriptor = state.approval.active;
-      const privateApproval = privateApprovals.get(toolCallId);
+      const privateApproval = privateApprovals.get(toolKey);
       const handler = privateApproval?.persistBashPermission;
-      if (descriptor?.toolCallId !== toolCallId || descriptor.toolName !== "Bash" || descriptor.dirAccess !== void 0 || descriptor.bashPolicy?.persistence.eligible !== true || handler === void 0 || !approvalResolvers.has(toolCallId)) {
+      if (descriptor?.toolCallId !== toolCallId || descriptor.parentToolCallId !== parentToolCallId || descriptor.toolName !== "Bash" || descriptor.dirAccess !== void 0 || descriptor.bashPolicy?.persistence.eligible !== true || handler === void 0 || !approvalResolvers.has(toolKey)) {
         return void 0;
       }
-      if (persistenceInFlight.has(toolCallId)) {
+      if (persistenceInFlight.has(toolKey)) {
         return {
           status: "validation-error",
           message: "A persistent Bash permission save is already in progress.",
@@ -600,7 +657,7 @@ function createSessionController(deps) {
           fieldErrors: { server: "Wait for the current operation to finish." }
         };
       }
-      persistenceInFlight.add(toolCallId);
+      persistenceInFlight.add(toolKey);
       hostBusyCount += 1;
       emitTurnStatus();
       try {
@@ -608,13 +665,13 @@ function createSessionController(deps) {
         if (outcome.status === "validation-error") {
           return outcome;
         }
-        const resolve = approvalResolvers.get(toolCallId);
-        if (resolve === void 0 || state.approval.active?.toolCallId !== toolCallId || privateApprovals.get(toolCallId) !== privateApproval) {
+        const pending = approvalResolvers.get(toolKey);
+        if (pending === void 0 || state.approval.active?.toolCallId !== toolCallId || state.approval.active.parentToolCallId !== parentToolCallId || privateApprovals.get(toolKey) !== privateApproval) {
           return void 0;
         }
-        approvalResolvers.delete(toolCallId);
-        privateApprovals.delete(toolCallId);
-        resolve({
+        approvalResolvers.delete(toolKey);
+        privateApprovals.delete(toolKey);
+        pending.resolve({
           action: "run",
           executionAuthorization: outcome.executionAuthorization,
           approvalSource: "user"
@@ -622,12 +679,13 @@ function createSessionController(deps) {
         emit({
           type: "approval-settled",
           toolCallId,
+          ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
           status: "approved",
           by: "client"
         });
         return { status: "approved" };
       } finally {
-        persistenceInFlight.delete(toolCallId);
+        persistenceInFlight.delete(toolKey);
         hostBusyCount = Math.max(0, hostBusyCount - 1);
         emitTurnStatus();
       }
@@ -695,6 +753,7 @@ function createSessionController(deps) {
       startNextQueuedSubmission();
     },
     async submit(input, opts) {
+      if (closing) throw new Error("Session is closing.");
       if (abortController || hostBusyCount > 0) {
         queue.push({
           id: `q-${++queueCounter}`,
@@ -715,7 +774,7 @@ function createSessionController(deps) {
           opts.turnId
         );
       }
-      await runTurn(input, {
+      await startTrackedTurn(input, {
         turnId: opts.turnId,
         allowSteering: opts.turnId === void 0
       });

package/dist/controller/session-controller.d.ts

@@ -84,28 +84,21 @@ export interface SessionController {
         compaction?: CompactionHooks;
         guardPrompt?: (input: AgentInput) => Promise<GuardResult>;
     }): void;
-    /**
-     * Settle a pending question by id.
-     *
-     * Single-active-question is the current protocol invariant: when parallel
-     * sub-agents ask concurrently, only the latest question is surfaced as
-     * `question.active` in state. All resolvers survive in the internal map, so
-     * answering any questionId settles the matching ask correctly.
-     */
+    /** Settle a pending question by id. */
     answerQuestion(questionId: string, answers: AskUserAnswers): boolean;
     /** Emit an error line into the replicated transcript. */
     appendError(message: string): void;
     /** Emit an info line into the replicated transcript (slash output, system notices). */
     appendInfo(message: string): void;
-    close(): void;
+    close(): Promise<void>;
     /**
      * Cancel a queued (not-yet-running) submission by its `turn-status.queued` id.
      * Returns true if an item was removed, false if the id was unknown (already
      * drained or never existed) — a race-safe no-op the host still acks ok.
      */
     dequeue(queuedId: string): boolean;
-    decideApproval(toolCallId: string, decision: "a" | "n" | "y", comment?: string, grantDir?: string): boolean;
-    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest): Promise<PersistBashPermissionResult | undefined>;
+    decideApproval(toolCallId: string, decision: "a" | "n" | "y", comment?: string, grantDir?: string, parentToolCallId?: string): boolean;
+    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest, parentToolCallId?: string): Promise<PersistBashPermissionResult | undefined>;
     /** Echo a user-style message without starting a turn (slash commands echo their invocation). */
     echoUserMessage(text: string, attachmentLabels?: string[]): void;
     /**