@qduc/term2 0.11.0 → 0.12.0

package/dist/services/approval/approval-flow-coordinator.d.ts

@@ -4,6 +4,13 @@ import { ApprovalState, type AbortedApprovalContext, type PendingApprovalContext
 import type { ConversationAgentClient } from '../conversation-agent-client.js';
 import { SessionToolTracker } from '../session/session-tool-tracker.js';
 import { GenerationGuard } from '../generation-guard.js';
+import type { ToolOwner } from './tool-owner.js';
+import { ToolOwnershipRegistry } from './tool-ownership-registry.js';
+import type { SessionAccessState } from '../session/session-access-state.js';
+import type { NestedToolCompatibilityState } from '../session/nested-tool-compatibility-state.js';
+import type { HookLifecyclePort } from '../hooks/hook-service.js';
+import type { HookEventFactory } from '../hooks/hook-event-factory.js';
+import { type ApprovalDecisionSource } from './approval-decision-executor.js';
 export interface ApprovalFlowCoordinatorDeps {
     agentClient: ConversationAgentClient;
     approvalState: ApprovalState;
@@ -11,28 +18,39 @@ export interface ApprovalFlowCoordinatorDeps {
     sessionId: string;
     toolTracker: SessionToolTracker;
     generationGuard: GenerationGuard;
+    /** Session-owned registry shared with nested subagent runners. */
+    toolOwnership: ToolOwnershipRegistry;
+    /** Handle-owned root capability; omitted only by nested compatibility fixtures. */
+    sessionAccess?: SessionAccessState;
+    /** Explicit nested/test-only legacy approval state. */
+    nestedCompatibility?: NestedToolCompatibilityState;
+    hookLifecycle?: HookLifecyclePort;
+    hookEvents?: HookEventFactory;
 }
 export interface AbortResolutionPlan {
     abortedContext: AbortedApprovalContext;
-    /** Cleanup that removes the rejection interceptor; always safe to call. */
-    removeInterceptor: () => void;
 }
 export interface ContinuationPlan {
     pendingApprovalContext: PendingApprovalContext;
     toolStartedEvent?: ConversationEvent;
-    /** Cleanup that removes the rejection interceptor; always safe to call. */
-    removeInterceptor: () => void;
 }
 export type ApprovalDecisionInput = {
     kind: 'approval_decision';
     answer: string;
     rejectionReason?: string;
     generation: number;
+    stopAfterApprovalResolution?: boolean;
 };
 export declare class ApprovalFlowCoordinator {
+    #private;
     private readonly deps;
     constructor(deps: ApprovalFlowCoordinatorDeps);
-    buildApprovalDecision(answer: string, rejectionReason?: string): ApprovalDecisionInput;
+    /**
+     * Which agent issued this pending tool call. A subagent claims its own
+     * approvals when it raises them; anything unclaimed is the parent's.
+     */
+    resolveOwner(interruption: unknown): ToolOwner;
+    buildApprovalDecision(answer: string, rejectionReason?: string, stopAfterApprovalResolution?: boolean): ApprovalDecisionInput;
     abort(): {
         aborted: boolean;
         callId?: string;
@@ -55,10 +73,9 @@ export declare class ApprovalFlowCoordinator {
     prepareAbortResolution(abortedContext: AbortedApprovalContext, userText: string): AbortResolutionPlan;
     /**
      * Prepare for a continuation after the user makes an approval decision.
-     * Returns null if there is no pending approval. Caller is responsible for invoking
-     * `removeInterceptor` in a finally block once the continuation stream completes.
+     * Returns null if there is no pending approval.
      */
-    prepareContinuation(answer: string, rejectionReason: string | undefined): ContinuationPlan | null;
+    prepareContinuation(answer: string, rejectionReason: string | undefined, source?: ApprovalDecisionSource): ContinuationPlan | null;
     recordPending(pending: PendingApprovalContext): void;
     clearPending(): void;
     getPending(): PendingApprovalContext | null;

package/dist/services/approval/approval-flow-coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approval-flow-coordinator.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-flow-coordinator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAK9G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAsBzD,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,uBAAuB,CAAC;IACrC,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,kBAAkB,CAAC;IAChC,eAAe,EAAE,eAAe,CAAC;CAClC;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,sBAAsB,CAAC;IACvC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,sBAAsB,EAAE,sBAAsB,CAAC;IAC/C,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,IAAI,CAAC;CAC/B;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,uBAAuB;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,2BAA2B,EAAI;IAElE,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,GAAG,qBAAqB,CAOrF;IAED,KAAK,IAAI;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAgB7C;IAED,cAAc,IAAI,sBAAsB,GAAG,IAAI,CAE9C;IAED,gBAAgB,IAAI;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,SAAS,CAAC;QAAC,OAAO,EAAE,sBAAsB,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAU9G;IAED;;;;;OAKG;IACH,sBAAsB,CAAC,cAAc,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,GAAG,mBAAmB,CAapG;IAED;;;;OAIG;IACH,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,gBAAgB,GAAG,IAAI,CA4KhG;IAED,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,IAAI,CAEnD;IAED,YAAY,IAAI,IAAI,CAEnB;IAED,UAAU,IAAI,sBAAsB,GAAG,IAAI,CAE1C;IAED,sBAAsB,IAAI,OAAO,CAEhC;IAED,2BAA2B,CAAC,YAAY,EAAE,OAAO,GAAG,sBAAsB,GAAG,IAAI,CAahF;CACF"}
+{"version":3,"file":"approval-flow-coordinator.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-flow-coordinator.ts"],"names":[],"mappings":"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"}

package/dist/services/approval/approval-flow-coordinator.js

@@ -1,25 +1,36 @@
 import { markToolCallAsApprovalRejection } from '../../utils/streaming/extract-command-messages.js';
-import { getCallIdFromObject, getToolInfoFromInterruption } from '../interruption-info.js';
-import { parseToolCallArguments } from '../tool-call-arguments.js';
-import { createInvalidToolCallDiagnostic } from '../logging/logging-contract.js';
-import { resolveToolOwner } from './tool-owner.js';
-import { deniedReadStore, executionOverrideStore, getProjectAllowReadStore, } from '../../utils/shell/sandbox/denied-read-stores.js';
-import { isDeniedReadApproveAnswer, isDockerHostControlApproveAnswer, isReadFileSessionApproveAnswer, } from '../../contracts/conversation.js';
-import path from 'node:path';
-import { sessionReadAccess } from './session-read-access.js';
-import { consumeDockerHostControlDenial, grantDockerHostControl, requiresDockerHostControlApproval, } from '../../utils/shell/sandbox/docker-host-control-grants.js';
-const noop = () => undefined;
+import { getCallIdFromObject } from '../interruption-info.js';
+import { ApprovalDecisionExecutor } from './approval-decision-executor.js';
 export class ApprovalFlowCoordinator {
     deps;
+    #toolOwnership;
+    #decisionExecutor;
     constructor(deps) {
         this.deps = deps;
+        this.#toolOwnership = deps.toolOwnership;
+        this.#decisionExecutor = new ApprovalDecisionExecutor({
+            logger: deps.logger,
+            sessionId: deps.sessionId,
+            sessionAccess: deps.sessionAccess,
+            nestedCompatibility: deps.nestedCompatibility,
+            hookLifecycle: deps.hookLifecycle,
+            hookEvents: deps.hookEvents,
+        });
+    }
+    /**
+     * Which agent issued this pending tool call. A subagent claims its own
+     * approvals when it raises them; anything unclaimed is the parent's.
+     */
+    resolveOwner(interruption) {
+        return this.#toolOwnership.ownerOf(getCallIdFromObject(interruption));
     }
-    buildApprovalDecision(answer, rejectionReason) {
+    buildApprovalDecision(answer, rejectionReason, stopAfterApprovalResolution) {
         return {
             kind: 'approval_decision',
             answer,
             rejectionReason,
             generation: this.deps.approvalState.getPending()?.token ?? 0,
+            ...(stopAfterApprovalResolution ? { stopAfterApprovalResolution: true } : {}),
         };
     }
     abort() {
@@ -63,173 +74,29 @@ export class ApprovalFlowCoordinator {
         const expectedCallId = getCallIdFromObject(abortedContext.interruption);
         const rejectionMessage = `Tool execution was not approved. User provided new input instead: ${userText}`;
         markToolCallAsApprovalRejection(expectedCallId);
-        abortedContext.state.reject(abortedContext.interruption, { message: rejectionMessage });
+        abortedContext.state.reject?.(abortedContext.interruption, { message: rejectionMessage });
         abortedContext.decisionsByCallId ??= new Map();
         if (expectedCallId) {
             abortedContext.decisionsByCallId.set(expectedCallId, 'rejected');
         }
-        return { abortedContext, removeInterceptor: noop };
+        return { abortedContext };
     }
     /**
      * Prepare for a continuation after the user makes an approval decision.
-     * Returns null if there is no pending approval. Caller is responsible for invoking
-     * `removeInterceptor` in a finally block once the continuation stream completes.
+     * Returns null if there is no pending approval.
      */
-    prepareContinuation(answer, rejectionReason) {
+    prepareContinuation(answer, rejectionReason, source = 'user') {
         const pendingApprovalContext = this.deps.approvalState.getPending();
         if (!pendingApprovalContext) {
             return null;
         }
-        const { state, interruption } = pendingApprovalContext;
-        const decisionCallId = getCallIdFromObject(interruption);
-        pendingApprovalContext.decisionsByCallId ??= new Map();
-        let toolStartedEvent;
-        // Denied-read decision values require approval (SDK resumes) plus an execution override.
-        const deniedReadDecision = isDeniedReadApproveAnswer(answer);
-        const { toolName: decisionToolName, rawArguments: decisionRawArguments } = getToolInfoFromInterruption(interruption);
-        const parsedDecisionArgs = parseToolCallArguments(decisionRawArguments, {
-            callId: decisionCallId ?? String(Date.now()),
-            toolName: decisionToolName,
-            sessionId: this.deps.sessionId,
-            traceId: this.deps.logger.getCorrelationId() ?? 'trace-unknown',
-        }).arguments;
-        const dockerDecision = isDockerHostControlApproveAnswer(answer);
-        const isDockerRequest = decisionToolName === 'shell' &&
-            typeof parsedDecisionArgs?.command === 'string' &&
-            requiresDockerHostControlApproval(parsedDecisionArgs.command);
-        let allowReadFolderForSession = false;
-        if (isReadFileSessionApproveAnswer(answer) && decisionToolName === 'read_file') {
-            const parsedReadArgs = parseToolCallArguments(decisionRawArguments, {
-                callId: decisionCallId ?? String(Date.now()),
-                toolName: decisionToolName,
-                sessionId: this.deps.sessionId,
-                traceId: this.deps.logger.getCorrelationId() ?? 'trace-unknown',
-            });
-            const requestedPath = parsedReadArgs.arguments?.path;
-            if (typeof requestedPath === 'string' && requestedPath.length > 0) {
-                sessionReadAccess.allowFolder(this.deps.sessionId, path.dirname(requestedPath));
-                allowReadFolderForSession = true;
-            }
-        }
-        // Docker host control is a distinct capability: ordinary approval answers
-        // must not resume it, because resumption without a matching grant would
-        // make generic/programmatic continuation a host-access bypass.
-        const isApproved = isDockerRequest
-            ? dockerDecision
-            : answer === 'y' || deniedReadDecision || allowReadFolderForSession;
-        if (isApproved) {
-            // For denied-read decisions, set the execution override before the SDK resumes.
-            if (deniedReadDecision) {
-                const { rawArguments } = getToolInfoFromInterruption(interruption);
-                const parsedArgs = parseToolCallArguments(rawArguments, {
-                    callId: decisionCallId ?? String(Date.now()),
-                    toolName: 'shell',
-                    sessionId: this.deps.sessionId,
-                    traceId: this.deps.logger.getCorrelationId() ?? 'trace-unknown',
-                });
-                const shellCommand = parsedArgs.arguments?.command;
-                if (typeof shellCommand === 'string') {
-                    const stagedInfo = deniedReadStore.consumeStaged(shellCommand);
-                    if (stagedInfo) {
-                        if (answer === 'allow-once' || answer === 'allow-remember') {
-                            executionOverrideStore.set(shellCommand, {
-                                extraAllowRead: [stagedInfo.suggestedParent],
-                            });
-                            if (answer === 'allow-remember') {
-                                getProjectAllowReadStore(process.cwd()).append(stagedInfo.suggestedParent);
-                                this.deps.logger.security('Sandbox allowed-read path remembered for project', {
-                                    path: stagedInfo.suggestedParent,
-                                    deniedPath: stagedInfo.path,
-                                    sensitive: stagedInfo.sensitive,
-                                    sessionId: this.deps.sessionId,
-                                });
-                            }
-                        }
-                        else if (answer === 'unsandboxed-once') {
-                            executionOverrideStore.set(shellCommand, { forceUnsandboxed: true });
-                        }
-                    }
-                }
-            }
-            if (dockerDecision && isDockerRequest && typeof parsedDecisionArgs?.command === 'string') {
-                const cwd = typeof parsedDecisionArgs.cwd === 'string' ? parsedDecisionArgs.cwd : process.cwd();
-                const scope = answer === 'docker-allow-once' ? 'once' : answer === 'docker-allow-session' ? 'session' : 'project';
-                grantDockerHostControl({ command: parsedDecisionArgs.command, cwd, scope, sessionId: this.deps.sessionId });
-                // The pending block is left in place deliberately: for an indirect
-                // invocation it is the only thing that tells `execute` this command
-                // needs host control. `execute` consumes it when it creates the control.
-            }
-            this.deps.logger.debug('Tool approval granted', {
-                eventType: 'approval.granted',
-                category: 'approval',
-                phase: 'approval',
-                sessionId: this.deps.sessionId,
-                traceId: this.deps.logger.getCorrelationId(),
-                ...(deniedReadDecision ? { deniedReadDecision: answer } : {}),
-            });
-            const { toolName, rawArguments } = getToolInfoFromInterruption(interruption);
-            const callId = decisionCallId;
-            const parseResult = parseToolCallArguments(rawArguments, {
-                callId: callId ?? String(Date.now()),
-                toolName,
-                sessionId: this.deps.sessionId,
-                traceId: this.deps.logger.getCorrelationId() ?? 'trace-unknown',
-            });
-            if (parseResult.invalidJsonDiagnostic) {
-                const diagnostic = createInvalidToolCallDiagnostic(parseResult.invalidJsonDiagnostic);
-                this.deps.logger.error('Invalid tool call argument payload', {
-                    ...diagnostic,
-                    sessionId: this.deps.sessionId,
-                    messageId: callId ?? String(Date.now()),
-                });
-            }
-            const toolCallId = callId ?? String(Date.now());
-            toolStartedEvent =
-                pendingApprovalContext.owner.kind === 'subagent'
-                    ? {
-                        type: 'subagent_tool_started',
-                        agentId: pendingApprovalContext.owner.agentId,
-                        role: pendingApprovalContext.owner.role,
-                        toolCallId,
-                        toolName,
-                        arguments: parseResult.arguments,
-                    }
-                    : {
-                        type: 'tool_started',
-                        toolCallId,
-                        toolName,
-                        arguments: parseResult.arguments,
-                    };
-            state.approve(interruption);
-            if (callId) {
-                pendingApprovalContext.decisionsByCallId.set(callId, 'approved');
-            }
-        }
-        else {
-            const expectedCallId = decisionCallId;
-            const rejectionMessage = rejectionReason
-                ? `Tool execution was not approved. User's reason: ${rejectionReason}`
-                : 'Tool execution was not approved.';
-            // A refused Docker request is settled: drop the pending block so the same
-            // command runs sandboxed again instead of stalling on approval forever.
-            if (isDockerRequest && typeof parsedDecisionArgs?.command === 'string') {
-                consumeDockerHostControlDenial(parsedDecisionArgs.command);
-            }
-            markToolCallAsApprovalRejection(expectedCallId);
-            state.reject?.(interruption, { message: rejectionMessage });
-            if (expectedCallId) {
-                pendingApprovalContext.decisionsByCallId.set(expectedCallId, 'rejected');
-            }
-            this.deps.logger.debug('Tool approval rejected', {
-                eventType: 'approval.rejected',
-                category: 'approval',
-                phase: 'approval',
-                sessionId: this.deps.sessionId,
-                traceId: this.deps.logger.getCorrelationId(),
-            });
-        }
-        const removeInterceptor = noop;
-        return { pendingApprovalContext, toolStartedEvent, removeInterceptor };
+        const result = this.#decisionExecutor.resolve({
+            pendingApprovalContext,
+            answer,
+            rejectionReason,
+            source,
+        });
+        return { pendingApprovalContext, toolStartedEvent: result.toolStartedEvent };
     }
     recordPending(pending) {
         this.deps.approvalState.setPending(pending);
@@ -252,7 +119,7 @@ export class ApprovalFlowCoordinator {
             ...pending,
             interruption,
             promptedCallId: getCallIdFromObject(interruption),
-            owner: resolveToolOwner(pending.state, interruption, this.deps.logger),
+            owner: this.resolveOwner(interruption),
         });
         return this.deps.approvalState.getPending();
     }

package/dist/services/approval/approval-flow-coordinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"approval-flow-coordinator.js","sourceRoot":"","sources":["../../../source/services/approval/approval-flow-coordinator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"approval-flow-coordinator.js","sourceRoot":"","sources":["../../../source/services/approval/approval-flow-coordinator.ts"],"names":[],"mappings":"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"}

package/dist/services/approval/approval-replay.d.ts

@@ -0,0 +1,52 @@
+type ApprovalContext = {
+    approveTool(item: unknown, options?: {
+        alwaysApprove?: boolean;
+    }): void;
+    rejectTool(item: unknown, options?: {
+        alwaysReject?: boolean;
+        message?: string;
+    }): void;
+};
+/**
+ * One entry of `RunContext.toJSON().approvals`.
+ *
+ * The upstream runtime does not export this shape, so we restate it here.
+ * export the type, so we restate it. The semantics, verified against
+ * `runContext.js#isToolApproved`, are:
+ *
+ * - the record is keyed by **tool name**, not by call id;
+ * - `approved: true` / `rejected: true` are *blanket* decisions covering every call of that
+ *   tool, including calls the user has never seen;
+ * - `approved: string[]` / `rejected: string[]` are decisions scoped to exactly those call
+ *   ids, and any other call id still prompts;
+ * - `false` carries no decision at all — it is what a blanket decision on the other side
+ *   leaves behind;
+ * - a blanket approval outranks a blanket rejection.
+ */
+export type ApprovalRecord = {
+    approved: boolean | string[];
+    rejected: boolean | string[];
+    messages?: Record<string, string>;
+    stickyRejectMessage?: string;
+};
+/**
+ * Seeds `target` with approval decisions already taken elsewhere — in practice, replaying a
+ * parent run's approvals into a freshly created nested subagent context so that a tool the
+ * user already approved does not prompt a second time inside the subagent.
+ *
+ * Uses only the public `approveTool` / `rejectTool` surface. `approvals` is the plain
+ * `toJSON().approvals` record of the source context.
+ *
+ * Rejections are replayed before approvals. `approveTool(…, { alwaysApprove: true })` clears
+ * the record's rejected list and `rejectTool(…, { alwaysReject: true })` clears its approved
+ * list, so ordering decides which survives a record holding both. Rejections-first lands on
+ * the same answer `isToolApproved` would have given for the original record, in which a
+ * blanket approval outranks everything.
+ *
+ * Known fidelity limit: a record that is blanket-rejected *and* carries per-call rejection
+ * messages keeps only `stickyRejectMessage`. The public API cannot express both, and the
+ * difference is confined to message text — every such call is rejected either way.
+ */
+export declare function replayApprovals(target: ApprovalContext, approvals: Readonly<Record<string, ApprovalRecord>> | undefined, agent: unknown): void;
+export {};
+//# sourceMappingURL=approval-replay.d.ts.map

package/dist/services/approval/approval-replay.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-replay.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-replay.ts"],"names":[],"mappings":"AAAA,KAAK,eAAe,GAAG;IACrB,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IACxE,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CACzF,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,EAAE,OAAO,GAAG,MAAM,EAAE,CAAC;IAC7B,QAAQ,EAAE,OAAO,GAAG,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAsBF;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,eAAe,EACvB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,GAAG,SAAS,EAC/D,KAAK,EAAE,OAAO,GACb,IAAI,CA6BN"}

package/dist/services/approval/approval-replay.js

@@ -0,0 +1,68 @@
+/**
+ * Call id attached to a replayed blanket decision. A blanket decision belongs to the tool
+ * rather than to any one call, but `approveTool`/`rejectTool` only accept a call. This
+ * sentinel keeps the synthetic call from colliding with a real one, so a blanket rejection's
+ * message is always served from `stickyRejectMessage` as it was in the source context.
+ */
+const BLANKET_DECISION_CALL_ID = '__approval_replay_blanket_decision__';
+function buildApprovalItem(toolName, callId, agent) {
+    return {
+        rawItem: { type: 'function_call', callId, name: toolName, arguments: '{}', status: 'completed' },
+        agent,
+        toolName,
+        // Top-level callId so typed ledgers (ApprovalLedger) can consume the item
+        // without probing rawItem; RunContext reads rawItem.callId first and sees
+        // the same value.
+        callId,
+    };
+}
+/**
+ * Seeds `target` with approval decisions already taken elsewhere — in practice, replaying a
+ * parent run's approvals into a freshly created nested subagent context so that a tool the
+ * user already approved does not prompt a second time inside the subagent.
+ *
+ * Uses only the public `approveTool` / `rejectTool` surface. `approvals` is the plain
+ * `toJSON().approvals` record of the source context.
+ *
+ * Rejections are replayed before approvals. `approveTool(…, { alwaysApprove: true })` clears
+ * the record's rejected list and `rejectTool(…, { alwaysReject: true })` clears its approved
+ * list, so ordering decides which survives a record holding both. Rejections-first lands on
+ * the same answer `isToolApproved` would have given for the original record, in which a
+ * blanket approval outranks everything.
+ *
+ * Known fidelity limit: a record that is blanket-rejected *and* carries per-call rejection
+ * messages keeps only `stickyRejectMessage`. The public API cannot express both, and the
+ * difference is confined to message text — every such call is rejected either way.
+ */
+export function replayApprovals(target, approvals, agent) {
+    if (!approvals)
+        return;
+    for (const [toolName, record] of Object.entries(approvals)) {
+        if (!record)
+            continue;
+        if (record.rejected === true) {
+            target.rejectTool(buildApprovalItem(toolName, BLANKET_DECISION_CALL_ID, agent), {
+                alwaysReject: true,
+                message: record.stickyRejectMessage,
+            });
+        }
+        else if (Array.isArray(record.rejected)) {
+            for (const callId of record.rejected) {
+                target.rejectTool(buildApprovalItem(toolName, callId, agent), {
+                    message: record.messages?.[callId],
+                });
+            }
+        }
+        if (record.approved === true) {
+            target.approveTool(buildApprovalItem(toolName, BLANKET_DECISION_CALL_ID, agent), {
+                alwaysApprove: true,
+            });
+        }
+        else if (Array.isArray(record.approved)) {
+            for (const callId of record.approved) {
+                target.approveTool(buildApprovalItem(toolName, callId, agent));
+            }
+        }
+    }
+}
+//# sourceMappingURL=approval-replay.js.map

package/dist/services/approval/approval-replay.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-replay.js","sourceRoot":"","sources":["../../../source/services/approval/approval-replay.ts"],"names":[],"mappings":"AA4BA;;;;;GAKG;AACH,MAAM,wBAAwB,GAAG,sCAAsC,CAAC;AAExE,SAAS,iBAAiB,CAAC,QAAgB,EAAE,MAAc,EAAE,KAAc;IACzE,OAAO;QACL,OAAO,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE;QAChG,KAAK;QACL,QAAQ;QACR,0EAA0E;QAC1E,0EAA0E;QAC1E,kBAAkB;QAClB,MAAM;KACP,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAuB,EACvB,SAA+D,EAC/D,KAAc;IAEd,IAAI,CAAC,SAAS;QAAE,OAAO;IAEvB,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3D,IAAI,CAAC,MAAM;YAAE,SAAS;QAEtB,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC7B,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,KAAK,CAAC,EAAE;gBAC9E,YAAY,EAAE,IAAI;gBAClB,OAAO,EAAE,MAAM,CAAC,mBAAmB;aACpC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;oBAC5D,OAAO,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;iBACnC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC7B,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,KAAK,CAAC,EAAE;gBAC/E,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACrC,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/services/approval/approval-state.d.ts

@@ -1,4 +1,4 @@
-import { type RunState } from '@openai/agents';
+import type { ContinuationHandle } from '../../contracts/continuation-handle.js';
 import { type GenerationToken } from '../generation-guard.js';
 import { type NormalizedUsage } from '../../utils/ai/token-usage.js';
 import { type CommandMessage } from '../../tools/types.js';
@@ -6,14 +6,13 @@ import { type PersistedAssistantTurnItem } from '../conversation/conversation-pe
 import { type ToolOwner } from './tool-owner.js';
 export type ApprovalBatchDecision = 'approved' | 'rejected';
 export type PendingApprovalContext = {
-    state: RunState<any, any>;
+    state: ContinuationHandle;
     interruption: unknown;
     interruptions?: unknown[];
     decisionsByCallId?: Map<string, ApprovalBatchDecision>;
     promptedCallId?: string;
     emittedCommandIds: Set<string>;
     toolCallArgumentsById: Map<string, unknown>;
-    removeInterceptor?: () => void;
     owner: ToolOwner;
     token?: GenerationToken;
     inputMode?: 'delta' | 'full_history';
@@ -22,14 +21,13 @@ export type PendingApprovalContext = {
     cumulativeTurnItems?: PersistedAssistantTurnItem[];
 };
 export type AbortedApprovalContext = {
-    state: RunState<any, any>;
+    state: ContinuationHandle;
     interruption: unknown;
     interruptions?: unknown[];
     decisionsByCallId?: Map<string, ApprovalBatchDecision>;
     promptedCallId?: string;
     emittedCommandIds: Set<string>;
     toolCallArgumentsById: Map<string, unknown>;
-    removeInterceptor?: () => void;
     owner: ToolOwner;
     token?: GenerationToken;
     inputMode?: 'delta' | 'full_history';
@@ -45,7 +43,6 @@ export declare class ApprovalState {
         owner?: ToolOwner;
     }): void;
     clearPending(): void;
-    setPendingRemoveInterceptor(removeInterceptor: (() => void) | null): void;
     abortPending(): boolean;
     consumeAborted(): AbortedApprovalContext | null;
 }

package/dist/services/approval/approval-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"approval-state.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,mDAAmD,CAAC;AACpG,OAAO,EAAqB,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,UAAU,CAAC;AAE5D,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IAC1B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7C,mBAAmB,CAAC,EAAE,0BAA0B,EAAE,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IAC1B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7C,mBAAmB,CAAC,EAAE,0BAA0B,EAAE,CAAC;CACpD,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,OAAO,CAAuC;IAEtD,UAAU,IAAI,sBAAsB,GAAG,IAAI,CAE1C;IAED,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,OAAO,CAAC,GAAG;QAAE,KAAK,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG,IAAI,CAGvF;IAED,YAAY,IAAI,IAAI,CAEnB;IAED,2BAA2B,CAAC,iBAAiB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CASxE;IAED,YAAY,IAAI,OAAO,CAuBtB;IAED,cAAc,IAAI,sBAAsB,GAAG,IAAI,CAI9C;CACF"}
+{"version":3,"file":"approval-state.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,mDAAmD,CAAC;AACpG,OAAO,EAAqB,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,MAAM,qBAAqB,GAAG,UAAU,GAAG,UAAU,CAAC;AAE5D,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IAC1B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7C,mBAAmB,CAAC,EAAE,0BAA0B,EAAE,CAAC;CACpD,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IAC1B,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACvD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,KAAK,EAAE,SAAS,CAAC;IACjB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;IACrC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC;IAC7C,mBAAmB,CAAC,EAAE,0BAA0B,EAAE,CAAC;CACpD,CAAC;AAEF,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAuC;IACtD,OAAO,CAAC,OAAO,CAAuC;IAEtD,UAAU,IAAI,sBAAsB,GAAG,IAAI,CAE1C;IAED,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,OAAO,CAAC,GAAG;QAAE,KAAK,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG,IAAI,CAGvF;IAED,YAAY,IAAI,IAAI,CAEnB;IAED,YAAY,IAAI,OAAO,CAsBtB;IAED,cAAc,IAAI,sBAAsB,GAAG,IAAI,CAI9C;CACF"}

package/dist/services/approval/approval-state.js

@@ -12,15 +12,6 @@ export class ApprovalState {
     clearPending() {
         this.pending = null;
     }
-    setPendingRemoveInterceptor(removeInterceptor) {
-        if (!this.pending) {
-            return;
-        }
-        this.pending = {
-            ...this.pending,
-            ...(removeInterceptor ? { removeInterceptor } : {}),
-        };
-    }
     abortPending() {
         if (!this.pending) {
             return false;
@@ -33,7 +24,6 @@ export class ApprovalState {
             promptedCallId: this.pending.promptedCallId,
             emittedCommandIds: this.pending.emittedCommandIds,
             toolCallArgumentsById: this.pending.toolCallArgumentsById,
-            removeInterceptor: this.pending.removeInterceptor,
             owner: this.pending.owner,
             token: this.pending.token,
             inputMode: this.pending.inputMode,

package/dist/services/approval/approval-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"approval-state.js","sourceRoot":"","sources":["../../../source/services/approval/approval-state.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAkB,MAAM,iBAAiB,CAAC;AAsCpE,MAAM,OAAO,aAAa;IAChB,OAAO,GAAkC,IAAI,CAAC;IAC9C,OAAO,GAAkC,IAAI,CAAC;IAEtD,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,OAAsE;QAC/E,OAAO,CAAC,KAAK,KAAK,iBAAiB,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,OAAiC,CAAC;IACnD,CAAC;IAED,YAAY;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,2BAA2B,CAAC,iBAAsC;QAChE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,IAAI,CAAC,OAAO;YACf,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACpD,CAAC;IACJ,CAAC;IAED,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;YACzC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;YAC3C,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,qBAAqB,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB;YACzD,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACjC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;YAC7C,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;YACjE,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB;SACtD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
+{"version":3,"file":"approval-state.js","sourceRoot":"","sources":["../../../source/services/approval/approval-state.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAkB,MAAM,iBAAiB,CAAC;AAoCpE,MAAM,OAAO,aAAa;IAChB,OAAO,GAAkC,IAAI,CAAC;IAC9C,OAAO,GAAkC,IAAI,CAAC;IAEtD,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,OAAsE;QAC/E,OAAO,CAAC,KAAK,KAAK,iBAAiB,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,OAAiC,CAAC;IACnD,CAAC;IAED,YAAY;QACV,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,YAAY;QACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,OAAO,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;YACzC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc;YAC3C,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB;YACjD,qBAAqB,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB;YACzD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;YACzB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;YACjC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;YAC7C,yBAAyB,EAAE,IAAI,CAAC,OAAO,CAAC,yBAAyB;YACjE,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB;SACtD,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}

package/dist/services/approval/background-subagent-approval-controller.d.ts

@@ -0,0 +1,25 @@
+import type { ILoggingService } from '../service-interfaces.js';
+import type { NestedToolCompatibilityState } from '../session/nested-tool-compatibility-state.js';
+import { type BackgroundSubagentApprovalResolutionRequest, type BackgroundSubagentApprovalSnapshot } from './background-subagent-approval-queue.js';
+import type { BackgroundSubagentApprovalPause } from '../subagents/foreground-subagent-lease.js';
+/**
+ * Session-owned policy/control boundary for approvals paused by adopted child
+ * leases. Root ApprovalState is deliberately not involved: its continuation
+ * belongs to the foreground turn, while this controller only touches the
+ * continuation retained by the matching lease.
+ */
+export declare class BackgroundSubagentApprovalController {
+    #private;
+    constructor({ logger, sessionId, nestedCompatibility, }: {
+        logger: ILoggingService;
+        sessionId: string;
+        nestedCompatibility?: NestedToolCompatibilityState;
+    });
+    getSnapshot(): BackgroundSubagentApprovalSnapshot;
+    subscribe(listener: () => void): () => void;
+    close(): readonly unknown[];
+    resolve(request: BackgroundSubagentApprovalResolutionRequest): import("./background-subagent-approval-queue.js").BackgroundSubagentApprovalResolveResult;
+    /** Sink installed on the subagent runtime for pauses after a successful move. */
+    publish: (pause: BackgroundSubagentApprovalPause) => void;
+}
+//# sourceMappingURL=background-subagent-approval-controller.d.ts.map

package/dist/services/approval/background-subagent-approval-controller.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"background-subagent-approval-controller.d.ts","sourceRoot":"","sources":["../../../source/services/approval/background-subagent-approval-controller.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAElG,OAAO,EAGL,KAAK,2CAA2C,EAChD,KAAK,kCAAkC,EACxC,MAAM,yCAAyC,CAAC;AAEjD,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,2CAA2C,CAAC;AAEjG;;;;;GAKG;AACH,qBAAa,oCAAoC;;IAI/C,YAAY,EACV,MAAM,EACN,SAAS,EACT,mBAAmB,GACpB,EAAE;QACD,MAAM,EAAE,eAAe,CAAC;QACxB,SAAS,EAAE,MAAM,CAAC;QAClB,mBAAmB,CAAC,EAAE,4BAA4B,CAAC;KACpD,EAEA;IAED,WAAW,IAAI,kCAAkC,CAEhD;IAED,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE1C;IAED,KAAK,IAAI,SAAS,OAAO,EAAE,CAE1B;IAED,OAAO,CAAC,OAAO,EAAE,2CAA2C,6FAE3D;IAED,iFAAiF;IACjF,OAAO,UAAW,+BAA+B,KAAG,IAAI,CAoBtD;CAuBH"}