sidekick-shared 0.23.1 → 0.24.1

package/dist/schemas/sessionEvent.d.ts

@@ -7,7 +7,7 @@
  * @module schemas/sessionEvent
  */
 import { z } from 'zod';
-import type { SessionEvent } from '../types/sessionEvent';
+import type { SessionEvent, SummarySessionEvent } from '../types/sessionEvent';
 export declare const messageUsageSchema: z.ZodObject<{
     input_tokens: z.ZodNumber;
     output_tokens: z.ZodNumber;
@@ -29,6 +29,28 @@ export declare const sessionMessageSchema: z.ZodObject<{
         reported_cost: z.ZodOptional<z.ZodNumber>;
         reasoning_tokens: z.ZodOptional<z.ZodNumber>;
     }, z.core.$strip>>;
+    normalizedUsage: z.ZodOptional<z.ZodObject<{
+        uncachedInputTokens: z.ZodNumber;
+        cacheReadTokens: z.ZodNumber;
+        cacheWriteTokens: z.ZodNumber;
+        outputTokens: z.ZodNumber;
+        reasoningTokens: z.ZodNumber;
+        reasoningIncludedInOutput: z.ZodBoolean;
+        cacheInclusiveInputTokens: z.ZodNumber;
+        billableOutputTokens: z.ZodNumber;
+        totalTokens: z.ZodNumber;
+        model: z.ZodOptional<z.ZodString>;
+        reportedCostUsd: z.ZodOptional<z.ZodNumber>;
+        provenance: z.ZodObject<{
+            provider: z.ZodOptional<z.ZodString>;
+            semantics: z.ZodEnum<{
+                "anthropic-additive-cache": "anthropic-additive-cache";
+                "openai-inclusive-cache": "openai-inclusive-cache";
+                "sidekick-disjoint": "sidekick-disjoint";
+            }>;
+            source: z.ZodOptional<z.ZodString>;
+        }, z.core.$strip>;
+    }, z.core.$strip>>;
     content: z.ZodOptional<z.ZodUnknown>;
 }, z.core.$strip>;
 export declare const permissionModeSchema: z.ZodEnum<{
@@ -37,15 +59,126 @@ export declare const permissionModeSchema: z.ZodEnum<{
     bypassPermissions: "bypassPermissions";
     plan: "plan";
 }>;
-export declare const sessionEventSchema: z.ZodObject<{
-    type: z.ZodEnum<{
-        user: "user";
-        assistant: "assistant";
-        system: "system";
-        tool_use: "tool_use";
-        tool_result: "tool_result";
-        summary: "summary";
-    }>;
+export declare const userSessionEventSchema: z.ZodObject<{
+    timestamp: z.ZodString;
+    entrypoint: z.ZodOptional<z.ZodString>;
+    isMeta: z.ZodOptional<z.ZodBoolean>;
+    isSidechain: z.ZodOptional<z.ZodBoolean>;
+    cwd: z.ZodOptional<z.ZodString>;
+    gitBranch: z.ZodOptional<z.ZodString>;
+    permissionMode: z.ZodOptional<z.ZodEnum<{
+        default: "default";
+        acceptEdits: "acceptEdits";
+        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>>;
+    compaction: z.ZodOptional<z.ZodObject<{
+        tokensBefore: z.ZodNumber;
+        tokensAfter: z.ZodNumber;
+    }, z.core.$strip>>;
+    providerMetadata: z.ZodOptional<z.ZodObject<{
+        providerId: z.ZodOptional<z.ZodString>;
+        source: z.ZodOptional<z.ZodString>;
+        retryAttempts: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
+        finishReasons: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        providerError: z.ZodOptional<z.ZodObject<{
+            type: z.ZodOptional<z.ZodString>;
+            message: z.ZodOptional<z.ZodString>;
+            code: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+    type: z.ZodLiteral<"user">;
+    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;
+            output_tokens: z.ZodNumber;
+            cache_creation_input_tokens: z.ZodOptional<z.ZodNumber>;
+            cache_read_input_tokens: z.ZodOptional<z.ZodNumber>;
+            reported_cost: z.ZodOptional<z.ZodNumber>;
+            reasoning_tokens: z.ZodOptional<z.ZodNumber>;
+        }, z.core.$strip>>;
+        normalizedUsage: z.ZodOptional<z.ZodObject<{
+            uncachedInputTokens: z.ZodNumber;
+            cacheReadTokens: z.ZodNumber;
+            cacheWriteTokens: z.ZodNumber;
+            outputTokens: z.ZodNumber;
+            reasoningTokens: z.ZodNumber;
+            reasoningIncludedInOutput: z.ZodBoolean;
+            cacheInclusiveInputTokens: z.ZodNumber;
+            billableOutputTokens: z.ZodNumber;
+            totalTokens: z.ZodNumber;
+            model: z.ZodOptional<z.ZodString>;
+            reportedCostUsd: z.ZodOptional<z.ZodNumber>;
+            provenance: z.ZodObject<{
+                provider: z.ZodOptional<z.ZodString>;
+                semantics: z.ZodEnum<{
+                    "anthropic-additive-cache": "anthropic-additive-cache";
+                    "openai-inclusive-cache": "openai-inclusive-cache";
+                    "sidekick-disjoint": "sidekick-disjoint";
+                }>;
+                source: z.ZodOptional<z.ZodString>;
+            }, z.core.$strip>;
+        }, z.core.$strip>>;
+        content: z.ZodOptional<z.ZodUnknown>;
+    }, z.core.$strip>;
+}, z.core.$strip>;
+export declare const assistantSessionEventSchema: z.ZodObject<{
+    timestamp: z.ZodString;
+    entrypoint: z.ZodOptional<z.ZodString>;
+    isMeta: z.ZodOptional<z.ZodBoolean>;
+    isSidechain: z.ZodOptional<z.ZodBoolean>;
+    cwd: z.ZodOptional<z.ZodString>;
+    gitBranch: z.ZodOptional<z.ZodString>;
+    permissionMode: z.ZodOptional<z.ZodEnum<{
+        default: "default";
+        acceptEdits: "acceptEdits";
+        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>>;
+    compaction: z.ZodOptional<z.ZodObject<{
+        tokensBefore: z.ZodNumber;
+        tokensAfter: z.ZodNumber;
+    }, z.core.$strip>>;
+    providerMetadata: z.ZodOptional<z.ZodObject<{
+        providerId: z.ZodOptional<z.ZodString>;
+        source: z.ZodOptional<z.ZodString>;
+        retryAttempts: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
+        finishReasons: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        providerError: z.ZodOptional<z.ZodObject<{
+            type: z.ZodOptional<z.ZodString>;
+            message: z.ZodOptional<z.ZodString>;
+            code: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+    type: z.ZodLiteral<"assistant">;
     message: z.ZodObject<{
         role: z.ZodString;
         id: z.ZodOptional<z.ZodString>;
@@ -59,10 +192,39 @@ export declare const sessionEventSchema: z.ZodObject<{
             reported_cost: z.ZodOptional<z.ZodNumber>;
             reasoning_tokens: z.ZodOptional<z.ZodNumber>;
         }, z.core.$strip>>;
+        normalizedUsage: z.ZodOptional<z.ZodObject<{
+            uncachedInputTokens: z.ZodNumber;
+            cacheReadTokens: z.ZodNumber;
+            cacheWriteTokens: z.ZodNumber;
+            outputTokens: z.ZodNumber;
+            reasoningTokens: z.ZodNumber;
+            reasoningIncludedInOutput: z.ZodBoolean;
+            cacheInclusiveInputTokens: z.ZodNumber;
+            billableOutputTokens: z.ZodNumber;
+            totalTokens: z.ZodNumber;
+            model: z.ZodOptional<z.ZodString>;
+            reportedCostUsd: z.ZodOptional<z.ZodNumber>;
+            provenance: z.ZodObject<{
+                provider: z.ZodOptional<z.ZodString>;
+                semantics: z.ZodEnum<{
+                    "anthropic-additive-cache": "anthropic-additive-cache";
+                    "openai-inclusive-cache": "openai-inclusive-cache";
+                    "sidekick-disjoint": "sidekick-disjoint";
+                }>;
+                source: z.ZodOptional<z.ZodString>;
+            }, z.core.$strip>;
+        }, z.core.$strip>>;
         content: z.ZodOptional<z.ZodUnknown>;
     }, z.core.$strip>;
+}, z.core.$strip>;
+export declare const summarySessionEventSchema: z.ZodType<SummarySessionEvent>;
+export declare const systemSessionEventSchema: z.ZodObject<{
     timestamp: z.ZodString;
+    entrypoint: z.ZodOptional<z.ZodString>;
+    isMeta: z.ZodOptional<z.ZodBoolean>;
     isSidechain: z.ZodOptional<z.ZodBoolean>;
+    cwd: z.ZodOptional<z.ZodString>;
+    gitBranch: z.ZodOptional<z.ZodString>;
     permissionMode: z.ZodOptional<z.ZodEnum<{
         default: "default";
         acceptEdits: "acceptEdits";
@@ -86,6 +248,8 @@ export declare const sessionEventSchema: z.ZodObject<{
         tokensAfter: z.ZodNumber;
     }, z.core.$strip>>;
     providerMetadata: z.ZodOptional<z.ZodObject<{
+        providerId: z.ZodOptional<z.ZodString>;
+        source: z.ZodOptional<z.ZodString>;
         retryAttempts: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
         finishReasons: z.ZodOptional<z.ZodArray<z.ZodString>>;
         providerError: z.ZodOptional<z.ZodObject<{
@@ -94,16 +258,213 @@ export declare const sessionEventSchema: z.ZodObject<{
             code: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
         }, z.core.$strip>>;
     }, z.core.$strip>>;
-    tool: z.ZodOptional<z.ZodObject<{
+    type: z.ZodLiteral<"system">;
+    message: z.ZodOptional<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;
+            output_tokens: z.ZodNumber;
+            cache_creation_input_tokens: z.ZodOptional<z.ZodNumber>;
+            cache_read_input_tokens: z.ZodOptional<z.ZodNumber>;
+            reported_cost: z.ZodOptional<z.ZodNumber>;
+            reasoning_tokens: z.ZodOptional<z.ZodNumber>;
+        }, z.core.$strip>>;
+        normalizedUsage: z.ZodOptional<z.ZodObject<{
+            uncachedInputTokens: z.ZodNumber;
+            cacheReadTokens: z.ZodNumber;
+            cacheWriteTokens: z.ZodNumber;
+            outputTokens: z.ZodNumber;
+            reasoningTokens: z.ZodNumber;
+            reasoningIncludedInOutput: z.ZodBoolean;
+            cacheInclusiveInputTokens: z.ZodNumber;
+            billableOutputTokens: z.ZodNumber;
+            totalTokens: z.ZodNumber;
+            model: z.ZodOptional<z.ZodString>;
+            reportedCostUsd: z.ZodOptional<z.ZodNumber>;
+            provenance: z.ZodObject<{
+                provider: z.ZodOptional<z.ZodString>;
+                semantics: z.ZodEnum<{
+                    "anthropic-additive-cache": "anthropic-additive-cache";
+                    "openai-inclusive-cache": "openai-inclusive-cache";
+                    "sidekick-disjoint": "sidekick-disjoint";
+                }>;
+                source: z.ZodOptional<z.ZodString>;
+            }, z.core.$strip>;
+        }, z.core.$strip>>;
+        content: z.ZodOptional<z.ZodUnknown>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
+export declare const toolUseSessionEventSchema: z.ZodObject<{
+    tool: z.ZodObject<{
         name: z.ZodString;
         input: z.ZodRecord<z.ZodString, z.ZodUnknown>;
+    }, z.core.$strip>;
+    timestamp: z.ZodString;
+    entrypoint: z.ZodOptional<z.ZodString>;
+    isMeta: z.ZodOptional<z.ZodBoolean>;
+    isSidechain: z.ZodOptional<z.ZodBoolean>;
+    cwd: z.ZodOptional<z.ZodString>;
+    gitBranch: z.ZodOptional<z.ZodString>;
+    permissionMode: z.ZodOptional<z.ZodEnum<{
+        default: "default";
+        acceptEdits: "acceptEdits";
+        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>>;
+    compaction: z.ZodOptional<z.ZodObject<{
+        tokensBefore: z.ZodNumber;
+        tokensAfter: z.ZodNumber;
+    }, z.core.$strip>>;
+    providerMetadata: z.ZodOptional<z.ZodObject<{
+        providerId: z.ZodOptional<z.ZodString>;
+        source: z.ZodOptional<z.ZodString>;
+        retryAttempts: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
+        finishReasons: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        providerError: z.ZodOptional<z.ZodObject<{
+            type: z.ZodOptional<z.ZodString>;
+            message: z.ZodOptional<z.ZodString>;
+            code: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+    type: z.ZodLiteral<"tool_use">;
+    message: z.ZodOptional<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;
+            output_tokens: z.ZodNumber;
+            cache_creation_input_tokens: z.ZodOptional<z.ZodNumber>;
+            cache_read_input_tokens: z.ZodOptional<z.ZodNumber>;
+            reported_cost: z.ZodOptional<z.ZodNumber>;
+            reasoning_tokens: z.ZodOptional<z.ZodNumber>;
+        }, z.core.$strip>>;
+        normalizedUsage: z.ZodOptional<z.ZodObject<{
+            uncachedInputTokens: z.ZodNumber;
+            cacheReadTokens: z.ZodNumber;
+            cacheWriteTokens: z.ZodNumber;
+            outputTokens: z.ZodNumber;
+            reasoningTokens: z.ZodNumber;
+            reasoningIncludedInOutput: z.ZodBoolean;
+            cacheInclusiveInputTokens: z.ZodNumber;
+            billableOutputTokens: z.ZodNumber;
+            totalTokens: z.ZodNumber;
+            model: z.ZodOptional<z.ZodString>;
+            reportedCostUsd: z.ZodOptional<z.ZodNumber>;
+            provenance: z.ZodObject<{
+                provider: z.ZodOptional<z.ZodString>;
+                semantics: z.ZodEnum<{
+                    "anthropic-additive-cache": "anthropic-additive-cache";
+                    "openai-inclusive-cache": "openai-inclusive-cache";
+                    "sidekick-disjoint": "sidekick-disjoint";
+                }>;
+                source: z.ZodOptional<z.ZodString>;
+            }, z.core.$strip>;
+        }, z.core.$strip>>;
+        content: z.ZodOptional<z.ZodUnknown>;
     }, z.core.$strip>>;
-    result: z.ZodOptional<z.ZodObject<{
+}, z.core.$strip>;
+export declare const toolResultSessionEventSchema: z.ZodObject<{
+    result: z.ZodObject<{
         tool_use_id: z.ZodString;
         output: z.ZodOptional<z.ZodUnknown>;
         is_error: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strip>;
+    timestamp: z.ZodString;
+    entrypoint: z.ZodOptional<z.ZodString>;
+    isMeta: z.ZodOptional<z.ZodBoolean>;
+    isSidechain: z.ZodOptional<z.ZodBoolean>;
+    cwd: z.ZodOptional<z.ZodString>;
+    gitBranch: z.ZodOptional<z.ZodString>;
+    permissionMode: z.ZodOptional<z.ZodEnum<{
+        default: "default";
+        acceptEdits: "acceptEdits";
+        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>>;
+    compaction: z.ZodOptional<z.ZodObject<{
+        tokensBefore: z.ZodNumber;
+        tokensAfter: z.ZodNumber;
+    }, z.core.$strip>>;
+    providerMetadata: z.ZodOptional<z.ZodObject<{
+        providerId: z.ZodOptional<z.ZodString>;
+        source: z.ZodOptional<z.ZodString>;
+        retryAttempts: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
+        finishReasons: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        providerError: z.ZodOptional<z.ZodObject<{
+            type: z.ZodOptional<z.ZodString>;
+            message: z.ZodOptional<z.ZodString>;
+            code: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+    type: z.ZodLiteral<"tool_result">;
+    message: z.ZodOptional<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;
+            output_tokens: z.ZodNumber;
+            cache_creation_input_tokens: z.ZodOptional<z.ZodNumber>;
+            cache_read_input_tokens: z.ZodOptional<z.ZodNumber>;
+            reported_cost: z.ZodOptional<z.ZodNumber>;
+            reasoning_tokens: z.ZodOptional<z.ZodNumber>;
+        }, z.core.$strip>>;
+        normalizedUsage: z.ZodOptional<z.ZodObject<{
+            uncachedInputTokens: z.ZodNumber;
+            cacheReadTokens: z.ZodNumber;
+            cacheWriteTokens: z.ZodNumber;
+            outputTokens: z.ZodNumber;
+            reasoningTokens: z.ZodNumber;
+            reasoningIncludedInOutput: z.ZodBoolean;
+            cacheInclusiveInputTokens: z.ZodNumber;
+            billableOutputTokens: z.ZodNumber;
+            totalTokens: z.ZodNumber;
+            model: z.ZodOptional<z.ZodString>;
+            reportedCostUsd: z.ZodOptional<z.ZodNumber>;
+            provenance: z.ZodObject<{
+                provider: z.ZodOptional<z.ZodString>;
+                semantics: z.ZodEnum<{
+                    "anthropic-additive-cache": "anthropic-additive-cache";
+                    "openai-inclusive-cache": "openai-inclusive-cache";
+                    "sidekick-disjoint": "sidekick-disjoint";
+                }>;
+                source: z.ZodOptional<z.ZodString>;
+            }, z.core.$strip>;
+        }, z.core.$strip>>;
+        content: z.ZodOptional<z.ZodUnknown>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
+export declare const sessionEventSchema: z.ZodType<SessionEvent>;
 /**
  * Extracts canonical SessionEvents from a raw JSONL value.
  *

package/dist/schemas/sessionEvent.js

@@ -8,9 +8,10 @@
  * @module schemas/sessionEvent
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sessionEventSchema = exports.permissionModeSchema = exports.sessionMessageSchema = exports.messageUsageSchema = void 0;
+exports.sessionEventSchema = exports.toolResultSessionEventSchema = exports.toolUseSessionEventSchema = exports.systemSessionEventSchema = exports.summarySessionEventSchema = exports.assistantSessionEventSchema = exports.userSessionEventSchema = exports.permissionModeSchema = exports.sessionMessageSchema = exports.messageUsageSchema = void 0;
 exports.extractSessionEvents = extractSessionEvents;
 const zod_1 = require("zod");
+const usageNormalization_1 = require("./usageNormalization");
 // ── MessageUsage ──
 exports.messageUsageSchema = zod_1.z.object({
     input_tokens: zod_1.z.number(),
@@ -27,6 +28,7 @@ exports.sessionMessageSchema = zod_1.z.object({
     sourceLabel: zod_1.z.string().optional(),
     model: zod_1.z.string().optional(),
     usage: exports.messageUsageSchema.optional(),
+    normalizedUsage: usageNormalization_1.normalizedUsageSchema.optional(),
     content: zod_1.z.unknown().optional(),
 });
 // ── PermissionMode ──
@@ -37,11 +39,13 @@ exports.permissionModeSchema = zod_1.z.enum([
     'plan',
 ]);
 // ── SessionEvent ──
-exports.sessionEventSchema = zod_1.z.object({
-    type: zod_1.z.enum(['user', 'assistant', 'tool_use', 'tool_result', 'summary', 'system']),
-    message: exports.sessionMessageSchema,
+const eventBaseShape = {
     timestamp: zod_1.z.string(),
+    entrypoint: zod_1.z.string().optional(),
+    isMeta: zod_1.z.boolean().optional(),
     isSidechain: zod_1.z.boolean().optional(),
+    cwd: zod_1.z.string().optional(),
+    gitBranch: zod_1.z.string().optional(),
     permissionMode: exports.permissionModeSchema.optional(),
     rateLimits: zod_1.z
         .object({
@@ -69,6 +73,8 @@ exports.sessionEventSchema = zod_1.z.object({
         .optional(),
     providerMetadata: zod_1.z
         .object({
+        providerId: zod_1.z.string().optional(),
+        source: zod_1.z.string().optional(),
         retryAttempts: zod_1.z.array(zod_1.z.number()).optional(),
         finishReasons: zod_1.z.array(zod_1.z.string()).optional(),
         providerError: zod_1.z
@@ -80,20 +86,80 @@ exports.sessionEventSchema = zod_1.z.object({
             .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()),
-    })
-        .optional(),
-    result: zod_1.z
-        .object({
+};
+const compactionSchema = zod_1.z
+    .object({
+    tokensBefore: zod_1.z.number().finite().int().nonnegative(),
+    tokensAfter: zod_1.z.number().finite().int().nonnegative(),
+})
+    .refine((value) => value.tokensAfter <= value.tokensBefore, {
+    message: 'tokensAfter must not exceed tokensBefore',
+});
+exports.userSessionEventSchema = zod_1.z.object({
+    type: zod_1.z.literal('user'),
+    message: exports.sessionMessageSchema,
+    ...eventBaseShape,
+});
+exports.assistantSessionEventSchema = zod_1.z.object({
+    type: zod_1.z.literal('assistant'),
+    message: exports.sessionMessageSchema,
+    ...eventBaseShape,
+});
+const summaryWithMessageSchema = zod_1.z.object({
+    type: zod_1.z.literal('summary'),
+    message: exports.sessionMessageSchema,
+    summary: zod_1.z.string().min(1).optional(),
+    ...eventBaseShape,
+    compaction: compactionSchema.optional(),
+});
+const summaryWithTextSchema = zod_1.z.object({
+    type: zod_1.z.literal('summary'),
+    message: exports.sessionMessageSchema.optional(),
+    summary: zod_1.z.string().min(1),
+    ...eventBaseShape,
+    compaction: compactionSchema.optional(),
+});
+const summaryWithCompactionSchema = zod_1.z.object({
+    type: zod_1.z.literal('summary'),
+    message: exports.sessionMessageSchema.optional(),
+    summary: zod_1.z.string().min(1).optional(),
+    ...eventBaseShape,
+    compaction: compactionSchema,
+});
+exports.summarySessionEventSchema = zod_1.z.union([
+    summaryWithMessageSchema,
+    summaryWithTextSchema,
+    summaryWithCompactionSchema,
+]);
+exports.systemSessionEventSchema = zod_1.z.object({
+    type: zod_1.z.literal('system'),
+    message: exports.sessionMessageSchema.optional(),
+    ...eventBaseShape,
+});
+exports.toolUseSessionEventSchema = zod_1.z.object({
+    type: zod_1.z.literal('tool_use'),
+    message: exports.sessionMessageSchema.optional(),
+    ...eventBaseShape,
+    tool: zod_1.z.object({ name: zod_1.z.string(), input: zod_1.z.record(zod_1.z.string(), zod_1.z.unknown()) }),
+});
+exports.toolResultSessionEventSchema = zod_1.z.object({
+    type: zod_1.z.literal('tool_result'),
+    message: exports.sessionMessageSchema.optional(),
+    ...eventBaseShape,
+    result: zod_1.z.object({
         tool_use_id: zod_1.z.string(),
         output: zod_1.z.unknown().optional(),
         is_error: zod_1.z.boolean().optional(),
-    })
-        .optional(),
+    }),
 });
+exports.sessionEventSchema = zod_1.z.union([
+    exports.userSessionEventSchema,
+    exports.assistantSessionEventSchema,
+    exports.summarySessionEventSchema,
+    exports.systemSessionEventSchema,
+    exports.toolUseSessionEventSchema,
+    exports.toolResultSessionEventSchema,
+]);
 // ── Progress unwrapping ──
 /** Recursion bound for nested progress envelopes; real data nests 1 level. */
 const MAX_PROGRESS_DEPTH = 8;
@@ -107,19 +173,38 @@ const MAX_PROGRESS_DEPTH = 8;
  * Returns zero events for unrecognized input — never throws.
  */
 function extractSessionEvents(raw, depth = 0) {
+    return extractSessionEventsWithProvenance(raw, depth, {});
+}
+function extractSessionEventsWithProvenance(raw, depth, inherited) {
     const direct = exports.sessionEventSchema.safeParse(raw);
     if (direct.success)
-        return [direct.data];
+        return [{ ...inherited, ...direct.data }];
     if (depth >= MAX_PROGRESS_DEPTH)
         return [];
     if (typeof raw === 'object' && raw !== null && raw.type === 'progress') {
+        const provenance = { ...inherited, ...progressProvenance(raw) };
         const data = raw.data;
         if (typeof data === 'object' && data !== null) {
             const message = data.message;
             if (typeof message === 'object' && message !== null) {
-                return extractSessionEvents(message, depth + 1);
+                return extractSessionEventsWithProvenance(message, depth + 1, provenance);
             }
         }
     }
     return [];
 }
+function progressProvenance(raw) {
+    const value = raw;
+    const provenance = {};
+    if (typeof value.entrypoint === 'string')
+        provenance.entrypoint = value.entrypoint;
+    if (typeof value.isMeta === 'boolean')
+        provenance.isMeta = value.isMeta;
+    if (typeof value.isSidechain === 'boolean')
+        provenance.isSidechain = value.isSidechain;
+    if (typeof value.cwd === 'string')
+        provenance.cwd = value.cwd;
+    if (typeof value.gitBranch === 'string')
+        provenance.gitBranch = value.gitBranch;
+    return provenance;
+}

package/dist/schemas/tokenEstimation.d.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+export declare const tokenEstimateSchema: z.ZodObject<{
+    count: z.ZodNumber;
+    method: z.ZodEnum<{
+        exact: "exact";
+        "sidekick-fallback-v1": "sidekick-fallback-v1";
+    }>;
+    confidence: z.ZodEnum<{
+        low: "low";
+        medium: "medium";
+        exact: "exact";
+    }>;
+    provenance: z.ZodString;
+}, z.core.$strip>;

package/dist/schemas/tokenEstimation.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tokenEstimateSchema = void 0;
+const zod_1 = require("zod");
+exports.tokenEstimateSchema = zod_1.z.object({
+    count: zod_1.z.number().finite().nonnegative(),
+    method: zod_1.z.enum(['exact', 'sidekick-fallback-v1']),
+    confidence: zod_1.z.enum(['exact', 'medium', 'low']),
+    provenance: zod_1.z.string(),
+});

package/dist/schemas/transcript.d.ts

@@ -0,0 +1,25 @@
+import { z } from 'zod';
+import type { CanonicalSessionTranscript, CanonicalTranscriptMessage, CanonicalToolCall, TranscriptSourceProvenance } from '../transcript';
+export declare const transcriptSourceProvenanceSchema: z.ZodType<TranscriptSourceProvenance>;
+export declare const canonicalTranscriptBlockSchema: z.ZodObject<{
+    type: z.ZodEnum<{
+        unknown: "unknown";
+        text: "text";
+        tool_use: "tool_use";
+        tool_result: "tool_result";
+        thinking: "thinking";
+        image: "image";
+    }>;
+    text: z.ZodOptional<z.ZodString>;
+    toolName: z.ZodOptional<z.ZodString>;
+    toolUseId: z.ZodOptional<z.ZodString>;
+    input: z.ZodOptional<z.ZodUnknown>;
+    output: z.ZodOptional<z.ZodUnknown>;
+    isError: z.ZodOptional<z.ZodBoolean>;
+    command: z.ZodOptional<z.ZodString>;
+    truncated: z.ZodOptional<z.ZodBoolean>;
+    raw: z.ZodOptional<z.ZodUnknown>;
+}, z.core.$strip>;
+export declare const canonicalToolCallSchema: z.ZodType<CanonicalToolCall>;
+export declare const canonicalTranscriptMessageSchema: z.ZodType<CanonicalTranscriptMessage>;
+export declare const canonicalSessionTranscriptSchema: z.ZodType<CanonicalSessionTranscript>;