@qduc/term2 0.1.7 → 0.1.8

package/dist/services/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-presentation-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"approval-presentation-policy.js","sourceRoot":"","sources":["../../source/services/approval-presentation-policy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAuC,MAAM,+BAA+B,CAAC;AAcvH,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-presentation-policy.test.d.ts

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

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

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

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

@@ -0,0 +1,74 @@
+import test from 'ava';
+import { annotateApprovedCommandMessage, filterPendingCommandMessagesForApproval, } from './approval-presentation-policy.js';
+const allowAllCapabilities = () => ({
+    annotateCommandMessage: true,
+    hidePendingDuringPrompt: true,
+});
+test('filterPendingCommandMessagesForApproval prioritizes callId over toolName', (t) => {
+    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);
+    t.is(out.length, 1);
+    t.is(out[0].callId, 'call-1');
+});
+test('filterPendingCommandMessagesForApproval falls back to toolName when callId missing', (t) => {
+    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);
+    t.is(out.length, 1);
+    t.is(out[0].toolName, 'grep');
+});
+test('annotateApprovedCommandMessage uses capability metadata instead of tool-name checks', (t) => {
+    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 });
+    t.truthy(output);
+    t.true(output.hadApproval === true);
+});
+//# sourceMappingURL=approval-presentation-policy.test.js.map

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

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

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

@@ -1,13 +1,13 @@
 export type PendingApprovalContext = {
-    state: any;
-    interruption: any;
+    state: unknown;
+    interruption: unknown;
     emittedCommandIds: Set<string>;
     toolCallArgumentsById: Map<string, unknown>;
     removeInterceptor?: () => void;
 };
 export type AbortedApprovalContext = {
-    state: any;
-    interruption: any;
+    state: unknown;
+    interruption: unknown;
     emittedCommandIds: Set<string>;
     toolCallArgumentsById: Map<string, unknown>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"approval-state.d.ts","sourceRoot":"","sources":["../../source/services/approval-state.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG;IACnC,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;IAC5C,iBAAiB,CAAC,EAAE,MAAM,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,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,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,sBAAsB,GAAG,IAAI;IAIjD,YAAY,IAAI,IAAI;IAIpB,2BAA2B,CAAC,iBAAiB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAWzE,YAAY,IAAI,OAAO;IAevB,cAAc,IAAI,sBAAsB,GAAG,IAAI;CAKhD"}
+{"version":3,"file":"approval-state.d.ts","sourceRoot":"","sources":["../../source/services/approval-state.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,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;CAChC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C,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,sBAAsB,GAAG,IAAI;IAIjD,YAAY,IAAI,IAAI;IAIpB,2BAA2B,CAAC,iBAAiB,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI;IAWzE,YAAY,IAAI,OAAO;IAevB,cAAc,IAAI,sBAAsB,GAAG,IAAI;CAKhD"}

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

@@ -1,6 +1,7 @@
 import type { CommandMessage } from '../tools/types.js';
 import type { NormalizedUsage } from '../utils/token-usage.js';
-export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | FinalResponseEvent | ErrorEvent | RetryEvent;
+import type { ApprovalDescriptor } from '../contracts/conversation.js';
+export type ConversationEvent = TextDeltaEvent | ReasoningDeltaEvent | ToolStartedEvent | CommandMessageEvent | ApprovalRequiredEvent | UsageUpdateEvent | FinalResponseEvent | ErrorEvent | RetryEvent;
 export interface RetryEvent {
     type: 'retry';
     toolName: string;
@@ -35,17 +36,19 @@ export interface ToolStartedEvent {
     type: 'tool_started';
     toolCallId: string;
     toolName: string;
-    arguments: any;
+    arguments: unknown;
 }
 export interface ApprovalRequiredEvent {
     type: 'approval_required';
-    approval: {
-        agentName: string;
-        toolName: string;
-        argumentsText: string;
-        /** Optional provider-specific tool call id (when available). */
-        callId?: string;
-    };
+    approval: Omit<ApprovalDescriptor, 'rawInterruption'>;
+}
+/**
+ * Emitted when token usage information is received during streaming.
+ * Allows UI to display token usage in real-time rather than waiting for final response.
+ */
+export interface UsageUpdateEvent {
+    type: 'usage_update';
+    usage: NormalizedUsage;
 }
 export interface CommandMessageEvent {
     type: 'command_message';

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;AAE/D,MAAM,MAAM,iBAAiB,GACzB,cAAc,GACd,mBAAmB,GACnB,gBAAgB,GAChB,mBAAmB,GACnB,qBAAqB,GACrB,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,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,mBAAmB,CAAC;IAC1B,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,gEAAgE;QAChE,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;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,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"}

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

@@ -0,0 +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>;
+}
+interface BuildConversationResultParams {
+    result: any;
+    finalOutputOverride?: string;
+    reasoningOutputOverride?: string;
+    emittedCommandIds?: Set<string>;
+    usage?: NormalizedUsage;
+    getToolCallArgumentsSnapshot?: () => 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 {};
+//# sourceMappingURL=conversation-result-builder.d.ts.map

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

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

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

@@ -0,0 +1,110 @@
+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, }) => {
+    if (result.interruptions && result.interruptions.length > 0) {
+        const interruption = result.interruptions[0];
+        const pendingApprovalContext = {
+            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);
+            }
+        }
+        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: {
+                type: 'approval_required',
+                approval: {
+                    agentName: interruption.agent?.name ?? 'Agent',
+                    toolName: toolName ?? 'Unknown Tool',
+                    argumentsText,
+                    rawInterruption: interruption,
+                    ...(callId ? { callId: String(callId) } : {}),
+                },
+            },
+            pendingApprovalContext,
+        };
+    }
+    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: {
+            type: 'response',
+            commandMessages: visibleCommandMessages,
+            finalText: finalOutputOverride ?? result.finalOutput ?? 'Done.',
+            reasoningText: reasoningOutputOverride,
+            usage: usage ?? extractUsage(result),
+        },
+        pendingApprovalContext: null,
+    };
+};
+//# sourceMappingURL=conversation-result-builder.js.map

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

