@qduc/term2 0.1.8 → 0.3.0

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

@@ -1,110 +1,98 @@
-import { extractCommandMessages } from '../utils/extract-command-messages.js';
 import { extractUsage } from '../utils/token-usage.js';
-export const getCommandFromArgs = (args) => {
-    if (!args) {
-        return '';
-    }
-    if (typeof args === 'string') {
-        try {
-            const parsed = JSON.parse(args);
-            // Handle shell tool's command parameter
-            if (parsed?.command) {
-                return parsed.command;
-            }
-            // Fallback for old 'commands' array format
-            if (Array.isArray(parsed?.commands)) {
-                return parsed.commands.join('\n');
-            }
-            return JSON.stringify(parsed);
-        }
-        catch {
-            return args;
-        }
-    }
-    if (typeof args === 'object') {
-        // Handle shell tool's command parameter
-        const cmdFromObject = 'command' in args ? String(args.command) : undefined;
-        // Fallback for old 'commands' array format
-        if ('commands' in args && Array.isArray(args.commands)) {
-            return args.commands.join('\n');
-        }
-        let argsFromObject;
-        if ('arguments' in args) {
-            const rawArguments = args.arguments;
-            if (typeof rawArguments === 'string') {
-                try {
-                    argsFromObject = JSON.stringify(JSON.parse(rawArguments));
-                }
-                catch {
-                    argsFromObject = String(rawArguments);
-                }
-            }
-            else if (rawArguments !== undefined) {
-                argsFromObject = String(rawArguments);
-            }
-        }
-        return cmdFromObject ?? argsFromObject ?? JSON.stringify(args);
-    }
-    return String(args);
-};
-export const buildConversationResult = ({ result, finalOutputOverride, reasoningOutputOverride, emittedCommandIds, usage, getToolCallArgumentsSnapshot, }) => {
+import { extractCommandMessages } from '../utils/extract-command-messages.js';
+import { asRecord, getCallIdFromObject, getString, getToolInfoFromInterruption } from './interruption-info.js';
+export async function buildConversationResult(input, deps) {
+    const { result, finalOutputOverride, reasoningOutputOverride, emittedCommandIds, usage, toolCallArgumentsById } = input;
+    const { approvalFlow, shellAutoApproval, logger, sessionId } = deps;
     if (result.interruptions && result.interruptions.length > 0) {
         const interruption = result.interruptions[0];
-        const pendingApprovalContext = {
+        const interruptionRecord = asRecord(interruption);
+        approvalFlow.recordPending({
             state: result.state,
             interruption,
             emittedCommandIds: emittedCommandIds ?? new Set(),
-            toolCallArgumentsById: getToolCallArgumentsSnapshot?.() ?? new Map(),
-        };
-        let argumentsText = '';
-        const toolName = interruption.name;
-        // For shell_call (built-in shell tool), extract commands from action
-        // For function tools (bash, shell), extract from arguments
-        if (interruption.type === 'shell_call') {
-            if (interruption.action?.commands) {
-                argumentsText = Array.isArray(interruption.action.commands)
-                    ? interruption.action.commands.join('\n')
-                    : String(interruption.action.commands);
+            toolCallArgumentsById: new Map(toolCallArgumentsById),
+        });
+        const agent = asRecord(interruptionRecord?.agent);
+        const callId = getCallIdFromObject(interruption);
+        const { toolName, argumentsText } = getToolInfoFromInterruption(interruption);
+        let llmAdvisory;
+        if (toolName === 'shell' || toolName === 'bash') {
+            llmAdvisory = await shellAutoApproval.resolveAdvisoryForInterruption({
+                interruption,
+                siblings: result.interruptions || [],
+            });
+            if (shellAutoApproval.shouldAutoApprove(llmAdvisory)) {
+                logger.debug('Shell command auto-approved by LLM', {
+                    eventType: 'approval.auto_approved',
+                    category: 'approval',
+                    phase: 'approval',
+                    sessionId,
+                    callId,
+                    command: argumentsText,
+                    model: llmAdvisory.model,
+                    reasoning: llmAdvisory.reasoning,
+                });
+                return {
+                    kind: 'auto_approve',
+                    advisory: llmAdvisory,
+                    callId,
+                    argumentsText,
+                };
             }
         }
-        else {
-            argumentsText = getCommandFromArgs(interruption.arguments);
-        }
-        const callId = interruption?.rawItem?.callId ??
-            interruption?.callId ??
-            interruption?.call_id ??
-            interruption?.tool_call_id ??
-            interruption?.toolCallId ??
-            interruption?.id;
         return {
-            conversationResult: {
+            kind: 'approval_required',
+            result: {
                 type: 'approval_required',
                 approval: {
-                    agentName: interruption.agent?.name ?? 'Agent',
+                    agentName: getString(agent, 'name') ?? 'Agent',
                     toolName: toolName ?? 'Unknown Tool',
                     argumentsText,
                     rawInterruption: interruption,
                     ...(callId ? { callId: String(callId) } : {}),
+                    llmAdvisory,
                 },
             },
-            pendingApprovalContext,
         };
     }
+    approvalFlow.clearPending();
+    shellAutoApproval.clearCache();
     const allCommandMessages = extractCommandMessages(result.newItems || result.history || []);
-    // Filter out commands that were already emitted in real-time
     const commandMessages = emittedCommandIds
         ? allCommandMessages.filter((msg) => !emittedCommandIds.has(msg.id))
         : allCommandMessages;
     const visibleCommandMessages = commandMessages.filter((msg) => !msg.isApprovalRejection);
     return {
-        conversationResult: {
+        kind: 'response',
+        result: {
             type: 'response',
             commandMessages: visibleCommandMessages,
             finalText: finalOutputOverride ?? result.finalOutput ?? 'Done.',
             reasoningText: reasoningOutputOverride,
             usage: usage ?? extractUsage(result),
         },
-        pendingApprovalContext: null,
+    };
+}
+export const toTerminalEvent = (result) => {
+    if (result.type === 'approval_required') {
+        return {
+            type: 'approval_required',
+            approval: {
+                agentName: result.approval.agentName,
+                toolName: result.approval.toolName,
+                argumentsText: result.approval.argumentsText,
+                ...(result.approval.callId ? { callId: result.approval.callId } : {}),
+                ...(result.approval.llmAdvisory ? { llmAdvisory: result.approval.llmAdvisory } : {}),
+            },
+        };
+    }
+    return {
+        type: 'final',
+        finalText: result.finalText,
+        ...(result.reasoningText ? { reasoningText: result.reasoningText } : {}),
+        ...(result.commandMessages?.length ? { commandMessages: result.commandMessages } : {}),
+        ...(result.usage ? { usage: result.usage } : {}),
     };
 };
 //# sourceMappingURL=conversation-result-builder.js.map

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

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

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

@@ -1,76 +1,156 @@
 import test from 'ava';
-import { buildConversationResult, getCommandFromArgs } from './conversation-result-builder.js';
-import { clearApprovalRejectionMarkers, markToolCallAsApprovalRejection } from '../utils/extract-command-messages.js';
-test('getCommandFromArgs: handles nullish inputs', (t) => {
-    t.is(getCommandFromArgs(undefined), '');
-    t.is(getCommandFromArgs(null), '');
+import { buildConversationResult, toTerminalEvent } from './conversation-result-builder.js';
+import { ApprovalFlowCoordinator } from './approval-flow-coordinator.js';
+import { ApprovalState } from './approval-state.js';
+import { ShellAutoApprovalResolver } from './shell-auto-approval-resolver.js';
+import { ConversationStore } from './conversation-store.js';
+import { LoggingService } from './logging-service.js';
+const logger = new LoggingService({ disableLogging: true });
+const makeStream = (extras = {}) => ({
+    [Symbol.asyncIterator]: async function* () { },
+    completed: Promise.resolve(null),
+    ...extras,
 });
-test('getCommandFromArgs: prefers command from JSON string', (t) => {
-    t.is(getCommandFromArgs('{"command":"ls -la"}'), 'ls -la');
+const makeDeps = (mode = 'off') => {
+    const conversationStore = new ConversationStore();
+    const agentClient = { chat: async () => '{"results":[]}' };
+    const settingsService = {
+        get: (key) => (key === 'shell.autoApproveMode' ? mode : undefined),
+    };
+    const shellAutoApproval = new ShellAutoApprovalResolver({
+        conversationStore,
+        agentClient,
+        logger,
+        settingsService,
+    });
+    const approvalFlow = new ApprovalFlowCoordinator({
+        agentClient,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+    });
+    return { approvalFlow, shellAutoApproval, logger, sessionId: 's1' };
+};
+test('response outcome when stream has no interruptions', async (t) => {
+    const stream = makeStream({
+        finalOutput: 'Done.',
+        history: [],
+        newItems: [],
+    });
+    const outcome = await buildConversationResult({
+        result: stream,
+        finalOutputOverride: 'Hello',
+        toolCallArgumentsById: new Map(),
+        emittedCommandIds: new Set(),
+    }, makeDeps());
+    t.is(outcome.kind, 'response');
+    if (outcome.kind === 'response') {
+        t.is(outcome.result.finalText, 'Hello');
+        t.deepEqual(outcome.result.commandMessages, []);
+    }
 });
-test('getCommandFromArgs: joins commands array from JSON string', (t) => {
-    t.is(getCommandFromArgs('{"commands":["one","two"]}'), 'one\ntwo');
+test('approval_required outcome when stream has interruptions', async (t) => {
+    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'));
+    t.is(outcome.kind, 'approval_required');
+    if (outcome.kind === 'approval_required') {
+        t.is(outcome.result.approval.toolName, 'shell');
+        t.is(outcome.result.approval.callId, 'c1');
+        t.is(outcome.result.approval.agentName, 'TestAgent');
+    }
 });
-test('getCommandFromArgs: returns invalid JSON string as-is', (t) => {
-    t.is(getCommandFromArgs('not json'), 'not json');
+test('auto_approve outcome when LLM advises approval and mode=auto', async (t) => {
+    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,
+    });
+    const approvalFlow = new ApprovalFlowCoordinator({
+        agentClient,
+        approvalState: new ApprovalState(),
+        logger,
+        sessionId: 's1',
+    });
+    const outcome = await buildConversationResult({ result: stream, toolCallArgumentsById: new Map() }, { approvalFlow, shellAutoApproval, logger, sessionId: 's1' });
+    t.is(outcome.kind, 'auto_approve');
+    if (outcome.kind === 'auto_approve') {
+        t.is(outcome.callId, 'c1');
+        t.is(outcome.argumentsText, 'ls');
+        t.is(outcome.advisory.approved, true);
+    }
 });
-test('getCommandFromArgs: extracts from object arguments', (t) => {
-    t.is(getCommandFromArgs({ command: 'pwd' }), 'pwd');
-    t.is(getCommandFromArgs({ commands: ['a', 'b'] }), 'a\nb');
-    t.is(getCommandFromArgs({ arguments: '{"foo":"bar"}' }), '{"foo":"bar"}');
+test('command messages dedup against emittedCommandIds', async (t) => {
+    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());
+    t.is(outcome.kind, 'response');
+    if (outcome.kind === 'response') {
+        const ids = (outcome.result.commandMessages ?? []).map((m) => m.id);
+        t.false(ids.includes('m-a'));
+    }
 });
-test('buildConversationResult: returns approval_required for interruptions', (t) => {
-    const toolArgs = new Map([['call-1', { command: 'ls' }]]);
-    const { conversationResult, pendingApprovalContext } = buildConversationResult({
-        result: {
-            interruptions: [
-                {
-                    type: 'shell_call',
-                    name: 'shell',
-                    action: { commands: ['ls', 'pwd'] },
-                    agent: { name: 'Agent Smith' },
-                    rawItem: { callId: 'call-1' },
-                },
-            ],
-            state: { id: 'state' },
-        },
-        emittedCommandIds: new Set(['already-emitted']),
-        getToolCallArgumentsSnapshot: () => toolArgs,
+test('toTerminalEvent shapes response into final event', (t) => {
+    const event = toTerminalEvent({
+        type: 'response',
+        commandMessages: [],
+        finalText: 'Done',
     });
-    t.is(conversationResult.type, 'approval_required');
-    const approval = conversationResult.approval;
-    t.is(approval.argumentsText, 'ls\npwd');
-    t.is(approval.toolName, 'shell');
-    t.is(approval.agentName, 'Agent Smith');
-    t.is(approval.callId, 'call-1');
-    t.is(pendingApprovalContext?.toolCallArgumentsById.get('call-1'), toolArgs.get('call-1'));
+    t.is(event.type, 'final');
+    if (event.type === 'final') {
+        t.is(event.finalText, 'Done');
+    }
 });
-test('buildConversationResult: filters emitted and approval rejection messages', (t) => {
-    clearApprovalRejectionMarkers();
-    const items = [
-        { type: 'function_call', name: 'shell', arguments: { command: 'echo one' }, callId: 'call-1' },
-        { type: 'function_call_result', name: 'shell', output: 'exit 0\none', callId: 'call-1' },
-        { type: 'function_call', name: 'shell', arguments: { command: 'echo two' }, callId: 'call-2' },
-        { type: 'function_call_result', name: 'shell', output: 'exit 1\ntwo', callId: 'call-2' },
-        { type: 'function_call', name: 'shell', arguments: { command: 'echo three' }, callId: 'call-3' },
-        { type: 'function_call_result', name: 'shell', output: 'exit 0\nthree', callId: 'call-3' },
-    ];
-    markToolCallAsApprovalRejection('call-2');
-    const { conversationResult, pendingApprovalContext } = buildConversationResult({
-        result: { history: items, finalOutput: 'Done.' },
-        emittedCommandIds: new Set(['call-1-0']),
-        reasoningOutputOverride: 'Because.',
-        usage: { total_tokens: 3 },
+test('toTerminalEvent shapes approval_required with optional fields', (t) => {
+    const event = toTerminalEvent({
+        type: 'approval_required',
+        approval: {
+            agentName: 'A',
+            toolName: 'shell',
+            argumentsText: 'ls',
+            callId: 'c1',
+            rawInterruption: { name: 'shell' },
+        },
     });
-    t.is(pendingApprovalContext, null);
-    t.is(conversationResult.type, 'response');
-    const response = conversationResult;
-    t.is(response.finalText, 'Done.');
-    t.is(response.reasoningText, 'Because.');
-    t.deepEqual(response.usage, { total_tokens: 3 });
-    t.is(response.commandMessages.length, 1);
-    t.is(response.commandMessages[0].command, 'echo three');
-    t.is(response.commandMessages[0].callId, 'call-3');
-    clearApprovalRejectionMarkers();
+    t.is(event.type, 'approval_required');
+    if (event.type === 'approval_required') {
+        t.is(event.approval.callId, 'c1');
+        t.is(event.approval.toolName, 'shell');
+    }
 });
 //# sourceMappingURL=conversation-result-builder.test.js.map

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

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

package/dist/services/conversation-retry-policy.d.ts

@@ -0,0 +1,37 @@
+export declare const MAX_HALLUCINATION_RETRIES = 2;
+export declare const isRecoverableModelError: (error: unknown) => boolean;
+export type RetryType = 'hallucination' | 'parsing_error' | 'behavior';
+export interface RetryEventPayload {
+    type: 'retry';
+    toolName: string;
+    attempt: number;
+    maxRetries: number;
+    errorMessage: string;
+}
+export interface RetryLogPayload {
+    toolName: string;
+    retryType: RetryType;
+    attempt: number;
+    maxRetries: number;
+    errorMessage: string;
+}
+export type RetryDecision = {
+    kind: 'no_retry';
+} | {
+    kind: 'retry';
+    message: string;
+    retryEvent: RetryEventPayload;
+    logPayload: RetryLogPayload;
+    attempt: number;
+    /** If true, caller should update conversation store from the existing stream and may inject error context. */
+    hadStream: boolean;
+    /** True when stream produced no usable history; caller should inject error-context message. */
+    shouldInjectErrorContext: boolean;
+    errorContextMessage: string;
+    nextRunOptions: {
+        hallucinationRetryCount: number;
+        skipUserMessage: boolean;
+    };
+};
+export declare const decideRetry: (error: unknown, attemptCount: number, hadStream: boolean, streamHistoryLength: number) => RetryDecision;
+//# sourceMappingURL=conversation-retry-policy.d.ts.map

package/dist/services/conversation-retry-policy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-retry-policy.d.ts","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,eAAO,MAAM,uBAAuB,GAAI,OAAO,OAAO,KAAG,OAYxD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,eAAe,GAAG,eAAe,GAAG,UAAU,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IAChC,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,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IACE,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,iBAAiB,CAAC;IAC9B,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,8GAA8G;IAC9G,SAAS,EAAE,OAAO,CAAC;IACnB,+FAA+F;IAC/F,wBAAwB,EAAE,OAAO,CAAC;IAClC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE;QAAE,uBAAuB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,OAAO,CAAA;KAAE,CAAC;CAC/E,CAAC;AAEN,eAAO,MAAM,WAAW,GACtB,OAAO,OAAO,EACd,cAAc,MAAM,EACpB,WAAW,OAAO,EAClB,qBAAqB,MAAM,KAC1B,aAuCF,CAAC"}

package/dist/services/conversation-retry-policy.js

@@ -0,0 +1,51 @@
+import { ModelBehaviorError } from '@openai/agents';
+export const MAX_HALLUCINATION_RETRIES = 2;
+export const isRecoverableModelError = (error) => {
+    if (!(error instanceof ModelBehaviorError)) {
+        return false;
+    }
+    const message = error.message.toLowerCase();
+    return ((message.includes('tool') && message.includes('not found')) ||
+        message.includes('model did not produce a final response') ||
+        message.includes('parsing tool arguments') ||
+        message.includes('valid json'));
+};
+export const decideRetry = (error, attemptCount, hadStream, streamHistoryLength) => {
+    if (!isRecoverableModelError(error) || attemptCount >= MAX_HALLUCINATION_RETRIES) {
+        return { kind: 'no_retry' };
+    }
+    const message = error instanceof Error ? error.message : String(error);
+    const lower = message.toLowerCase();
+    const isHallucination = lower.includes('not found');
+    const isParsingError = lower.includes('parsing tool arguments') || lower.includes('valid json');
+    const toolName = isHallucination ? message.match(/Tool (\S+) not found/)?.[1] || 'unknown' : 'unknown';
+    const retryType = isHallucination ? 'hallucination' : isParsingError ? 'parsing_error' : 'behavior';
+    const attempt = attemptCount + 1;
+    return {
+        kind: 'retry',
+        message,
+        retryEvent: {
+            type: 'retry',
+            toolName: isHallucination ? toolName : 'model',
+            attempt,
+            maxRetries: MAX_HALLUCINATION_RETRIES,
+            errorMessage: message,
+        },
+        logPayload: {
+            toolName,
+            retryType,
+            attempt,
+            maxRetries: MAX_HALLUCINATION_RETRIES,
+            errorMessage: message,
+        },
+        attempt,
+        hadStream,
+        shouldInjectErrorContext: hadStream && streamHistoryLength === 0,
+        errorContextMessage: `[System: Previous attempt failed with error: ${message}. Please retry with corrected output.]`,
+        nextRunOptions: {
+            hallucinationRetryCount: attempt,
+            skipUserMessage: hadStream,
+        },
+    };
+};
+//# sourceMappingURL=conversation-retry-policy.js.map

package/dist/services/conversation-retry-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-retry-policy.js","sourceRoot":"","sources":["../../source/services/conversation-retry-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAE3C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAW,EAAE;IACjE,IAAI,CAAC,CAAC,KAAK,YAAY,kBAAkB,CAAC,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAC5C,OAAO,CACL,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC3D,OAAO,CAAC,QAAQ,CAAC,wCAAwC,CAAC;QAC1D,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAAC;QAC1C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAC/B,CAAC;AACJ,CAAC,CAAC;AAoCF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,KAAc,EACd,YAAoB,EACpB,SAAkB,EAClB,mBAA2B,EACZ,EAAE;IACjB,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,IAAI,YAAY,IAAI,yBAAyB,EAAE,CAAC;QACjF,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACpC,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAC,wBAAwB,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAChG,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;IACvG,MAAM,SAAS,GAAc,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC;IAC/G,MAAM,OAAO,GAAG,YAAY,GAAG,CAAC,CAAC;IAEjC,OAAO;QACL,IAAI,EAAE,OAAO;QACb,OAAO;QACP,UAAU,EAAE;YACV,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO;YAC9C,OAAO;YACP,UAAU,EAAE,yBAAyB;YACrC,YAAY,EAAE,OAAO;SACtB;QACD,UAAU,EAAE;YACV,QAAQ;YACR,SAAS;YACT,OAAO;YACP,UAAU,EAAE,yBAAyB;YACrC,YAAY,EAAE,OAAO;SACtB;QACD,OAAO;QACP,SAAS;QACT,wBAAwB,EAAE,SAAS,IAAI,mBAAmB,KAAK,CAAC;QAChE,mBAAmB,EAAE,gDAAgD,OAAO,wCAAwC;QACpH,cAAc,EAAE;YACd,uBAAuB,EAAE,OAAO;YAChC,eAAe,EAAE,SAAS;SAC3B;KACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/services/conversation-retry-policy.test.d.ts

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

package/dist/services/conversation-retry-policy.test.d.ts.map

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