@qduc/term2 0.7.3 → 0.8.0

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

@@ -0,0 +1 @@
+{"version":3,"file":"approval-flow-coordinator.test.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-flow-coordinator.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,314 @@
+import { it, expect } from 'vitest';
+import { ApprovalFlowCoordinator } from './approval-flow-coordinator.js';
+import { ApprovalState } from './approval-state.js';
+import { LoggingService } from '../logging/logging-service.js';
+const logger = new LoggingService({ disableLogging: true });
+const mockToolTracker = {
+    recordAbortedApproval: () => { },
+    export: () => [],
+};
+const mockGenerationGuard = {
+    isCurrent: () => true,
+    capture: () => 1,
+};
+const makeMockAgentClient = () => {
+    const installs = [];
+    const removes = [];
+    let installCounter = 0;
+    const client = {
+        abort: () => undefined,
+        addToolInterceptor: (interceptor) => {
+            installCounter++;
+            installs.push(interceptor);
+            const id = installCounter;
+            return () => {
+                removes.push(id);
+            };
+        },
+    };
+    return { client, installs, removes };
+};
+it('abort delegates to agentClient and approvalState', () => {
+    let abortCalled = false;
+    const client = { abort: () => (abortCalled = true) };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state: {},
+        interruption: {},
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+    });
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    const result = coord.abort();
+    expect(abortCalled).toBe(true);
+    expect(result.aborted).toBe(true);
+});
+it('abort returns false when no pending approval', () => {
+    const client = { abort: () => undefined };
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    expect(coord.abort().aborted).toBe(false);
+});
+it('prepareContinuation returns null when no pending approval', () => {
+    const client = {};
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    expect(coord.prepareContinuation('y', undefined)).toBe(null);
+});
+it('prepareContinuation answer=y emits tool_started and approves', () => {
+    let approved = false;
+    const state = { approve: () => (approved = true) };
+    const interruption = { name: 'shell', callId: 'c1', arguments: { command: 'ls' } };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption,
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+    });
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    const plan = coord.prepareContinuation('y', undefined);
+    expect(plan).toBeTruthy();
+    expect(approved).toBe(true);
+    expect(plan?.toolStartedEvent?.type).toBe('tool_started');
+    if (plan?.toolStartedEvent?.type === 'tool_started') {
+        expect(plan.toolStartedEvent.toolName).toBe('shell');
+        expect(plan.toolStartedEvent.toolCallId).toBe('c1');
+    }
+});
+it('prepareContinuation answer=y normalizes JSON string tool_started arguments', () => {
+    const state = { approve: () => undefined };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption: { name: 'shell', callId: 'c-json', arguments: JSON.stringify({ command: 'npm test' }) },
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+    });
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    const plan = coord.prepareContinuation('y', undefined);
+    expect(plan?.toolStartedEvent?.type).toBe('tool_started');
+    if (plan?.toolStartedEvent?.type === 'tool_started') {
+        expect(plan.toolStartedEvent.arguments).toEqual({ command: 'npm test' });
+    }
+});
+it('prepareContinuation answer=y emits subagent_tool_started for subagent ownership', () => {
+    const state = { approve: () => undefined };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption: { name: 'shell', callId: 'nested-c1', arguments: JSON.stringify({ command: 'npm test' }) },
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+        owner: { kind: 'subagent', agentId: 'worker-1', role: 'worker' },
+    });
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    const plan = coord.prepareContinuation('y', undefined);
+    expect(plan?.toolStartedEvent).toEqual({
+        type: 'subagent_tool_started',
+        agentId: 'worker-1',
+        role: 'worker',
+        toolCallId: 'nested-c1',
+        toolName: 'shell',
+        arguments: { command: 'npm test' },
+    });
+});
+it('prepareContinuation rejection calls state.reject with the correct rejection message', () => {
+    let approved = false;
+    let rejectedInterruption = null;
+    let rejectedOptions = null;
+    const state = {
+        approve: () => (approved = true),
+        reject: (interruption, options) => {
+            rejectedInterruption = interruption;
+            rejectedOptions = options;
+        },
+    };
+    const interruption = { name: 'shell', callId: 'c1', arguments: { command: 'rm -rf /' } };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption,
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+    });
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    const plan = coord.prepareContinuation('n', 'too dangerous');
+    expect(plan).toBeTruthy();
+    expect(approved).toBe(false);
+    expect(rejectedInterruption).toBe(interruption);
+    expect(rejectedOptions).toEqual({ message: "Tool execution was not approved. User's reason: too dangerous" });
+});
+it('prepareContinuation rejection for nested subagent calls state.reject with the correct rejection message', () => {
+    let approved = false;
+    let rejectedInterruption = null;
+    let rejectedOptions = null;
+    const state = {
+        approve: () => (approved = true),
+        reject: (interruption, options) => {
+            rejectedInterruption = interruption;
+            rejectedOptions = options;
+        },
+    };
+    const interruption = { name: 'shell', callId: 'worker-shell', arguments: { command: 'npm test' } };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption,
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+        owner: { kind: 'subagent', agentId: 'worker-1', role: 'worker' },
+    });
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    const plan = coord.prepareContinuation('n', 'do not run it');
+    expect(plan).toBeTruthy();
+    expect(approved).toBe(false);
+    expect(rejectedInterruption).toBe(interruption);
+    expect(rejectedOptions).toEqual({ message: "Tool execution was not approved. User's reason: do not run it" });
+});
+it('prepareContinuation rejection: nested subagent where state.reject is undefined — does not throw', () => {
+    // state has no reject method — simulates SDK state that only has approve
+    const state = {
+        approve: () => undefined,
+        // reject is intentionally absent
+    };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption: { name: 'shell', callId: 'nested-c1', arguments: { command: 'ls' } },
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+        owner: { kind: 'subagent', agentId: 'worker-1', role: 'worker' },
+    });
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    // Should not throw — reject is optional-chained in the implementation
+    expect(() => {
+        coord.prepareContinuation('n', undefined);
+    }).not.toThrow();
+});
+it('prepareAbortResolution calls state.reject with the correct rejection message', () => {
+    let rejectedInterruption = null;
+    let rejectedOptions = null;
+    const state = {
+        reject: (interruption, options) => {
+            rejectedInterruption = interruption;
+            rejectedOptions = options;
+        },
+    };
+    const aborted = {
+        state,
+        interruption: { name: 'shell', callId: 'c1', arguments: { command: 'ls' } },
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+        owner: { kind: 'parent' },
+    };
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    const plan = coord.prepareAbortResolution(aborted, 'a new question');
+    expect(rejectedInterruption).toBe(aborted.interruption);
+    expect(rejectedOptions).toEqual({
+        message: 'Tool execution was not approved. User provided new input instead: a new question',
+    });
+    expect(typeof plan.removeInterceptor).toBe('function');
+});
+it('retargetPendingInterruption preserves batch context', () => {
+    const approvalState = new ApprovalState();
+    const state = { _pendingAgentToolRuns: new Map() };
+    approvalState.setPending({
+        state,
+        interruption: { name: 'shell', callId: 'call-1', arguments: { command: 'pwd' } },
+        emittedCommandIds: new Set(['message-1']),
+        toolCallArgumentsById: new Map([['call-1', { command: 'pwd' }]]),
+        inputMode: 'delta',
+    });
+    const { client } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+        toolTracker: mockToolTracker,
+        generationGuard: mockGenerationGuard,
+    });
+    const nextInterruption = { name: 'shell', callId: 'call-2', arguments: { command: 'ls' } };
+    const pending = coord.retargetPendingInterruption(nextInterruption);
+    expect(pending?.interruption).toBe(nextInterruption);
+    expect(pending?.state).toBe(state);
+    expect(pending?.emittedCommandIds).toEqual(new Set(['message-1']));
+    expect(pending?.toolCallArgumentsById).toEqual(new Map([['call-1', { command: 'pwd' }]]));
+});
+//# sourceMappingURL=approval-flow-coordinator.test.js.map

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

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