@@ -0,0 +1 @@
+{"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.d.ts

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

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

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

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

@@ -0,0 +1,76 @@
+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), '');
+});
+test('getCommandFromArgs: prefers command from JSON string', (t) => {
+    t.is(getCommandFromArgs('{"command":"ls -la"}'), 'ls -la');
+});
+test('getCommandFromArgs: joins commands array from JSON string', (t) => {
+    t.is(getCommandFromArgs('{"commands":["one","two"]}'), 'one\ntwo');
+});
+test('getCommandFromArgs: returns invalid JSON string as-is', (t) => {
+    t.is(getCommandFromArgs('not json'), 'not json');
+});
+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('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,
+    });
+    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'));
+});
+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 },
+    });
+    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();
+});
+//# sourceMappingURL=conversation-result-builder.test.js.map

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

@@ -0,0 +1 @@
+{"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-service.d.ts

@@ -1,7 +1,9 @@
 import type { OpenAIAgentClient } from '../lib/openai-agent-client.js';
 import type { ILoggingService } from './service-interfaces.js';
 import { ConversationSession } from './conversation-session.js';
-export type { ConversationResult, CommandMessage } from './conversation-session.js';
+import type { ConversationTerminal, ReasoningEffortSetting } from '../contracts/conversation.js';
+export type { ConversationTerminal, ApprovalDescriptor, PendingApproval } from '../contracts/conversation.js';
+export type { CommandMessage } from './conversation-session.js';
 /**
  * Backward-compatible facade for the CLI.
  *
@@ -19,13 +21,13 @@ export declare class ConversationService {
     get sessionId(): string;
     reset(): void;
     setModel(model: string): void;
-    setReasoningEffort(effort: any): void;
-    setTemperature(temperature: any): void;
+    setReasoningEffort(effort: ReasoningEffortSetting): void;
+    setTemperature(temperature?: number): void;
     setProvider(provider: string): void;
     setRetryCallback(callback: () => void): void;
     addShellContext(historyText: string): void;
     abort(): void;
-    sendMessage(...args: Parameters<ConversationSession['sendMessage']>): Promise<import("./conversation-session.js").ConversationResult>;
-    handleApprovalDecision(...args: Parameters<ConversationSession['handleApprovalDecision']>): Promise<import("./conversation-session.js").ConversationResult | null>;
+    sendMessage(...args: Parameters<ConversationSession['sendMessage']>): Promise<ConversationTerminal>;
+    handleApprovalDecision(...args: Parameters<ConversationSession['handleApprovalDecision']>): Promise<ConversationTerminal | null>;
 }
 //# sourceMappingURL=conversation-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"conversation-service.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,YAAY,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEpF;;;;GAIG;AACH,qBAAa,mBAAmB;;gBAGlB,EACV,WAAW,EACX,IAAI,EACJ,SAAqB,GACtB,EAAE;QACD,WAAW,EAAE,iBAAiB,CAAC;QAC/B,IAAI,EAAE;YAAE,MAAM,EAAE,eAAe,CAAA;SAAE,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IAID,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,KAAK,IAAI,IAAI;IAIb,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAI7B,kBAAkB,CAAC,MAAM,EAAE,GAAG,GAAG,IAAI;IAIrC,cAAc,CAAC,WAAW,EAAE,GAAG,GAAG,IAAI;IAItC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAI5C,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI1C,KAAK,IAAI,IAAI;IAIb,WAAW,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAInE,sBAAsB,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,CAAC;CAG1F"}
+{"version":3,"file":"conversation-service.d.ts","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEjG,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC9G,YAAY,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE;;;;GAIG;AACH,qBAAa,mBAAmB;;gBAGlB,EACV,WAAW,EACX,IAAI,EACJ,SAAqB,GACtB,EAAE;QACD,WAAW,EAAE,iBAAiB,CAAC;QAC/B,IAAI,EAAE;YAAE,MAAM,EAAE,eAAe,CAAA;SAAE,CAAC;QAClC,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;IAID,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,KAAK,IAAI,IAAI;IAIb,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAI7B,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAIxD,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAI1C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAInC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAI5C,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAI1C,KAAK,IAAI,IAAI;IAIb,WAAW,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAInG,sBAAsB,CACpB,GAAG,IAAI,EAAE,UAAU,CAAC,mBAAmB,CAAC,wBAAwB,CAAC,CAAC,GACjE,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;CAGxC"}

package/dist/services/conversation-service.js

@@ -22,7 +22,7 @@ export class ConversationService {
         this.#session.setReasoningEffort(effort);
     }
     setTemperature(temperature) {
-        this.#session.setTemperature?.(temperature);
+        this.#session.setTemperature(temperature);
     }
     setProvider(provider) {
         this.#session.setProvider(provider);

package/dist/services/conversation-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-service.js","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAIhE;;;;GAIG;AACH,MAAM,OAAO,mBAAmB;IACrB,QAAQ,CAAsB;IAEvC,YAAY,EACV,WAAW,EACX,IAAI,EACJ,SAAS,GAAG,SAAS,GAKtB;QACC,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,kBAAkB,CAAC,MAAW;QAC5B,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,cAAc,CAAC,WAAgB;QAC5B,IAAI,CAAC,QAAgB,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,gBAAgB,CAAC,QAAoB;QACnC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,eAAe,CAAC,WAAmB;QACjC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,GAAG,IAAoD;QACjE,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,sBAAsB,CAAC,GAAG,IAA+D;QACvF,OAAO,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,CAAC;IACvD,CAAC;CACF"}
+{"version":3,"file":"conversation-service.js","sourceRoot":"","sources":["../../source/services/conversation-service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAMhE;;;;GAIG;AACH,MAAM,OAAO,mBAAmB;IACrB,QAAQ,CAAsB;IAEvC,YAAY,EACV,WAAW,EACX,IAAI,EACJ,SAAS,GAAG,SAAS,GAKtB;QACC,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAmB,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,kBAAkB,CAAC,MAA8B;QAC/C,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,cAAc,CAAC,WAAoB;QACjC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,gBAAgB,CAAC,QAAoB;QACnC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,eAAe,CAAC,WAAmB;QACjC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,GAAG,IAAoD;QACjE,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,sBAAsB,CACpB,GAAG,IAA+D;QAElE,OAAO,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC,CAAC;IACvD,CAAC;CACF"}