@qduc/term2 0.1.8 → 0.2.0

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

@@ -0,0 +1,120 @@
+import { installApprovalRejectionInterceptor, tryInstallApprovalRejectionInterceptor, } from './approval-rejection-interceptor.js';
+import { asRecord, getCallIdFromObject, getMethod, getString, getToolInfoFromInterruption, } from './interruption-info.js';
+const noop = () => undefined;
+export class ApprovalFlowCoordinator {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    abort() {
+        this.deps.agentClient.abort();
+        if (this.deps.approvalState.abortPending()) {
+            this.deps.logger.debug('Aborted approval - will handle rejection on next message', {
+                eventType: 'approval.aborted',
+                category: 'approval',
+                phase: 'abort',
+                sessionId: this.deps.sessionId,
+                traceId: this.deps.logger.getCorrelationId(),
+            });
+            return true;
+        }
+        return false;
+    }
+    consumeAborted() {
+        return this.deps.approvalState.consumeAborted();
+    }
+    /**
+     * Drive an aborted-approval resolution: install rejection interceptor and approve the
+     * interruption so the agent gets the rejection text via the interceptor.
+     */
+    prepareAbortResolution(abortedContext, userText) {
+        const interruptionRecord = asRecord(abortedContext.interruption);
+        const toolName = getString(interruptionRecord, 'name') ?? 'unknown';
+        const expectedCallId = getCallIdFromObject(abortedContext.interruption);
+        const rejectionMessage = `Tool execution was not approved. User provided new input instead: ${userText}`;
+        const removeInterceptor = installApprovalRejectionInterceptor(this.deps.agentClient, {
+            toolName,
+            expectedCallId,
+            rejectionMessage,
+        });
+        const approve = getMethod(abortedContext.state, 'approve');
+        approve?.call(abortedContext.state, abortedContext.interruption);
+        return { abortedContext, removeInterceptor };
+    }
+    /**
+     * 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.
+     */
+    prepareContinuation(answer, rejectionReason) {
+        const pendingApprovalContext = this.deps.approvalState.getPending();
+        if (!pendingApprovalContext) {
+            return null;
+        }
+        const { state, interruption } = pendingApprovalContext;
+        const interruptionRecord = asRecord(interruption);
+        let toolStartedEvent;
+        if (answer === 'y') {
+            this.deps.logger.debug('Tool approval granted', {
+                eventType: 'approval.granted',
+                category: 'approval',
+                phase: 'approval',
+                sessionId: this.deps.sessionId,
+                traceId: this.deps.logger.getCorrelationId(),
+            });
+            const { toolName, rawArguments } = getToolInfoFromInterruption(interruption);
+            const callId = getCallIdFromObject(interruption);
+            toolStartedEvent = {
+                type: 'tool_started',
+                toolCallId: callId ?? String(Date.now()),
+                toolName,
+                arguments: rawArguments,
+            };
+            const approve = getMethod(state, 'approve');
+            approve?.call(state, interruption);
+        }
+        else {
+            const toolName = getString(interruptionRecord, 'name') ?? 'unknown';
+            const expectedCallId = getCallIdFromObject(interruption);
+            const rejectionMessage = rejectionReason
+                ? `Tool execution was not approved. User's reason: ${rejectionReason}`
+                : 'Tool execution was not approved.';
+            const installedInterceptor = tryInstallApprovalRejectionInterceptor(this.deps.agentClient, {
+                toolName,
+                expectedCallId,
+                rejectionMessage,
+            });
+            if (installedInterceptor) {
+                const approve = getMethod(state, 'approve');
+                approve?.call(state, interruption);
+                this.deps.approvalState.setPendingRemoveInterceptor(installedInterceptor);
+            }
+            else {
+                const reject = getMethod(state, 'reject');
+                reject?.call(state, interruption);
+            }
+            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 = this.deps.approvalState.getPending()?.removeInterceptor ?? noop;
+        return { pendingApprovalContext, toolStartedEvent, removeInterceptor };
+    }
+    recordPending(pending) {
+        this.deps.approvalState.setPending(pending);
+    }
+    clearPending() {
+        this.deps.approvalState.clearPending();
+    }
+    getPending() {
+        return this.deps.approvalState.getPending();
+    }
+    getPendingInterruption() {
+        return this.deps.approvalState.getPending()?.interruption;
+    }
+}
+//# sourceMappingURL=approval-flow-coordinator.js.map

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

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

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

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

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

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

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

@@ -0,0 +1,168 @@
+import test from 'ava';
+import { ApprovalFlowCoordinator } from './approval-flow-coordinator.js';
+import { ApprovalState } from './approval-state.js';
+import { LoggingService } from './logging-service.js';
+const logger = new LoggingService({ disableLogging: true });
+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 };
+};
+test('abort delegates to agentClient and approvalState', (t) => {
+    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',
+    });
+    const result = coord.abort();
+    t.true(abortCalled);
+    t.true(result);
+});
+test('abort returns false when no pending approval', (t) => {
+    const client = { abort: () => undefined };
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+    });
+    t.false(coord.abort());
+});
+test('prepareContinuation returns null when no pending approval', (t) => {
+    const client = {};
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+    });
+    t.is(coord.prepareContinuation('y', undefined), null);
+});
+test('prepareContinuation answer=y emits tool_started and approves', (t) => {
+    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',
+    });
+    const plan = coord.prepareContinuation('y', undefined);
+    t.truthy(plan);
+    t.true(approved);
+    t.is(plan?.toolStartedEvent?.type, 'tool_started');
+    if (plan?.toolStartedEvent?.type === 'tool_started') {
+        t.is(plan.toolStartedEvent.toolName, 'shell');
+        t.is(plan.toolStartedEvent.toolCallId, 'c1');
+    }
+});
+test('prepareContinuation rejection: with interceptor support, approves with installed interceptor', (t) => {
+    let approved = false;
+    let rejected = false;
+    const state = {
+        approve: () => (approved = true),
+        reject: () => (rejected = true),
+    };
+    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, installs } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+    });
+    const plan = coord.prepareContinuation('n', 'too dangerous');
+    t.truthy(plan);
+    t.true(approved, 'approve is called when interceptor is installed');
+    t.false(rejected, 'reject is NOT called when interceptor is available');
+    t.is(installs.length, 1, 'one interceptor was installed');
+    t.is(plan?.toolStartedEvent, undefined, 'no tool_started for rejection');
+});
+test('prepareContinuation rejection: without interceptor support, falls back to reject', (t) => {
+    let approved = false;
+    let rejected = false;
+    const state = {
+        approve: () => (approved = true),
+        reject: () => (rejected = true),
+    };
+    const interruption = { name: 'shell', callId: 'c1', arguments: { command: 'rm -rf /' } };
+    const approvalState = new ApprovalState();
+    approvalState.setPending({
+        state,
+        interruption,
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+    });
+    // agentClient lacks addToolInterceptor — interceptor cannot be installed
+    const client = {};
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState,
+        logger,
+        sessionId: 's1',
+    });
+    const plan = coord.prepareContinuation('n', undefined);
+    t.truthy(plan);
+    t.false(approved);
+    t.true(rejected);
+});
+test('prepareAbortResolution installs interceptor and approves', (t) => {
+    let approved = false;
+    const state = { approve: () => (approved = true) };
+    const aborted = {
+        state,
+        interruption: { name: 'shell', callId: 'c1', arguments: { command: 'ls' } },
+        emittedCommandIds: new Set(),
+        toolCallArgumentsById: new Map(),
+    };
+    const { client, installs } = makeMockAgentClient();
+    const coord = new ApprovalFlowCoordinator({
+        agentClient: client,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+    });
+    const plan = coord.prepareAbortResolution(aborted, 'a new question');
+    t.true(approved);
+    t.is(installs.length, 1);
+    t.is(typeof plan.removeInterceptor, 'function');
+});
+//# sourceMappingURL=approval-flow-coordinator.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"approval-flow-coordinator.test.js","sourceRoot":"","sources":["../../source/services/approval-flow-coordinator.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;AAE5D,MAAM,mBAAmB,GAAG,GAAG,EAAE;IAC/B,MAAM,QAAQ,GAAU,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,MAAM,MAAM,GAAQ;QAClB,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS;QACtB,kBAAkB,EAAE,CAAC,WAAgB,EAAE,EAAE;YACvC,cAAc,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3B,MAAM,EAAE,GAAG,cAAc,CAAC;YAC1B,OAAO,GAAG,EAAE;gBACV,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnB,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AACvC,CAAC,CAAC;AAEF,IAAI,CAAC,kDAAkD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7D,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,MAAM,MAAM,GAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,CAAC;IAC1D,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;IAC1C,aAAa,CAAC,UAAU,CAAC;QACvB,KAAK,EAAE,EAAE;QACT,YAAY,EAAE,EAAE;QAChB,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,qBAAqB,EAAE,IAAI,GAAG,EAAE;KACjC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC;QACxC,WAAW,EAAE,MAAM;QACnB,aAAa;QACb,MAAM;QACN,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACpB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8CAA8C,EAAE,CAAC,CAAC,EAAE,EAAE;IACzD,MAAM,MAAM,GAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC;QACxC,WAAW,EAAE,MAAM;QACnB,aAAa,EAAE,IAAI,aAAa,EAAE;QAClC,MAAM;QACN,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IACH,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2DAA2D,EAAE,CAAC,CAAC,EAAE,EAAE;IACtE,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC;QACxC,WAAW,EAAE,MAAM;QACnB,aAAa,EAAE,IAAI,aAAa,EAAE;QAClC,MAAM;QACN,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IACH,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8DAA8D,EAAE,CAAC,CAAC,EAAE,EAAE;IACzE,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,KAAK,GAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;IACnF,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;IAC1C,aAAa,CAAC,UAAU,CAAC;QACvB,KAAK;QACL,YAAY;QACZ,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,qBAAqB,EAAE,IAAI,GAAG,EAAE;KACjC,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,GAAG,mBAAmB,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC;QACxC,WAAW,EAAE,MAAM;QACnB,aAAa;QACb,MAAM;QACN,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,IAAI,IAAI,EAAE,gBAAgB,EAAE,IAAI,KAAK,cAAc,EAAE,CAAC;QACpD,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC9C,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8FAA8F,EAAE,CAAC,CAAC,EAAE,EAAE;IACzG,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,KAAK,GAAQ;QACjB,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;QAChC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;KAChC,CAAC;IACF,MAAM,YAAY,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC;IACzF,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;IAC1C,aAAa,CAAC,UAAU,CAAC;QACvB,KAAK;QACL,YAAY;QACZ,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,qBAAqB,EAAE,IAAI,GAAG,EAAE;KACjC,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,EAAE,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC;QACxC,WAAW,EAAE,MAAM;QACnB,aAAa;QACb,MAAM;QACN,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;IAC7D,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,iDAAiD,CAAC,CAAC;IACpE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,oDAAoD,CAAC,CAAC;IACxE,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,+BAA+B,CAAC,CAAC;IAC1D,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,+BAA+B,CAAC,CAAC;AAC3E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kFAAkF,EAAE,CAAC,CAAC,EAAE,EAAE;IAC7F,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,KAAK,GAAQ;QACjB,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;QAChC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC;KAChC,CAAC;IACF,MAAM,YAAY,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC;IACzF,MAAM,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;IAC1C,aAAa,CAAC,UAAU,CAAC;QACvB,KAAK;QACL,YAAY;QACZ,iBAAiB,EAAE,IAAI,GAAG,EAAE;QAC5B,qBAAqB,EAAE,IAAI,GAAG,EAAE;KACjC,CAAC,CAAC;IAEH,yEAAyE;IACzE,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC;QACxC,WAAW,EAAE,MAAM;QACnB,aAAa;QACb,MAAM;QACN,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAClB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACnB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,CAAC,CAAC,EAAE,EAAE;IACrE,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,KAAK,GAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;IACxD,MAAM,OAAO,GAAG;QACd,KAAK;QACL,YAAY,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC3E,iBAAiB,EAAE,IAAI,GAAG,EAAU;QACpC,qBAAqB,EAAE,IAAI,GAAG,EAAE;KACjC,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,mBAAmB,EAAE,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,uBAAuB,CAAC;QACxC,WAAW,EAAE,MAAM;QACnB,aAAa,EAAE,IAAI,aAAa,EAAE;QAClC,MAAM;QACN,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,KAAK,CAAC,sBAAsB,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IACrE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC,EAAE,CAAC,OAAO,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;AAClD,CAAC,CAAC,CAAC"}