package/dist/services/approval/approval-presentation-policy.d.ts

@@ -0,0 +1,17 @@
+import type { ApprovalDescriptor } from '../../contracts/conversation.js';
+import { type ApprovalPresentationCapability } from '../../tools/tool-capabilities.js';
+import type { CommandMessage } from '../../tools/types.js';
+export type ApprovedCommandMessage = CommandMessage & {
+    hadApproval?: boolean;
+};
+export interface ApprovedToolContext {
+    callId?: string;
+    toolName?: string;
+}
+type CapabilityResolver = (toolName?: string) => ApprovalPresentationCapability;
+export declare const filterPendingCommandMessagesForApproval: <TMessage extends {
+    sender?: string;
+}>(messages: TMessage[], approval: Pick<ApprovalDescriptor, "callId" | "toolName"> | null | undefined, getCapability?: CapabilityResolver) => TMessage[];
+export declare const annotateApprovedCommandMessage: (commandMessage: ApprovedCommandMessage, approvedContext: ApprovedToolContext | null, getCapability?: CapabilityResolver) => ApprovedCommandMessage;
+export {};
+//# sourceMappingURL=approval-presentation-policy.d.ts.map

package/dist/services/approval/approval-presentation-policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-presentation-policy.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-presentation-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAEL,KAAK,8BAA8B,EACpC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,MAAM,sBAAsB,GAAG,cAAc,GAAG;IACpD,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,KAAK,kBAAkB,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,8BAA8B,CAAC;AAIhF,eAAO,MAAM,uCAAuC,GAAI,QAAQ,SAAS;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,EAC1F,UAAU,QAAQ,EAAE,EACpB,UAAU,IAAI,CAAC,kBAAkB,EAAE,QAAQ,GAAG,UAAU,CAAC,GAAG,IAAI,GAAG,SAAS,EAC5E,gBAAe,kBAA8C,KAC5D,QAAQ,EA+BV,CAAC;AAEF,eAAO,MAAM,8BAA8B,GACzC,gBAAgB,sBAAsB,EACtC,iBAAiB,mBAAmB,GAAG,IAAI,EAC3C,gBAAe,kBAA8C,KAC5D,sBAoBF,CAAC"}

