sidekick-shared 0.18.4 → 0.19.0

package/dist/providers/codex.js

@@ -46,6 +46,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodexProvider = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const EventAggregator_1 = require("../aggregation/EventAggregator");
+const sessionContext_1 = require("../context/sessionContext");
 const codexParser_1 = require("../parsers/codexParser");
 const codexDatabase_1 = require("./codexDatabase");
 const codexProfiles_1 = require("../codexProfiles");
@@ -284,8 +286,8 @@ function extractFirstUserMessage(rolloutPath) {
                 // Check event_msg with user_message
                 if (parsed.type === 'event_msg') {
                     const payload = parsed.payload;
-                    if (payload.event?.type === 'user_message' && payload.event.message?.trim()) {
-                        return truncate(payload.event.message, 60);
+                    if (payload.type === 'user_message' && payload.message?.trim()) {
+                        return truncate(payload.message, 60);
                     }
                 }
             }
@@ -301,47 +303,106 @@ function extractFirstUserMessage(rolloutPath) {
 }
 /** Extract searchable text from a rollout line. */
 function extractSearchableText(line) {
+    const parts = [];
     switch (line.type) {
-        case 'response_item': {
+        case 'session_meta': {
             const payload = line.payload;
-            const item = payload.item;
-            if (!item)
-                return '';
+            if (payload.cwd)
+                parts.push(payload.cwd);
+            if (payload.source)
+                parts.push(payload.source);
+            if (payload.base_instructions?.text)
+                parts.push(payload.base_instructions.text);
+            if (payload.git?.branch)
+                parts.push(payload.git.branch);
+            if (payload.git?.commit)
+                parts.push(payload.git.commit);
+            return parts.join(' ');
+        }
+        case 'response_item': {
+            const item = line.payload;
             if (item.type === 'message') {
-                if (typeof item.content === 'string')
-                    return item.content;
-                if (Array.isArray(item.content)) {
-                    return item.content
-                        .map((p) => p.text || '')
-                        .filter(Boolean)
-                        .join(' ');
+                parts.push(extractTextFromUnknownContent(item.content));
+            }
+            if (item.type === 'reasoning') {
+                const summary = item.summary;
+                if (Array.isArray(summary)) {
+                    for (const entry of summary) {
+                        if (typeof entry.text === 'string')
+                            parts.push(entry.text);
+                    }
                 }
             }
-            if (item.type === 'function_call' && item.arguments)
-                return item.arguments;
-            if (item.type === 'function_call_output' && item.output)
-                return item.output;
-            return '';
+            if (item.type === 'function_call') {
+                if (typeof item.name === 'string')
+                    parts.push(item.name);
+                if (typeof item.arguments === 'string')
+                    parts.push(item.arguments);
+            }
+            if (item.type === 'function_call_output' && typeof item.output === 'string') {
+                parts.push(item.output);
+            }
+            if (item.type === 'local_shell_call') {
+                const action = item.action;
+                const command = action?.command;
+                if (Array.isArray(command))
+                    parts.push(command.map(String).join(' '));
+                if (typeof action?.workdir === 'string')
+                    parts.push(action.workdir);
+            }
+            if (item.type === 'custom_tool_call') {
+                if (typeof item.name === 'string')
+                    parts.push(item.name);
+                if (typeof item.input === 'string')
+                    parts.push(item.input);
+            }
+            if (item.type === 'custom_tool_call_output' && typeof item.output === 'string') {
+                parts.push(item.output);
+            }
+            return parts.filter(Boolean).join(' ');
         }
         case 'event_msg': {
-            const payload = line.payload;
-            const event = payload.event;
-            if (!event)
-                return '';
-            if (event.message)
-                return event.message;
-            if (event.result)
-                return event.result;
-            return '';
+            const event = line.payload;
+            for (const key of ['type', 'message', 'result', 'stdout', 'stderr', 'summary', 'error', 'code', 'tool_name', 'server_name']) {
+                if (typeof event[key] === 'string')
+                    parts.push(event[key]);
+            }
+            const command = event.command;
+            if (Array.isArray(command))
+                parts.push(command.map(String).join(' '));
+            if (event.arguments && typeof event.arguments === 'object')
+                parts.push(JSON.stringify(event.arguments));
+            return parts.filter(Boolean).join(' ');
         }
         case 'compacted': {
             const payload = line.payload;
             return payload.summary || '';
         }
+        case 'turn_context': {
+            const payload = line.payload;
+            for (const key of ['model', 'cwd', 'approval_policy', 'sandbox_policy', 'effort']) {
+                if (typeof payload[key] === 'string')
+                    parts.push(payload[key]);
+            }
+            return parts.join(' ');
+        }
         default:
             return '';
     }
 }
+function extractTextFromUnknownContent(content) {
+    if (typeof content === 'string')
+        return content;
+    if (!Array.isArray(content))
+        return '';
+    return content
+        .map(part => {
+        const p = part;
+        return typeof p.text === 'string' ? p.text : '';
+    })
+        .filter(Boolean)
+        .join(' ');
+}
 // ---------------------------------------------------------------------------
 // CodexReader — incremental JSONL reader wrapping CodexRolloutParser
 // ---------------------------------------------------------------------------
@@ -827,82 +888,55 @@ class CodexProvider {
     // --- Stats ---
     readSessionStats(sessionPath) {
         const sessionId = extractSessionId(path.basename(sessionPath));
-        let messageCount = 0;
-        let startTime = '';
-        let endTime = '';
-        const tokens = { input: 0, output: 0, cacheWrite: 0, cacheRead: 0 };
-        const modelUsage = {};
-        const toolUsage = {};
-        let compactionEstimate = 0;
-        let currentModel = 'unknown';
+        const aggregator = new EventAggregator_1.EventAggregator({
+            providerId: 'codex',
+            computeContextSize: usage => usage.inputTokens,
+        });
         try {
-            const content = fs.readFileSync(sessionPath, 'utf8');
-            const lines = content.split('\n');
-            for (const line of lines) {
-                const trimmed = line.trim();
-                if (!trimmed || !trimmed.startsWith('{'))
-                    continue;
-                try {
-                    const parsed = JSON.parse(trimmed);
-                    if (!startTime && parsed.timestamp)
-                        startTime = parsed.timestamp;
-                    if (parsed.timestamp)
-                        endTime = parsed.timestamp;
-                    if (parsed.type === 'turn_context' && parsed.payload?.model)
-                        currentModel = parsed.payload.model;
-                    if (parsed.type === 'compacted')
-                        compactionEstimate++;
-                    if (parsed.type === 'response_item') {
-                        const p = parsed.payload;
-                        if (p?.role === 'user' || p?.role === 'assistant')
-                            messageCount++;
-                        if (p?.type === 'function_call') {
-                            const name = p.name || 'unknown';
-                            toolUsage[name] = (toolUsage[name] || 0) + 1;
-                        }
-                        if (p?.type === 'local_shell_call')
-                            toolUsage['Bash'] = (toolUsage['Bash'] || 0) + 1;
-                        if (p?.type === 'custom_tool_call') {
-                            const name = p.name || 'unknown';
-                            toolUsage[name] = (toolUsage[name] || 0) + 1;
-                        }
-                    }
-                    if (parsed.type === 'event_msg') {
-                        const evt = parsed.payload;
-                        if (evt?.type === 'token_count') {
-                            const usage = evt.info?.last_token_usage || evt.info?.total_token_usage;
-                            if (usage) {
-                                tokens.input = usage.input_tokens || 0;
-                                tokens.output = usage.output_tokens || 0;
-                                tokens.cacheRead = usage.cached_input_tokens || 0;
-                                if (!modelUsage[currentModel])
-                                    modelUsage[currentModel] = { calls: 0, tokens: 0 };
-                                modelUsage[currentModel].calls++;
-                                modelUsage[currentModel].tokens = (usage.input_tokens || 0) + (usage.output_tokens || 0);
-                            }
-                        }
-                    }
-                }
-                catch { /* skip */ }
+            const reader = this.createReader(sessionPath);
+            for (const event of reader.readAll()) {
+                aggregator.processEvent(event);
             }
         }
-        catch { /* skip */ }
+        catch (err) {
+            // Return an empty stats shell below. Surface the cause under DEBUG so a
+            // malformed rollout doesn't fail silently during dashboard refreshes.
+            if (process.env.DEBUG)
+                console.error(`CodexProvider.readSessionStats: ${err}`);
+        }
+        const metrics = aggregator.getMetrics();
+        const modelUsage = {};
+        for (const model of metrics.modelStats) {
+            modelUsage[model.model] = { calls: model.calls, tokens: model.tokens };
+        }
+        const toolUsage = {};
+        for (const tool of metrics.toolStats) {
+            toolUsage[tool.name] = tool.successCount + tool.failureCount + tool.pendingCount;
+        }
         return {
             providerId: 'codex',
             sessionId,
             filePath: sessionPath,
             label: this.extractSessionLabel(sessionPath),
-            startTime,
-            endTime,
-            messageCount,
-            tokens,
+            startTime: metrics.sessionStartTime || '',
+            endTime: metrics.lastEventTime || '',
+            messageCount: metrics.messageCount,
+            tokens: {
+                input: metrics.tokens.inputTokens,
+                output: metrics.tokens.outputTokens,
+                cacheWrite: metrics.tokens.cacheWriteTokens,
+                cacheRead: metrics.tokens.cacheReadTokens,
+            },
             modelUsage,
             toolUsage,
-            compactionEstimate,
-            truncationCount: 0,
-            reportedCost: 0,
+            compactionEstimate: metrics.compactionCount,
+            truncationCount: metrics.truncationCount,
+            reportedCost: metrics.tokens.reportedCost,
         };
     }
+    readSessionContextSnapshot(sessionPath, options = {}) {
+        return (0, sessionContext_1.readSessionContextSnapshot)(this, sessionPath, options);
+    }
     // --- Optional methods ---
     getContextWindowLimit(modelId) {
         // Prefer actual model_context_window reported by token_count events

package/dist/providers/openCode.d.ts

@@ -15,6 +15,7 @@
  *
  * @module providers/openCode
  */
+import type { ReadSessionContextSnapshotOptions, SessionContextSnapshot } from '../context/sessionContext';
 import type { SessionProviderBase, SessionReader, ProjectFolderInfo, SearchHit, SessionFileStats, ProviderId, ProviderRuntimeStatus } from './types';
 import type { TokenUsage, SubagentStats, ContextAttribution } from '../types/sessionEvent';
 /**
@@ -61,6 +62,7 @@ export declare class OpenCodeProvider implements SessionProviderBase {
     private searchInSessionFromFiles;
     getProjectsBaseDir(): string;
     readSessionStats(sessionPath: string): SessionFileStats;
+    readSessionContextSnapshot(sessionPath: string, options?: ReadSessionContextSnapshotOptions): SessionContextSnapshot;
     getSessionMetadata(sessionPath: string): {
         mtime: Date;
     } | null;

package/dist/providers/openCode.js

@@ -55,6 +55,7 @@ const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const child_process_1 = require("child_process");
+const sessionContext_1 = require("../context/sessionContext");
 const openCodeParser_1 = require("../parsers/openCodeParser");
 const openCodeDatabase_1 = require("./openCodeDatabase");
 const modelContext_1 = require("../modelContext");
@@ -1367,6 +1368,9 @@ class OpenCodeProvider {
             reportedCost,
         };
     }
+    readSessionContextSnapshot(sessionPath, options = {}) {
+        return (0, sessionContext_1.readSessionContextSnapshot)(this, sessionPath, options);
+    }
     // --- Optional methods ---
     getSessionMetadata(sessionPath) {
         // Check cache first

package/dist/providers/types.d.ts

@@ -8,6 +8,7 @@
  * SessionProvider is the original simplified interface maintained for backward
  * compatibility with existing CLI code.
  */
+import type { ReadSessionContextSnapshotOptions, SessionContextSnapshot } from '../context/sessionContext';
 import type { SessionEvent, SubagentStats, TokenUsage, ContextAttribution } from '../types/sessionEvent';
 export type ProviderId = 'claude-code' | 'opencode' | 'codex';
 export interface SearchHit {
@@ -138,6 +139,8 @@ export interface SessionProviderBase {
     getCurrentUsageSnapshot?(sessionPath: string): TokenUsage | null;
     /** Gets context attribution breakdown from provider data, if available. */
     getContextAttribution?(sessionPath: string): ContextAttribution | null;
+    /** Reads a provider-neutral context evidence snapshot for a session. */
+    readSessionContextSnapshot?(sessionPath: string, options?: ReadSessionContextSnapshotOptions): SessionContextSnapshot;
     /** Reports provider runtime readiness for DB-backed providers. */
     getRuntimeStatus?(): ProviderRuntimeStatus;
     /** Tests whether a provider can monitor a directory path, including synthetic DB-backed paths. */
@@ -156,6 +159,7 @@ export interface SessionProvider {
     findAllSessions(workspacePath: string): string[];
     getProjectsBaseDir(): string;
     readSessionStats(sessionPath: string): SessionFileStats;
+    readSessionContextSnapshot?(sessionPath: string, options?: ReadSessionContextSnapshotOptions): SessionContextSnapshot;
     extractSessionLabel(sessionPath: string): string | null;
     searchInSession(sessionPath: string, query: string, maxResults: number): SearchHit[];
     getAllProjectFolders(workspacePath?: string): ProjectFolderInfo[];

package/dist/report/htmlReportGenerator.js

@@ -217,6 +217,7 @@ tr:hover td { background: rgba(155,109,255,0.05); }
 .role-badge.summary { background: rgba(107,95,128,0.2); color: var(--text-muted); }
 .message-ts { color: var(--text-muted); margin-left: auto; }
 .message-model { color: var(--text-secondary); font-family: monospace; font-size: 11px; }
+.message-source { color: var(--text-muted); font-family: monospace; font-size: 11px; font-style: italic; }
 .message-tokens { color: var(--text-muted); font-size: 11px; }
 
 .message-body { padding: 12px 14px; }
@@ -498,6 +499,7 @@ function generateTranscript(transcript, includeThinking, includeToolDetail) {
 function renderMessage(entry, includeThinking, includeToolDetail) {
     const ts = entry.timestamp ? (0, htmlHelpers_1.formatTimestamp)(entry.timestamp) : '';
     const roleBadge = `<span class="role-badge ${entry.type}">${entry.type}</span>`;
+    const sourceStr = entry.sourceLabel ? `<span class="message-source">${(0, htmlHelpers_1.escapeHtml)(entry.sourceLabel)}</span>` : '';
     const modelStr = entry.model ? `<span class="message-model">${(0, htmlHelpers_1.escapeHtml)(entry.model)}</span>` : '';
     const tokenStr = entry.usage
         ? `<span class="message-tokens">${(0, htmlHelpers_1.fmtTokens)(entry.usage.input_tokens + entry.usage.output_tokens)} tokens</span>`
@@ -512,6 +514,7 @@ function renderMessage(entry, includeThinking, includeToolDetail) {
     return `<div class="message ${entry.type}" data-type="${entry.type}">
   <div class="message-header">
     ${roleBadge}
+    ${sourceStr}
     ${modelStr}
     ${tokenStr}
     <span class="message-ts">${ts}</span>

package/dist/report/index.d.ts

@@ -2,7 +2,7 @@
  * Public API for the report module.
  */
 export type { TranscriptContentBlock, TranscriptEntry, HtmlReportOptions } from './types';
-export { parseTranscript } from './transcriptParser';
+export { parseTranscript, parseTranscriptFromEvents } from './transcriptParser';
 export { generateHtmlReport } from './htmlReportGenerator';
 export { openInBrowser } from './openBrowser';
 export { escapeHtml, simpleMarkdownToHtml, highlightCodeBlock } from './htmlHelpers';

package/dist/report/index.js

@@ -3,9 +3,10 @@
  * Public API for the report module.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.highlightCodeBlock = exports.simpleMarkdownToHtml = exports.escapeHtml = exports.openInBrowser = exports.generateHtmlReport = exports.parseTranscript = void 0;
+exports.highlightCodeBlock = exports.simpleMarkdownToHtml = exports.escapeHtml = exports.openInBrowser = exports.generateHtmlReport = exports.parseTranscriptFromEvents = exports.parseTranscript = void 0;
 var transcriptParser_1 = require("./transcriptParser");
 Object.defineProperty(exports, "parseTranscript", { enumerable: true, get: function () { return transcriptParser_1.parseTranscript; } });
+Object.defineProperty(exports, "parseTranscriptFromEvents", { enumerable: true, get: function () { return transcriptParser_1.parseTranscriptFromEvents; } });
 var htmlReportGenerator_1 = require("./htmlReportGenerator");
 Object.defineProperty(exports, "generateHtmlReport", { enumerable: true, get: function () { return htmlReportGenerator_1.generateHtmlReport; } });
 var openBrowser_1 = require("./openBrowser");

package/dist/report/transcriptParser.d.ts

@@ -2,6 +2,7 @@
  * Parse Claude Code JSONL session files into typed transcript entries
  * with full, untruncated content suitable for HTML report rendering.
  */
+import type { SessionEvent } from '../types/sessionEvent';
 import type { TranscriptEntry } from './types';
 /**
  * Parse a JSONL session file into an array of TranscriptEntry objects.
@@ -10,3 +11,5 @@ import type { TranscriptEntry } from './types';
  * this preserves full message content for HTML report rendering.
  */
 export declare function parseTranscript(sessionPath: string): TranscriptEntry[];
+/** Parse canonical provider events into transcript entries. */
+export declare function parseTranscriptFromEvents(events: SessionEvent[]): TranscriptEntry[];

package/dist/report/transcriptParser.js

@@ -38,6 +38,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTranscript = parseTranscript;
+exports.parseTranscriptFromEvents = parseTranscriptFromEvents;
 const fs = __importStar(require("fs"));
 const jsonl_1 = require("../parsers/jsonl");
 /**
@@ -69,11 +70,23 @@ function parseTranscript(sessionPath) {
     }
     return entries;
 }
+/** Parse canonical provider events into transcript entries. */
+function parseTranscriptFromEvents(events) {
+    const entries = [];
+    for (const event of events) {
+        const entry = eventToTranscriptEntry(event);
+        if (entry) {
+            entries.push(entry);
+        }
+    }
+    return entries;
+}
 function eventToTranscriptEntry(event) {
     if (!event.type || !event.message)
         return null;
     const role = event.message.role;
     const timestamp = event.timestamp || '';
+    const sourceLabel = event.message.sourceLabel;
     const model = event.message.model;
     const usage = event.message.usage
         ? {
@@ -85,13 +98,22 @@ function eventToTranscriptEntry(event) {
         : undefined;
     const content = extractContentBlocks(event.message.content);
     // Skip empty entries (warmup messages, etc.)
-    if (content.length === 0)
-        return null;
+    if (content.length === 0) {
+        if (usage || sourceLabel) {
+            content.push({ type: 'text', text: sourceLabel ? `${sourceLabel} updated` : 'Usage updated' });
+        }
+        else {
+            return null;
+        }
+    }
     let type;
     // Check event.type first — summary events have role 'assistant' but should be typed as 'summary'
     if (event.type === 'summary') {
         type = 'summary';
     }
+    else if (event.type === 'system') {
+        type = 'system';
+    }
     else if (role === 'user') {
         type = 'user';
     }
@@ -101,7 +123,7 @@ function eventToTranscriptEntry(event) {
     else {
         type = 'system';
     }
-    return { type, timestamp, model, usage, content };
+    return { type, timestamp, sourceLabel, model, usage, content };
 }
 function extractContentBlocks(content) {
     if (!content)

package/dist/report/types.d.ts

@@ -21,6 +21,8 @@ export interface TranscriptContentBlock {
 export interface TranscriptEntry {
     type: 'user' | 'assistant' | 'system' | 'summary';
     timestamp: string;
+    /** Optional human-readable source label (e.g. "developer", "base instructions"). */
+    sourceLabel?: string;
     model?: string;
     usage?: {
         input_tokens: number;

package/dist/schemas/sessionEvent.d.ts

@@ -18,6 +18,7 @@ export declare const messageUsageSchema: z.ZodObject<{
 export declare const sessionMessageSchema: z.ZodObject<{
     role: z.ZodString;
     id: z.ZodOptional<z.ZodString>;
+    sourceLabel: z.ZodOptional<z.ZodString>;
     model: z.ZodOptional<z.ZodString>;
     usage: z.ZodOptional<z.ZodObject<{
         input_tokens: z.ZodNumber;
@@ -42,10 +43,12 @@ export declare const sessionEventSchema: z.ZodObject<{
         tool_use: "tool_use";
         tool_result: "tool_result";
         summary: "summary";
+        system: "system";
     }>;
     message: z.ZodObject<{
         role: z.ZodString;
         id: z.ZodOptional<z.ZodString>;
+        sourceLabel: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         usage: z.ZodOptional<z.ZodObject<{
             input_tokens: z.ZodNumber;
@@ -65,6 +68,18 @@ export declare const sessionEventSchema: z.ZodObject<{
         bypassPermissions: "bypassPermissions";
         plan: "plan";
     }>>;
+    rateLimits: z.ZodOptional<z.ZodObject<{
+        primary: z.ZodOptional<z.ZodObject<{
+            usedPercent: z.ZodNumber;
+            windowMinutes: z.ZodNumber;
+            resetsAt: z.ZodNumber;
+        }, z.core.$strip>>;
+        secondary: z.ZodOptional<z.ZodObject<{
+            usedPercent: z.ZodNumber;
+            windowMinutes: z.ZodNumber;
+            resetsAt: z.ZodNumber;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
     tool: z.ZodOptional<z.ZodObject<{
         name: z.ZodString;
         input: z.ZodRecord<z.ZodString, z.ZodUnknown>;

package/dist/schemas/sessionEvent.js

@@ -23,6 +23,7 @@ exports.messageUsageSchema = zod_1.z.object({
 exports.sessionMessageSchema = zod_1.z.object({
     role: zod_1.z.string(),
     id: zod_1.z.string().optional(),
+    sourceLabel: zod_1.z.string().optional(),
     model: zod_1.z.string().optional(),
     usage: exports.messageUsageSchema.optional(),
     content: zod_1.z.unknown().optional(),
@@ -36,11 +37,23 @@ exports.permissionModeSchema = zod_1.z.enum([
 ]);
 // ── SessionEvent ──
 exports.sessionEventSchema = zod_1.z.object({
-    type: zod_1.z.enum(['user', 'assistant', 'tool_use', 'tool_result', 'summary']),
+    type: zod_1.z.enum(['user', 'assistant', 'tool_use', 'tool_result', 'summary', 'system']),
     message: exports.sessionMessageSchema,
     timestamp: zod_1.z.string(),
     isSidechain: zod_1.z.boolean().optional(),
     permissionMode: exports.permissionModeSchema.optional(),
+    rateLimits: zod_1.z.object({
+        primary: zod_1.z.object({
+            usedPercent: zod_1.z.number(),
+            windowMinutes: zod_1.z.number(),
+            resetsAt: zod_1.z.number(),
+        }).optional(),
+        secondary: zod_1.z.object({
+            usedPercent: zod_1.z.number(),
+            windowMinutes: zod_1.z.number(),
+            resetsAt: zod_1.z.number(),
+        }).optional(),
+    }).optional(),
     tool: zod_1.z.object({
         name: zod_1.z.string(),
         input: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()),

package/dist/types/sessionEvent.d.ts

@@ -37,6 +37,8 @@ export interface SessionMessage {
     role: string;
     /** Optional message identifier (for deduplication) */
     id?: string;
+    /** Optional human-readable source label (e.g. "developer", "base instructions"). */
+    sourceLabel?: string;
     /** Model identifier (e.g., "claude-opus-4-20250514") */
     model?: string;
     /** Token usage statistics (only present in assistant messages) */
@@ -52,7 +54,7 @@ export interface SessionMessage {
  */
 export interface SessionEvent {
     /** Event type discriminator */
-    type: 'user' | 'assistant' | 'tool_use' | 'tool_result' | 'summary';
+    type: 'user' | 'assistant' | 'tool_use' | 'tool_result' | 'summary' | 'system';
     /** Message data containing role, model, usage */
     message: SessionMessage;
     /** ISO 8601 timestamp of event */
@@ -61,6 +63,19 @@ export interface SessionEvent {
     isSidechain?: boolean;
     /** Permission mode active when this event occurred */
     permissionMode?: 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan';
+    /** Subscription rate limits, when provided by the session source. */
+    rateLimits?: {
+        primary?: {
+            usedPercent: number;
+            windowMinutes: number;
+            resetsAt: number;
+        };
+        secondary?: {
+            usedPercent: number;
+            windowMinutes: number;
+            resetsAt: number;
+        };
+    };
     /** Tool use details (when type is 'tool_use') */
     tool?: {
         name: string;

package/dist/watchers/eventBridge.js

@@ -30,6 +30,7 @@ function toFollowEvents(event, providerId) {
         : undefined;
     const cost = usage?.reported_cost;
     const model = event.message?.model;
+    const rateLimits = event.rateLimits;
     switch (event.type) {
         case 'user': {
             const content = event.message?.content;
@@ -118,6 +119,24 @@ function toFollowEvents(event, providerId) {
             });
             break;
         }
+        case 'system': {
+            const text = extractTextContent(event.message?.content);
+            const label = event.message?.sourceLabel || event.message?.role || 'system';
+            const summary = text || (usage
+                ? `Tokens: ${usage.input_tokens || 0} in / ${usage.output_tokens || 0} out`
+                : label);
+            events.push({
+                providerId, type: 'system', timestamp: ts,
+                summary: label && text ? `${label}: ${text}` : summary,
+                tokens,
+                cacheTokens,
+                cost,
+                model,
+                rateLimits,
+                raw: event,
+            });
+            break;
+        }
         default: {
             // Handle 'result' and other types as system events
             const evtType = event.type;
@@ -136,6 +155,11 @@ function toFollowEvents(event, providerId) {
             e.permissionMode = permissionMode;
         }
     }
+    if (rateLimits) {
+        for (const e of events) {
+            e.rateLimits = e.rateLimits ?? rateLimits;
+        }
+    }
     return events;
 }
 // ── Helpers ──

package/dist/watchers/factory.d.ts

@@ -1,10 +1,10 @@
 /**
  * Factory for creating the correct session watcher by provider.
  */
-import type { SessionProvider } from '../providers/types';
+import type { SessionProviderBase } from '../providers/types';
 import type { SessionWatcher, SessionWatcherCallbacks } from './types';
 export interface CreateWatcherOptions {
-    provider: SessionProvider;
+    provider: SessionProviderBase;
     workspacePath: string;
     sessionId?: string;
     callbacks: SessionWatcherCallbacks;