package/dist/services/approval-rejection-interceptor.d.ts

@@ -0,0 +1,16 @@
+type ToolInterceptor = (name: string, params: unknown, toolCallId?: string) => Promise<string | null>;
+type InterceptorCapableClient = {
+    addToolInterceptor: (interceptor: ToolInterceptor) => () => void;
+};
+type MaybeInterceptorCapableClient = {
+    addToolInterceptor?: (interceptor: ToolInterceptor) => () => void;
+};
+type ApprovalRejectionInterceptorInput = {
+    toolName: string;
+    expectedCallId?: string;
+    rejectionMessage: string;
+};
+export declare const installApprovalRejectionInterceptor: (agentClient: InterceptorCapableClient, input: ApprovalRejectionInterceptorInput) => (() => void);
+export declare const tryInstallApprovalRejectionInterceptor: (agentClient: MaybeInterceptorCapableClient, input: ApprovalRejectionInterceptorInput) => (() => void) | null;
+export {};
+//# sourceMappingURL=approval-rejection-interceptor.d.ts.map

package/dist/services/approval-rejection-interceptor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-rejection-interceptor.d.ts","sourceRoot":"","sources":["../../source/services/approval-rejection-interceptor.ts"],"names":[],"mappings":"AAEA,KAAK,eAAe,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;AAEtG,KAAK,wBAAwB,GAAG;IAC9B,kBAAkB,EAAE,CAAC,WAAW,EAAE,eAAe,KAAK,MAAM,IAAI,CAAC;CAClE,CAAC;AAEF,KAAK,6BAA6B,GAAG;IACnC,kBAAkB,CAAC,EAAE,CAAC,WAAW,EAAE,eAAe,KAAK,MAAM,IAAI,CAAC;CACnE,CAAC;AAEF,KAAK,iCAAiC,GAAG;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAaF,eAAO,MAAM,mCAAmC,GAC9C,aAAa,wBAAwB,EACrC,OAAO,iCAAiC,KACvC,CAAC,MAAM,IAAI,CAEb,CAAC;AAEF,eAAO,MAAM,sCAAsC,GACjD,aAAa,6BAA6B,EAC1C,OAAO,iCAAiC,KACvC,CAAC,MAAM,IAAI,CAAC,GAAG,IAMjB,CAAC"}

