sidekick-shared 0.29.0 → 0.29.1

package/dist/aggregation/EventAggregator.js

@@ -22,6 +22,7 @@ const HeatmapTracker_1 = require("./HeatmapTracker");
 const PatternExtractor_1 = require("./PatternExtractor");
 const errorTaxonomy_1 = require("../extractors/errorTaxonomy");
 const tokenEstimation_1 = require("../tokenEstimation");
+const subagentSpawn_1 = require("../subagentSpawn");
 const usageNormalization_1 = require("../usageNormalization");
 // ── Defaults ──
 const DEFAULT_TIMELINE_CAP = 200;
@@ -34,6 +35,22 @@ const COMPACTION_DROP_THRESHOLD = 0.8; // >20% drop
 exports.SNAPSHOT_SCHEMA_VERSION = 6;
 // ── Goal gate detection regex ──
 const GOAL_GATE_REGEX = /\b(CRITICAL|MUST|blocker|required|must.?complete|goal.?gate|essential|do.?not.?skip|blocking)\b/i;
+// ── Task notifications delivered as attachments ──
+/**
+ * The notification a `system` FollowEvent carries when it stands for a
+ * mid-turn task-notification attachment (its `raw` is the attachment line or
+ * the SessionEvent `extractSessionEvents` made from it).
+ */
+function taskNotificationFromAttachmentFollowEvent(event) {
+    const raw = event.raw;
+    if (!raw || typeof raw !== 'object')
+        return null;
+    const prompt = (0, subagentSpawn_1.taskNotificationPromptFromAttachment)(raw);
+    if (prompt !== null)
+        return (0, subagentSpawn_1.parseTaskNotification)(prompt);
+    const asEvent = raw;
+    return (0, subagentSpawn_1.isTaskNotificationSystemEvent)(asEvent) ? (0, subagentSpawn_1.taskNotificationFromEvent)(asEvent) : null;
+}
 // ── Todo dependency parsing ──
 /**
  * Parses dependency references from a todo item's content text.
@@ -172,6 +189,17 @@ class EventAggregator {
     // processEvent — main entry for SessionEvent
     // ═══════════════════════════════════════════════════════════════════════
     processEvent(event) {
+        // Opt-in mid-turn task notifications (`extractSessionEvents` with
+        // `includeTaskNotifications`) only finish background subagents and mark
+        // the timeline: they are not messages, prompts, context, or activity.
+        if ((0, subagentSpawn_1.isTaskNotificationSystemEvent)(event)) {
+            const notification = (0, subagentSpawn_1.taskNotificationFromEvent)(event);
+            if (notification) {
+                this.applyTaskNotification(notification, event.timestamp);
+                this.addTaskNotificationTimeline(event.timestamp, notification);
+            }
+            return;
+        }
         // 1. Increment counters, capture timestamps
         this.eventCount++;
         if (!this.sessionStartTime) {
@@ -237,6 +265,15 @@ class EventAggregator {
     // processFollowEvent — adapter for CLI FollowEvent format
     // ═══════════════════════════════════════════════════════════════════════
     processFollowEvent(event) {
+        // A mid-turn task-notification attachment, like its SessionEvent form above.
+        if (event.type === 'system') {
+            const notification = taskNotificationFromAttachmentFollowEvent(event);
+            if (notification) {
+                this.applyTaskNotification(notification, event.timestamp);
+                this.addTaskNotificationTimeline(event.timestamp, notification);
+                return;
+            }
+        }
         // 1. Increment counters, capture timestamps
         this.eventCount++;
         if (!this.sessionStartTime) {
@@ -630,6 +667,14 @@ class EventAggregator {
         this.pendingToolCalls.clear();
         this.pendingTaskCreates.clear();
         this.pendingSubagents.clear();
+        // A spawn still waiting for its tool_result is resolved by that result,
+        // which can land after the snapshot boundary. Background agents need no
+        // entry: their notifications are matched against every subagent.
+        this.subagents.forEach((agent, idx) => {
+            if (agent.status === 'running' && !agent.background && agent.id) {
+                this.pendingSubagents.set(agent.id, idx);
+            }
+        });
         this.pendingUserRequest = null;
         this.planExtractor.reset();
         return true;
@@ -1108,7 +1153,7 @@ class EventAggregator {
                 else if (name === 'UpdatePlan') {
                     this.handleUpdatePlan(input, new Date(event.timestamp));
                 }
-                else if ((name === 'Agent' || name === 'Task') && toolUseId) {
+                else if ((0, subagentSpawn_1.isSubagentSpawnTool)(name) && toolUseId) {
                     this.handleAgentSpawn(toolUseId, input, new Date(event.timestamp));
                 }
             }
@@ -1118,7 +1163,7 @@ class EventAggregator {
                     continue;
                 const isError = block.is_error ?? false;
                 this.resolveTaskCreate(toolUseId, block.content ?? block.output, event.timestamp, isError);
-                this.resolveAgentResult(toolUseId, isError, event.timestamp);
+                this.resolveAgentResult(toolUseId, isError, event.timestamp, block.content ?? block.output);
             }
         }
     }
@@ -1152,7 +1197,7 @@ class EventAggregator {
             else if (event.toolName === 'UpdatePlan') {
                 this.handleUpdatePlan(input, new Date(event.timestamp));
             }
-            else if ((event.toolName === 'Agent' || event.toolName === 'Task') && toolUseId) {
+            else if ((0, subagentSpawn_1.isSubagentSpawnTool)(event.toolName) && toolUseId) {
                 this.handleAgentSpawn(toolUseId, input, new Date(event.timestamp));
             }
         }
@@ -1164,7 +1209,7 @@ class EventAggregator {
                 return;
             const isError = raw.is_error ?? false;
             this.resolveTaskCreate(toolUseId, raw.content, event.timestamp, isError);
-            this.resolveAgentResult(toolUseId, isError, event.timestamp);
+            this.resolveAgentResult(toolUseId, isError, event.timestamp, raw.content);
         }
     }
     applyTaskUpdate(input) {
@@ -1469,11 +1514,14 @@ class EventAggregator {
         };
         this.tasks.set(agentTaskId, task);
     }
-    resolveAgentResult(toolUseId, isError, timestamp) {
+    resolveAgentResult(toolUseId, isError, timestamp, content) {
         const agentTaskId = `agent-${toolUseId}`;
         const agentTask = this.tasks.get(agentTaskId);
         if (!agentTask)
             return;
+        // A background launch returns at once; its task notification finishes it.
+        if (!isError && (0, subagentSpawn_1.parseAsyncAgentLaunch)(content))
+            return;
         agentTask.status = isError ? 'deleted' : 'completed';
         agentTask.updatedAt = new Date(timestamp);
     }
@@ -1493,31 +1541,25 @@ class EventAggregator {
     // Private: Subagent Tracking from SessionEvent
     // ═══════════════════════════════════════════════════════════════════════
     extractSubagentFromEvent(event) {
+        const notification = (0, subagentSpawn_1.taskNotificationFromEvent)(event);
+        if (notification)
+            this.applyTaskNotification(notification, event.timestamp);
         const content = event.message?.content;
         if (!Array.isArray(content))
             return;
         for (const block of content) {
-            if (block.type === 'tool_use' && block.name === 'Task') {
+            if (block.type === 'tool_use' && (0, subagentSpawn_1.isSubagentSpawnTool)(block.name)) {
                 const input = block.input;
                 const toolUseId = block.id;
                 if (!input || !toolUseId)
                     continue;
-                const info = {
-                    id: toolUseId,
-                    description: input.description || 'Unknown task',
-                    subagentType: input.subagent_type || input.subagentType || 'general',
-                    spawnTime: event.timestamp,
-                    status: 'running',
-                };
-                const idx = this.subagents.length;
-                this.subagents.push(info);
-                this.pendingSubagents.set(toolUseId, idx);
+                this.trackSubagentSpawn(toolUseId, input, event.timestamp);
             }
             else if (block.type === 'tool_result') {
                 const toolUseId = block.tool_use_id;
                 if (!toolUseId)
                     continue;
-                this.completeSubagent(toolUseId, event.timestamp);
+                this.resolveSubagentResult(toolUseId, block.content ?? block.output, block.is_error === true, event.timestamp);
             }
         }
     }
@@ -1526,23 +1568,10 @@ class EventAggregator {
     // ═══════════════════════════════════════════════════════════════════════
     extractSubagentFromFollowEvent(event) {
         const raw = event.raw;
-        if (event.type === 'tool_use' && event.toolName === 'Task') {
+        if (event.type === 'tool_use' && (0, subagentSpawn_1.isSubagentSpawnTool)(event.toolName)) {
             if (!raw?.input)
                 return;
-            const input = raw.input;
-            const toolUseId = raw.id || '';
-            const info = {
-                id: toolUseId,
-                description: input.description || 'Unknown task',
-                subagentType: input.subagent_type || input.subagentType || 'general',
-                spawnTime: event.timestamp,
-                status: 'running',
-            };
-            const idx = this.subagents.length;
-            this.subagents.push(info);
-            if (toolUseId) {
-                this.pendingSubagents.set(toolUseId, idx);
-            }
+            this.trackSubagentSpawn(raw.id || '', raw.input, event.timestamp);
         }
         else if (event.type === 'tool_result') {
             if (!raw)
@@ -1550,23 +1579,133 @@ class EventAggregator {
             const toolUseId = raw.tool_use_id;
             if (!toolUseId)
                 return;
-            this.completeSubagent(toolUseId, event.timestamp);
+            this.resolveSubagentResult(toolUseId, raw.content, raw.is_error === true, event.timestamp);
+        }
+        else if (event.type === 'user' && raw?.type === 'user') {
+            // Claude Code delivers most task notifications as their own user line.
+            const notification = (0, subagentSpawn_1.taskNotificationFromEvent)(raw);
+            if (notification)
+                this.applyTaskNotification(notification, event.timestamp);
+        }
+    }
+    trackSubagentSpawn(toolUseId, input, timestamp) {
+        const info = {
+            id: toolUseId,
+            description: input.description || 'Unknown task',
+            subagentType: input.subagent_type || input.subagentType || 'general',
+            spawnTime: timestamp,
+            status: 'running',
+        };
+        const idx = this.subagents.length;
+        this.subagents.push(info);
+        if (toolUseId) {
+            this.pendingSubagents.set(toolUseId, idx);
         }
     }
-    completeSubagent(toolUseId, timestamp) {
+    /**
+     * The spawning tool call's result. A foreground agent ends here; a
+     * background launch only reports the agent id, and the agent keeps running
+     * until its task notification arrives.
+     */
+    resolveSubagentResult(toolUseId, content, isError, timestamp) {
         const idx = this.pendingSubagents.get(toolUseId);
         if (idx === undefined)
             return;
-        this.pendingSubagents.delete(toolUseId);
+        const launch = isError ? null : (0, subagentSpawn_1.parseAsyncAgentLaunch)(content);
+        if (launch) {
+            this.markBackgroundLaunch(idx, launch);
+            return;
+        }
+        this.completeSubagent(toolUseId, timestamp, isError ? 'failed' : 'completed');
+    }
+    markBackgroundLaunch(idx, launch) {
         const agent = this.subagents[idx];
+        this.pendingSubagents.delete(agent.id);
+        agent.background = true;
+        if (launch.agentId)
+            agent.agentId = launch.agentId;
+    }
+    completeSubagent(toolUseId, timestamp, outcome = 'completed') {
+        const idx = this.pendingSubagents.get(toolUseId);
+        if (idx === undefined)
+            return;
+        this.finishSubagent(this.subagents[idx], timestamp, outcome);
+    }
+    finishSubagent(agent, timestamp, outcome) {
+        this.pendingSubagents.delete(agent.id);
         agent.status = 'completed';
         agent.completionTime = timestamp;
+        agent.outcome = outcome;
         const start = new Date(agent.spawnTime).getTime();
         const end = new Date(timestamp).getTime();
         if (!isNaN(start) && !isNaN(end) && end >= start) {
             agent.durationMs = end - start;
         }
     }
