@qduc/term2 0.6.1 → 0.7.0

package/dist/services/stream-event-processor.js

@@ -3,6 +3,29 @@ import { extractReasoningDelta, extractTextDelta } from './stream-event-parsing.
 import { captureToolCallArguments, emitCommandMessagesFromItems } from './command-message-streaming.js';
 import { createInvalidToolCallDiagnostic } from './logging-contract.js';
 import { asRecord, getString } from './interruption-info.js';
+import { parseToolCallArguments } from './tool-call-arguments.js';
+function normalizeCodexRateLimitWindow(obj) {
+    if (!obj || typeof obj !== 'object') {
+        return undefined;
+    }
+    const rec = obj;
+    const used_percent = typeof rec.used_percent === 'number' ? rec.used_percent : undefined;
+    const window_minutes = typeof rec.window_minutes === 'number' ? rec.window_minutes : undefined;
+    const reset_after_seconds = typeof rec.reset_after_seconds === 'number' ? rec.reset_after_seconds : undefined;
+    const reset_at = typeof rec.reset_at === 'number' ? rec.reset_at : undefined;
+    if (used_percent !== undefined &&
+        window_minutes !== undefined &&
+        reset_after_seconds !== undefined &&
+        reset_at !== undefined) {
+        return {
+            used_percent,
+            window_minutes,
+            reset_after_seconds,
+            reset_at,
+        };
+    }
+    return undefined;
+}
 export const createStreamAccumulator = () => ({
     finalOutput: '',
     reasoningOutput: '',
@@ -27,7 +50,7 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
         return { type: 'text_delta', delta, fullText: acc.finalOutput };
     };
     const emitReasoning = (delta) => {
-        if (!delta || delta.replaceAll('\n', '') === '')
+        if (!delta)
             return null;
         acc.reasoningOutput += delta;
         acc.reasoningDeltaCount++;
@@ -52,6 +75,35 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
             });
             yield { type: 'usage_update', usage: mergedUsage };
         }