package/dist/services/approval-rejection-interceptor.js

@@ -0,0 +1,20 @@
+import { markToolCallAsApprovalRejection } from '../utils/extract-command-messages.js';
+const createInterceptor = ({ toolName, expectedCallId, rejectionMessage }) => {
+    return async (name, _params, toolCallId) => {
+        if (name === toolName && (!expectedCallId || toolCallId === expectedCallId)) {
+            markToolCallAsApprovalRejection(toolCallId ?? expectedCallId);
+            return rejectionMessage;
+        }
+        return null;
+    };
+};
+export const installApprovalRejectionInterceptor = (agentClient, input) => {
+    return agentClient.addToolInterceptor(createInterceptor(input));
+};
+export const tryInstallApprovalRejectionInterceptor = (agentClient, input) => {
+    if (typeof agentClient.addToolInterceptor !== 'function') {
+        return null;
+    }
+    return agentClient.addToolInterceptor(createInterceptor(input));
+};
+//# sourceMappingURL=approval-rejection-interceptor.js.map

package/dist/services/approval-rejection-interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-rejection-interceptor.js","sourceRoot":"","sources":["../../source/services/approval-rejection-interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAkBvF,MAAM,iBAAiB,GAAG,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAqC,EAAE,EAAE;IAC9G,OAAO,KAAK,EAAE,IAAY,EAAE,OAAgB,EAAE,UAAmB,EAA0B,EAAE;QAC3F,IAAI,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,cAAc,IAAI,UAAU,KAAK,cAAc,CAAC,EAAE,CAAC;YAC5E,+BAA+B,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC;YAC9D,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAG,CACjD,WAAqC,EACrC,KAAwC,EAC1B,EAAE;IAChB,OAAO,WAAW,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GAAG,CACpD,WAA0C,EAC1C,KAAwC,EACnB,EAAE;IACvB,IAAI,OAAO,WAAW,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,WAAW,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC"}

