@nuvin/session 0.3.0-rc.2 → 0.3.0-rc.3

package/dist/client/index.js

@@ -1,10 +1,10 @@
 import {
   createSessionViewState,
   reduceSessionEvent
-} from "../chunk-B6S3CWQX.js";
+} from "../chunk-CAMZK5FN.js";
 import {
   PROTOCOL_VERSION
-} from "../chunk-COSZ5DKO.js";
+} from "../chunk-6SBER3TI.js";
 
 // src/client/endpoint.ts
 var TerminalEndpointError = class extends Error {
@@ -442,6 +442,9 @@ function createHttpDataClient(options = {}) {
 }
 
 // src/client/session-client.ts
+function cloneNonRootToolCallPath(toolCallPath) {
+  return toolCallPath && toolCallPath.length > 0 ? [...toolCallPath] : void 0;
+}
 var SessionCommandError = class extends Error {
   constructor(code, message) {
     super(message);
@@ -633,7 +636,8 @@ function createSessionClient(transport) {
       })).then(() => {
       });
     },
-    decideApproval(toolCallId, decision, comment, grantDir, parentToolCallId) {
+    decideApproval(toolCallId, decision, comment, grantDir, toolCallPath) {
+      const commandPath = cloneNonRootToolCallPath(toolCallPath);
       return sendCommand((id) => ({
         id,
         type: "decide-approval",
@@ -641,24 +645,30 @@ function createSessionClient(transport) {
         decision,
         ...comment !== void 0 ? { comment } : {},
         ...grantDir !== void 0 ? { grantDir } : {},
-        ...parentToolCallId !== void 0 ? { parentToolCallId } : {}
+        ...commandPath !== void 0 ? { toolCallPath: commandPath } : {}
       })).then(() => {
       });
     },
-    persistBashPermission(toolCallId, request, parentToolCallId) {
+    persistBashPermission(toolCallId, request, toolCallPath) {
+      const commandPath = cloneNonRootToolCallPath(toolCallPath);
       return sendCommand((id) => ({
         id,
         type: "persist-bash-permission",
         toolCallId,
-        ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
+        ...commandPath !== void 0 ? { toolCallPath: commandPath } : {},
         request
       })).then(toPersistBashPermissionResult);
     },
-    answerQuestion(questionId, answers) {
-      return sendCommand((id) => ({ id, type: "answer-question", questionId, answers })).then(
-        () => {
-        }
-      );
+    answerQuestion(questionId, answers, toolCallPath) {
+      const commandPath = cloneNonRootToolCallPath(toolCallPath);
+      return sendCommand((id) => ({
+        id,
+        type: "answer-question",
+        questionId,
+        answers,
+        ...commandPath !== void 0 ? { toolCallPath: commandPath } : {}
+      })).then(() => {
+      });
     },
     abort() {
       return sendCommand((id) => ({ id, type: "abort" })).then(() => {

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

@@ -18,9 +18,9 @@ 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, parentToolCallId?: string): Promise<void>;
-    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest, parentToolCallId?: string): Promise<PersistBashPermissionResult>;
-    answerQuestion(questionId: string, answers: AskUserAnswers): Promise<void>;
+    decideApproval(toolCallId: string, decision: "a" | "n" | "y", comment?: string, grantDir?: string, toolCallPath?: readonly string[]): Promise<void>;
+    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest, toolCallPath?: readonly string[]): Promise<PersistBashPermissionResult>;
+    answerQuestion(questionId: string, answers: AskUserAnswers, toolCallPath?: readonly string[]): Promise<void>;
     abort(): Promise<void>;
     /** Cancel a queued (not-yet-running) message by its `turn-status.queued` id. */
     dequeueMessage(queuedId: string): Promise<void>;

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

@@ -1,5 +1,5 @@
-import type { AgentEvent, AskUserAnswers, AskUserQuestionRequest, Message, ToolPermissionClass, ToolRuntimeDispatchDecision, ToolUseBlock } from "@nuvin/agent-core/shared";
-import type { BashPolicyApprovalDiagnostics, DirAccessRequest, PersistBashPermissionHandlerResult, PersistBashPermissionRequest, WorkflowBashPolicySummary } from "../protocol/types.ts";
+import type { AgentEvent, AskUserAnswers, AskUserQuestionRequest, Message, ToolExecutionScope, ToolPermissionClass, ToolRuntimeDispatchDecision, ToolUseBlock } from "@nuvin/agent-core/shared";
+import type { BashPolicyApprovalDiagnostics, DirAccessRequest, PersistBashPermissionHandlerResult, PersistBashPermissionRequest, WireAgentEventScope, WorkflowBashPolicySummary } from "../protocol/types.ts";
 import type { TuiMessage } from "../state/messages.ts";
 /** UI-safe transcript projection of runtime LoadedSession. */
 export type SessionLoadedPayload = {
@@ -8,18 +8,14 @@ export type SessionLoadedPayload = {
     messages: TuiMessage[];
 };
 /**
- * Optional context describing the delegated child agent that produced the
- * event/tool-call. Set by the delegation wrapping in `root.tsx` so the UI
- * can nest sub-agent activity under the originating `AssignTask`
- * tool call. Coordinator (root) callbacks omit it.
+ * Convert normalized host scope to protocol scope. Root activity stays
+ * unscoped on the wire; nested paths are copied so caller mutation cannot
+ * change a routed event or interaction after publication.
  */
-export type DelegationScope = {
-    agentId: string;
-    parentToolCallId: string;
-};
+export declare function toWireSessionScope(scope: ToolExecutionScope): WireAgentEventScope | undefined;
 export type AgentEventPayload = {
     event: AgentEvent;
-    scope?: DelegationScope;
+    scope?: WireAgentEventScope;
 };
 export type ToolCallRequest = {
     agentId: string;
@@ -27,8 +23,8 @@ export type ToolCallRequest = {
     bashPolicy?: BashPolicyApprovalDiagnostics;
     /** Set by the runtime pre-check when the call's path is outside allowedDirs. */
     dirAccess?: DirAccessRequest;
-    parentToolCallId?: string;
     permissionClass?: ToolPermissionClass;
+    toolCallPath?: readonly string[];
     persistBashPermission?: (request: PersistBashPermissionRequest) => Promise<PersistBashPermissionHandlerResult>;
     toolCall: ToolUseBlock;
     workflowBashPolicy?: WorkflowBashPolicySummary;
@@ -36,7 +32,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, scope?: DelegationScope) => Promise<AskUserAnswers> | AskUserAnswers;
+export type UserQuestionHandler = (request: AskUserQuestionRequest, scope?: WireAgentEventScope) => Promise<AskUserAnswers> | AskUserAnswers;
 /**
  * In-process channel between the Agent (constructed in `main()`) and the
  * React UI (`<App />`). Two distinct shapes:
@@ -51,10 +47,10 @@ export declare class AgentChannel {
     private readonly emitter;
     private decider;
     private questionHandler;
-    publishEvent(event: AgentEvent, scope?: DelegationScope): void;
+    publishEvent(event: AgentEvent, scope?: ToolExecutionScope): void;
     publishSessionLoaded(loaded: SessionLoadedPayload): void;
     requestToolDecision(request: ToolCallRequest): Promise<ToolRuntimeDispatchDecision> | ToolRuntimeDispatchDecision;
-    requestUserQuestion(request: AskUserQuestionRequest, scope?: DelegationScope): Promise<AskUserAnswers>;
+    requestUserQuestion(request: AskUserQuestionRequest, scope?: ToolExecutionScope): 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,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"}
+{"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,kBAAkB,EAClB,mBAAmB,EACnB,2BAA2B,EAC3B,YAAY,EACb,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,kCAAkC,EAClC,4BAA4B,EAC5B,mBAAmB,EACnB,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;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,kBAAkB,GAAG,mBAAmB,GAAG,SAAS,CAI7F;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,mBAAmB,CAAC;CAC7B,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,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,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,mBAAmB,KACxB,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,kBAAkB,GAAG,IAAI;IAOjE,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,IAAI;IAIxD,mBAAmB,CACjB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,2BAA2B,CAAC,GAAG,2BAA2B;IAerE,mBAAmB,CACjB,OAAO,EAAE,sBAAsB,EAC/B,KAAK,CAAC,EAAE,kBAAkB,GACzB,OAAO,CAAC,cAAc,CAAC;IAW1B,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

@@ -7,11 +7,16 @@ import {
   createSessionViewState,
   isToolAutoApprovedForMode,
   reduceSessionEvent,
-  scopedToolKey
-} from "../chunk-B6S3CWQX.js";
+  sanitizeBoundedDisplayText,
+  scopedToolKey,
+  summarizeToolCallInput
+} from "../chunk-CAMZK5FN.js";
 
 // src/controller/agent-channel.ts
 import { EventEmitter } from "events";
+function toWireSessionScope(scope) {
+  return scope.toolCallPath.length === 0 ? void 0 : { agentId: scope.agentId, toolCallPath: [...scope.toolCallPath] };
+}
 var NO_DECIDER_DECISION = {
   action: "reject",
   reason: "UI is not ready to handle tool calls."
@@ -22,7 +27,10 @@ var AgentChannel = class {
   questionHandler = null;
   // ---------- Agent-side (publishers) ----------
   publishEvent(event, scope) {
-    this.emitter.emit("event", { event, scope });
+    this.emitter.emit("event", {
+      event,
+      scope: scope === void 0 ? void 0 : toWireSessionScope(scope)
+    });
   }
   publishSessionLoaded(loaded) {
     this.emitter.emit("session-loaded", loaded);
@@ -31,13 +39,23 @@ var AgentChannel = class {
     if (!this.decider) {
       return NO_DECIDER_DECISION;
     }
-    return this.decider(request);
+    const { toolCallPath, ...rootRequest } = request;
+    const scope = toWireSessionScope({
+      agentId: request.agentId,
+      toolCallPath: toolCallPath ?? []
+    });
+    return this.decider({
+      ...rootRequest,
+      ...scope === void 0 ? {} : { toolCallPath: scope.toolCallPath }
+    });
   }
   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, scope));
+    return Promise.resolve(
+      this.questionHandler(request, scope === void 0 ? void 0 : toWireSessionScope(scope))
+    );
   }
   // ---------- UI-side (subscribers) ----------
   onEvent(listener) {
@@ -94,7 +112,6 @@ function createSessionController(deps) {
   let activeTurnId;
   let activePolicyDenial;
   let hostBusyCount = 0;
-  let questionCounter = 0;
   const listeners = /* @__PURE__ */ new Set();
   const approvalResolvers = /* @__PURE__ */ new Map();
   const privateApprovals = /* @__PURE__ */ new Map();
@@ -171,8 +188,8 @@ function createSessionController(deps) {
     });
   });
   deps.channel.setToolDecider((request) => {
-    const { toolCall, agentId, parentToolCallId, dirAccess, bashPolicy } = request;
-    const scope = parentToolCallId !== void 0 ? { agentId, parentToolCallId } : void 0;
+    const { toolCall, agentId, toolCallPath, dirAccess, bashPolicy } = request;
+    const scope = toolCallPath === void 0 ? void 0 : { agentId, toolCallPath: [...toolCallPath] };
     const approvalKey = request.approvalKey ?? `${agentId}:${toolCall.name}`;
     const permissionClass = request.permissionClass ?? "always-confirm";
     const hasBashPolicy = toolCall.name === "Bash" && bashPolicy !== void 0;
@@ -246,27 +263,30 @@ function createSessionController(deps) {
       activePolicyDenial = "Tool approval is unavailable in headless mode.";
       return { action: "reject", reason: activePolicyDenial };
     }
-    const nickname = nicknameFor(parentToolCallId);
-    const input = asJsonObject(toolCall.input);
+    const nickname = nicknameFor(toolCallPath);
+    const ancestorDisplay = buildAncestorDisplay(toolCallPath);
+    const rawInput = asJsonObject(toolCall.input);
+    const input = toolCall.name === "Program" ? typeof rawInput?.description === "string" ? { description: sanitizeBoundedDisplayText(rawInput.description) } : void 0 : rawInput;
     const descriptor = {
       agentId,
       permissionClass,
-      summary: findToolSummary(toolCall.id, parentToolCallId),
+      summary: findToolSummary(toolCall.id, toolCallPath),
       toolCallId: toolCall.id,
       toolName: toolCall.name,
+      ...ancestorDisplay !== void 0 ? { ancestorDisplay } : {},
       ...dirAccess !== void 0 ? { dirAccess } : {},
       ...input !== void 0 ? { input } : {},
-      ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
+      ...toolCallPath !== void 0 ? { toolCallPath: [...toolCallPath] } : {},
       ...nickname !== void 0 ? { nickname } : {},
       ...!dirAccess && bashPolicy !== void 0 ? { bashPolicy } : {},
       ...request.workflowBashPolicy !== void 0 ? { workflowBashPolicy: request.workflowBashPolicy } : {}
     };
     return new Promise((resolve) => {
-      const toolKey = scopedToolKey(parentToolCallId, toolCall.id);
+      const toolKey = scopedToolKey(toolCallPath, toolCall.id);
       approvalResolvers.set(toolKey, {
         resolve,
         toolCallId: toolCall.id,
-        ...parentToolCallId !== void 0 ? { parentToolCallId } : {}
+        ...toolCallPath !== void 0 ? { toolCallPath: [...toolCallPath] } : {}
       });
       privateApprovals.set(toolKey, {
         approvalKey,
@@ -281,39 +301,69 @@ function createSessionController(deps) {
       activePolicyDenial = "Questions are unavailable in headless mode.";
       return Promise.reject(new Error(activePolicyDenial));
     }
-    questionCounter += 1;
-    const questionId = `question-${questionCounter}`;
+    const { questionId } = request;
+    const toolCallPath = scope?.toolCallPath;
     return new Promise((resolve, reject) => {
-      questionResolvers.set(questionId, { resolve, reject });
-      const nickname = nicknameFor(scope?.parentToolCallId);
+      const questionKey = scopedToolKey(toolCallPath, questionId);
+      questionResolvers.set(questionKey, {
+        resolve,
+        reject,
+        questionId,
+        ...toolCallPath !== void 0 ? { toolCallPath: [...toolCallPath] } : {}
+      });
+      const nickname = nicknameFor(toolCallPath);
       emit({
         type: "question-asked",
         question: {
           questionId,
           request,
           ...scope?.agentId !== void 0 ? { agentId: scope.agentId } : {},
-          ...scope?.parentToolCallId !== void 0 ? { parentToolCallId: scope.parentToolCallId } : {},
+          ...toolCallPath !== void 0 ? { toolCallPath: [...toolCallPath] } : {},
           ...nickname !== void 0 ? { nickname } : {}
         }
       });
     });
   });
-  function findToolSummary(toolCallId, parentToolCallId) {
-    const messageId = state.messages.toolMessageIds[scopedToolKey(parentToolCallId, toolCallId)];
+  function findToolMessage(toolCallId, toolCallPath) {
+    const messageId = state.messages.toolMessageIds[scopedToolKey(toolCallPath, toolCallId)];
     const message = state.messages.messages.find((entry) => entry.id === messageId);
-    return message?.role === "tool" ? message.summary : "";
+    return message?.role === "tool" ? message : void 0;
+  }
+  function findToolSummary(toolCallId, toolCallPath) {
+    const summary = findToolMessage(toolCallId, toolCallPath)?.summary ?? "";
+    return sanitizeBoundedDisplayText(summary);
   }
-  function nicknameFor(parentToolCallId) {
-    if (!parentToolCallId) return void 0;
-    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 nicknameFor(toolCallPath) {
+    if (!toolCallPath || toolCallPath.length === 0) return void 0;
+    const parentIndex = toolCallPath.length - 1;
+    const directAncestorId = toolCallPath[parentIndex];
+    if (directAncestorId === void 0) return void 0;
+    const parentMessage = findToolMessage(directAncestorId, toolCallPath.slice(0, parentIndex));
+    const nickname = parentMessage?.input?.nickname;
+    return typeof nickname === "string" ? sanitizeBoundedDisplayText(nickname) : void 0;
   }
-  function findDescriptor(toolCallId, parentToolCallId) {
+  function buildAncestorDisplay(toolCallPath) {
+    if (!toolCallPath || toolCallPath.length === 0) return void 0;
+    const ancestors = [];
+    for (let index = 0; index < toolCallPath.length; index += 1) {
+      const toolCallId = toolCallPath[index];
+      if (toolCallId === void 0) return void 0;
+      const message = findToolMessage(toolCallId, toolCallPath.slice(0, index));
+      if (!message) return void 0;
+      const nickname = message.input?.nickname;
+      ancestors.push({
+        toolCallId,
+        toolName: message.toolName,
+        summary: message.toolName === "Program" ? summarizeToolCallInput(message.toolName, message.input ?? {}) : sanitizeBoundedDisplayText(message.summary),
+        ...typeof nickname === "string" ? { nickname: sanitizeBoundedDisplayText(nickname) } : {}
+      });
+    }
+    return ancestors;
+  }
+  function findDescriptor(toolCallId, toolCallPath) {
+    const toolKey = scopedToolKey(toolCallPath, toolCallId);
     return [state.approval.active, ...state.approval.pending].find(
-      (entry) => entry?.toolCallId === toolCallId && entry.parentToolCallId === parentToolCallId
+      (entry) => entry !== null && scopedToolKey(entry.toolCallPath, entry.toolCallId) === toolKey
     );
   }
   function rejectAllPending(reason) {
@@ -322,7 +372,7 @@ function createSessionController(deps) {
       emit({
         type: "approval-settled",
         toolCallId: pending.toolCallId,
-        ...pending.parentToolCallId === void 0 ? {} : { parentToolCallId: pending.parentToolCallId },
+        ...pending.toolCallPath === void 0 ? {} : { toolCallPath: [...pending.toolCallPath] },
         status: "rejected",
         by: "abort"
       });
@@ -330,9 +380,13 @@ function createSessionController(deps) {
     approvalResolvers.clear();
     privateApprovals.clear();
     persistenceInFlight.clear();
-    for (const [questionId, { reject }] of questionResolvers) {
+    for (const { reject, questionId, toolCallPath } of questionResolvers.values()) {
       reject(new Error(reason));
-      emit({ type: "question-settled", questionId });
+      emit({
+        type: "question-settled",
+        questionId,
+        ...toolCallPath === void 0 ? {} : { toolCallPath: [...toolCallPath] }
+      });
     }
     questionResolvers.clear();
   }
@@ -553,12 +607,17 @@ function createSessionController(deps) {
       if (hooks.compaction) compaction = hooks.compaction;
       if (hooks.guardPrompt) guardPrompt = hooks.guardPrompt;
     },
-    answerQuestion(questionId, answers) {
-      const entry = questionResolvers.get(questionId);
+    answerQuestion(questionId, answers, toolCallPath) {
+      const questionKey = scopedToolKey(toolCallPath, questionId);
+      const entry = questionResolvers.get(questionKey);
       if (!entry) return false;
-      questionResolvers.delete(questionId);
+      questionResolvers.delete(questionKey);
       entry.resolve(answers);
-      emit({ type: "question-settled", questionId });
+      emit({
+        type: "question-settled",
+        questionId,
+        ...toolCallPath && toolCallPath.length > 0 ? { toolCallPath: [...toolCallPath] } : {}
+      });
       return true;
     },
     appendError(message) {
@@ -591,8 +650,8 @@ function createSessionController(deps) {
       emitTurnStatus();
       return true;
     },
-    decideApproval(toolCallId, decision, comment, grantDir, parentToolCallId) {
-      const toolKey = scopedToolKey(parentToolCallId, toolCallId);
+    decideApproval(toolCallId, decision, comment, grantDir, toolCallPath) {
+      const toolKey = scopedToolKey(toolCallPath, toolCallId);
       if (persistenceInFlight.has(toolKey)) {
         return false;
       }
@@ -600,7 +659,7 @@ function createSessionController(deps) {
       if (!pending) return false;
       approvalResolvers.delete(toolKey);
       persistenceInFlight.delete(toolKey);
-      const descriptor = findDescriptor(toolCallId, parentToolCallId);
+      const descriptor = findDescriptor(toolCallId, toolCallPath);
       const privateApproval = privateApprovals.get(toolKey);
       privateApprovals.delete(toolKey);
       if (decision === "a" && descriptor && !descriptor.dirAccess) {
@@ -643,18 +702,21 @@ function createSessionController(deps) {
       emit({
         type: "approval-settled",
         toolCallId,
-        ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
+        ...toolCallPath && toolCallPath.length > 0 ? { toolCallPath: [...toolCallPath] } : {},
         status: rejected ? "rejected" : "approved",
         by: "client"
       });
       return true;
     },
-    async persistBashPermission(toolCallId, request, parentToolCallId) {
-      const toolKey = scopedToolKey(parentToolCallId, toolCallId);
+    async persistBashPermission(toolCallId, request, toolCallPath) {
+      const persistenceToolCallPath = toolCallPath && toolCallPath.length > 0 ? [...toolCallPath] : void 0;
+      const toolKey = scopedToolKey(persistenceToolCallPath, toolCallId);
       const descriptor = state.approval.active;
+      const descriptorKey = descriptor === null ? void 0 : scopedToolKey(descriptor.toolCallPath, descriptor.toolCallId);
       const privateApproval = privateApprovals.get(toolKey);
       const handler = privateApproval?.persistBashPermission;
-      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)) {
+      const pending = approvalResolvers.get(toolKey);
+      if (descriptorKey !== toolKey || descriptor?.toolName !== "Bash" || descriptor.dirAccess !== void 0 || descriptor.bashPolicy?.persistence.eligible !== true || handler === void 0 || pending === void 0) {
         return void 0;
       }
       if (persistenceInFlight.has(toolKey)) {
@@ -676,13 +738,13 @@ function createSessionController(deps) {
       emitTurnStatus();
       try {
         const outcome = await handler(request);
+        const activeDescriptor = state.approval.active;
+        if (approvalResolvers.get(toolKey) !== pending || activeDescriptor === null || scopedToolKey(activeDescriptor.toolCallPath, activeDescriptor.toolCallId) !== toolKey || privateApprovals.get(toolKey) !== privateApproval) {
+          return void 0;
+        }
         if (outcome.status === "validation-error") {
           return outcome;
         }
-        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(toolKey);
         privateApprovals.delete(toolKey);
         pending.resolve({
@@ -693,7 +755,7 @@ function createSessionController(deps) {
         emit({
           type: "approval-settled",
           toolCallId,
-          ...parentToolCallId !== void 0 ? { parentToolCallId } : {},
+          ...persistenceToolCallPath === void 0 ? {} : { toolCallPath: [...persistenceToolCallPath] },
           status: "approved",
           by: "client"
         });
@@ -809,5 +871,6 @@ function createSessionController(deps) {
 export {
   AgentChannel,
   createSessionController,
-  formatBashPolicyDenial
+  formatBashPolicyDenial,
+  toWireSessionScope
 };

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

@@ -89,8 +89,8 @@ export interface SessionController {
         compaction?: CompactionHooks;
         guardPrompt?: (input: AgentInput) => Promise<GuardResult>;
     }): void;
-    /** Settle a pending question by id. */
-    answerQuestion(questionId: string, answers: AskUserAnswers): boolean;
+    /** Settle a pending question by id and full ancestor path. */
+    answerQuestion(questionId: string, answers: AskUserAnswers, toolCallPath?: readonly string[]): 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). */
@@ -102,8 +102,8 @@ export interface SessionController {
      * 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, parentToolCallId?: string): boolean;
-    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest, parentToolCallId?: string): Promise<PersistBashPermissionResult | undefined>;
+    decideApproval(toolCallId: string, decision: "a" | "n" | "y", comment?: string, grantDir?: string, toolCallPath?: readonly string[]): boolean;
+    persistBashPermission(toolCallId: string, request: PersistBashPermissionRequest, toolCallPath?: readonly string[]): Promise<PersistBashPermissionResult | undefined>;
     /** Echo a user-style message without starting a turn (slash commands echo their invocation). */
     echoUserMessage(text: string, attachmentLabels?: string[]): void;
     /**

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

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

package/dist/protocol/index.js

@@ -7,7 +7,7 @@ import {
 } from "../chunk-7LEIACBZ.js";
 import {
   PROTOCOL_VERSION
-} from "../chunk-COSZ5DKO.js";
+} from "../chunk-6SBER3TI.js";
 import {
   AGENT_MODEL_TIERS,
   GRANT_CAPABILITIES,