sidekick-shared 0.29.0 → 0.30.0

package/dist/esm/parsers/codexParser.js

@@ -14,6 +14,7 @@
 import { isAggregateCodexLimit } from '../types/codex';
 import { normalizeToolName } from './openCodeParser';
 import { normalizeProviderUsage } from '../usageNormalization';
+import { SUBAGENT_ACTIVITY_BLOCK_TYPE, SUBAGENT_ACTIVITY_ORIGIN_KIND, parseCodexAgentMessageText, } from '../subagentActivity';
 function reportedCompaction(tokensBefore, tokensAfter) {
     if (typeof tokensBefore !== 'number' ||
         typeof tokensAfter !== 'number' ||
@@ -171,6 +172,84 @@ export function extractPatchFilePaths(input) {
 }
 /** Default cap on each piece of per-call correlation state the parser keeps. */
 export const DEFAULT_MAX_TRACKED_TOOL_CALLS = 4096;
+/** Entries per table {@link CodexRolloutParser.exportResumeState} keeps by default. */
+const DEFAULT_RESUME_STATE_LIMIT = 256;
+/** Raw names of Codex's multi-agent tools (namespace `collaboration`). */
+const COLLABORATION_TOOL_NAMES = new Set([
+    'spawn_agent',
+    'followup_task',
+    'send_message',
+    'interrupt_agent',
+    'wait_agent',
+    'list_agents',
+]);
+const SUBAGENT_ACTIVITY_KINDS = new Set([
+    'started',
+    'completed',
+    'interacted',
+    'interrupted',
+]);
+function nonEmptyString(value) {
+    return typeof value === 'string' && value.length > 0 ? value : undefined;
+}
+/** `subagent_history_start_ordinal` of a session_meta payload, when valid. */
+function historyStartOrdinalOf(meta) {
+    const value = meta?.subagent_history_start_ordinal;
+    return typeof value === 'number' && Number.isInteger(value) && value > 0 ? value : null;
+}
+function isPlainObject(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function cloneJson(value) {
+    return JSON.parse(JSON.stringify(value));
+}
+function isOptionalString(value) {
+    return value === undefined || typeof value === 'string';
+}
+function isStringArray(value) {
+    return Array.isArray(value) && value.every((item) => typeof item === 'string');
+}
+function isTokenCount(value) {
+    return typeof value === 'number' && Number.isFinite(value) && value >= 0;
+}
+/** A valid `CodexTokenUsage` (copied), `null` for `null`, or `undefined` when invalid. Internal. */
+export function codexTokenUsageFrom(value) {
+    if (value === null)
+        return null;
+    if (!isPlainObject(value))
+        return undefined;
+    if (!isTokenCount(value.input_tokens) || !isTokenCount(value.output_tokens))
+        return undefined;
+    const usage = {
+        input_tokens: value.input_tokens,
+        output_tokens: value.output_tokens,
+    };
+    for (const field of ['cached_input_tokens', 'reasoning_output_tokens', 'total_tokens']) {
+        const count = value[field];
+        if (count === undefined)
+            continue;
+        if (!isTokenCount(count))
+            return undefined;
+        usage[field] = count;
+    }
+    return usage;
+}
+/** Last `limit` items of an insertion-ordered collection, oldest first. */
+function newest(items, size, limit) {
+    const count = limit >= 0 ? Math.min(size, Math.floor(limit)) : 0;
+    const kept = [];
+    let skip = size - count;
+    for (const item of items) {
+        if (kept.length >= count)
+            break;
+        if (skip > 0) {
+            skip -= 1;
+            continue;
+        }
+        kept.push(item);
+    }
+    return kept;
+}
 /** Fixed per-entry cost added to each pending call's byte estimate. */
 const PENDING_ENTRY_OVERHEAD_BYTES = 64;
 /** Prefix of the bookkeeping keys the parser stashes inside tool inputs. */
@@ -235,6 +314,15 @@ export class CodexRolloutParser {
     /** Byte budget for pending calls; `null` = unlimited (no accounting). */
     maxPendingBytes;
     metadataOnly;
+    includeSubagentActivity;
+    /**
+     * Set once a forked child's rollout embeds an ancestor's session_meta: its
+     * own `subagent_history_start_ordinal`, below which records are the
+     * parent's history and are skipped. `null` while nothing is skipped.
+     */
+    historyStartOrdinal = null;
+    /** Multi-agent tool calls (call id → raw name), only with `includeSubagentActivity`. */
+    collaborationCalls = new Map();
     /** Pending calls in insertion order, for the byte budget. */
     pendingLedger = new Map();
     pendingBytes = 0;
@@ -250,6 +338,7 @@ export class CodexRolloutParser {
                 ? Math.floor(maxBytes)
                 : null;
         this.metadataOnly = options.metadataOnly === true;
+        this.includeSubagentActivity = options.includeSubagentActivity === true;
     }
     /** Counters for the pending tool-call state and what the caps evicted. */
     getPendingStats() {
@@ -282,13 +371,172 @@ export class CodexRolloutParser {
     getLastRateLimits() {
         return this.lastRateLimits;
     }
+    /**
+     * In a forked subagent's rollout, the ordinal of its first own record:
+     * records with a lower `ordinal` are the parent history the fork embeds
+     * and produce no events. Known once the rollout's second line (an embedded
+     * ancestor `session_meta`) was parsed; `null` otherwise, and for every
+     * rollout that is not such a fork.
+     */
+    getInheritedHistoryEnd() {
+        return this.historyStartOrdinal;
+    }
+    /**
+     * The state later lines depend on — session metadata, current model,
+     * previous cumulative token total, context window, rate limits, plan mode,
+     * and the tool-call correlation tables (newest `limit` entries each) — as
+     * JSON-serializable data. Eviction counters are not included.
+     */
+    exportResumeState(limit = DEFAULT_RESUME_STATE_LIMIT) {
+        return cloneJson({
+            version: 1,
+            sessionMeta: this.sessionMeta,
+            currentModel: this.currentModel,
+            prevTotalUsage: this.prevTotalUsage,
+            lastTokenUsage: this.lastTokenUsage,
+            modelContextWindow: this.modelContextWindow,
+            lastRateLimits: this.lastRateLimits,
+            hasAggregateRateLimits: this.hasAggregateRateLimits,
+            inPlanMode: this.inPlanMode,
+            emittedToolUseIds: newest(this.emittedToolUseIds, this.emittedToolUseIds.size, limit),
+            patchExpandedToolUseIds: newest(this.patchExpandedToolUseIds, this.patchExpandedToolUseIds.size, limit),
+            pendingExecCommands: newest(this.pendingExecCommands.values(), this.pendingExecCommands.size, limit),
+            pendingMcpToolCalls: newest(this.pendingMcpToolCalls.values(), this.pendingMcpToolCalls.size, limit),
+            ...(this.historyStartOrdinal !== null
+                ? { inheritedHistoryEnd: this.historyStartOrdinal }
+                : {}),
+            ...(this.collaborationCalls.size > 0
+                ? {
+                    collaborationCalls: newest(this.collaborationCalls, this.collaborationCalls.size, limit),
+                }
+                : {}),
+        });
+    }
+    /**
+     * Replaces this parser's state with one from {@link exportResumeState}, as
+     * if it had parsed the rollout up to where that state was taken. Returns
+     * false, changing nothing, when `state` is not a valid version-1 state.
+     * This parser's own `maxTrackedToolCalls`, `maxPendingBytes`, and
+     * `metadataOnly` options apply to the imported tables.
+     */
+    importResumeState(state) {
+        if (!isPlainObject(state) || state.version !== 1)
+            return false;
+        const s = state;
+        const prevTotalUsage = codexTokenUsageFrom(s.prevTotalUsage);
+        const lastTokenUsage = codexTokenUsageFrom(s.lastTokenUsage);
+        if (prevTotalUsage === undefined || lastTokenUsage === undefined)
+            return false;
+        if (s.sessionMeta !== null && !isPlainObject(s.sessionMeta))
+            return false;
+        if (s.lastRateLimits !== null && !isPlainObject(s.lastRateLimits))
+            return false;
+        if (s.currentModel !== null && typeof s.currentModel !== 'string')
+            return false;
+        const contextWindow = s.modelContextWindow;
+        if (contextWindow !== null &&
+            !(typeof contextWindow === 'number' && Number.isFinite(contextWindow) && contextWindow > 0)) {
+            return false;
+        }
+        if (typeof s.hasAggregateRateLimits !== 'boolean' || typeof s.inPlanMode !== 'boolean') {
+            return false;
+        }
+        if (!isStringArray(s.emittedToolUseIds))
+            return false;
+        const patches = s.patchExpandedToolUseIds;
+        if (!Array.isArray(patches) ||
+            !patches.every((entry) => Array.isArray(entry) &&
+                entry.length === 2 &&
+                typeof entry[0] === 'string' &&
+                isStringArray(entry[1]))) {
+            return false;
+        }
+        const execs = s.pendingExecCommands;
+        if (!Array.isArray(execs) ||
+            !execs.every((entry) => isPlainObject(entry) &&
+                typeof entry.call_id === 'string' &&
+                isStringArray(entry.command) &&
+                isOptionalString(entry.workdir) &&
+                typeof entry.timestamp === 'string')) {
+            return false;
+        }
+        const mcps = s.pendingMcpToolCalls;
+        if (!Array.isArray(mcps) ||
+            !mcps.every((entry) => isPlainObject(entry) &&
+                typeof entry.call_id === 'string' &&
+                typeof entry.tool_name === 'string' &&
+                isOptionalString(entry.server_name) &&
+                (entry.arguments === undefined || isPlainObject(entry.arguments)) &&
+                typeof entry.timestamp === 'string')) {
+            return false;
+        }
+        const inheritedEnd = s.inheritedHistoryEnd;
+        if (inheritedEnd !== undefined &&
+            inheritedEnd !== null &&
+            !(typeof inheritedEnd === 'number' && Number.isInteger(inheritedEnd) && inheritedEnd > 0)) {
+            return false;
+        }
+        const collaborationCalls = s.collaborationCalls;
+        if (collaborationCalls !== undefined &&
+            !(Array.isArray(collaborationCalls) &&
+                collaborationCalls.every((entry) => Array.isArray(entry) &&
+                    entry.length === 2 &&
+                    typeof entry[0] === 'string' &&
+                    typeof entry[1] === 'string'))) {
+            return false;
+        }
+        const copy = cloneJson({
+            sessionMeta: s.sessionMeta,
+            lastRateLimits: s.lastRateLimits,
+            patches: patches,
+            execs: execs,
+            mcps: mcps,
+        });
+        this.reset();
+        this.sessionMeta = copy.sessionMeta;
+        this.historyStartOrdinal = typeof inheritedEnd === 'number' ? inheritedEnd : null;
+        this.currentModel = s.currentModel;
+        this.prevTotalUsage = prevTotalUsage;
+        this.lastTokenUsage = lastTokenUsage;
+        this.modelContextWindow = contextWindow;
+        this.lastRateLimits = copy.lastRateLimits;
+        this.hasAggregateRateLimits = s.hasAggregateRateLimits;
+        this.inPlanMode = s.inPlanMode;
+        for (const id of s.emittedToolUseIds) {
+            rememberBounded(this.emittedToolUseIds, id, this.maxTrackedToolCalls);
+        }
+        for (const [callId, toolUseIds] of copy.patches)
+            this.putPendingPatch(callId, toolUseIds);
+        for (const pending of copy.execs) {
+            this.putPendingExec(this.metadataOnly
+                ? { call_id: pending.call_id, command: [], timestamp: pending.timestamp }
+                : pending);
+        }
+        for (const pending of copy.mcps) {
+            this.putPendingMcp(this.metadataOnly ? { ...pending, arguments: undefined } : pending);
+        }
+        if (this.includeSubagentActivity && Array.isArray(collaborationCalls)) {
+            for (const [callId, name] of collaborationCalls) {
+                this.rememberCollaborationCall(callId, name);
+            }
+        }
+        return true;
+    }
     /**
      * Converts a single rollout line to zero or more session events.
      */
     convertLine(line) {
+        if (line.type === 'session_meta') {
+            return this.handleSessionMeta(line.timestamp, line.payload, line.ordinal);
+        }
+        // A forked subagent rollout embeds the parent's history before its own
+        // records; that history is the parent's, not the child's.
+        if (this.historyStartOrdinal !== null &&
+            typeof line.ordinal === 'number' &&
+            line.ordinal < this.historyStartOrdinal) {
+            return [];
+        }
         switch (line.type) {
-            case 'session_meta':
-                return this.handleSessionMeta(line.timestamp, line.payload);
             case 'response_item':
                 return this.handleResponseItem(line.timestamp, line.payload);
             case 'compacted':
@@ -304,6 +552,8 @@ export class CodexRolloutParser {
     /** Reset all parser state. */
     reset() {
         this.sessionMeta = null;
+        this.historyStartOrdinal = null;
+        this.collaborationCalls.clear();
         this.currentModel = null;
         this.pendingExecCommands.clear();
         this.pendingMcpToolCalls.clear();
@@ -353,6 +603,16 @@ export class CodexRolloutParser {
             this.evictedByBytes += 1;
         }
     }
+    putPendingExec(pending) {
+        this.putPending(this.pendingExecCommands, pending.call_id, pending, () => stringBytes(pending.call_id, pending.workdir, pending.timestamp, ...(Array.isArray(pending.command) ? pending.command : [])));
+    }
+    putPendingMcp(pending) {
+        this.putPending(this.pendingMcpToolCalls, pending.call_id, pending, () => stringBytes(pending.call_id, pending.server_name, pending.tool_name, pending.timestamp) +
+            approxJsonBytes(pending.arguments));
+    }
+    putPendingPatch(callId, toolUseIds) {
+        this.putPending(this.patchExpandedToolUseIds, callId, toolUseIds, () => stringBytes(callId, ...toolUseIds));
+    }
     /** Removes and returns a pending call. */
     takePending(table, callId) {
         const value = table.get(callId);
@@ -383,7 +643,25 @@ export class CodexRolloutParser {
         return this.metadataOnly ? '' : content;
     }
     // --- Handlers ---
-    handleSessionMeta(timestamp, payload) {
+    handleSessionMeta(timestamp, payload, ordinal) {
+        if (this.sessionMeta) {
+            // Only the rollout's own (first) session_meta counts. A forked child
+            // embeds its parent's right after its own, followed by the parent's
+            // history up to the child's `subagent_history_start_ordinal`; from
+            // here on, records below that ordinal are skipped. (Children whose
+            // rollout has no embedded meta keep every record: in some, Codex
+            // recorded a start ordinal past their own records.)
+            const start = historyStartOrdinalOf(this.sessionMeta);
+            if (this.historyStartOrdinal === null &&
+                start !== null &&
+                typeof ordinal === 'number' &&
+                ordinal < start) {
+                this.historyStartOrdinal = start;
+            }
+            return [];
+        }
+        if (!payload || typeof payload !== 'object')
+            return [];
         this.sessionMeta = payload;
         const text = payload.base_instructions?.text?.trim();
         return [
@@ -423,10 +701,91 @@ export class CodexRolloutParser {
                 return this.handleCustomToolCall(timestamp, payload);
             case 'custom_tool_call_output':
                 return this.handleCustomToolCallOutput(timestamp, payload);
+            case 'agent_message':
+                return this.handleAgentMessage(timestamp, payload);
             default:
                 return [];
         }
     }
+    // --- Subagent activity ---
+    rememberCollaborationCall(callId, name) {
+        this.collaborationCalls.delete(callId);
+        this.collaborationCalls.set(callId, name);
+        while (this.collaborationCalls.size > this.maxTrackedToolCalls) {
+            this.collaborationCalls.delete(this.collaborationCalls.keys().next().value);
+        }
+    }
+    subagentActivityEvent(timestamp, id, activity) {
+        return {
+            type: 'system',
+            timestamp,
+            origin: { kind: SUBAGENT_ACTIVITY_ORIGIN_KIND },
+            message: {
+                role: 'system',
+                id: `subagent-activity:${id}`,
+                sourceLabel: 'subagent activity',
+                content: [{ type: SUBAGENT_ACTIVITY_BLOCK_TYPE, ...activity }],
+            },
+            providerMetadata: { providerId: 'codex', source: 'codex-rollout' },
+        };
+    }
+    /** A child's `FINAL_ANSWER` message to its parent (opt-in). */
+    handleAgentMessage(timestamp, item) {
+        if (!this.includeSubagentActivity || !Array.isArray(item.content))
+            return [];
+        const first = item.content.find((part) => !!part && typeof part === 'object' && typeof part.text === 'string');
+        const parsed = parseCodexAgentMessageText(first?.text);
+        if (!parsed || parsed.messageType !== 'FINAL_ANSWER')
+            return [];
+        const agentPath = nonEmptyString(item.author) ?? parsed.sender;
+        const recipient = nonEmptyString(item.recipient) ?? parsed.taskName;
+        const text = this.metadataOnly ? undefined : nonEmptyString(parsed.payload.trim());
+        const activity = {
+            kind: 'final-answer',
+            ...(agentPath ? { agentPath } : {}),
+            ...(recipient ? { recipient } : {}),
+            ...(text ? { text } : {}),
+        };
+        return [
+            this.subagentActivityEvent(timestamp, nonEmptyString(item.id) ?? `final-answer-${timestamp}-${agentPath ?? ''}`, activity),
+        ];
+    }
+    /** A `SubAgentActivity` turn item (opt-in). */
+    handleItemCompleted(timestamp, event) {
+        if (!this.includeSubagentActivity)
+            return [];
+        const item = event.item;
+        if (!item || item.type !== 'SubAgentActivity')
+            return [];
+        const kind = typeof item.kind === 'string' ? item.kind : '';
+        if (!SUBAGENT_ACTIVITY_KINDS.has(kind))
+            return [];
+        const itemId = nonEmptyString(item.id);
+        const completedTurn = kind === 'completed' && itemId?.startsWith('subagent-completed-')
+            ? nonEmptyString(itemId.slice('subagent-completed-'.length))
+            : undefined;
+        const callId = kind === 'completed' ? undefined : itemId;
+        const tool = callId ? this.collaborationCalls.get(callId) : undefined;
+        const fields = {
+            callId,
+            tool,
+            turnId: completedTurn,
+            agentThreadId: nonEmptyString(item.agent_thread_id),
+            agentPath: nonEmptyString(item.agent_path),
+            model: nonEmptyString(item.model),
+            reasoningEffort: nonEmptyString(item.reasoning_effort),
+            parentThreadId: nonEmptyString(event.thread_id),
+            parentTurnId: nonEmptyString(event.turn_id),
+        };
+        const activity = { kind: kind };
+        for (const [key, value] of Object.entries(fields)) {
+            if (value !== undefined)
+                activity[key] = value;
+        }
+        return [
+            this.subagentActivityEvent(timestamp, itemId ?? `${kind}-${timestamp}-${activity.agentThreadId ?? ''}`, activity),
+        ];
+    }
     handleMessage(timestamp, item) {
         const text = extractTextFromContent(item.content);
         if (!text)
@@ -508,6 +867,11 @@ export class CodexRolloutParser {
         const canonicalName = normalizeCodexToolName(item.name);
         const normalizedInput = normalizeCodexToolInput(canonicalName, item.name, parsedArgs);
         rememberBounded(this.emittedToolUseIds, item.call_id, this.maxTrackedToolCalls);
+        if (this.includeSubagentActivity &&
+            typeof item.call_id === 'string' &&
+            (item.namespace === 'collaboration' || COLLABORATION_TOOL_NAMES.has(item.name))) {
+            this.rememberCollaborationCall(item.call_id, item.name);
+        }
         return [
             {
                 type: 'assistant',
@@ -582,7 +946,7 @@ export class CodexRolloutParser {
             if (filePaths.length === 0)
                 return [];
             const toolUseIds = filePaths.map((fp) => `${item.call_id}-${fp}`);
-            this.putPending(this.patchExpandedToolUseIds, item.call_id, toolUseIds, () => stringBytes(item.call_id, ...toolUseIds));
+            this.putPendingPatch(item.call_id, toolUseIds);
             for (const id of toolUseIds) {
                 rememberBounded(this.emittedToolUseIds, id, this.maxTrackedToolCalls);
             }
@@ -732,7 +1096,7 @@ export class CodexRolloutParser {
                 const pending = this.metadataOnly
                     ? { call_id: e.call_id, command: [], timestamp }
                     : { call_id: e.call_id, command: e.command, workdir: e.workdir, timestamp };
-                this.putPending(this.pendingExecCommands, e.call_id, pending, () => stringBytes(pending.call_id, pending.workdir, pending.timestamp, ...(Array.isArray(pending.command) ? pending.command : [])));
+                this.putPendingExec(pending);
                 return [];
             }
             case 'exec_command_end': {
@@ -795,8 +1159,7 @@ export class CodexRolloutParser {
                     arguments: this.metadataOnly ? undefined : e.arguments,
                     timestamp,
                 };
-                this.putPending(this.pendingMcpToolCalls, e.call_id, pending, () => stringBytes(pending.call_id, pending.server_name, pending.tool_name, timestamp) +
-                    approxJsonBytes(pending.arguments));
+                this.putPendingMcp(pending);
                 return [];
             }
             case 'mcp_tool_call_end': {
@@ -965,6 +1328,8 @@ export class CodexRolloutParser {
                         timestamp,
                     },
                 ];
+            case 'item_completed':
+                return this.handleItemCompleted(timestamp, event);
             case 'turn_aborted':
             case 'agent_reasoning':
             case 'agent_message':

package/dist/esm/parsers/openCodeParser.js

@@ -11,6 +11,7 @@
  * @module parsers/openCodeParser
  */
 import { normalizeProviderUsage } from '../usageNormalization';
+import { ownValue } from '../ownKey';
 /**
  * OpenCode → Claude Code tool name mapping.
  * OpenCode uses lowercase names; downstream code expects PascalCase.
@@ -46,7 +47,7 @@ export function normalizeToolName(name) {
     if (!name)
         return name;
     // Check mapping (case-insensitive lookup via lowercase key)
-    const mapped = TOOL_NAME_MAP[name.toLowerCase()];
+    const mapped = ownValue(TOOL_NAME_MAP, name.toLowerCase());
     if (mapped)
         return mapped;
     // Already PascalCase (starts with uppercase)? Pass through.

package/dist/esm/parsers/subagentEndState.js

@@ -0,0 +1,61 @@
+/**
+ * Whether a Claude Code subagent transcript ended cleanly, read line by line.
+ *
+ * Clean means: the last user or assistant line is an assistant line that
+ * stopped with `end_turn` or `stop_sequence`, and every `tool_use` in the
+ * transcript has its `tool_result`. A user line after that (a resumed agent's
+ * new prompt) makes it unfinished again.
+ *
+ * Pure. Internal to the subagent parsers.
+ *
+ * @module parsers/subagentEndState
+ */
+const ENDED_STOP_REASONS = new Set(['end_turn', 'stop_sequence']);
+/** Bounds the unanswered-call set for pathological transcripts. */
+const MAX_PENDING_TOOL_USES = 4096;
+export class SubagentEndTracker {
+    unanswered = new Set();
+    lastWasCleanAssistant = false;
+    /** Feeds one parsed JSONL line, in file order. */
+    observe(raw) {
+        if (!raw || typeof raw !== 'object')
+            return;
+        const line = raw;
+        if (line.type !== 'assistant' && line.type !== 'user')
+            return;
+        const message = line.message && typeof line.message === 'object'
+            ? line.message
+            : undefined;
+        const content = Array.isArray(message?.content) ? message.content : [];
+        if (line.type === 'user') {
+            for (const block of content) {
+                if (!block || typeof block !== 'object')
+                    continue;
+                const typed = block;
+                if (typed.type === 'tool_result' && typeof typed.tool_use_id === 'string') {
+                    this.unanswered.delete(typed.tool_use_id);
+                }
+            }
+            this.lastWasCleanAssistant = false;
+            return;
+        }
+        let callsTool = false;
+        for (const block of content) {
+            if (!block || typeof block !== 'object')
+                continue;
+            const typed = block;
+            if (typed.type !== 'tool_use')
+                continue;
+            callsTool = true;
+            if (typeof typed.id === 'string' && this.unanswered.size < MAX_PENDING_TOOL_USES) {
+                this.unanswered.add(typed.id);
+            }
+        }
+        const stop = typeof message?.stop_reason === 'string' ? message.stop_reason : '';
+        this.lastWasCleanAssistant = !callsTool && ENDED_STOP_REASONS.has(stop);
+    }
+    /** Whether the lines so far end cleanly. */
+    endedCleanly() {
+        return this.lastWasCleanAssistant && this.unanswered.size === 0;
+    }
+}

package/dist/esm/parsers/subagentScanner.js

@@ -12,28 +12,50 @@ import * as path from 'path';
 import { ClaudeUsageDeduper, dedupedRawClaudeUsage } from '../usage/claudeUsageDedupe';
 import { addUsageToSubagent } from '../usage/subagentUsage';
 import { cachedSubagentStats } from './subagentStatsCache';
+import { isSubagentSpawnTool } from '../subagentSpawn';
+import { SubagentEndTracker } from './subagentEndState';
 /**
  * Pattern for matching subagent JSONL files.
  * Files are named like: agent-<hash>.jsonl
  */
 const AGENT_FILE_PATTERN = /^agent-(.+)\.jsonl$/;
+function metaString(value) {
+    return typeof value === 'string' && value ? value : undefined;
+}
 /**
  * Reads `agent-<id>.meta.json` (written by Claude Code next to the transcript)
- * for the spawn's agent type and description. Missing or malformed files
- * yield an empty object.
+ * for the spawn's agent type, description, spawning tool_use id, parent agent,
+ * and completion flags. Missing or malformed files yield an empty object;
+ * wrongly typed fields are left out.
  */
 export function readAgentMeta(agentFilePath) {
     try {
         const metaPath = agentFilePath.replace(/\.jsonl$/, '.meta.json');
         const parsed = JSON.parse(fs.readFileSync(metaPath, 'utf-8'));
-        return {
-            ...(typeof parsed.agentType === 'string' && parsed.agentType
-                ? { agentType: parsed.agentType }
-                : {}),
-            ...(typeof parsed.description === 'string' && parsed.description
-                ? { description: parsed.description }
-                : {}),
-        };
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+            return {};
+        const record = parsed;
+        const meta = {};
+        const agentType = metaString(record.agentType);
+        if (agentType)
+            meta.agentType = agentType;
+        const description = metaString(record.description);
+        if (description)
+            meta.description = description;
+        const toolUseId = metaString(record.toolUseId);
+        if (toolUseId)
+            meta.toolUseId = toolUseId;
+        const parentAgentId = metaString(record.parentAgentId);
+        if (parentAgentId)
+            meta.parentAgentId = parentAgentId;
+        const requestShape = metaString(record.requestShape);
+        if (requestShape)
+            meta.requestShape = requestShape;
+        if (typeof record.finished === 'boolean')
+            meta.finished = record.finished;
+        if (typeof record.stoppedByUser === 'boolean')
+            meta.stoppedByUser = record.stoppedByUser;
+        return meta;
     }
     catch {
         return {};
@@ -139,6 +161,7 @@ function parseAgentFile(filePath, agentId, log) {
         let description;
         const tokens = { agentId, toolCalls: [], inputTokens: 0, outputTokens: 0 };
         const usageDeduper = new ClaudeUsageDeduper();
+        const endTracker = new SubagentEndTracker();
         let startTime;
         let endTime;
         // Task tracking state
@@ -155,6 +178,7 @@ function parseAgentFile(filePath, agentId, log) {
                 if (!startTime)
                     startTime = eventTimestamp;
                 endTime = eventTimestamp;
+                endTracker.observe(event);
                 // Extract token usage from assistant messages. Split lines of one
                 // response repeat its usage, so count each response once.
                 const usage = dedupedRawClaudeUsage(event, usageDeduper);
@@ -208,8 +232,8 @@ function parseAgentFile(filePath, agentId, log) {
                                 }
                             }
                             toolCalls.push(toolCall);
-                            // If this is a Task tool call (spawning another subagent), extract info
-                            if (toolUse.name === 'Task' && toolUse.input) {
+                            // If this is an Agent/Task call (spawning another subagent), extract info
+                            if (isSubagentSpawnTool(toolUse.name) && toolUse.input) {
                                 if (toolUse.input.subagent_type && !agentType) {
                                     agentType = String(toolUse.input.subagent_type);
                                 }
@@ -277,6 +301,7 @@ function parseAgentFile(filePath, agentId, log) {
                 startTime,
                 endTime,
                 durationMs,
+                endedCleanly: endTracker.endedCleanly(),
             };
         }
         return null;