package/dist/services/approval-rejection-interceptor.test.d.ts

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

package/dist/services/approval-rejection-interceptor.test.d.ts.map

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

package/dist/services/approval-rejection-interceptor.test.js

@@ -0,0 +1,60 @@
+import test from 'ava';
+import { installApprovalRejectionInterceptor, tryInstallApprovalRejectionInterceptor, } from './approval-rejection-interceptor.js';
+import { clearApprovalRejectionMarkers, extractCommandMessages } from '../utils/extract-command-messages.js';
+test.beforeEach(() => {
+    clearApprovalRejectionMarkers();
+});
+test.afterEach(() => {
+    clearApprovalRejectionMarkers();
+});
+test('installApprovalRejectionInterceptor intercepts matching tool call and marks approval rejection', async (t) => {
+    let capturedInterceptor;
+    let removed = false;
+    const remove = installApprovalRejectionInterceptor({
+        addToolInterceptor(interceptor) {
+            capturedInterceptor = interceptor;
+            return () => {
+                removed = true;
+            };
+        },
+    }, {
+        toolName: 'shell',
+        expectedCallId: 'call-1',
+        rejectionMessage: 'Tool execution was not approved.',
+    });
+    t.truthy(capturedInterceptor);
+    t.is(await capturedInterceptor('grep', {}, 'call-1'), null);
+    t.is(await capturedInterceptor('shell', {}, 'call-2'), null);
+    t.is(await capturedInterceptor('shell', {}, 'call-1'), 'Tool execution was not approved.');
+    const messages = extractCommandMessages([
+        {
+            rawItem: {
+                type: 'function_call',
+                callId: 'call-1',
+                name: 'shell',
+                arguments: JSON.stringify({ command: 'ls source' }),
+            },
+        },
+        {
+            rawItem: {
+                type: 'function_call_output',
+                callId: 'call-1',
+                name: 'shell',
+                output: 'exit 0\nsource',
+            },
+        },
+    ]);
+    t.true(messages.length >= 1);
+    t.true(messages[0].isApprovalRejection === true);
+    remove();
+    t.true(removed);
+});
+test('tryInstallApprovalRejectionInterceptor returns null when interceptor support is unavailable', (t) => {
+    const remove = tryInstallApprovalRejectionInterceptor({}, {
+        toolName: 'shell',
+        expectedCallId: 'call-1',
+        rejectionMessage: 'Tool execution was not approved.',
+    });
+    t.is(remove, null);
+});
+//# sourceMappingURL=approval-rejection-interceptor.test.js.map