+    /**
+     * Applies a background task's notification to the subagent it reports on,
+     * matched by the spawning tool_use id (or by agent id when the notification
+     * has none). The latest notification wins: an interim one ("waiting on its
+     * own background work") keeps or puts the agent back to running, a final one
+     * completes it. Notifications for background shell tasks match nothing.
+     */
+    applyTaskNotification(notification, timestamp) {
+        const agent = this.findNotifiedSubagent(notification);
+        const toolUseId = agent?.id || notification.toolUseId;
+        const outcome = (0, subagentSpawn_1.taskNotificationOutcome)(notification.status);
+        if (agent) {
+            agent.background = true;
+            if (!agent.agentId)
+                agent.agentId = notification.taskId;
+            if (notification.interim) {
+                this.pendingSubagents.delete(agent.id);
+                agent.status = 'running';
+                delete agent.completionTime;
+                delete agent.durationMs;
+                delete agent.outcome;
+            }
+            else {
+                this.finishSubagent(agent, timestamp, outcome);
+            }
+        }
+        const agentTask = toolUseId ? this.tasks.get(`agent-${toolUseId}`) : undefined;
+        if (agentTask?.isSubagent) {
+            agentTask.status = notification.interim
+                ? 'in_progress'
+                : outcome === 'failed'
+                    ? 'deleted'
+                    : 'completed';
+            agentTask.updatedAt = new Date(timestamp);
+        }
+    }
+    findNotifiedSubagent(notification) {
+        const { toolUseId, taskId } = notification;
+        for (let i = this.subagents.length - 1; i >= 0; i--) {
+            if (toolUseId && this.subagents[i].id === toolUseId)
+                return this.subagents[i];
+        }
+        for (let i = this.subagents.length - 1; i >= 0; i--) {
+            if (this.subagents[i].agentId === taskId)
+                return this.subagents[i];
+        }
+        return undefined;
+    }
+    addTaskNotificationTimeline(timestamp, notification) {
+        let description = notification.summary ?? `Background task ${notification.status ?? 'finished'}`;
+        if (description.length > 200)
+            description = description.substring(0, 197) + '...';
+        this.timeline.push({
+            type: 'tool_result',
+            timestamp,
+            description,
+            noiseLevel: 'system',
+            messageClassification: 'system',
+            ...(notification.toolUseId ? { metadata: { toolUseId: notification.toolUseId } } : {}),
+        });
+        if (this.timeline.length > this.timelineCap) {
+            this.timeline.shift();
+        }
+    }
     // ═══════════════════════════════════════════════════════════════════════
     // Private: Plan Extraction from SessionEvent
     // ═══════════════════════════════════════════════════════════════════════

