@qduc/term2 0.7.3 → 0.9.0

package/dist/services/conversation/conversation-result-builder.test.js

@@ -0,0 +1,504 @@
+import { it, expect, beforeEach, afterEach } from 'vitest';
+import { buildConversationResult, toTerminalEvent } from './conversation-result-builder.js';
+import { ApprovalFlowCoordinator } from '../approval/approval-flow-coordinator.js';
+import { ApprovalState } from '../approval/approval-state.js';
+import { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
+import { ConversationStore } from './conversation-store.js';
+import { LoggingService } from '../logging/logging-service.js';
+import { clearToolFormatters, registerToolFormatters } from '../../tools/command-message-formatters.js';
+import { formatShellCommandMessage } from '../../tools/system/shell.js';
+import { clearApprovalRejectionMarkers } from '../../utils/streaming/extract-command-messages.js';
+beforeEach(() => {
+    clearToolFormatters();
+    registerToolFormatters([{ name: 'shell', formatCommandMessage: formatShellCommandMessage }]);
+    clearApprovalRejectionMarkers();
+});
+afterEach(() => {
+    clearToolFormatters();
+    clearApprovalRejectionMarkers();
+});
+const logger = new LoggingService({ disableLogging: true });
+const makeStream = (extras = {}) => ({
+    [Symbol.asyncIterator]: async function* () { },
+    completed: Promise.resolve(null),
+    ...extras,
+});
+const makeDeps = (mode = 'off') => {
+    const conversationStore = new ConversationStore();
+    const agentClient = { chat: async () => '{"results":[]}' };
+    const settingsService = {
+        get: (key) => (key === 'shell.autoApproveMode' ? mode : undefined),
+    };
+    const sessionContextService = {
+        runWithContext: (_context, fn) => fn(),
+        getContext: () => null,
+    };
+    const shellAutoApproval = new ShellAutoApprovalResolver({
+        conversationStore,
+        agentClient,
+        logger,
+        settingsService,
+        sessionContextService,
+    });
+    const approvalFlow = new ApprovalFlowCoordinator({
+        agentClient,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+        toolTracker: { recordAbortedApproval: () => { }, export: () => [] },
+        generationGuard: { isCurrent: () => true },
+    });
+    return { approvalFlow, shellAutoApproval, logger, sessionId: 's1' };
+};
+it('response outcome when stream has no interruptions', async () => {
+    const stream = makeStream({
+        finalOutput: 'Done.',
+        history: [],
+        newItems: [],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        finalOutputOverride: 'Hello',
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    expect(outcome.kind).toBe('response');
+    if (outcome.kind === 'response') {
+        expect(outcome.result.finalText).toBe('Hello');
+        expect(outcome.result.commandMessages).toEqual([]);
+    }
+});
+it('response outcome uses completed final output when it extends streamed output', async () => {
+    const stream = makeStream({
+        finalOutput: 'Intro\n\n## Missing Header\n\nBody',
+        history: [],
+        newItems: [],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        finalOutputOverride: 'Intro\n\n',
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    expect(outcome.kind).toBe('response');
+    if (outcome.kind === 'response') {
+        expect(outcome.result.finalText).toBe('Intro\n\n## Missing Header\n\nBody');
+    }
+});
+it('response outcome uses completed final output when it corrects streamed text with the same length', async () => {
+    const stream = makeStream({
+        finalOutput: 'Hello world',
+        history: [],
+        newItems: [],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        finalOutputOverride: 'Hello wrold',
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    expect(outcome.kind).toBe('response');
+    if (outcome.kind === 'response') {
+        expect(outcome.result.finalText).toBe('Hello world');
+    }
+});
+it('response outcome uses completed final output when it shortens streamed text', async () => {
+    const stream = makeStream({
+        finalOutput: 'The answer is 42.',
+        history: [],
+        newItems: [],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        finalOutputOverride: 'The answer is 42. Extra hallucinated sentence.',
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    expect(outcome.kind).toBe('response');
+    if (outcome.kind === 'response') {
+        expect(outcome.result.finalText).toBe('The answer is 42.');
+    }
+});
+it('approval_required outcome when stream has interruptions', async () => {
+    const stream = makeStream({
+        interruptions: [
+            {
+                name: 'shell',
+                callId: 'c1',
+                arguments: { command: 'ls' },
+                agent: { name: 'TestAgent' },
+            },
+        ],
+        state: { id: 'state-1' },
+    });
+    const outcome = await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, makeDeps('off'));
+    expect(outcome.kind).toBe('approval_required');
+    if (outcome.kind === 'approval_required') {
+        expect(outcome.result.approval.toolName).toBe('shell');
+        expect(outcome.result.approval.callId).toBe('c1');
+        expect(outcome.result.approval.agentName).toBe('TestAgent');
+    }
+});
+it('approval_required records the matching nested subagent owner', async () => {
+    const deps = makeDeps('off');
+    const stream = makeStream({
+        interruptions: [
+            {
+                name: 'shell',
+                callId: 'nested-shell-call',
+                arguments: { command: 'touch nested.txt' },
+                agent: { name: 'Worker' },
+            },
+        ],
+        state: {
+            _pendingAgentToolRuns: new Map([
+                [
+                    'run_subagent:parent-call',
+                    JSON.stringify({
+                        context: { context: { agentId: 'worker-1', role: 'worker' } },
+                        currentStep: {
+                            type: 'next_step_interruption',
+                            data: { interruptions: [{ callId: 'nested-shell-call' }] },
+                        },
+                    }),
+                ],
+            ]),
+        },
+    });
+    const outcome = await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, deps);
+    expect(outcome.kind).toBe('approval_required');
+    expect(deps.approvalFlow.getPending()?.owner).toEqual({
+        kind: 'subagent',
+        agentId: 'worker-1',
+        role: 'worker',
+    });
+});
+it('approval_required matches the correct owner when multiple subagents are pending', async () => {
+    const deps = makeDeps('off');
+    const nestedState = (agentId, role, callId) => JSON.stringify({
+        context: { context: { agentId, role } },
+        currentStep: {
+            type: 'next_step_interruption',
+            data: { interruptions: [{ callId }] },
+        },
+    });
+    const stream = makeStream({
+        interruptions: [
+            {
+                name: 'shell',
+                callId: 'target-call',
+                arguments: { command: 'pwd' },
+                agent: { name: 'Worker' },
+            },
+        ],
+        state: {
+            _pendingAgentToolRuns: new Map([
+                ['run_subagent:first', nestedState('worker-1', 'worker', 'other-call')],
+                ['run_subagent:second', nestedState('explorer-1', 'explorer', 'target-call')],
+            ]),
+        },
+    });
+    await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, deps);
+    expect(deps.approvalFlow.getPending()?.owner).toEqual({
+        kind: 'subagent',
+        agentId: 'explorer-1',
+        role: 'explorer',
+    });
+});
+it('approval_required defaults to parent owner for malformed nested state', async () => {
+    const deps = makeDeps('off');
+    const stream = makeStream({
+        interruptions: [
+            {
+                name: 'shell',
+                callId: 'parent-call',
+                arguments: { command: 'pwd' },
+                agent: { name: 'CLI Agent' },
+            },
+        ],
+        state: {
+            _pendingAgentToolRuns: new Map([['run_subagent:broken', '{invalid-json']]),
+        },
+    });
+    await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, deps);
+    expect(deps.approvalFlow.getPending()?.owner).toEqual({ kind: 'parent' });
+});
+it('approval_required outcome preserves usage from model turn', async () => {
+    const stream = makeStream({
+        interruptions: [
+            {
+                name: 'shell',
+                callId: 'call-usage',
+                arguments: { command: 'ls' },
+                agent: { name: 'TestAgent' },
+            },
+        ],
+        state: { id: 'state-usage' },
+    });
+    const usage = { prompt_tokens: 100, completion_tokens: 20, total_tokens: 120 };
+    const outcome = await buildConversationResult({ result: stream, usage, toolCallArgumentsById: new Map() }, makeDeps());
+    expect(outcome.kind).toBe('approval_required');
+    if (outcome.kind === 'approval_required') {
+        expect(outcome.result.usage).toEqual(usage);
+    }
+});
+it('auto_approve outcome when LLM advises approval and mode=auto', async () => {
+    const stream = makeStream({
+        interruptions: [
+            {
+                name: 'shell',
+                callId: 'c1',
+                arguments: { command: 'ls' },
+            },
+        ],
+        state: {},
+    });
+    const conversationStore = new ConversationStore();
+    const agentClient = {
+        chat: async () => '{"results":[{"id":"c1","reasoning":"safe","approved":true}]}',
+    };
+    const settingsService = {
+        get: (key) => (key === 'shell.autoApproveMode' ? 'auto' : undefined),
+    };
+    const shellAutoApproval = new ShellAutoApprovalResolver({
+        conversationStore,
+        agentClient,
+        logger,
+        settingsService,
+        sessionContextService: {
+            runWithContext: (_context, fn) => fn(),
+            getContext: () => null,
+        },
+    });
+    const approvalFlow = new ApprovalFlowCoordinator({
+        agentClient,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+        toolTracker: { recordAbortedApproval: () => { }, export: () => [] },
+        generationGuard: { isCurrent: () => true },
+    });
+    const outcome = await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, { approvalFlow, shellAutoApproval, logger, sessionId: 's1' });
+    expect(outcome.kind).toBe('auto_approve');
+    if (outcome.kind === 'auto_approve') {
+        expect(outcome.callId).toBe('c1');
+        expect(outcome.argumentsText).toBe('ls');
+        expect(outcome.advisory.approved).toBe(true);
+    }
+});
+it('command messages dedup against emittedCommandIds', async () => {
+    const stream = makeStream({
+        history: [
+            { type: 'function_call_output', call_id: 'a', output: '{"text":"x","metadata":{"messageId":"m-a"}}' },
+            { type: 'function_call_output', call_id: 'b', output: '{"text":"y","metadata":{"messageId":"m-b"}}' },
+        ],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        emittedCommandIds: new Set(['m-a']),
+        toolCallArgumentsById: new Map(),
+    }, makeDeps());
+    expect(outcome.kind).toBe('response');
+    if (outcome.kind === 'response') {
+        const ids = (outcome.result.commandMessages ?? []).map((m) => m.id);
+        expect(ids.includes('m-a')).toBe(false);
+    }
+});
+it('response outcome derives turnItems from provider items with metadata and reasoning ordering', async () => {
+    const stream = makeStream({
+        history: [],
+        newItems: [
+            {
+                type: 'function_call',
+                id: 'fc_1',
+                callId: 'call-1',
+                name: 'shell',
+                arguments: '{"command":"date"}',
+                providerData: {
+                    reasoning_content: 'I should run date.',
+                    reasoning_details: [{ type: 'summary_text', text: 'I should run date.' }],
+                },
+            },
+            {
+                type: 'function_call_result',
+                id: 'fr_1',
+                callId: 'call-1',
+                name: 'shell',
+                output: 'Mon Jan 01 00:00:00 UTC 2024',
+            },
+            {
+                role: 'assistant',
+                type: 'message',
+                id: 'msg_1',
+                content: [{ type: 'output_text', text: 'Done.' }],
+                providerData: {
+                    reasoning_content: 'Final reflection.',
+                    reasoning_details: [{ type: 'summary_text', text: 'Final reflection.' }],
+                },
+            },
+        ],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    expect(outcome.kind).toBe('response');
+    if (outcome.kind === 'response') {
+        expect(outcome.result.turnItems).toEqual([
+            {
+                type: 'reasoning',
+                text: 'I should run date.',
+                providerMetadata: {
+                    reasoning_content: 'I should run date.',
+                    reasoning_details: [{ type: 'summary_text', text: 'I should run date.' }],
+                },
+            },
+            {
+                type: 'tool_call',
+                callId: 'call-1',
+                toolName: 'shell',
+                arguments: '{"command":"date"}',
+                providerItem: {
+                    type: 'function_call',
+                    id: 'fc_1',
+                    callId: 'call-1',
+                    name: 'shell',
+                    arguments: '{"command":"date"}',
+                    providerData: {
+                        reasoning_content: 'I should run date.',
+                        reasoning_details: [{ type: 'summary_text', text: 'I should run date.' }],
+                    },
+                },
+            },
+            {
+                type: 'tool_result',
+                callId: 'call-1',
+                toolName: 'shell',
+                status: 'completed',
+                output: 'Mon Jan 01 00:00:00 UTC 2024',
+                providerItem: {
+                    type: 'function_call_result',
+                    id: 'fr_1',
+                    callId: 'call-1',
+                    name: 'shell',
+                    output: 'Mon Jan 01 00:00:00 UTC 2024',
+                },
+            },
+            {
+                type: 'reasoning',
+                text: 'Final reflection.',
+                providerMetadata: {
+                    reasoning_content: 'Final reflection.',
+                    reasoning_details: [{ type: 'summary_text', text: 'Final reflection.' }],
+                },
+            },
+            {
+                type: 'assistant_text',
+                text: 'Done.',
+                providerMetadata: {
+                    reasoning_content: 'Final reflection.',
+                    reasoning_details: [{ type: 'summary_text', text: 'Final reflection.' }],
+                },
+                providerItemId: 'msg_1',
+            },
+        ]);
+    }
+});
+it('toTerminalEvent shapes response into final event', () => {
+    const event = toTerminalEvent({
+        type: 'response',
+        commandMessages: [],
+        finalText: 'Done',
+    });
+    expect(event.type).toBe('final');
+    if (event.type === 'final') {
+        expect(event.finalText).toBe('Done');
+    }
+});
+it('toTerminalEvent shapes approval_required with optional fields', () => {
+    const event = toTerminalEvent({
+        type: 'approval_required',
+        approval: {
+            agentName: 'A',
+            toolName: 'shell',
+            argumentsText: 'ls',
+            callId: 'c1',
+            rawInterruption: { name: 'shell' },
+        },
+        usage: { prompt_tokens: 10, completion_tokens: 2, total_tokens: 12 },
+    });
+    expect(event.type).toBe('approval_required');
+    if (event.type === 'approval_required') {
+        expect(event.approval.callId).toBe('c1');
+        expect(event.approval.toolName).toBe('shell');
+        expect(event.usage).toEqual({ prompt_tokens: 10, completion_tokens: 2, total_tokens: 12 });
+    }
+});
+it('response outcome preserves approval-rejected command messages for rendering', async () => {
+    // Regression test: when shell approval is denied, the command message with the rejection
+    // message must still appear in commandMessages so the UI can render it.
+    // Previously these were filtered out silently, leaving the user without feedback.
+    // Simulate that approval-flow-coordinator marked call-1 as rejected (happens before buildConversationResult).
+    const { markToolCallAsApprovalRejection } = await import('../../utils/streaming/extract-command-messages.js');
+    markToolCallAsApprovalRejection('call-1');
+    // A model turn carries command items in newItems (not history), so mirror that shape.
+    const stream = makeStream({
+        newItems: [
+            {
+                rawItem: {
+                    type: 'function_call',
+                    id: 'fc-1',
+                    callId: 'call-1',
+                    name: 'shell',
+                    arguments: JSON.stringify({ command: 'rm -rf /dangerous' }),
+                },
+            },
+            {
+                rawItem: {
+                    type: 'function_call_output',
+                    id: 'fco-1',
+                    callId: 'call-1',
+                    name: 'shell',
+                    output: "Tool execution was not approved. User's reason: too risky",
+                },
+            },
+        ],
+    });
+    const outcome = await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, makeDeps());
+    expect(outcome.kind).toBe('response');
+    if (outcome.kind === 'response') {
+        // Previously this assertion would fail because isApprovalRejection messages were filtered out.
+        expect((outcome.result.commandMessages ?? []).length).toBeGreaterThan(0);
+        const rejectedMsg = (outcome.result.commandMessages ?? []).find((m) => m.isApprovalRejection);
+        expect(rejectedMsg).toBeTruthy();
+        expect(rejectedMsg.toolName).toBe('shell');
+        expect(rejectedMsg.output.includes('not approved')).toBe(true);
+    }
+});
+it('buildConversationResult and toTerminalEvent preserve turnItems', async () => {
+    const stream = makeStream({
+        finalOutput: 'Done.',
+        history: [],
+        newItems: [],
+    });
+    const turnItems = [
+        { type: 'reasoning', text: 'Thinking' },
+        { type: 'assistant_text', text: 'Done.' },
+    ];
+    const outcome = await buildConversationResult({
+        result: stream,
+        toolCallArgumentsById: new Map(),
+        turnItems,
+    }, makeDeps());
+    expect(outcome.kind).toBe('response');
+    if (outcome.kind === 'response') {
+        expect(outcome.result.turnItems).toEqual(turnItems);
+        const event = toTerminalEvent(outcome.result);
+        expect(event.type).toBe('final');
+        if (event.type === 'final') {
+            expect(event.turnItems).toEqual(turnItems);
+        }
+    }
+});
+//# sourceMappingURL=conversation-result-builder.test.js.map

package/dist/services/conversation/conversation-result-builder.test.js.map

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

package/dist/services/conversation/conversation-runtime-factory.d.ts

@@ -0,0 +1,33 @@
+import type { ILoggingService, ISessionContextService, ISettingsService } from '../service-interfaces.js';
+import type { AskUserAnswerSink, ConversationAgentClient, SubagentEventSinkHost } from '../conversation-agent-client.js';
+import { type SessionRuntime } from '../session/session-composition.js';
+export type ConversationRuntimeBundle = {
+    /** The clean session runtime (no adapter). */
+    runtime: SessionRuntime;
+    /** The legacy ConversationAdapter wired to the runtime's turn flow. */
+    adapter: import('./conversation-adapter.js').ConversationAdapter;
+};
+export type CreateConversationRuntimeOptions = {
+    sessionId: string;
+    /** ISO timestamp; defaults to now. */
+    sessionStartedAt?: string;
+    agentClient: ConversationAgentClient;
+    askUserAnswerSink?: AskUserAnswerSink | null;
+    subagentEventSinkHost?: SubagentEventSinkHost | null;
+    deps: {
+        logger: ILoggingService;
+        settingsService?: ISettingsService;
+        sessionContextService: ISessionContextService;
+    };
+};
+/**
+ * Factory that assembles a session runtime and a ConversationAdapter.
+ *
+ * - Calls {@link createSessionRuntime} to build the session runtime once.
+ * - Constructs the legacy adapter in the conversation layer from the same
+ *   closed runtime instance.
+ *
+ * Returns `{ runtime, adapter }` so callers can use whichever layer suits them.
+ */
+export declare function createConversationRuntime(options: CreateConversationRuntimeOptions): ConversationRuntimeBundle;
+//# sourceMappingURL=conversation-runtime-factory.d.ts.map

package/dist/services/conversation/conversation-runtime-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-runtime-factory.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/conversation-runtime-factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAG9F,MAAM,MAAM,yBAAyB,GAAG;IACtC,8CAA8C;IAC9C,OAAO,EAAE,cAAc,CAAC;IACxB,uEAAuE;IACvE,OAAO,EAAE,OAAO,2BAA2B,EAAE,mBAAmB,CAAC;CAClE,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,sCAAsC;IACtC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,uBAAuB,CAAC;IACrC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAC7C,qBAAqB,CAAC,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACrD,IAAI,EAAE;QACJ,MAAM,EAAE,eAAe,CAAC;QACxB,eAAe,CAAC,EAAE,gBAAgB,CAAC;QACnC,qBAAqB,EAAE,sBAAsB,CAAC;KAC/C,CAAC;CACH,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,gCAAgC,GAAG,yBAAyB,CAK9G"}

package/dist/services/conversation/conversation-runtime-factory.js

@@ -0,0 +1,17 @@
+import { createSessionRuntime } from '../session/session-composition.js';
+import { createConversationAdapterForRuntime } from './conversation-adapter-factory.js';
+/**
+ * Factory that assembles a session runtime and a ConversationAdapter.
+ *
+ * - Calls {@link createSessionRuntime} to build the session runtime once.
+ * - Constructs the legacy adapter in the conversation layer from the same
+ *   closed runtime instance.
+ *
+ * Returns `{ runtime, adapter }` so callers can use whichever layer suits them.
+ */
+export function createConversationRuntime(options) {
+    const runtime = createSessionRuntime(options);
+    const adapter = createConversationAdapterForRuntime(runtime, { deps: options.deps });
+    return { runtime, adapter };
+}
+//# sourceMappingURL=conversation-runtime-factory.js.map

package/dist/services/conversation/conversation-runtime-factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-runtime-factory.js","sourceRoot":"","sources":["../../../source/services/conversation/conversation-runtime-factory.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,oBAAoB,EAAuB,MAAM,mCAAmC,CAAC;AAC9F,OAAO,EAAE,mCAAmC,EAAE,MAAM,mCAAmC,CAAC;AAuBxF;;;;;;;;GAQG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAyC;IACjF,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,mCAAmC,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAErF,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC"}

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

@@ -0,0 +1,73 @@
+import type { ILoggingService, ISettingsService, ISessionContextService } from '../service-interfaces.js';
+import type { ConversationTerminal, ReasoningEffortSetting } from '../../contracts/conversation.js';
+import type { SavedToolExecution } from '../tool-execution-ledger.js';
+import type { LogEvent, StateSnapshot } from '../logging/conversation-log-events.js';
+import type { UserTurn } from '../../types/user-turn.js';
+import type { ConversationAgentClient } from '../conversation-agent-client.js';
+import type { SkillsService } from '../skills/skills-service.js';
+import type { SendMessageOptions, HandleApprovalDecisionOptions } from './conversation-adapter.js';
+import type { LargeUncachedInputDecision } from '../large-uncached-input-guard.js';
+import type { InputSurgeDecision } from '../input-surge-guard.js';
+export type { ConversationTerminal, ApprovalDescriptor, PendingApproval } from '../../contracts/conversation.js';
+export type { CommandMessage } from '../../tools/types.js';
+/**
+ * Backward-compatible facade for the CLI.
+ *
+ * Phase 3: the session owns the conversation state; the service is a thin wrapper.
+ */
+export declare class ConversationService {
+    #private;
+    constructor({ agentClient, deps, sessionId, sessionStartedAt, }: {
+        agentClient: ConversationAgentClient;
+        deps: {
+            logger: ILoggingService;
+            settingsService?: ISettingsService;
+            sessionContextService: ISessionContextService;
+            skillsService?: SkillsService;
+        };
+        sessionId?: string;
+        sessionStartedAt?: string;
+    });
+    get sessionId(): string;
+    resetWithNewId(newId: string): void;
+    setLogSink(sink: ((event: LogEvent) => void) | null): void;
+    getCurrentSnapshot(): StateSnapshot;
+    undoLastUserTurn(): {
+        text: string;
+        images?: UserTurn['images'];
+    } | null;
+    listUserTurns(): {
+        index: number;
+        text: string;
+        imageCount: number;
+    }[];
+    undoNUserTurns(n: number): {
+        text: string;
+        images?: UserTurn['images'];
+    } | null;
+    setModel(model: string): void;
+    setReasoningEffort(effort: ReasoningEffortSetting): void;
+    setTemperature(temperature?: number): void;
+    setProvider(provider: string): void;
+    switchProvider(provider: string): void;
+    setRetryCallback(callback: () => void): void;
+    addShellContext(historyText: string): void;
+    queueModeNotice(text: string): void;
+    abort(): void;
+    sendMessage(input: string | UserTurn, options?: SendMessageOptions): Promise<ConversationTerminal>;
+    previewLargeUncachedInput(input: string | UserTurn, now?: number): LargeUncachedInputDecision;
+    previewInputSurge(input: string | UserTurn): InputSurgeDecision;
+    handleApprovalDecision(answer: string, rejectionReason?: string, options?: HandleApprovalDecisionOptions): Promise<ConversationTerminal | null>;
+    exportState(): {
+        history: unknown[];
+        previousResponseId: string | null;
+        toolLedger: SavedToolExecution[];
+    };
+    importState(state: {
+        history: unknown[];
+        previousResponseId: string | null;
+        toolLedger?: SavedToolExecution[];
+        updatedAt?: string;
+    }): void;
+}
+//# sourceMappingURL=conversation-service.d.ts.map