aisnitch 0.2.21 → 0.2.23

package/dist/index.d.cts

@@ -266,6 +266,9 @@ declare const EventDataSchema: z.ZodObject<{
     activeFile: z.ZodOptional<z.ZodString>;
     model: z.ZodOptional<z.ZodString>;
     tokensUsed: z.ZodOptional<z.ZodNumber>;
+    inputTokens: z.ZodOptional<z.ZodNumber>;
+    outputTokens: z.ZodOptional<z.ZodNumber>;
+    cachedTokens: z.ZodOptional<z.ZodNumber>;
     errorMessage: z.ZodOptional<z.ZodString>;
     errorType: z.ZodOptional<z.ZodEnum<{
         rate_limit: "rate_limit";
@@ -361,6 +364,9 @@ declare const AISnitchEventSchema: z.ZodObject<{
         activeFile: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         tokensUsed: z.ZodOptional<z.ZodNumber>;
+        inputTokens: z.ZodOptional<z.ZodNumber>;
+        outputTokens: z.ZodOptional<z.ZodNumber>;
+        cachedTokens: z.ZodOptional<z.ZodNumber>;
         errorMessage: z.ZodOptional<z.ZodString>;
         errorType: z.ZodOptional<z.ZodEnum<{
             rate_limit: "rate_limit";
@@ -470,6 +476,9 @@ declare const NormalizedAdapterHookPayloadSchema: z.ZodObject<{
         activeFile: z.ZodOptional<z.ZodOptional<z.ZodString>>;
         model: z.ZodOptional<z.ZodOptional<z.ZodString>>;
         tokensUsed: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        inputTokens: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        outputTokens: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        cachedTokens: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         errorMessage: z.ZodOptional<z.ZodOptional<z.ZodString>>;
         errorType: z.ZodOptional<z.ZodOptional<z.ZodEnum<{
             rate_limit: "rate_limit";

package/dist/index.d.ts

@@ -266,6 +266,9 @@ declare const EventDataSchema: z.ZodObject<{
     activeFile: z.ZodOptional<z.ZodString>;
     model: z.ZodOptional<z.ZodString>;
     tokensUsed: z.ZodOptional<z.ZodNumber>;
+    inputTokens: z.ZodOptional<z.ZodNumber>;
+    outputTokens: z.ZodOptional<z.ZodNumber>;
+    cachedTokens: z.ZodOptional<z.ZodNumber>;
     errorMessage: z.ZodOptional<z.ZodString>;
     errorType: z.ZodOptional<z.ZodEnum<{
         rate_limit: "rate_limit";
@@ -361,6 +364,9 @@ declare const AISnitchEventSchema: z.ZodObject<{
         activeFile: z.ZodOptional<z.ZodString>;
         model: z.ZodOptional<z.ZodString>;
         tokensUsed: z.ZodOptional<z.ZodNumber>;
+        inputTokens: z.ZodOptional<z.ZodNumber>;
+        outputTokens: z.ZodOptional<z.ZodNumber>;
+        cachedTokens: z.ZodOptional<z.ZodNumber>;
         errorMessage: z.ZodOptional<z.ZodString>;
         errorType: z.ZodOptional<z.ZodEnum<{
             rate_limit: "rate_limit";
@@ -470,6 +476,9 @@ declare const NormalizedAdapterHookPayloadSchema: z.ZodObject<{
         activeFile: z.ZodOptional<z.ZodOptional<z.ZodString>>;
         model: z.ZodOptional<z.ZodOptional<z.ZodString>>;
         tokensUsed: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        inputTokens: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        outputTokens: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
+        cachedTokens: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
         errorMessage: z.ZodOptional<z.ZodOptional<z.ZodString>>;
         errorType: z.ZodOptional<z.ZodOptional<z.ZodEnum<{
             rate_limit: "rate_limit";

package/dist/index.js

@@ -618,6 +618,9 @@ var EventDataSchema = z.strictObject({
   activeFile: z.string().min(1).max(4096).optional(),
   model: z.string().min(1).max(200).optional(),
   tokensUsed: z.number().int().min(0).optional(),
+  inputTokens: z.number().int().min(0).optional(),
+  outputTokens: z.number().int().min(0).optional(),
+  cachedTokens: z.number().int().min(0).optional(),
   errorMessage: z.string().min(1).max(1e4).optional(),
   errorType: ErrorTypeSchema.optional(),
   raw: z.record(z.string(), z.unknown()).optional(),
@@ -2015,7 +2018,7 @@ function extractClaudeTranscriptObservations(payload, transcriptPath) {
   });
   const contentParts = extractClaudeContentParts(payload);
   const model = getString(payload, "model") ?? getString(getRecord(payload.message), "model");
-  const tokensUsed = extractTokenUsage(payload);
+  const tokens = extractTokenUsageDetailed(payload);
   const rawPayload = payload;
   const sharedContext = {
     // 📖 Pass process.env so terminal detection works from transcript path too
@@ -2028,7 +2031,10 @@ function extractClaudeTranscriptObservations(payload, transcriptPath) {
   const sharedData = {
     model,
     raw: rawPayload,
-    tokensUsed
+    tokensUsed: tokens.total,
+    inputTokens: tokens.input,
+    outputTokens: tokens.output,
+    cachedTokens: tokens.cached
   };
   const observations = [];
   if (contentParts.some((part) => part.type === "thinking")) {
@@ -2086,23 +2092,28 @@ function extractClaudeContentParts(payload) {
   }
   return content.filter(isRecord);
 }
-function extractTokenUsage(payload) {
+function extractTokenUsageDetailed(payload) {
   const tokens = getNumber(payload, "tokens");
   if (tokens !== void 0) {
-    return tokens;
+    return { total: tokens };
   }
   const usage = getRecord(payload.usage);
   if (!usage) {
-    return void 0;
+    return {};
   }
   const totalTokens = getNumber(usage, "total_tokens");
   if (totalTokens !== void 0) {
-    return totalTokens;
+    return {
+      total: totalTokens,
+      input: getNumber(usage, "input_tokens"),
+      output: getNumber(usage, "output_tokens"),
+      cached: getNumber(usage, "cached_tokens")
+    };
   }
   const inputTokens = getNumber(usage, "input_tokens") ?? 0;
   const outputTokens = getNumber(usage, "output_tokens") ?? 0;
   const usageSum = inputTokens + outputTokens;
-  return usageSum > 0 ? usageSum : void 0;
+  return usageSum > 0 ? { total: usageSum, input: inputTokens, output: outputTokens } : {};
 }
 function extractClaudeToolInput(payload) {
   const toolInput = getRecord(payload.tool_input) ?? getRecord(payload.toolInput);
@@ -7206,7 +7217,17 @@ var OpenCodeAdapter = class extends BaseAdapter {
       project: extractOpenCodeProject(payload),
       raw: payload,
       toolInput: extractOpenCodeToolInput(payload),
-      toolName: extractOpenCodeToolName(payload)
+      toolName: extractOpenCodeToolName(payload),
+      // 📖 Extract token usage from payload (with input/output/cached breakdown)
+      ...(() => {
+        const tokens = extractOpenCodeTokens(payload);
+        return {
+          tokensUsed: tokens.total,
+          inputTokens: tokens.inputTokens,
+          outputTokens: tokens.outputTokens,
+          cachedTokens: tokens.cachedTokens
+        };
+      })()
     };
     switch (eventType) {
       case "session.created": {
@@ -7235,9 +7256,21 @@ var OpenCodeAdapter = class extends BaseAdapter {
         await this.emitStateChange("agent.compact", sharedData, context);
         return;
       }
+      case "thinking": {
+        const thinkingContent = extractOpenCodeThinkingContent(payload);
+        await this.emitStateChange("agent.thinking", {
+          ...sharedData,
+          thinkingContent
+        }, context);
+        return;
+      }
       case "message.updated":
       case "message.part.updated": {
-        await this.emitStateChange("agent.streaming", sharedData, context);
+        const messageContent = extractOpenCodeMessageContent(payload);
+        await this.emitStateChange("agent.streaming", {
+          ...sharedData,
+          messageContent
+        }, context);
         return;
       }
       case "permission.asked": {
@@ -7456,6 +7489,67 @@ function extractOpenCodeToolResult(payload) {
   }
   return void 0;
 }
+function extractOpenCodeMessageContent(payload) {
+  const directMessage = getString10(payload, "text") ?? getString10(payload, "message") ?? getString10(payload, "content") ?? getString10(payload, "output");
+  if (directMessage) {
+    return directMessage;
+  }
+  const part = getRecord9(payload.part) ?? getRecord9(getRecord9(payload.properties)?.part);
+  if (part) {
+    return getString10(part, "text") ?? getString10(part, "content");
+  }
+  const props = getRecord9(payload.properties);
+  if (props) {
+    const message = getRecord9(props.message) ?? getRecord9(props.info);
+    if (message) {
+      return getString10(message, "text") ?? getString10(message, "content");
+    }
+    return getString10(props, "text") ?? getString10(props, "message");
+  }
+  return void 0;
+}
+function extractOpenCodeThinkingContent(payload) {
+  const directThinking = getString10(payload, "thinking") ?? getString10(payload, "thinkingContent") ?? getString10(payload, "reasoning") ?? getString10(payload, "thought");
+  if (directThinking) {
+    return directThinking;
+  }
+  const props = getRecord9(payload.properties);
+  if (props) {
+    return getString10(props, "thinking") ?? getString10(props, "reasoning") ?? getString10(props, "thought");
+  }
+  return void 0;
+}
+function extractOpenCodeTokens(payload) {
+  const directTokens = getNumber8(payload, "tokensUsed") ?? getNumber8(payload, "tokens");
+  if (directTokens !== void 0) {
+    return { total: directTokens };
+  }
+  const props = getRecord9(payload.properties);
+  if (props) {
+    const info = getRecord9(props.info);
+    if (info) {
+      const tokens = getRecord9(info.tokens);
+      if (tokens) {
+        const inputTokens = getNumber8(tokens, "input") ?? 0;
+        const outputTokens = getNumber8(tokens, "output") ?? 0;
+        const reasoningTokens = getNumber8(tokens, "reasoning") ?? 0;
+        const total = inputTokens + outputTokens + reasoningTokens;
+        return total > 0 ? {
+          total,
+          inputTokens,
+          outputTokens,
+          // reasoning tokens are often billed as cached on some providers
+          cachedTokens: reasoningTokens
+        } : {};
+      }
+    }
+    const fallbackTokens = getNumber8(props, "tokensUsed") ?? getNumber8(props, "tokens");
+    if (fallbackTokens !== void 0) {
+      return { total: fallbackTokens };
+    }
+  }
+  return {};
+}
 
 // src/adapters/pi.ts
 import { execFile as execFile12 } from "child_process";
@@ -9152,7 +9246,7 @@ import { WebSocket, WebSocketServer } from "ws";
 
 // src/package-info.ts
 var AISNITCH_PACKAGE_NAME = "aisnitch";
-var AISNITCH_VERSION = "0.2.21";
+var AISNITCH_VERSION = "0.2.23";
 var AISNITCH_DESCRIPTION = "Universal bridge for AI coding tool activity \u2014 capture, normalize, stream.";
 function getPackageScaffoldInfo() {
   return {