+        // Intercept Codex rate-limits frames (e.g. codex.rate_limits) from the
+        // upstream provider stream so the UI can display them in the status bar.
+        const rawRateLimit = getString(event, 'type') === 'codex.rate_limits'
+            ? event
+            : getString(eventData, 'type') === 'codex.rate_limits'
+                ? eventData
+                : getString(modelEvent, 'type') === 'codex.rate_limits'
+                    ? modelEvent
+                    : undefined;
+        if (rawRateLimit) {
+            const rl = asRecord(rawRateLimit);
+            const rlData = asRecord(rl?.rate_limits) ?? rl;
+            const primary = normalizeCodexRateLimitWindow(rlData?.primary);
+            const secondary = normalizeCodexRateLimitWindow(rlData?.secondary);
+            if (primary !== undefined || secondary !== undefined) {
+                const rateLimits = {
+                    allowed: Boolean(rlData?.allowed),
+                    limit_reached: Boolean(rlData?.limit_reached),
+                    ...(primary !== undefined ? { primary } : {}),
+                    ...(secondary !== undefined ? { secondary } : {}),
+                };
+                logger.debug('Codex rate limits extracted from stream event', {
+                    sessionId,
+                    source: 'codex_rate_limits',
+                    rateLimits,
+                });
+                yield { type: 'codex_rate_limits', rateLimits };
+            }
+        }
         const delta1 = extractTextDelta(rawEvent);
         if (delta1) {
             const e = emitText(delta1);
@@ -82,6 +134,7 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
             captureToolCallArguments(eventItem, toolCallArgumentsById);
             const rawItem = asRecord(eventItemRecord?.rawItem) ?? eventItemRecord;
             if (getString(rawItem, 'type') === 'function_call') {
+                opts.onFunctionCallItem?.(eventItem);
                 const callId = getString(rawItem, 'callId') ??
                     getString(rawItem, 'call_id') ??
                     getString(rawItem, 'tool_call_id') ??
@@ -90,48 +143,26 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
                 if (callId) {
                     const toolName = getString(rawItem, 'name') ?? getString(eventItemRecord, 'name');
                     const args = rawItem?.arguments ?? rawItem?.args ?? eventItemRecord?.arguments ?? eventItemRecord?.args;
-                    // Providers sometimes surface arguments as a JSON string.
-                    // Normalize so downstream UI can reliably render parameters.
-                    const normalizedArgs = (() => {
-                        if (typeof args !== 'string')
-                            return args;
-                        const trimmed = args.trim();
-                        if (!trimmed)
-                            return args;
-                        try {
-                            return JSON.parse(trimmed);
-                        }
-                        catch {
-                            if ((trimmed.startsWith('{') || trimmed.startsWith('[')) &&
-                                !emittedInvalidToolCallPackets.has(String(callId))) {
-                                emittedInvalidToolCallPackets.add(String(callId));
-                                const diagnostic = createInvalidToolCallDiagnostic({
-                                    toolName: toolName ?? 'unknown',
-                                    toolCallId: String(callId),
-                                    rawPayload: trimmed,
-                                    normalizedToolCall: {
-                                        toolName: toolName ?? 'unknown',
-                                        toolCallId: String(callId),
-                                        arguments: args,
-                                    },
-                                    validationErrors: ['arguments must be valid JSON'],
-                                    traceId: logger.getCorrelationId() ?? 'trace-unknown',
-                                    retryContext: { sessionId },
-                                });
-                                logger.error('Invalid tool call argument payload', {
-                                    ...diagnostic,
-                                    sessionId,
-                                    messageId: String(callId),
-                                });
-                            }
-                            return args;
-                        }
-                    })();
+                    const parseResult = parseToolCallArguments(args, {
+                        callId: String(callId),
+                        toolName: toolName ?? 'unknown',
+                        sessionId,
+                        traceId: logger.getCorrelationId() ?? 'trace-unknown',
+                    });
+                    if (parseResult.invalidJsonDiagnostic && !emittedInvalidToolCallPackets.has(String(callId))) {
+                        emittedInvalidToolCallPackets.add(String(callId));
+                        const diagnostic = createInvalidToolCallDiagnostic(parseResult.invalidJsonDiagnostic);
+                        logger.error('Invalid tool call argument payload', {
+                            ...diagnostic,
+                            sessionId,
+                            messageId: String(callId),
+                        });
+                    }
                     yield {
                         type: 'tool_started',
                         toolCallId: callId,
                         toolName: toolName ?? 'unknown',
-                        arguments: normalizedArgs,
+                        arguments: parseResult.arguments,
                     };
                     logger.debug('Tool execution started', {
                         eventType: 'tool_call.execution_started',
@@ -145,6 +176,13 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
                     });
                 }
             }
+            const rawItemType = getString(rawItem, 'type');
+            if (rawItemType === 'function_call_result' ||
+                rawItemType === 'function_call_output' ||
+                rawItemType === 'function_call_output_result' ||
+                rawItemType === 'tool_call_output_item') {
+                opts.onFunctionResultItem?.(eventItem);
+            }
             for (const e of maybeEmitCommandMessagesFromItems([eventItem])) {
                 yield e;
             }
@@ -152,6 +190,7 @@ export async function* processStreamEvents(stream, acc, opts, deps) {
         else if (eventType === 'tool_call_output_item' ||
             getString(asRecord(event?.rawItem), 'type') === 'function_call_output') {
             captureToolCallArguments(rawEvent, toolCallArgumentsById);
+            opts.onFunctionResultItem?.(rawEvent);
             for (const e of maybeEmitCommandMessagesFromItems([rawEvent])) {
                 yield e;
             }

package/dist/services/stream-event-processor.js.map

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

package/dist/services/stream-event-processor.test.js

@@ -92,6 +92,52 @@ test('emits tool_started for function_call run_item_stream_event', async (t) =>
     t.is(toolStarted.toolName, 'shell');
     t.deepEqual(toolStarted.arguments, { command: 'ls' });
 });
+test('emits one tool_started for duplicate function_call events with the same callId', async (t) => {
+    const functionCall = {
+        type: 'run_item_stream_event',
+        item: {
+            rawItem: {
+                type: 'function_call',
+                callId: 'call-dup',
+                name: 'shell',
+                arguments: JSON.stringify({ command: 'npm test' }),
+            },
+        },
+    };
+    const stream = makeStream([functionCall, functionCall]);
+    const acc = createStreamAccumulator();
+    const opts = baseOpts();
+    const events = [];
+    for await (const ev of processStreamEvents(stream, acc, opts, baseDeps())) {
+        events.push(ev);
+    }
+    const starts = events.filter((e) => e.type === 'tool_started');
+    t.is(starts.length, 2);
+    t.deepEqual(starts[0].arguments, { command: 'npm test' });
+    t.deepEqual(starts[1].arguments, { command: 'npm test' });
+});
+test('emits tool_started even when the callId was already emitted by approval handling', async (t) => {
+    const stream = makeStream([
+        {
+            type: 'run_item_stream_event',
+            item: {
+                rawItem: {
+                    type: 'function_call',
+                    callId: 'call-approved',
+                    name: 'shell',
+                    arguments: JSON.stringify({ command: 'git status' }),
+                },
+            },
+        },
+    ]);
+    const acc = createStreamAccumulator();
+    const opts = baseOpts();
+    const events = [];
+    for await (const ev of processStreamEvents(stream, acc, opts, baseDeps())) {
+        events.push(ev);
+    }
+    t.true(events.some((e) => e.type === 'tool_started'));
+});
 test('invalid JSON arguments are deduped via emittedInvalidToolCallPackets', async (t) => {
     const events1 = [
         {
@@ -226,4 +272,29 @@ test('throws AbortError if stream is cancelled', async (t) => {
         }
     }, { name: 'AbortError', message: 'The user aborted a request.' });
 });
+test('extracts codex rate limits from nested or flat structures in raw events', async (t) => {
+    const nestedEvent = {
+        type: 'codex.rate_limits',
+        plan_type: 'plus',
+        rate_limits: {
+            allowed: true,
+            limit_reached: false,
+            primary: { used_percent: 11, window_minutes: 300, reset_after_seconds: 9697, reset_at: 1779703037 },
+            secondary: { used_percent: 14, window_minutes: 10080, reset_after_seconds: 503937, reset_at: 1780197277 },
+        },
+    };
+    const stream = makeStream([nestedEvent]);
+    const acc = createStreamAccumulator();
+    const events = [];
+    for await (const ev of processStreamEvents(stream, acc, baseOpts(), baseDeps())) {
+        events.push(ev);
+    }
+    const rateLimitEvents = events.filter((e) => e.type === 'codex_rate_limits');
+    t.is(rateLimitEvents.length, 1);
+    const info = rateLimitEvents[0].rateLimits;
+    t.is(info.allowed, true);
+    t.is(info.limit_reached, false);
+    t.is(info.primary.used_percent, 11);
+    t.is(info.secondary.used_percent, 14);
+});
 //# sourceMappingURL=stream-event-processor.test.js.map

package/dist/services/stream-event-processor.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream-event-processor.test.js","sourceRoot":"","sources":["../../source/services/stream-event-processor.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EACL,uBAAuB,EACvB,mBAAmB,GAGpB,MAAM,6BAA6B,CAAC;AAGrC,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;AAE5D,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,SAA+B,EAAE,EAAe,EAAE;IACvF,OAAO;QACL,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,KAAK,SAAS,CAAC;YACrC,KAAK,MAAM,CAAC,IAAI,MAAM;gBAAE,MAAM,CAAC,CAAC;QAClC,CAAC;QACD,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC;QACpD,GAAG,MAAM;KACK,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,GAA2B,EAAE,CAAC,CAAC;IAC9C,qBAAqB,EAAE,IAAI,GAAG,EAAE;IAChC,6BAA6B,EAAE,IAAI,GAAG,EAAE;IACxC,wBAAwB,EAAE,KAAK;CAChC,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,GAAwB,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC;AAEpF,IAAI,CAAC,mDAAmD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACpE,MAAM,MAAM,GAAG,UAAU,CAAC;QACxB,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QACvF,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;KACzF,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAChF,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IACjE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC3B,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACtC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC5C,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACrC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sFAAsF,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACvG,MAAM,MAAM,GAAG,UAAU,CAAC;QACxB,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE;QAC/F,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACpF,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE;QAClG,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE;KACnG,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAChF,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,iDAAiD,CAAC,CAAC;IACzE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,QAAQ,KAAK,iCAAiC,CAAC,CAAC,CAAC;AAC1G,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wDAAwD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,UAAU,CAAC;QACxB,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;QAC5F,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;KAC3F,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAChF,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC,CAAC;IAC3E,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,4DAA4D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC7E,MAAM,MAAM,GAAG,UAAU,CAAC;QACxB;YACE,IAAI,EAAE,uBAAuB;YAC7B,IAAI,EAAE;gBACJ,OAAO,EAAE;oBACP,IAAI,EAAE,eAAe;oBACrB,MAAM,EAAE,QAAQ;oBAChB,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;iBAC7C;aACF;SACF;KACF,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;IACxB,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAC1E,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IAClE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACtB,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sEAAsE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACvF,MAAM,OAAO,GAAG;QACd;YACE,IAAI,EAAE,uBAAuB;YAC7B,IAAI,EAAE;gBACJ,OAAO,EAAE;oBACP,IAAI,EAAE,eAAe;oBACrB,MAAM,EAAE,UAAU;oBAClB,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,WAAW;iBACvB;aACF;SACF;KACF,CAAC;IAEF,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,MAAM,cAAc,GAAQ;QAC1B,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS;QACrB,KAAK,EAAE,GAAG,EAAE,CAAC,SAAS;QACtB,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS;QACrB,KAAK,EAAE,GAAG,EAAE;YACV,aAAa,EAAE,CAAC;QAClB,CAAC;QACD,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;KAClC,CAAC;IACF,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;IACxB,MAAM,IAAI,GAAwB,EAAE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;IAE7E,MAAM,IAAI,GAAG,uBAAuB,EAAE,CAAC;IACvC,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,mBAAmB,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACjF,KAAK,CAAC,CAAC;IACT,CAAC;IACD,wDAAwD;IACxD,MAAM,IAAI,GAAG,uBAAuB,EAAE,CAAC;IACvC,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,mBAAmB,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACjF,KAAK,CAAC,CAAC;IACT,CAAC;IACD,CAAC,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IACvB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,6DAA6D,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC9E,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;IACxB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,IAAI,CAAC,wBAAwB,GAAG,KAAK,CAAC;IACtC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QACzE,KAAK,CAAC,CAAC;IACT,CAAC;IACD,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yDAAyD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC1E,MAAM,IAAI,GAAG,QAAQ,EAAE,CAAC;IACxB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;IACrC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QACzE,KAAK,CAAC,CAAC;IACT,CAAC;IACD,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;AAC1E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qDAAqD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACtE,MAAM,MAAM,GAAG,UAAU,CAAC;QACxB;YACE,IAAI,EAAE;gBACJ,IAAI,EAAE,oBAAoB;gBAC1B,QAAQ,EAAE;oBACR,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;iBAC/C;aACF;SACF;KACF,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,KAAK,EAAE,MAAM,EAAE,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAChF,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,cAAc,CAAC,CAAC;IACpE,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IACrE,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,EAAE;QAC5B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;KAC7E,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAC/E,KAAK,CAAC,CAAC;IACT,CAAC;IACD,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+FAA+F,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAChH,MAAM,MAAM,GAAG,UAAU,CACvB;QACE;YACE,IAAI,EAAE,wBAAwB;YAC9B,IAAI,EAAE;gBACJ,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE;oBACL,KAAK,EAAE;wBACL,aAAa,EAAE,GAAG;wBAClB,iBAAiB,EAAE,EAAE;wBACrB,YAAY,EAAE,GAAG;wBACjB,qBAAqB,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE;qBAC7C;iBACF;aACF;SACF;KACF,EACD;QACE,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC;YACzB,KAAK,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE;SACxE,CAAC;KACH,CACF,CAAC;IACF,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QAC/E,KAAK,CAAC,CAAC;IACT,CAAC;IAED,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE;QAC3B,aAAa,EAAE,GAAG;QAClB,iBAAiB,EAAE,EAAE;QACrB,YAAY,EAAE,GAAG;QACjB,iBAAiB,EAAE,EAAE;KACtB,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0CAA0C,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC3D,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,EAAE;QAC5B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;QAChC,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,uBAAuB,EAAE,CAAC;IACtC,MAAM,CAAC,CAAC,WAAW,CACjB,KAAK,IAAI,EAAE;QACT,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;YAC/E,KAAK,CAAC,CAAC;QACT,CAAC;IACH,CAAC,EACD,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,6BAA6B,EAAE,CAC/D,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"stream-event-processor.test.js","sourceRoot":"","sources":["../../source/services/stream-event-processor.test.ts"],"names":[],"mappings":"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"}

package/dist/services/subagents/subagent-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-manager.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-manager.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAoC,MAAM,YAAY,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AA0BnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AA8P1E,qBAAa,eAAe;;gBAQd,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,WAAW,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;KAC/C;IAiBD,kBAAkB,IAAI,IAAI;IAIpB,GAAG,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;CAsiB7D"}
+{"version":3,"file":"subagent-manager.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-manager.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAoC,MAAM,YAAY,CAAC;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AA6BnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAsR1E,qBAAa,eAAe;;gBAQd,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,WAAW,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;KAC/C;IAiBD,kBAAkB,IAAI,IAAI;IAIpB,GAAG,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;CAomB7D"}

package/dist/services/subagents/subagent-manager.js

@@ -4,6 +4,8 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { getProvider } from '../../providers/index.js';
 import { SubagentSession } from './subagent-session.js';
+import { executeWithRetry } from '../../lib/retry-executor.js';
+import { decideRecoverableModelRetry, MAX_SUBAGENT_MODEL_RETRIES } from '../conversation-retry-policy.js';
 import { wrapToolInvoke } from '../../lib/tool-invoke.js';
 import { wrapNeedsApproval } from '../../lib/openai-agent-client.js';
 import { toOpenAIStrictToolSchema } from '../../lib/openai-strict-tool-schema.js';
@@ -26,6 +28,7 @@ import { tryAcquireFileLock } from '../../tools/file-locks.js';
 import { classifyCommand, SafetyStatus } from '../../utils/command-safety/index.js';
 import { evaluateShellAutoApprovalAdvisories } from '../shell-auto-approval-evaluator.js';
 const PROMPTS_DIR = path.join(import.meta.dirname, '../../prompts/subagents');
+const MUTATING_TOOL_NAMES = new Set(['apply_patch', 'search_replace', 'create_file', 'shell']);
 const ROLE_MAX_TURNS_DEFAULT = 20;
 function parseFrontmatter(content) {
     const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
@@ -241,6 +244,22 @@ function extractFinalText(result) {
 function aggregateToolUsage(toolCounts) {
     return Array.from(toolCounts.entries()).map(([toolName, count]) => ({ toolName, count }));
 }
+function buildSubagentRetryTask(originalTask, errorMessage, toolNames, retryType, hallucinatedToolName) {
+    const availableTools = toolNames.length > 0 ? toolNames.join(', ') : 'none';
+    let instruction;
+    if (retryType === 'hallucination' && hallucinatedToolName && hallucinatedToolName !== 'unknown') {
+        instruction =
+            `The tool "${hallucinatedToolName}" does not exist. Do not attempt to use it. ` +
+                `Available tools: ${availableTools}.`;
+    }
+    else if (retryType === 'parsing_error') {
+        instruction = `Your previous tool call could not be parsed. Ensure all tool arguments are valid JSON and try again.`;
+    }
+    else {
+        instruction = `Please produce a final textual answer now. Do not call any more tools; provide a direct response to the original task.`;
+    }
+    return `${originalTask}\n\n` + `[System: Previous attempt failed with error: ${errorMessage}. ${instruction}]`;
+}
 export class SubagentManager {
     #logger;
     #settings;
@@ -287,6 +306,7 @@ export class SubagentManager {
                 error?.message?.includes('abort') ||
                 error?.message?.includes('cancel') ||
                 error?.code === 'ERR_ABORTED';
+            const usage = normalizeAgentRunUsage(error?.state?.usage) ?? extractUsage(error);
             const result = {
                 agentId,
                 role: request.role,
@@ -295,6 +315,7 @@ export class SubagentManager {
                 filesChanged: [],
                 toolsUsed: [],
                 error: error?.message || String(error),
+                ...(usage ? { usage } : {}),
             };
             this.#emit({ type: 'subagent_completed', result });
             return result;
@@ -367,12 +388,15 @@ export class SubagentManager {
         const filesChanged = [];
         const toolDefinitions = this.#buildToolDefinitions(definition, request.writeBoundary, filesChanged, request.task);
         const providerId = definition.provider;
+        let mutatingToolAttempted = false;
         const tools = buildAgentTools(toolDefinitions, {
             providerId,
             logger: this.#logger,
             settings: this.#settings,
             onToolStart: (name, _params, commandMessages) => {
                 toolCounts.set(name, (toolCounts.get(name) ?? 0) + 1);
+                if (MUTATING_TOOL_NAMES.has(name))
+                    mutatingToolAttempted = true;
                 this.#emit({
                     type: 'subagent_tool_started',
                     agentId,
@@ -415,22 +439,70 @@ export class SubagentManager {
         // run_subagent is registered as a plain function tool,
         // details.resumeState is not populated by the SDK, so this branch is
         // dead code until run_subagent switches to Agent.asTool registration.
-        const runInput = request.resumeState ? await RunState.fromString(agent, request.resumeState) : request.task;
-        const result = await runWithProvider(providerId, runner, agent, runInput, {
-            stream: false,
-            maxTurns: definition.maxTurns,
-            ...(request.signal ? { signal: request.signal } : {}),
-        });
-        return {
-            agentId,
-            role: request.role,
-            status: 'completed',
-            finalText: extractFinalText(result),
-            filesChanged: [...new Set(filesChanged)],
-            toolsUsed: aggregateToolUsage(toolCounts),
-            usage: normalizeAgentRunUsage(result?.state?.usage) ?? extractUsage(result),
-            nestedRunResult: result,
-        };
+        const initialInput = request.resumeState
+            ? await RunState.fromString(agent, request.resumeState)
+            : request.task;
+        let runInput = initialInput;
+        let modelRetryCount = 0;
+        while (true) {
+            try {
+                const result = await executeWithRetry({
+                    operation: () => runWithProvider(providerId, runner, agent, runInput, {
+                        stream: false,
+                        maxTurns: definition.maxTurns,
+                        ...(request.signal ? { signal: request.signal } : {}),
+                    }),
+                    retryAttempts: this.#settings.get('agent.retryAttempts') ?? 2,
+                    provider: providerId,
+                    model: definition.model,
+                    traceId: this.#logger.getCorrelationId?.() ?? undefined,
+                    logger: this.#logger,
+                });
+                return {
+                    agentId,
+                    role: request.role,
+                    status: 'completed',
+                    finalText: extractFinalText(result),
+                    filesChanged: [...new Set(filesChanged)],
+                    toolsUsed: aggregateToolUsage(toolCounts),
+                    usage: normalizeAgentRunUsage(result?.state?.usage) ?? extractUsage(result),
+                    nestedRunResult: result,
+                };
+            }
+            catch (error) {
+                const decision = decideRecoverableModelRetry(error, modelRetryCount, MAX_SUBAGENT_MODEL_RETRIES);
+                if (decision.kind === 'no_retry')
+                    throw error;
+                // Avoid unsafe retries after the subagent has already invoked any
+                // mutating tool (write or shell), regardless of whether the write
+                // succeeded. Even a failed write attempt may reflect a partial state
+                // change that makes a retry unsafe (e.g. duplicate edits).
+                if ((definition.canWrite || definition.canRunShell) && mutatingToolAttempted)
+                    throw error;
+                modelRetryCount = decision.attempt;
+                this.#logger.warn('Subagent model error retry', {
+                    eventType: 'retry.subagent_model_error',
+                    category: 'retry',
+                    phase: 'retry',
+                    agentId,
+                    role: request.role,
+                    retryType: decision.retryType,
+                    retryAttempt: decision.attempt,
+                    maxRetries: decision.maxRetries,
+                    errorMessage: decision.message,
+                });
+                this.#emit({
+                    type: 'retry',
+                    toolName: decision.toolName,
+                    attempt: decision.attempt,
+                    maxRetries: decision.maxRetries,
+                    errorMessage: decision.message,
+                    retryType: decision.retryType,
+                });
+                const availableToolNames = toolDefinitions.map((d) => d.name);
+                runInput = buildSubagentRetryTask(typeof initialInput === 'string' ? initialInput : request.task, decision.message, availableToolNames, decision.retryType, decision.toolName);
+            }
+        }
     }
     #buildToolDefinitions(definition, writeBoundary, filesChanged, taskContext) {
         const tools = [];