package/dist/services/approval/approval-presentation-policy.js

@@ -0,0 +1,44 @@
+import { getApprovalPresentationCapability, } from '../../tools/tool-capabilities.js';
+const defaultCapabilityResolver = (toolName) => getApprovalPresentationCapability(toolName);
+export const filterPendingCommandMessagesForApproval = (messages, approval, getCapability = defaultCapabilityResolver) => {
+    if (!Array.isArray(messages) || messages.length === 0) {
+        return messages ?? [];
+    }
+    const callId = approval?.callId ? String(approval.callId) : undefined;
+    const toolName = approval?.toolName;
+    if (!callId && !toolName) {
+        return messages;
+    }
+    return messages.filter((msg) => {
+        const commandMsg = msg;
+        if (!commandMsg || commandMsg.sender !== 'command') {
+            return true;
+        }
+        if (commandMsg.status !== 'pending' && commandMsg.status !== 'running') {
+            return true;
+        }
+        const capability = getCapability(commandMsg.toolName);
+        if (!capability.hidePendingDuringPrompt) {
+            return true;
+        }
+        const matchesCallId = callId && commandMsg.callId && String(commandMsg.callId) === callId;
+        const matchesToolName = !callId && toolName && commandMsg.toolName === toolName;
+        return !(matchesCallId || matchesToolName);
+    });
+};
+export const annotateApprovedCommandMessage = (commandMessage, approvedContext, getCapability = defaultCapabilityResolver) => {
+    if (!approvedContext) {
+        return commandMessage;
+    }
+    const capability = getCapability(commandMessage.toolName);
+    if (!capability.annotateCommandMessage) {
+        return commandMessage;
+    }
+    const matchesCallId = approvedContext.callId && commandMessage.callId && approvedContext.callId === commandMessage.callId;
+    const matchesToolName = !approvedContext.callId && approvedContext.toolName && approvedContext.toolName === commandMessage.toolName;
+    if (!matchesCallId && !matchesToolName) {
+        return commandMessage;
+    }
+    return { ...commandMessage, hadApproval: true };
+};
+//# sourceMappingURL=approval-presentation-policy.js.map

