@qduc/term2 0.11.1 → 0.12.0

package/dist/utils/ai/token-usage.js

@@ -34,15 +34,14 @@ function asUsageContainer(value) {
 export function normalizeUsage(usage) {
     if (!usage || typeof usage !== 'object')
         return undefined;
-    const promptTokens = coalesceNumber(usage.prompt_tokens, usage.input_tokens, usage.input_token_count, usage.prompt_token_count, usage.promptTokenCount, usage.inputTokenCount, usage.inputTokens, // Agents SDK
-    usage.prompt_n !== undefined && usage.prompt_n != null
+    const promptTokens = coalesceNumber(usage.prompt_tokens, usage.input_tokens, usage.input_token_count, usage.prompt_token_count, usage.promptTokenCount, usage.inputTokenCount, usage.inputTokens, usage.prompt_n !== undefined && usage.prompt_n != null
         ? (toNumber(usage.cache_n) || 0) + toNumber(usage.prompt_n)
         : undefined);
-    const completionTokens = coalesceNumber(usage.completion_tokens, usage.output_tokens, usage.output_token_count, usage.completion_token_count, usage.candidatesTokenCount, usage.outputTokenCount, usage.outputTokens, // Agents SDK
-    usage.predicted_n);
-    const cacheCreationTokens = coalesceNumber(usage.cache_creation_input_tokens, usage.cacheCreationInputTokens, usage.cache_creation_tokens, usage.cacheCreationTokens, usage.cacheWrite5mTokens, usage.cacheWrite1hTokens);
-    const cacheReadTokens = coalesceNumber(usage.cache_read_input_tokens, usage.cacheReadInputTokens, usage.cache_read_tokens, usage.cached_tokens, usage.cachedTokens, usage.inputTokensDetails?.cached_tokens, usage.prompt_tokens_details?.cached_tokens, usage.promptTokensDetails?.cachedTokens, usage.cachedContentTokenCount, usage.cached_content_token_count, usage.cacheReadTokens);
-    const totalTokens = coalesceNumber(usage.total_tokens, usage.total_token_count, usage.totalTokenCount, usage.totalTokens) ?? sumNumbers(promptTokens, completionTokens, cacheCreationTokens);
+    const completionTokens = coalesceNumber(usage.completion_tokens, usage.output_tokens, usage.output_token_count, usage.completion_token_count, usage.candidatesTokenCount, usage.outputTokenCount, usage.outputTokens, usage.predicted_n);
+    const cacheCreationTokens = coalesceNumber(usage.cache_creation_input_tokens, usage.cacheCreationInputTokens, usage.cache_creation_tokens, usage.cacheCreationTokens, usage.cache_write_tokens, usage.cacheWriteTokens, sumDetailField(usage.inputTokensDetails ?? usage.input_tokens_details, ['cache_write_tokens', 'cacheWriteTokens']), usage.cacheWrite5mTokens, usage.cacheWrite1hTokens);
+    const cacheReadTokens = coalesceNumber(usage.cache_read_input_tokens, usage.cacheReadInputTokens, usage.cache_read_tokens, usage.cached_tokens, usage.cachedTokens, usage.cachedInputTokens, usage.cached_input_tokens, usage.inputTokensDetails?.cached_tokens, usage.prompt_tokens_details?.cached_tokens, usage.promptTokensDetails?.cachedTokens, usage.cachedContentTokenCount, usage.cached_content_token_count, usage.cacheReadTokens);
+    const totalTokens = coalesceNumber(usage.total_tokens, usage.total_token_count, usage.totalTokenCount, usage.totalTokens) ??
+        sumNumbers(promptTokens, completionTokens, cacheCreationTokens);
     const reasoningTokens = coalesceNumber(usage.reasoning_tokens, usage.reasoning_token_count, usage?.completion_tokens_details?.reasoning_tokens, usage?.output_tokens_details?.reasoning_tokens, usage.thoughtsTokenCount, usage.thoughts_token_count, usage.reasoningTokens);
     const promptMs = coalesceNumber(usage.prompt_ms, usage.promptMs);
     const completionMs = coalesceNumber(usage.completion_ms, usage.completionMs, usage.predicted_ms, usage.predictedMs, usage.output_ms, usage.outputMs);
@@ -140,11 +139,11 @@ function sumDetailField(details, keys) {
     return found ? total : undefined;
 }
 /**
- * Normalize the Agents SDK run-level Usage accumulator (`runState.usage`) into
- * NormalizedUsage. This is the authoritative, already-cumulative usage for an
- * entire run (all model turns, including resumed approval continuations, since
- * the SDK keeps accumulating onto the same RunContext.usage). Cache and
- * reasoning details are exposed as per-request arrays, so they are summed here.
+ * Normalize the application run-level usage accumulator (`runState.usage`)
+ * into NormalizedUsage. This is the authoritative, already-cumulative usage
+ * for an entire run (all model turns, including resumed approval
+ * continuations). Cache and reasoning details are exposed as per-request
+ * arrays, so they are summed here.
  */
 export function normalizeAgentRunUsage(stateUsage) {
     const usage = asUsageContainer(stateUsage);
@@ -152,22 +151,32 @@ export function normalizeAgentRunUsage(stateUsage) {
         return undefined;
     const promptTokens = coalesceNumber(usage.inputTokens, usage.input_tokens);
     const completionTokens = coalesceNumber(usage.outputTokens, usage.output_tokens);
-    const totalTokens = coalesceNumber(usage.totalTokens, usage.total_tokens) ?? sumNumbers(promptTokens, completionTokens);
-    const cacheReadTokens = sumDetailField(usage.inputTokensDetails ?? usage.input_tokens_details, [
-        'cached_tokens',
-        'cachedTokens',
-        'cache_read_tokens',
-        'cacheReadTokens',
-    ]);
-    const cacheCreationTokens = sumDetailField(usage.inputTokensDetails ?? usage.input_tokens_details, [
-        'cache_creation_tokens',
-        'cacheCreationTokens',
-        'cache_creation_input_tokens',
-    ]);
+    // Application-owned run state stores these as cumulative scalar totals. Prefer
+    // them when present; detail arrays are the legacy SDK fallback and must not be
+    // added a second time when both representations coexist.
+    const cacheReadTokens = coalesceNumber(usage.cachedInputTokens, usage.cached_input_tokens, usage.cacheReadTokens) ??
+        sumDetailField(usage.inputTokensDetails ?? usage.input_tokens_details, [
+            'cached_tokens',
+            'cachedTokens',
+            'cache_read_tokens',
+            'cacheReadTokens',
+        ]);
+    const cacheCreationTokens = coalesceNumber(usage.cacheWriteTokens, usage.cache_write_tokens, usage.cacheCreationTokens) ??
+        sumDetailField(usage.inputTokensDetails ?? usage.input_tokens_details, [
+            'cache_creation_tokens',
+            'cacheCreationTokens',
+            'cache_creation_input_tokens',
+            'cache_write_tokens',
+            'cacheWriteTokens',
+        ]);
     const reasoningTokens = sumDetailField(usage.outputTokensDetails ?? usage.output_tokens_details, [
         'reasoning_tokens',
         'reasoningTokens',
     ]);
+    // Match normalizeUsage(): cache creation represents billable input and is
+    // included in the total whenever a provider did not supply a native total.
+    const totalTokens = coalesceNumber(usage.totalTokens, usage.total_tokens) ??
+        sumNumbers(promptTokens, completionTokens, cacheCreationTokens);
     const mapped = {};
     if (promptTokens != null)
         mapped.prompt_tokens = promptTokens;
@@ -206,9 +215,6 @@ export function formatFooterUsage(usage, options = {}) {
             const cachePrefix = options.cacheWarning ? '⚠️ ' : '';
             promptDetails.push(`${cachePrefix}${usage.cache_read_tokens.toLocaleString()} ${cacheLabel}`);
         }
-        if (usage.cache_creation_tokens != null) {
-            promptDetails.push(`${usage.cache_creation_tokens.toLocaleString()} cache write`);
-        }
         if (promptDetails.length > 0) {
             promptPart += ` (${promptDetails.join(', ')})`;
         }
@@ -221,6 +227,16 @@ export function formatFooterUsage(usage, options = {}) {
         return '';
     return `Tok: ${parts.join(' / ')}`;
 }
+function formatCompactTokens(tokens) {
+    return tokens >= 1_000_000 ? `${(tokens / 1_000_000).toFixed(1)}M` : `${Math.round(tokens / 1_000)}k`;
+}
+/**
+ * Compact context gauge, e.g. "100k/1.0M": tokens used in the current context
+ * (the last request's prompt tokens) over the model's context window.
+ */
+export function formatContextUsage(usedTokens, contextWindow) {
+    return `${formatCompactTokens(usedTokens)}/${formatCompactTokens(contextWindow)}`;
+}
 export function addTokenUsage(current, next) {
     const result = { ...(current ?? {}) };
     if (!next)
@@ -251,15 +267,12 @@ export function addBillableSessionTokenUsage(current, next) {
     });
 }
 export function createUsageAccumulator(initialUsage) {
-    let accumulated = addBillableSessionTokenUsage(undefined, initialUsage);
+    let accumulated = addTokenUsage(undefined, initialUsage);
     return {
-        add(usage, options) {
-            if (options?.alreadyBillable) {
-                accumulated = addTokenUsage(accumulated, usage);
-            }
-            else {
-                accumulated = addBillableSessionTokenUsage(accumulated, usage);
-            }
+        add(usage, _options) {
+            // Keep provider-reported input intact. Cached input is a subset of input,
+            // not a replacement for it, and is accumulated as a separate dimension.
+            accumulated = addTokenUsage(accumulated, usage);
         },
         reset() {
             accumulated = {};

package/dist/utils/ai/token-usage.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-usage.js","sourceRoot":"","sources":["../../../source/utils/ai/token-usage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token-usage.js","sourceRoot":"","sources":["../../../source/utils/ai/token-usage.ts"],"names":[],"mappings":"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"}

package/dist/utils/apply-diff.d.ts

@@ -0,0 +1,3 @@
+/** Application-owned headerless V4A diff implementation. */
+export declare function applyDiff(input: string, diff: string, mode?: 'default' | 'create'): string;
+//# sourceMappingURL=apply-diff.d.ts.map

package/dist/utils/apply-diff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-diff.d.ts","sourceRoot":"","sources":["../../source/utils/apply-diff.ts"],"names":[],"mappings":"AAAA,4DAA4D;AAC5D,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,SAAS,GAAG,QAAoB,GAAG,MAAM,CAIrG"}

package/dist/utils/apply-diff.js

@@ -0,0 +1,192 @@
+/** Application-owned headerless V4A diff implementation. */
+export function applyDiff(input, diff, mode = 'default') {
+    const lines = normalizeLines(diff);
+    if (mode === 'create')
+        return parseCreate(lines);
+    return applyChunks(input, parseUpdate(lines, input).chunks);
+}
+const END_PATCH = '*** End Patch';
+const END_FILE = '*** End of File';
+const SECTION_MARKERS = [END_PATCH, '*** Update File:', '*** Delete File:', '*** Add File:', END_FILE];
+const TERMINATORS = [END_PATCH, '*** Update File:', '*** Delete File:', '*** Add File:'];
+function normalizeLines(diff) {
+    return diff
+        .split(/\r?\n/)
+        .map((line) => line.replace(/\r$/, ''))
+        .filter((line, index, all) => !(index === all.length - 1 && line === ''));
+}
+function done(state, prefixes) {
+    return state.index >= state.lines.length || prefixes.some((prefix) => state.lines[state.index]?.startsWith(prefix));
+}
+function readPrefix(state, prefix) {
+    const line = state.lines[state.index];
+    if (line?.startsWith(prefix)) {
+        state.index += 1;
+        return line.slice(prefix.length);
+    }
+    return '';
+}
+function parseCreate(lines) {
+    const parser = { lines: [...lines, END_PATCH], index: 0, fuzz: 0 };
+    const output = [];
+    while (!done(parser, TERMINATORS)) {
+        const line = parser.lines[parser.index++];
+        if (!line.startsWith('+'))
+            throw new Error(`Invalid Add File Line: ${line}`);
+        output.push(line.slice(1));
+    }
+    return output.join('\n');
+}
+function parseUpdate(lines, input) {
+    const parser = { lines: [...lines, END_PATCH], index: 0, fuzz: 0 };
+    const inputLines = input.split('\n');
+    const chunks = [];
+    let cursor = 0;
+    while (!done(parser, SECTION_MARKERS)) {
+        const anchor = readPrefix(parser, '@@ ');
+        const bare = !anchor && parser.lines[parser.index] === '@@';
+        if (bare)
+            parser.index += 1;
+        if (!anchor && !bare && cursor !== 0)
+            throw new Error(`Invalid Line:\n${parser.lines[parser.index]}`);
+        if (anchor.trim())
+            cursor = seekAnchor(anchor, inputLines, cursor, parser);
+        const section = readSection(parser.lines, parser.index);
+        const match = findContext(inputLines, section.context, cursor, section.eof);
+        if (match.index === -1) {
+            throw new Error(`${section.eof ? 'Invalid EOF Context' : 'Invalid Context'} ${cursor}:\n${section.context.join('\n')}`);
+        }
+        parser.fuzz += match.fuzz;
+        for (const chunk of section.chunks)
+            chunks.push({ ...chunk, origIndex: chunk.origIndex + match.index });
+        cursor = match.index + section.context.length;
+        parser.index = section.endIndex;
+    }
+    return { chunks, fuzz: parser.fuzz };
+}
+function seekAnchor(anchor, lines, cursor, parser) {
+    let found = false;
+    if (!lines.slice(0, cursor).some((line) => line === anchor)) {
+        for (let index = cursor; index < lines.length; index += 1) {
+            if (lines[index] === anchor) {
+                cursor = index + 1;
+                found = true;
+                break;
+            }
+        }
+    }
+    if (!found && !lines.slice(0, cursor).some((line) => line.trim() === anchor.trim())) {
+        for (let index = cursor; index < lines.length; index += 1) {
+            if (lines[index].trim() === anchor.trim()) {
+                cursor = index + 1;
+                parser.fuzz += 1;
+                break;
+            }
+        }
+    }
+    return cursor;
+}
+function readSection(lines, startIndex) {
+    const context = [];
+    const chunks = [];
+    let deletes = [];
+    let inserts = [];
+    let mode = 'keep';
+    let index = startIndex;
+    const originalIndex = index;
+    while (index < lines.length) {
+        const raw = lines[index];
+        if (raw.startsWith('@@') ||
+            raw.startsWith(END_PATCH) ||
+            raw.startsWith('*** Update File:') ||
+            raw.startsWith('*** Delete File:') ||
+            raw.startsWith('*** Add File:') ||
+            raw.startsWith(END_FILE))
+            break;
+        if (raw === '***')
+            break;
+        if (raw.startsWith('***'))
+            throw new Error(`Invalid Line: ${raw}`);
+        index += 1;
+        const previous = mode;
+        let line = raw || ' ';
+        if (line[0] === '+')
+            mode = 'add';
+        else if (line[0] === '-')
+            mode = 'delete';
+        else if (line[0] === ' ')
+            mode = 'keep';
+        else
+            throw new Error(`Invalid Line: ${line}`);
+        line = line.slice(1);
+        if (mode === 'keep' && previous !== mode && (inserts.length || deletes.length)) {
+            chunks.push({ origIndex: context.length - deletes.length, delLines: deletes, insLines: inserts });
+            deletes = [];
+            inserts = [];
+        }
+        if (mode === 'delete') {
+            deletes.push(line);
+            context.push(line);
+        }
+        else if (mode === 'add')
+            inserts.push(line);
+        else
+            context.push(line);
+    }
+    if (inserts.length || deletes.length) {
+        chunks.push({ origIndex: context.length - deletes.length, delLines: deletes, insLines: inserts });
+    }
+    if (index < lines.length && lines[index] === END_FILE)
+        return { context, chunks, endIndex: index + 1, eof: true };
+    if (index === originalIndex)
+        throw new Error(`Nothing in this section - index=${index} ${lines[index]}`);
+    return { context, chunks, endIndex: index, eof: false };
+}
+function findContext(lines, context, start, eof) {
+    if (eof) {
+        const end = Math.max(0, lines.length - context.length);
+        const exactEnd = findContextCore(lines, context, end, (line) => line);
+        if (exactEnd.index !== -1)
+            return exactEnd;
+        const fallback = findContextCore(lines, context, start, (line) => line);
+        return { index: fallback.index, fuzz: fallback.fuzz + 10000 };
+    }
+    return findContextCore(lines, context, start, (line) => line);
+}
+function findContextCore(lines, context, start, map) {
+    if (!context.length)
+        return { index: start, fuzz: 0 };
+    for (let index = start; index < lines.length; index += 1)
+        if (equalsSlice(lines, context, index, map))
+            return { index, fuzz: 0 };
+    for (let index = start; index < lines.length; index += 1)
+        if (equalsSlice(lines, context, index, (line) => map(line).trimEnd()))
+            return { index, fuzz: 1 };
+    for (let index = start; index < lines.length; index += 1)
+        if (equalsSlice(lines, context, index, (line) => map(line).trim()))
+            return { index, fuzz: 100 };
+    return { index: -1, fuzz: 0 };
+}
+function equalsSlice(lines, context, start, map) {
+    if (start + context.length > lines.length)
+        return false;
+    return context.every((line, offset) => map(lines[start + offset]) === map(line));
+}
+function applyChunks(input, chunks) {
+    const original = input.split('\n');
+    const destination = [];
+    let cursor = 0;
+    for (const chunk of chunks) {
+        if (chunk.origIndex > original.length)
+            throw new Error(`applyDiff: chunk.origIndex ${chunk.origIndex} > input length ${original.length}`);
+        if (cursor > chunk.origIndex)
+            throw new Error(`applyDiff: overlapping chunk at ${chunk.origIndex} (cursor ${cursor})`);
+        destination.push(...original.slice(cursor, chunk.origIndex));
+        cursor = chunk.origIndex;
+        destination.push(...chunk.insLines);
+        cursor += chunk.delLines.length;
+    }
+    destination.push(...original.slice(cursor));
+    return destination.join('\n');
+}
+//# sourceMappingURL=apply-diff.js.map

package/dist/utils/apply-diff.js.map

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

package/dist/utils/conversation/conversation-event-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-event-handler.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/conversation-event-handler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,KAAK,EAEV,cAAc,EACd,OAAO,EAIR,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAyC,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAarG,MAAM,WAAW,4BAA4B;IAC3C,kBAAkB,EAAE;QAClB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,gBAAgB,EAAE;QAChB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,cAAc,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC9C,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,IAAI,CAAC;IAC/D,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,CAAC;IACjD,sBAAsB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,cAAc,CAAC;CACjE;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,4BAA4B,EAClC,KAAK,EAAE,cAAc,GACpB,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAgjBpC"}
+{"version":3,"file":"conversation-event-handler.d.ts","sourceRoot":"","sources":["../../../source/utils/conversation/conversation-event-handler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,KAAK,EAEV,cAAc,EACd,OAAO,EAIR,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAyC,KAAK,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAarG,MAAM,WAAW,4BAA4B;IAC3C,kBAAkB,EAAE;QAClB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,gBAAgB,EAAE;QAChB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAC7B,MAAM,EAAE,MAAM,IAAI,CAAC;QACnB,KAAK,EAAE,MAAM,IAAI,CAAC;KACnB,CAAC;IACF,cAAc,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAC9C,WAAW,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,IAAI,CAAC;IAC/D,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,OAAO,EAAE,CAAC;IACjD,sBAAsB,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,cAAc,CAAC;CACjE;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,4BAA4B,EAClC,KAAK,EAAE,cAAc,GACpB,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAinBpC"}

package/dist/utils/conversation/conversation-event-handler.js

@@ -27,13 +27,14 @@ export function createConversationEventHandler(deps, state) {
     const { botResponseUpdater, reasoningUpdater, appendMessages, setMessages, createMessageId, trimMessages, annotateCommandMessage, } = deps;
     const activeRunningToolCallIds = new Set();
     const pendingSubagentToolCalls = new Map();
-    // Only the synchronous delegation tool: its call is rendered by
-    // SubagentActivityMessage, so a CommandMessage would duplicate it. Background
-    // runs (run_subagent_async) route their lifecycle to the background sink and
-    // never produce a SubagentActivityMessage here, so their tool call must be
-    // rendered as an ordinary CommandMessage.
-    const isSubagentDelegationTool = (toolName) => {
-        return toolName === 'run_subagent';
+    const foregroundSubagentToolCallIds = new Set();
+    // Foreground delegation is rendered by SubagentActivityMessage, so its
+    // CommandMessage would duplicate the activity row. Background delegation is
+    // an ordinary command message; its lifecycle is independently routed using
+    // the event's `async` metadata.
+    const isForegroundSubagentDelegationTool = (toolName, args) => {
+        return (toolName === 'run_subagent' &&
+            (!args || typeof args !== 'object' || args.execution !== 'background'));
     };
     const markCurrentReasoningFinalized = () => {
         if (!state.currentReasoningMessageId) {
@@ -203,15 +204,16 @@ export function createConversationEventHandler(deps, state) {
             }
             case 'tool_started': {
                 const { toolCallId, toolName, arguments: rawArgs } = event;
-                if (isSubagentDelegationTool(toolName)) {
+                const args = parseToolArguments(rawArgs);
+                if (isForegroundSubagentDelegationTool(toolName, args)) {
                     // Flush reasoning state
                     flushReasoning();
                     // Flush any accumulated text before showing the tool call
                     flushBotText();
                     resetBotTextTracking();
                     botResponseUpdater.cancel();
-                    const args = parseToolArguments(rawArgs);
                     if (toolCallId) {
+                        foregroundSubagentToolCallIds.add(toolCallId);
                         pendingSubagentToolCalls.set(toolCallId, args);
                     }
                     return;
@@ -224,7 +226,6 @@ export function createConversationEventHandler(deps, state) {
                 botResponseUpdater.cancel();
                 // Emit a "pending" command message when tool starts running
                 // tool_started.arguments may be either an object or a JSON string
-                const args = parseToolArguments(rawArgs);
                 const command = formatToolCommand(toolName, args);
                 const pendingMessage = {
                     id: toolCallId ?? createMessageId(),
@@ -247,12 +248,14 @@ export function createConversationEventHandler(deps, state) {
             }
             case 'command_message': {
                 const cmdMsg = event.message;
-                if (cmdMsg.callId) {
-                    activeRunningToolCallIds.delete(cmdMsg.callId);
-                }
-                // run_subagent is displayed via SubagentActivityMessage; skip the
-                // command_message so we don't create a duplicate CommandMessage.
-                if (isSubagentDelegationTool(cmdMsg.toolName)) {
+                const hadPendingCommand = cmdMsg.callId !== undefined && activeRunningToolCallIds.delete(cmdMsg.callId);
+                const wasForegroundSubagent = cmdMsg.callId !== undefined && foregroundSubagentToolCallIds.delete(cmdMsg.callId);
+                // Foreground run_subagent is displayed via SubagentActivityMessage;
+                // skip its completion so we do not create a duplicate CommandMessage.
+                // Calls from legacy records without a preceding tool_started are also
+                // foreground unless their arguments explicitly choose background.
+                if (wasForegroundSubagent ||
+                    (!hadPendingCommand && isForegroundSubagentDelegationTool(cmdMsg.toolName, cmdMsg.toolArgs))) {
                     return;
                 }
                 const annotated = annotateCommandMessage(cmdMsg);
@@ -314,6 +317,7 @@ export function createConversationEventHandler(deps, state) {
                     agentId: event.agentId,
                     role: event.role,
                     task: event.task,
+                    ...(event.parentTool !== undefined ? { parentTool: event.parentTool } : {}),
                     async: event.async,
                     tools: [],
                 };
@@ -512,6 +516,58 @@ export function createConversationEventHandler(deps, state) {
                 // Codex rate limits are handled separately in streaming-session-factory.ts
                 // This case exists for exhaustiveness and to document the event flow
                 return;
+            // Server-side context compaction, rendered as a start notice that the completion
+            // replaces in place.
+            //
+            // A response carries more than one compaction item (measured on OpenAI: the streamed
+            // order is `[compaction, message, compaction]`), so `started` fires more than once per
+            // turn. Only the last item becomes history, so a second `started` supersedes the first
+            // rather than stacking — otherwise one compaction would print several notices.
+            case 'context_compaction_started': {
+                const previousId = state.contextCompactionMessageId;
+                const systemMessage = {
+                    id: createMessageId(),
+                    sender: 'system',
+                    text: 'Compacting context...',
+                };
+                state.contextCompactionMessageId = systemMessage.id;
+                setMessages((prev) => [...prev.filter((message) => message.id !== previousId), systemMessage]);
+                return;
+            }
+            case 'context_compaction_completed': {
+                // `inputTokensBefore` is the pre-compaction prompt size: the provider reports the
+                // compaction pass's own input tokens, not the compacted result. There is no
+                // "after" number to pair it with, so the line states only what was compacted from.
+                const previousId = state.contextCompactionMessageId;
+                const before = event.inputTokensBefore;
+                const seconds = event.durationMs > 0 ? ` (${(event.durationMs / 1000).toFixed(1)}s)` : '';
+                const text = before === undefined
+                    ? `Compacted context${seconds}.`
+                    : `Compacted from ${before.toLocaleString('en-US')} tokens${seconds}.`;
+                const systemMessage = { id: createMessageId(), sender: 'system', text };
+                state.contextCompactionMessageId = null;
+                setMessages((prev) => {
+                    const index = prev.findIndex((message) => message.id === previousId);
+                    if (index === -1)
+                        return [...prev, systemMessage];
+                    const next = prev.slice();
+                    next[index] = systemMessage;
+                    return next;
+                });
+                return;
+            }
+            case 'context_compaction_failed': {
+                // `durationMs` is hardcoded 0 at both catch sites, so only the category is shown.
+                const previousId = state.contextCompactionMessageId;
+                const systemMessage = {
+                    id: createMessageId(),
+                    sender: 'system',
+                    text: `Context compaction failed (${event.errorCategory}). The turn continues with the full context.`,
+                };
+                state.contextCompactionMessageId = null;
+                setMessages((prev) => [...prev.filter((message) => message.id !== previousId), systemMessage]);
+                return;
+            }
             default:
                 // Ignore unknown events (approval_required, error handled elsewhere)
                 return;