package/dist/aggregation/snapshot.d.ts

@@ -2,11 +2,15 @@
  * Session snapshot sidecar — persists aggregator state + reader position
  * so that re-attaching to a session skips full replay.
  *
- * Snapshots are stored in ~/.config/sidekick/snapshots/{sessionId}.json.
- * They are invalidated when the source file changes beyond the snapshot position.
+ * Snapshots are stored in `<config dir>/snapshots/{sessionId}.json` (see
+ * `getConfigDir()`). They are invalidated when the source file shrank below
+ * the snapshot position or, for file-backed sessions that recorded a
+ * {@link SessionSnapshot.sourceCheckpoint}, when the file is no longer the
+ * same append-only file.
  *
  * @module aggregation/snapshot
  */
+import { type JsonlTailCheckpoint } from '../watchers/jsonlTail';
 import { type SerializedAggregatorState } from './EventAggregator';
 /** Newest snapshots kept on disk; older ones are pruned opportunistically. */
 export declare const MAX_SNAPSHOT_FILES = 200;
@@ -22,6 +26,23 @@ export interface SessionSnapshot {
     readerPosition: number;
     /** Source file size at snapshot time (for staleness check; 0 for DB-backed). */
     sourceSize: number;
+    /**
+     * Identity of the source file at `readerPosition`, from
+     * `captureJsonlCheckpoint(sourcePath, readerPosition)`: its device and
+     * inode plus a digest of its first bytes. Present for file-backed sessions
+     * written by 0.29.1 and later; absent for DB-backed sessions and older
+     * snapshots. {@link isSnapshotValid} checks it when given the source path.
+     */
+    sourceCheckpoint?: JsonlTailCheckpoint;
+    /**
+     * The reader's parse state at `readerPosition`, from
+     * `SessionReader.getResumeState()` or `SessionWatcher.getResumeState()`
+     * (for Claude Code, which split-line responses were already counted).
+     * After seeking to `readerPosition`, pass it to `restoreResumeState()` and
+     * replay from the start when that returns false. Absent when the reader
+     * keeps none, and in snapshots written before 0.29.1.
+     */
+    readerState?: unknown;
     /** ISO timestamp when snapshot was written. */
     createdAt: string;
     /** Serialized EventAggregator state. */
@@ -55,8 +76,8 @@ export declare function pruneSnapshots(keep?: number): number;
  * - Schema version doesn't match
  * - JSON parse fails
  *
- * The caller is responsible for staleness checks (comparing sourceSize
- * and readerPosition against the actual file).
+ * The caller is responsible for staleness checks against the actual file:
+ * `isSnapshotValid(snapshot, currentSize, sourcePath)`.
  */
 export declare function loadSnapshot(sessionId: string): SessionSnapshot | null;
 /**
@@ -66,10 +87,18 @@ export declare function deleteSnapshot(sessionId: string): void;
 /**
  * Validates whether a snapshot is still usable for a given source file.
  *
- * For JSONL providers: checks that the file hasn't been truncated
- * (current size >= snapshot position) and that the size matches or has grown.
- *
  * For DB-backed providers: sourceSize is 0, so we always consider valid
  * (the DB reader's timestamp-based cursor handles staleness naturally).
+ *
+ * For JSONL providers: the file must not have shrunk below the snapshot
+ * position. With `sourcePath` the check is also content-aware: the snapshot
+ * must carry a {@link SessionSnapshot.sourceCheckpoint} for exactly
+ * `readerPosition`, and that checkpoint must still match the file at
+ * `sourcePath` (same device and inode, same first bytes, position just after
+ * a newline), so a file replaced by another one or rewritten to the same or
+ * a larger size is not resumed mid-content. A snapshot without a checkpoint
+ * (written before 0.29.1) is invalid when `sourcePath` is given, which costs
+ * one full replay. Without `sourcePath` only the size check applies, as it
+ * did before.
  */
-export declare function isSnapshotValid(snapshot: SessionSnapshot, currentSourceSize: number): boolean;
+export declare function isSnapshotValid(snapshot: SessionSnapshot, currentSourceSize: number, sourcePath?: string): boolean;

package/dist/aggregation/snapshot.js

@@ -3,8 +3,11 @@
  * Session snapshot sidecar — persists aggregator state + reader position
  * so that re-attaching to a session skips full replay.
  *
- * Snapshots are stored in ~/.config/sidekick/snapshots/{sessionId}.json.
- * They are invalidated when the source file changes beyond the snapshot position.
+ * Snapshots are stored in `<config dir>/snapshots/{sessionId}.json` (see
+ * `getConfigDir()`). They are invalidated when the source file shrank below
+ * the snapshot position or, for file-backed sessions that recorded a
+ * {@link SessionSnapshot.sourceCheckpoint}, when the file is no longer the
+ * same append-only file.
  *
  * @module aggregation/snapshot
  */
@@ -52,6 +55,7 @@ exports.isSnapshotValid = isSnapshotValid;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const paths_1 = require("../paths");
+const jsonlTail_1 = require("../watchers/jsonlTail");
 const atomic_1 = require("../writers/atomic");
 const EventAggregator_1 = require("./EventAggregator");
 /** Current schema version — bump when format changes. */
@@ -143,8 +147,8 @@ function pruneSnapshots(keep = exports.MAX_SNAPSHOT_FILES) {
  * - Schema version doesn't match
  * - JSON parse fails
  *
- * The caller is responsible for staleness checks (comparing sourceSize
- * and readerPosition against the actual file).
+ * The caller is responsible for staleness checks against the actual file:
+ * `isSnapshotValid(snapshot, currentSize, sourcePath)`.
  */
 function loadSnapshot(sessionId) {
     try {
@@ -184,13 +188,21 @@ function deleteSnapshot(sessionId) {
 /**
  * Validates whether a snapshot is still usable for a given source file.
  *
- * For JSONL providers: checks that the file hasn't been truncated
- * (current size >= snapshot position) and that the size matches or has grown.
- *
  * For DB-backed providers: sourceSize is 0, so we always consider valid
  * (the DB reader's timestamp-based cursor handles staleness naturally).
+ *
+ * For JSONL providers: the file must not have shrunk below the snapshot
+ * position. With `sourcePath` the check is also content-aware: the snapshot
+ * must carry a {@link SessionSnapshot.sourceCheckpoint} for exactly
+ * `readerPosition`, and that checkpoint must still match the file at
+ * `sourcePath` (same device and inode, same first bytes, position just after
+ * a newline), so a file replaced by another one or rewritten to the same or
+ * a larger size is not resumed mid-content. A snapshot without a checkpoint
+ * (written before 0.29.1) is invalid when `sourcePath` is given, which costs
+ * one full replay. Without `sourcePath` only the size check applies, as it
+ * did before.
  */
-function isSnapshotValid(snapshot, currentSourceSize) {
+function isSnapshotValid(snapshot, currentSourceSize, sourcePath) {
     // DB-backed providers store sourceSize=0 — always valid (cursor is a timestamp)
     if (snapshot.sourceSize === 0) {
         return true;
@@ -199,5 +211,15 @@ function isSnapshotValid(snapshot, currentSourceSize) {
     if (currentSourceSize < snapshot.readerPosition) {
         return false;
     }
-    return true;
+    if (typeof sourcePath !== 'string') {
+        return true;
+    }
+    // Snapshot content comes from disk: guard the shape before trusting it.
+    const checkpoint = snapshot.sourceCheckpoint;
+    if (!checkpoint ||
+        typeof checkpoint !== 'object' ||
+        checkpoint.offset !== snapshot.readerPosition) {
+        return false;
+    }
+    return (0, jsonlTail_1.verifyJsonlCheckpoint)(sourcePath, checkpoint);
 }

package/dist/aggregation/types.d.ts

@@ -117,15 +117,28 @@ export interface BurnRateInfo {
     /** Number of samples in the window. */
     sampleCount: number;
 }
+/** How a subagent ended: a failed spawn, or a background agent's notification status. */
+export type SubagentOutcome = 'completed' | 'failed' | 'killed' | 'stopped';
 /** Subagent lifecycle info (for tracking spawn/completion from tool events). */
 export interface SubagentLifecycle {
+    /** The spawning tool_use id (`Agent` / `Task`). */
     id: string;
     description: string;
     subagentType: string;
     spawnTime: string;
     completionTime?: string;
+    /**
+     * A background agent stays `running` after its spawn's immediate result
+     * until its task notification arrives.
+     */
     status: 'running' | 'completed';
     durationMs?: number;
+    /** Claude Code's agent id (the `agent-<id>.jsonl` transcript name), once known. */
+    agentId?: string;
+    /** The agent was launched in the background (its spawn returned at once). */
+    background?: boolean;
+    /** How the agent ended, once `status` is `completed`. */
+    outcome?: SubagentOutcome;
 }
 /** Frequency entry for tool/word frequency tracking. */
 export interface FrequencyMetric {

package/dist/browser.d.ts

@@ -14,6 +14,7 @@ export type { UsageProvider, UsageSemantics, UsageNormalizationProvenance, Provi
 export { formatTokenBreakdown, summarizeTokens, sumTokenTotals, TOKEN_CONTEXT_LABEL, TOKEN_MAIN_THREAD_LABEL, TOKEN_SESSION_TOTAL_LABEL, TOKEN_SUBAGENTS_LABEL, TOKEN_TOTAL_LABEL, } from './tokenSummary';
 export type { TokenSummary, TokenTotalsLike } from './tokenSummary';
 export { ClaudeUsageDeduper, SYNTHETIC_MODEL } from './usage/claudeUsageDedupe';
+export type { ClaudeUsageDedupeBuckets, ClaudeUsageDedupeState } from './usage/claudeUsageDedupe';
 export { ASCII_CHARS_PER_TOKEN, estimateTextTokens, estimateSerializedTokens, } from './tokenEstimation';
 export type { ExactTokenCounterContext, ExactTokenCounter, TokenEstimationMethod, TokenEstimationConfidence, TokenEstimationOptions, TokenEstimate, } from './tokenEstimation';
 export { projectSessionTranscript } from './transcript';
@@ -28,6 +29,9 @@ export type { AccountProviderId, ModelProviderId, QuotaProviderId, RuntimeQuotaP
 /** Same type as `ProviderId` from the package root and `sidekick-shared/node`. */
 SessionProviderId as ProviderId, } from './providerIds';
 export type { BuildSessionContextSnapshotOptions, SessionContextCapabilities, SessionContextLayerBreakdown, SessionContextPressure, SessionContextProjector, SessionContextSnapshot, SessionContextSource, SessionContextSourceType, } from './context/sessionContext';
+export { SUBAGENT_SPAWN_TOOL_NAMES, isSubagentSpawnTool, isTaskNotificationSystemEvent, parseTaskNotification, taskNotificationFromEvent, } from './subagentSpawn';
+export type { TaskNotification } from './subagentSpawn';
+export type { SubagentOutcome } from './aggregation/types';
 export { assistantTurnEventsFromSessionEvents, extractTurnSubagents, isAssistantTurnSubagentTool, reasoningSummary, segmentAssistantTurn, } from './turns/assistantTurn';
 export type { AssistantTurnEvent, AssistantTurnEventType, AssistantTurnProcess, AssistantTurnProcessStep, AssistantTurnProjection, AssistantTurnSubagent, AssistantTurnSubagentStatus, AssistantTurnTimelineItem, AssistantTurnToolRef, ExtractTurnSubagentsOptions, ReasoningSummary, SegmentAssistantTurnOptions, } from './turns/assistantTurn';
 export { parseModelId, getModelPricing, resolveModelPricing, getModelInfo, calculateCost, calculateCostWithPricing, calculateCostWithProvenance, mergeCostSources, shortModelName, getModelDisplayInfo, compareModelIds, sortModelIds, formatCost, canonicalModelId, isMovingModelAlias, registerModelPricing, clearRegisteredModelPricing, getPricingCatalogInfo, costSourceFromPricingProvenance, mergeCostComponents, } from './modelInfo';
@@ -51,7 +55,7 @@ export type { SessionEvent, ClaudeSessionEvent, MessageUsage, SessionMessage, Se
 export type { CodexRolloutLine, CodexSessionMeta, CodexResponseItem, CodexMessageItem, CodexContentPart, CodexReasoningItem, CodexFunctionCallItem, CodexFunctionCallOutputItem, CodexLocalShellCallItem, CodexWebSearchCallItem, CodexCustomToolCallItem, CodexCustomToolCallOutputItem, CodexCompacted, CodexTurnContext, CodexEventMsg, CodexEvent, CodexTurnStartedEvent, CodexTurnCompleteEvent, CodexTaskStartedEvent, CodexTaskCompleteEvent, CodexTurnAbortedEvent, CodexTokenCountEvent, CodexTokenUsage, CodexRateLimits, CodexAgentMessageEvent, CodexAgentReasoningEvent, CodexUserMessageEvent, CodexExecCommandBeginEvent, CodexExecCommandEndEvent, CodexMcpToolCallBeginEvent, CodexMcpToolCallEndEvent, CodexErrorEvent, CodexContextCompactedEvent, CodexPatchAppliedEvent, CodexBackgroundEvent, CodexGenericEvent, CodexDbThread, CodexReasoningSummary, } from './types/codex';
 export { isAggregateCodexLimit } from './types/codex';
 export { CodexRolloutParser, DEFAULT_MAX_TRACKED_TOOL_CALLS, extractPatchFilePaths, normalizeCodexToolName, normalizeCodexToolInput, resolveCodexCallUsage, } from './parsers/codexParser';
-export type { CodexPendingStats, CodexRolloutParserOptions } from './parsers/codexParser';
+export type { CodexPendingStats, CodexRolloutParserOptions, CodexRolloutResumeState, } from './parsers/codexParser';
 export { codexRolloutOrigin, codexSpawnParentFromSource } from './parsers/codexRolloutOrigin';
 export type { CodexRolloutOrigin } from './parsers/codexRolloutOrigin';
 export { HUMAN_CLAUDE_ENTRYPOINTS, HUMAN_CODEX_SOURCES, humanPromptText, isHumanPrompt, } from './humanPrompt';

package/dist/browser.js

@@ -9,9 +9,9 @@
  * For pricing hydration (LiteLLM catalog refresh), use `sidekick-shared/node`.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.resolveModelPricing = exports.getModelPricing = exports.parseModelId = exports.segmentAssistantTurn = exports.reasoningSummary = exports.isAssistantTurnSubagentTool = exports.extractTurnSubagents = exports.assistantTurnEventsFromSessionEvents = exports.SESSION_PROVIDER_IDS = exports.RUNTIME_QUOTA_PROVIDER_IDS = exports.QUOTA_PROVIDER_IDS = exports.MODEL_PROVIDER_IDS = exports.ACCOUNT_PROVIDER_IDS = exports.createSessionContextProjector = exports.calculateSessionContextPressure = exports.buildSessionContextSnapshot = exports.parseMcpToolName = exports.parseLocalDateKey = exports.formatTokenCount = exports.formatLocalDateKey = exports.formatDurationMs = exports.addLocalDays = exports.projectSessionTranscript = exports.estimateSerializedTokens = exports.estimateTextTokens = exports.ASCII_CHARS_PER_TOKEN = exports.SYNTHETIC_MODEL = exports.ClaudeUsageDeduper = exports.TOKEN_TOTAL_LABEL = exports.TOKEN_SUBAGENTS_LABEL = exports.TOKEN_SESSION_TOTAL_LABEL = exports.TOKEN_MAIN_THREAD_LABEL = exports.TOKEN_CONTEXT_LABEL = exports.sumTokenTotals = exports.summarizeTokens = exports.formatTokenBreakdown = exports.calculateNormalizedUsageCost = exports.extractNormalizedUsage = exports.normalizeProviderUsage = exports.DEFAULT_CONTEXT_WINDOW = exports.resolveModelContextWindow = exports.getModelContextWindowSize = void 0;
-exports.HUMAN_CLAUDE_ENTRYPOINTS = exports.codexSpawnParentFromSource = exports.codexRolloutOrigin = exports.resolveCodexCallUsage = exports.normalizeCodexToolInput = exports.normalizeCodexToolName = exports.extractPatchFilePaths = exports.DEFAULT_MAX_TRACKED_TOOL_CALLS = exports.CodexRolloutParser = exports.isAggregateCodexLimit = exports.parseCodexLoginStatus = exports.parseClaudeAuthStatus = exports.decodeCodexErrorInfo = exports.CODEX_ERROR_INFO_KINDS = exports.PROVIDER_RECOVERY_ACTIONS = exports.PROVIDER_FAILURE_EVIDENCE_SOURCES = exports.PROVIDER_FAILURE_CODES = exports.PROVIDER_CREDENTIAL_KINDS = exports.PROVIDER_AUTHENTICATION_STATES = exports.PROVIDER_AUTHENTICATION_SOURCES = exports.diagnoseProviderFailure = exports.mergeFailingToolWindows = exports.failingToolTrend = exports.FAILING_TOOL_TREND_ARROWS = exports.sessionSummaryFromStats = exports.removeSessionSummary = exports.markFileImported = exports.isFileImported = exports.applySessionSummary = exports.weekKey = exports.usageBucketKey = exports.summarizeUsageRows = exports.bucketUsage = exports.findActiveBillingBlock = exports.computeBillingBlocks = exports.BILLING_BLOCK_DURATION_MS = exports.RESOLVED_MODEL_CATALOG_SCHEMA_VERSION = exports.resolveModelAlias = exports.registerModelAlias = exports.importResolvedModelCatalog = exports.exportResolvedModelCatalog = exports.mergeCostComponents = exports.costSourceFromPricingProvenance = exports.getPricingCatalogInfo = exports.clearRegisteredModelPricing = exports.registerModelPricing = exports.isMovingModelAlias = exports.canonicalModelId = exports.formatCost = exports.sortModelIds = void 0;
-exports.quotaWindowShortLabel = exports.quotaWindowLabel = exports.quotaWindowHasData = exports.quotaWindowApplies = exports.formatExtraUsage = exports.extraQuotaRows = exports.claudePlanLabel = exports.TOOL_CATEGORIES = exports.classifyTool = exports.renderHandoffUrlTemplate = exports.isHumanPrompt = exports.humanPromptText = exports.HUMAN_CODEX_SOURCES = void 0;
+exports.calculateCostWithPricing = exports.calculateCost = exports.getModelInfo = exports.resolveModelPricing = exports.getModelPricing = exports.parseModelId = exports.segmentAssistantTurn = exports.reasoningSummary = exports.isAssistantTurnSubagentTool = exports.extractTurnSubagents = exports.assistantTurnEventsFromSessionEvents = exports.taskNotificationFromEvent = exports.parseTaskNotification = exports.isTaskNotificationSystemEvent = exports.isSubagentSpawnTool = exports.SUBAGENT_SPAWN_TOOL_NAMES = exports.SESSION_PROVIDER_IDS = exports.RUNTIME_QUOTA_PROVIDER_IDS = exports.QUOTA_PROVIDER_IDS = exports.MODEL_PROVIDER_IDS = exports.ACCOUNT_PROVIDER_IDS = exports.createSessionContextProjector = exports.calculateSessionContextPressure = exports.buildSessionContextSnapshot = exports.parseMcpToolName = exports.parseLocalDateKey = exports.formatTokenCount = exports.formatLocalDateKey = exports.formatDurationMs = exports.addLocalDays = exports.projectSessionTranscript = exports.estimateSerializedTokens = exports.estimateTextTokens = exports.ASCII_CHARS_PER_TOKEN = exports.SYNTHETIC_MODEL = exports.ClaudeUsageDeduper = exports.TOKEN_TOTAL_LABEL = exports.TOKEN_SUBAGENTS_LABEL = exports.TOKEN_SESSION_TOTAL_LABEL = exports.TOKEN_MAIN_THREAD_LABEL = exports.TOKEN_CONTEXT_LABEL = exports.sumTokenTotals = exports.summarizeTokens = exports.formatTokenBreakdown = exports.calculateNormalizedUsageCost = exports.extractNormalizedUsage = exports.normalizeProviderUsage = exports.DEFAULT_CONTEXT_WINDOW = exports.resolveModelContextWindow = exports.getModelContextWindowSize = void 0;
+exports.normalizeCodexToolName = exports.extractPatchFilePaths = exports.DEFAULT_MAX_TRACKED_TOOL_CALLS = exports.CodexRolloutParser = exports.isAggregateCodexLimit = exports.parseCodexLoginStatus = exports.parseClaudeAuthStatus = exports.decodeCodexErrorInfo = exports.CODEX_ERROR_INFO_KINDS = exports.PROVIDER_RECOVERY_ACTIONS = exports.PROVIDER_FAILURE_EVIDENCE_SOURCES = exports.PROVIDER_FAILURE_CODES = exports.PROVIDER_CREDENTIAL_KINDS = exports.PROVIDER_AUTHENTICATION_STATES = exports.PROVIDER_AUTHENTICATION_SOURCES = exports.diagnoseProviderFailure = exports.mergeFailingToolWindows = exports.failingToolTrend = exports.FAILING_TOOL_TREND_ARROWS = exports.sessionSummaryFromStats = exports.removeSessionSummary = exports.markFileImported = exports.isFileImported = exports.applySessionSummary = exports.weekKey = exports.usageBucketKey = exports.summarizeUsageRows = exports.bucketUsage = exports.findActiveBillingBlock = exports.computeBillingBlocks = exports.BILLING_BLOCK_DURATION_MS = exports.RESOLVED_MODEL_CATALOG_SCHEMA_VERSION = exports.resolveModelAlias = exports.registerModelAlias = exports.importResolvedModelCatalog = exports.exportResolvedModelCatalog = exports.mergeCostComponents = exports.costSourceFromPricingProvenance = exports.getPricingCatalogInfo = exports.clearRegisteredModelPricing = exports.registerModelPricing = exports.isMovingModelAlias = exports.canonicalModelId = exports.formatCost = exports.sortModelIds = exports.compareModelIds = exports.getModelDisplayInfo = exports.shortModelName = exports.mergeCostSources = exports.calculateCostWithProvenance = void 0;
+exports.quotaWindowShortLabel = exports.quotaWindowLabel = exports.quotaWindowHasData = exports.quotaWindowApplies = exports.formatExtraUsage = exports.extraQuotaRows = exports.claudePlanLabel = exports.TOOL_CATEGORIES = exports.classifyTool = exports.renderHandoffUrlTemplate = exports.isHumanPrompt = exports.humanPromptText = exports.HUMAN_CODEX_SOURCES = exports.HUMAN_CLAUDE_ENTRYPOINTS = exports.codexSpawnParentFromSource = exports.codexRolloutOrigin = exports.resolveCodexCallUsage = exports.normalizeCodexToolInput = void 0;
 var modelContext_1 = require("./modelContext");
 Object.defineProperty(exports, "getModelContextWindowSize", { enumerable: true, get: function () { return modelContext_1.getModelContextWindowSize; } });
 Object.defineProperty(exports, "resolveModelContextWindow", { enumerable: true, get: function () { return modelContext_1.resolveModelContextWindow; } });
@@ -56,6 +56,12 @@ Object.defineProperty(exports, "MODEL_PROVIDER_IDS", { enumerable: true, get: fu
 Object.defineProperty(exports, "QUOTA_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.QUOTA_PROVIDER_IDS; } });
 Object.defineProperty(exports, "RUNTIME_QUOTA_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.RUNTIME_QUOTA_PROVIDER_IDS; } });
 Object.defineProperty(exports, "SESSION_PROVIDER_IDS", { enumerable: true, get: function () { return providerIds_1.SESSION_PROVIDER_IDS; } });
+var subagentSpawn_1 = require("./subagentSpawn");
+Object.defineProperty(exports, "SUBAGENT_SPAWN_TOOL_NAMES", { enumerable: true, get: function () { return subagentSpawn_1.SUBAGENT_SPAWN_TOOL_NAMES; } });
+Object.defineProperty(exports, "isSubagentSpawnTool", { enumerable: true, get: function () { return subagentSpawn_1.isSubagentSpawnTool; } });
+Object.defineProperty(exports, "isTaskNotificationSystemEvent", { enumerable: true, get: function () { return subagentSpawn_1.isTaskNotificationSystemEvent; } });
+Object.defineProperty(exports, "parseTaskNotification", { enumerable: true, get: function () { return subagentSpawn_1.parseTaskNotification; } });
+Object.defineProperty(exports, "taskNotificationFromEvent", { enumerable: true, get: function () { return subagentSpawn_1.taskNotificationFromEvent; } });
 var assistantTurn_1 = require("./turns/assistantTurn");
 Object.defineProperty(exports, "assistantTurnEventsFromSessionEvents", { enumerable: true, get: function () { return assistantTurn_1.assistantTurnEventsFromSessionEvents; } });
 Object.defineProperty(exports, "extractTurnSubagents", { enumerable: true, get: function () { return assistantTurn_1.extractTurnSubagents; } });

package/dist/context/sessionContext.js

@@ -14,6 +14,7 @@ const EventAggregator_1 = require("../aggregation/EventAggregator");
 const modelContext_1 = require("../modelContext");
 const mcpToolName_1 = require("../parsers/mcpToolName");
 const tokenEstimation_1 = require("../tokenEstimation");
+const subagentSpawn_1 = require("../subagentSpawn");
 const DEFAULT_CONTEXT_SOURCE_LIMIT = 200;
 const DEFAULT_SNIPPET_MAX_CHARS = 240;
 const DEFAULT_BODY_MAX_CHARS = 5000;
@@ -211,6 +212,9 @@ function extractSourcesFromEvent(event, state) {
     }
 }
 function extractSystemSource(event, state) {
+    // Background-task notices only update subagent lifecycles (like the aggregator).
+    if ((0, subagentSpawn_1.isTaskNotificationSystemEvent)(event))
+        return;
     const message = event.message;
     const text = extractText(message?.content);
     const label = message?.sourceLabel ?? message?.role ?? 'system';