package/dist/services/approval/approval-presentation-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-presentation-policy.js","sourceRoot":"","sources":["../../../source/services/approval/approval-presentation-policy.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iCAAiC,GAElC,MAAM,kCAAkC,CAAC;AAc1C,MAAM,yBAAyB,GAAuB,CAAC,QAAQ,EAAE,EAAE,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;AAEhH,MAAM,CAAC,MAAM,uCAAuC,GAAG,CACrD,QAAoB,EACpB,QAA4E,EAC5E,gBAAoC,yBAAyB,EACjD,EAAE;IACd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtD,OAAO,QAAQ,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtE,MAAM,QAAQ,GAAG,QAAQ,EAAE,QAAQ,CAAC;IAEpC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7B,MAAM,UAAU,GAAG,GAAgC,CAAC;QACpD,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACvE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAI,UAAU,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC;QAC1F,MAAM,eAAe,GAAG,CAAC,MAAM,IAAI,QAAQ,IAAI,UAAU,CAAC,QAAQ,KAAK,QAAQ,CAAC;QAChF,OAAO,CAAC,CAAC,aAAa,IAAI,eAAe,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,cAAsC,EACtC,eAA2C,EAC3C,gBAAoC,yBAAyB,EACrC,EAAE;IAC1B,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,UAAU,GAAG,aAAa,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC1D,IAAI,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC;QACvC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,MAAM,aAAa,GACjB,eAAe,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,IAAI,eAAe,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,CAAC;IACtG,MAAM,eAAe,GACnB,CAAC,eAAe,CAAC,MAAM,IAAI,eAAe,CAAC,QAAQ,IAAI,eAAe,CAAC,QAAQ,KAAK,cAAc,CAAC,QAAQ,CAAC;IAE9G,IAAI,CAAC,aAAa,IAAI,CAAC,eAAe,EAAE,CAAC;QACvC,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,OAAO,EAAE,GAAG,cAAc,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AAClD,CAAC,CAAC"}

package/dist/services/approval/approval-presentation-policy.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=approval-presentation-policy.test.d.ts.map

package/dist/services/approval/approval-presentation-policy.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-presentation-policy.test.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-presentation-policy.test.ts"],"names":[],"mappings":""}

package/dist/services/approval/approval-presentation-policy.test.js

@@ -0,0 +1,74 @@
+import { it, expect } from 'vitest';
+import { annotateApprovedCommandMessage, filterPendingCommandMessagesForApproval, } from './approval-presentation-policy.js';
+const allowAllCapabilities = () => ({
+    annotateCommandMessage: true,
+    hidePendingDuringPrompt: true,
+});
+it('filterPendingCommandMessagesForApproval prioritizes callId over toolName', () => {
+    const messages = [
+        {
+            id: 'call-1-running',
+            sender: 'command',
+            status: 'running',
+            command: 'echo one',
+            output: '',
+            callId: 'call-1',
+            toolName: 'shell',
+        },
+        {
+            id: 'call-2-running',
+            sender: 'command',
+            status: 'running',
+            command: 'echo two',
+            output: '',
+            callId: 'call-2',
+            toolName: 'shell',
+        },
+    ];
+    const out = filterPendingCommandMessagesForApproval(messages, { callId: 'call-2', toolName: 'shell' }, allowAllCapabilities);
+    expect(out.length).toBe(1);
+    expect(out[0].callId).toBe('call-1');
+});
+it('filterPendingCommandMessagesForApproval falls back to toolName when callId missing', () => {
+    const messages = [
+        {
+            id: 'apply-running',
+            sender: 'command',
+            status: 'running',
+            command: 'apply patch',
+            output: '',
+            toolName: 'apply_patch',
+        },
+        {
+            id: 'grep-running',
+            sender: 'command',
+            status: 'running',
+            command: 'grep foo',
+            output: '',
+            toolName: 'grep',
+        },
+    ];
+    const out = filterPendingCommandMessagesForApproval(messages, { toolName: 'apply_patch' }, allowAllCapabilities);
+    expect(out.length).toBe(1);
+    expect(out[0].toolName).toBe('grep');
+});
+it('annotateApprovedCommandMessage uses capability metadata instead of tool-name checks', () => {
+    const context = {
+        callId: 'call-annotate-1',
+        toolName: 'custom_tool',
+    };
+    const output = annotateApprovedCommandMessage({
+        id: 'msg-1',
+        sender: 'command',
+        status: 'completed',
+        command: 'custom',
+        output: 'ok',
+        callId: 'call-annotate-1',
+        toolName: 'custom_tool',
+    }, context, (toolName) => toolName === 'custom_tool'
+        ? { annotateCommandMessage: true, hidePendingDuringPrompt: false }
+        : { annotateCommandMessage: false, hidePendingDuringPrompt: false });
+    expect(output).toBeTruthy();
+    expect(output.hadApproval === true).toBe(true);
+});
+//# sourceMappingURL=approval-presentation-policy.test.js.map