package/dist/services/approval-rejection-interceptor.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-rejection-interceptor.test.js","sourceRoot":"","sources":["../../source/services/approval-rejection-interceptor.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EACL,mCAAmC,EACnC,sCAAsC,GACvC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAE7G,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE;IACnB,6BAA6B,EAAE,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE;IAClB,6BAA6B,EAAE,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gGAAgG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACjH,IAAI,mBAAmB,CAAC;IACxB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,MAAM,MAAM,GAAG,mCAAmC,CAChD;QACE,kBAAkB,CAAC,WAAW;YAC5B,mBAAmB,GAAG,WAAW,CAAC;YAClC,OAAO,GAAG,EAAE;gBACV,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC,CAAC;QACJ,CAAC;KACF,EACD;QACE,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,QAAQ;QACxB,gBAAgB,EAAE,kCAAkC;KACrD,CACF,CAAC;IAEF,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC9B,CAAC,CAAC,EAAE,CAAC,MAAM,mBAAmB,CAAC,MAAM,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,EAAE,CAAC,MAAM,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,EAAE,CAAC,MAAM,mBAAmB,CAAC,OAAO,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,kCAAkC,CAAC,CAAC;IAE3F,MAAM,QAAQ,GAAG,sBAAsB,CAAC;QACtC;YACE,OAAO,EAAE;gBACP,IAAI,EAAE,eAAe;gBACrB,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;aACpD;SACF;QACD;YACE,OAAO,EAAE;gBACP,IAAI,EAAE,sBAAsB;gBAC5B,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE,gBAAgB;aACzB;SACF;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,mBAAmB,KAAK,IAAI,CAAC,CAAC;IAEjD,MAAM,EAAE,CAAC;IACT,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6FAA6F,EAAE,CAAC,CAAC,EAAE,EAAE;IACxG,MAAM,MAAM,GAAG,sCAAsC,CACnD,EAAE,EACF;QACE,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,QAAQ;QACxB,gBAAgB,EAAE,kCAAkC;KACrD,CACF,CAAC;IAEF,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC"}

package/dist/services/conversation-events.d.ts

@@ -1,6 +1,6 @@
 import type { CommandMessage } from '../tools/types.js';
 import type { NormalizedUsage } from '../utils/token-usage.js';
-import type { ApprovalDescriptor } from '../contracts/conversation.js';
+import type { ApprovalDescriptor, LLMAdvisory } from '../contracts/conversation.js';
 export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | UsageUpdateEvent | FinalResponseEvent | ErrorEvent | RetryEvent;
 export interface RetryEvent {
     type: 'retry';
@@ -40,7 +40,9 @@ export interface ToolStartedEvent {
 }
 export interface ApprovalRequiredEvent {
     type: 'approval_required';
-    approval: Omit<ApprovalDescriptor, 'rawInterruption'>;
+    approval: Omit<ApprovalDescriptor, 'rawInterruption'> & {
+        llmAdvisory?: LLMAdvisory;
+    };
 }
 /**
  * Emitted when token usage information is received during streaming.

package/dist/services/conversation-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,MAAM,MAAM,iBAAiB,GACzB,cAAc,GACd,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,qBAAqB,GACrB,gBAAgB,GAChB,kBAAkB,GAClB,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;CACvD;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,4DAA4D;IAC5D,eAAe,CAAC,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;IACnD,iCAAiC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"conversation-events.d.ts","sourceRoot":"","sources":["../../source/services/conversation-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEpF,MAAM,MAAM,iBAAiB,GACzB,cAAc,GACd,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,qBAAqB,GACrB,gBAAgB,GAChB,kBAAkB,GAClB,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,GAAG;QACtD,WAAW,CAAC,EAAE,WAAW,CAAC;KAC3B,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,cAAc,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,4DAA4D;IAC5D,eAAe,CAAC,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;IACnD,iCAAiC;IACjC,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf"}

package/dist/services/conversation-result-builder.d.ts

@@ -1,41 +1,41 @@
-import type { CommandMessage } from '../tools/types.js';
-import { type NormalizedUsage } from '../utils/token-usage.js';
-interface ApprovalResult {
-    type: 'approval_required';
-    approval: {
-        agentName: string;
-        toolName: string;
-        argumentsText: string;
-        rawInterruption: any;
-        callId?: string;
-    };
-}
-interface ResponseResult {
-    type: 'response';
-    commandMessages: CommandMessage[];
-    finalText: string;
-    reasoningText?: string;
-    usage?: NormalizedUsage;
-}
-export type ConversationResult = ApprovalResult | ResponseResult;
-export interface PendingApprovalContext {
-    state: any;
-    interruption: any;
-    emittedCommandIds: Set<string>;
-    toolCallArgumentsById: Map<string, unknown>;
+import type { ConversationEvent } from './conversation-events.js';
+import type { ConversationTerminal, LLMAdvisory } from '../contracts/conversation.js';
+import type { ILoggingService } from './service-interfaces.js';
+import type { NormalizedUsage } from '../utils/token-usage.js';
+import type { AgentStream } from './agent-stream.js';
+import type { ApprovalFlowCoordinator } from './approval-flow-coordinator.js';
+import type { ShellAutoApprovalResolver } from './shell-auto-approval-resolver.js';
+export type ConversationResult = ConversationTerminal;
+export type BuildResultOutcome = {
+    kind: 'response';
+    result: Extract<ConversationResult, {
+        type: 'response';
+    }>;
+} | {
+    kind: 'approval_required';
+    result: Extract<ConversationResult, {
+        type: 'approval_required';
+    }>;
+} | {
+    kind: 'auto_approve';
+    advisory: LLMAdvisory;
+    callId: string | undefined;
+    argumentsText: string;
+};
+export interface ResultBuilderDeps {
+    approvalFlow: ApprovalFlowCoordinator;
+    shellAutoApproval: ShellAutoApprovalResolver;
+    logger: ILoggingService;
+    sessionId: string;
 }
-interface BuildConversationResultParams {
-    result: any;
+export interface ResultBuilderInput {
+    result: AgentStream;
     finalOutputOverride?: string;
     reasoningOutputOverride?: string;
     emittedCommandIds?: Set<string>;
     usage?: NormalizedUsage;
-    getToolCallArgumentsSnapshot?: () => Map<string, unknown>;
+    toolCallArgumentsById: Map<string, unknown>;
 }
-export declare const getCommandFromArgs: (args: unknown) => string;
-export declare const buildConversationResult: ({ result, finalOutputOverride, reasoningOutputOverride, emittedCommandIds, usage, getToolCallArgumentsSnapshot, }: BuildConversationResultParams) => {
-    conversationResult: ConversationResult;
-    pendingApprovalContext: PendingApprovalContext | null;
-};
-export {};
+export declare function buildConversationResult(input: ResultBuilderInput, deps: ResultBuilderDeps): Promise<BuildResultOutcome>;
+export declare const toTerminalEvent: (result: ConversationResult) => ConversationEvent;
 //# sourceMappingURL=conversation-result-builder.d.ts.map

package/dist/services/conversation-result-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAgB,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE7E,UAAU,cAAc;IACtB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,GAAG,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,UAAU,CAAC;IACjB,eAAe,EAAE,cAAc,EAAE,CAAC;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG,cAAc,CAAC;AAEjE,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,GAAG,CAAC;IACX,YAAY,EAAE,GAAG,CAAC;IAClB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,UAAU,6BAA6B;IACrC,MAAM,EAAE,GAAG,CAAC;IACZ,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3D;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,OAAO,KAAG,MA8ClD,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,mHAOrC,6BAA6B,KAAG;IACjC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,sBAAsB,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAoEvD,CAAC"}
+{"version":3,"file":"conversation-result-builder.d.ts","sourceRoot":"","sources":["../../source/services/conversation-result-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAEnF,MAAM,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAC1B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,IAAI,EAAE,mBAAmB,CAAA;KAAE,CAAC,CAAA;CAAE,GACjG;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,QAAQ,EAAE,WAAW,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEN,MAAM,WAAW,iBAAiB;IAChC,YAAY,EAAE,uBAAuB,CAAC;IACtC,iBAAiB,EAAE,yBAAyB,CAAC;IAC7C,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,WAAW,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAED,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,kBAAkB,EACzB,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,kBAAkB,CAAC,CAqF7B;AAED,eAAO,MAAM,eAAe,GAAI,QAAQ,kBAAkB,KAAG,iBAqB5D,CAAC"}