package/dist/services/approval/approval-presentation-policy.test.js.map

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

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

@@ -0,0 +1,52 @@
+import { type RunState } from '@openai/agents';
+import { type GenerationToken } from '../generation-guard.js';
+import { type NormalizedUsage } from '../../utils/ai/token-usage.js';
+import { type CommandMessage } from '../../tools/types.js';
+import { type PersistedAssistantTurnItem } from '../conversation/conversation-persistence-types.js';
+import { type ToolOwner } from './tool-owner.js';
+export type ApprovalBatchDecision = 'approved' | 'rejected';
+export type PendingApprovalContext = {
+    state: RunState<any, any>;
+    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';
+    cumulativeUsage?: NormalizedUsage;
+    cumulativeCommandMessages?: CommandMessage[];
+    cumulativeTurnItems?: PersistedAssistantTurnItem[];
+};
+export type AbortedApprovalContext = {
+    state: RunState<any, any>;
+    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';
+    cumulativeUsage?: NormalizedUsage;
+    cumulativeCommandMessages?: CommandMessage[];
+    cumulativeTurnItems?: PersistedAssistantTurnItem[];
+};
+export declare class ApprovalState {
+    private pending;
+    private aborted;
+    getPending(): PendingApprovalContext | null;
+    setPending(context: Omit<PendingApprovalContext, 'owner'> & {
+        owner?: ToolOwner;
+    }): void;
+    clearPending(): void;
+    setPendingRemoveInterceptor(removeInterceptor: (() => void) | null): void;
+    abortPending(): boolean;
+    consumeAborted(): AbortedApprovalContext | null;
+}
+//# sourceMappingURL=approval-state.d.ts.map

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

@@ -0,0 +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;IAI3C,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,sBAAsB,EAAE,OAAO,CAAC,GAAG;QAAE,KAAK,CAAC,EAAE,SAAS,CAAA;KAAE,GAAG,IAAI;IAKxF,YAAY,IAAI,IAAI;IAIpB,2BAA2B,CAAC,iBAAiB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAWzE,YAAY,IAAI,OAAO;IAyBvB,cAAc,IAAI,sBAAsB,GAAG,IAAI;CAKhD"}

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

@@ -0,0 +1,53 @@
+import { PARENT_TOOL_OWNER } from './tool-owner.js';
+export class ApprovalState {
+    pending = null;
+    aborted = null;
+    getPending() {
+        return this.pending;
+    }
+    setPending(context) {
+        context.owner ??= PARENT_TOOL_OWNER;
+        this.pending = context;
+    }
+    clearPending() {
+        this.pending = null;
+    }
+    setPendingRemoveInterceptor(removeInterceptor) {
+        if (!this.pending) {
+            return;
+        }
+        this.pending = {
+            ...this.pending,
+            ...(removeInterceptor ? { removeInterceptor } : {}),
+        };
+    }
+    abortPending() {
+        if (!this.pending) {
+            return false;
+        }
+        this.aborted = {
+            state: this.pending.state,
+            interruption: this.pending.interruption,
+            interruptions: this.pending.interruptions,
+            decisionsByCallId: this.pending.decisionsByCallId,
+            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,
+            cumulativeUsage: this.pending.cumulativeUsage,
+            cumulativeCommandMessages: this.pending.cumulativeCommandMessages,
+            cumulativeTurnItems: this.pending.cumulativeTurnItems,
+        };
+        this.pending = null;
+        return true;
+    }
+    consumeAborted() {
+        const aborted = this.aborted;
+        this.aborted = null;
+        return aborted;
+    }
+}
+//# sourceMappingURL=approval-state.js.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=approval-state.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"approval-state.test.d.ts","sourceRoot":"","sources":["../../../source/services/approval/approval-state.test.ts"],"names":[],"mappings":""}