@timefly/opencode-plugin 0.2.3 → 0.2.8

package/README.md

@@ -76,7 +76,7 @@ Example result:
 ```json
 {
   "$schema": "https://opencode.ai/config.json",
-  "plugin": ["@timefly/opencode-plugin"]
+  "plugin": ["@timefly/opencode-plugin@latest"]
 }
 ```
 
@@ -97,18 +97,11 @@ OpenCode plugins run inside the OpenCode process. There is no built-in TimeFly U
 | Step | What happens |
 |------|----------------|
 | `login` | Opens browser → Google OAuth → saves tokens to `~/.config/opencode/timefly-auth.json` |
-| Plugin startup | Reads auth file (or `TIMEFLY_ACCESS_TOKEN` env override) |
+| Plugin startup | Reads auth file from `login` |
 | Each sync | Sends `Authorization: Bearer <accessToken>` to `POST /ai/sync` |
 | Token expiry | SDK auto-refreshes using `refreshToken` (~30 days) and updates the auth file |
 | No auth | Events queue locally in `.timefly-ai-queue.json` (project cwd) |
 
-Manual env override (not recommended — access tokens expire in ~15 minutes):
-
-```bash
-export TIMEFLY_ACCESS_TOKEN="..."
-export TIMEFLY_API_BASE_URL="https://api.timefly.dev"
-```
-
 ## How sync works
 
 Unlike the VS Code extension (which syncs on a timer every ~2 minutes), the OpenCode plugin syncs **on every event** — there is no background interval.
@@ -213,20 +206,11 @@ Add to `opencode.json` or `~/.config/opencode/opencode.json`:
 ```json
 {
   "$schema": "https://opencode.ai/config.json",
-  "plugin": ["@timefly/opencode-plugin"]
+  "plugin": ["@timefly/opencode-plugin@latest"]
 }
 ```
 
-OpenCode installs npm plugins automatically at startup via Bun.
-
-## Environment
-
-| Variable | Required | Default |
-|----------|----------|---------|
-| Auth file from `login` | Recommended | `~/.config/opencode/timefly-auth.json` |
-| `TIMEFLY_ACCESS_TOKEN` | Optional override | — |
-| `TIMEFLY_API_BASE_URL` | No | `https://api.timefly.dev` |
-| `TIMEFLY_OPENCODE_SESSION_ID` | No | OpenCode session ID |
+OpenCode installs npm plugins automatically at startup via Bun. Re-run `setup-opencode` to refresh `@latest` and clear the plugin cache.
 
 ## Events captured
 
@@ -287,6 +271,7 @@ Based on OpenCode source (`packages/opencode`, `@opencode-ai/plugin` hooks, and
 
 | Topic | Detail |
 |-------|--------|
+| **Plugin cache** | OpenCode caches plugins under `~/.cache/opencode/packages/`. If you upgraded but still see old errors, delete `@timefly` there and restart OpenCode. |
 | **Custom providers** (e.g. `nan`) | OpenCode runtime passes flat `Provider.Info` (`provider.id`) via `LLMRequestPrep.prepare` — not `provider.info.id`. Plugin reads both runtime and typed `ProviderContext` shapes. |
 | **Token counts** | Require provider to report usage. If `message.updated` lacks token fields, turn events are skipped (no crash). |
 | **Provider-side tools** | Tools executed inside the provider (`providerExecuted`) may not hit `tool.execute.*` — no tool events for those. |

package/dist/event-handlers.d.ts

@@ -2,12 +2,12 @@ import { createEventTracker } from './event-tracker.js';
 import { type OpenCodeBusEvent } from './opencode-readers.js';
 import type { createEventPublisher } from './publish-events.js';
 type EventPublisher = ReturnType<typeof createEventPublisher>['publish'];
-export declare const handleSessionCreated: (eventProperties: Record<string, unknown>, publish: EventPublisher) => Promise<void>;
+export declare const handleSessionCreated: (eventProperties: Record<string, unknown>, tracker: ReturnType<typeof createEventTracker>, publish: EventPublisher) => Promise<void>;
 export declare const handleSessionIdle: (eventProperties: Record<string, unknown>, tracker: ReturnType<typeof createEventTracker>, publish: EventPublisher) => Promise<void>;
 export declare const handleMessageUpdated: (eventProperties: Record<string, unknown>, tracker: ReturnType<typeof createEventTracker>, publish: EventPublisher) => Promise<void>;
 export declare const handleMessagePartUpdated: (eventProperties: Record<string, unknown>, tracker: ReturnType<typeof createEventTracker>, publish: EventPublisher) => Promise<void>;
-export declare const handleSessionCompacted: (eventProperties: Record<string, unknown>, publish: EventPublisher) => Promise<void>;
-export declare const handleSessionError: (eventProperties: Record<string, unknown>, publish: EventPublisher) => Promise<void>;
+export declare const handleSessionCompacted: (eventProperties: Record<string, unknown>, tracker: ReturnType<typeof createEventTracker>, publish: EventPublisher) => Promise<void>;
+export declare const handleSessionError: (eventProperties: Record<string, unknown>, tracker: ReturnType<typeof createEventTracker>, publish: EventPublisher) => Promise<void>;
 export declare const handleCommandExecuted: (eventProperties: Record<string, unknown>, publish: EventPublisher) => Promise<void>;
 export declare const handleBusEvent: (event: OpenCodeBusEvent, tracker: ReturnType<typeof createEventTracker>, publish: EventPublisher) => Promise<void>;
 export {};

package/dist/event-handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-handlers.d.ts","sourceRoot":"","sources":["../src/event-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAiBvD,OAAO,EASN,KAAK,gBAAgB,EACrB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAG/D,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,SAAS,CAAC,CAAA;AAKxE,eAAO,MAAM,oBAAoB,GAAI,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAapH,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC7B,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAad,CAAA;AAED,eAAO,MAAM,oBAAoB,GAChC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAwCd,CAAA;AAED,eAAO,MAAM,wBAAwB,GACpC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAiCd,CAAA;AAED,eAAO,MAAM,sBAAsB,GAClC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAQd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC9B,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAmBd,CAAA;AAED,eAAO,MAAM,qBAAqB,GACjC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAad,CAAA;AAED,eAAO,MAAM,cAAc,GAC1B,OAAO,gBAAgB,EACvB,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAkCd,CAAA"}
+{"version":3,"file":"event-handlers.d.ts","sourceRoot":"","sources":["../src/event-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAiBvD,OAAO,EASN,KAAK,gBAAgB,EACrB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAG/D,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,SAAS,CAAC,CAAA;AAKxE,eAAO,MAAM,oBAAoB,GAChC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAed,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC7B,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAad,CAAA;AAED,eAAO,MAAM,oBAAoB,GAChC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CA0Dd,CAAA;AAED,eAAO,MAAM,wBAAwB,GACpC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAqCd,CAAA;AAED,eAAO,MAAM,sBAAsB,GAClC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAWd,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC9B,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAqBd,CAAA;AAED,eAAO,MAAM,qBAAqB,GACjC,iBAAiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxC,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAad,CAAA;AAED,eAAO,MAAM,cAAc,GAC1B,OAAO,gBAAgB,EACvB,SAAS,UAAU,CAAC,OAAO,kBAAkB,CAAC,EAC9C,SAAS,cAAc,KACrB,OAAO,CAAC,IAAI,CAkCd,CAAA"}

package/dist/event-handlers.js

@@ -1,12 +1,13 @@
 import { mapAssistantLlmResponseInput, mapAssistantTurnCompleteInput, mapCommandExecutedInput, mapCompactionInput, mapCompactionPartInput, mapErrorInput, mapRetryPartInput, mapSessionEndInput, mapSessionStartInput, mapStepFinishInput, mapUserMessageInput } from './map-opencode-event.js';
 import { readAssistantMessage, readCompactionPart, readEventProperties, readRetryPart, readSessionIdFromProperties, readSessionInfo, readStepFinishPart, readUserMessage } from './opencode-readers.js';
-import { sumTokenUsage } from './token-usage.js';
+import { buildTokenMetrics } from './token-usage.js';
 const isRecord = (value) => typeof value === 'object' && value !== null;
-export const handleSessionCreated = (eventProperties, publish) => {
+export const handleSessionCreated = (eventProperties, tracker, publish) => {
     const sessionInfo = readSessionInfo(eventProperties.info);
     if (!sessionInfo) {
         return Promise.resolve();
     }
+    tracker.recordSessionStart(sessionInfo.id);
     return publish([
         {
             eventType: 'session_start',
@@ -22,7 +23,7 @@ export const handleSessionIdle = (eventProperties, tracker, publish) => {
     return publish([
         {
             eventType: 'session_end',
-            ...mapSessionEndInput(sessionId, tracker.getSessionStats(sessionId))
+            ...mapSessionEndInput(sessionId, tracker.getSessionStats(sessionId), tracker.getSessionTiming(sessionId))
         }
     ]);
 };
@@ -32,17 +33,32 @@ export const handleMessageUpdated = (eventProperties, tracker, publish) => {
         if (assistantMessage.time.completed === undefined || tracker.hasProcessedMessage(assistantMessage.id)) {
             return Promise.resolve();
         }
+        tracker.recordSessionStart(assistantMessage.sessionID, assistantMessage.time.created);
         tracker.markMessageProcessed(assistantMessage.id);
-        const eventsToPublish = [mapAssistantTurnCompleteInput(assistantMessage), mapAssistantLlmResponseInput(assistantMessage)].filter((eventInput) => eventInput !== undefined);
+        const durationMs = Math.max(0, assistantMessage.time.completed - assistantMessage.time.created);
+        const tokenMetrics = buildTokenMetrics(assistantMessage.tokens, durationMs);
+        const sessionStats = tracker.getSessionStats(assistantMessage.sessionID);
+        const compactionDelta = tracker.recordTurnTokens(assistantMessage.sessionID, {
+            contextTokens: tokenMetrics.inputTokens,
+            billedInputTokens: tokenMetrics.inputTokens,
+            outputTokens: tokenMetrics.outputTokens,
+            totalTokens: tokenMetrics.totalTokens,
+            cacheReadTokens: tokenMetrics.cacheReadTokens,
+            cacheWriteTokens: tokenMetrics.cacheWriteTokens,
+            reasoningTokens: tokenMetrics.reasoningTokens
+        });
+        tracker.recordSessionStats(assistantMessage.sessionID, {
+            aiGenerationMs: durationMs,
+            primaryProviderId: assistantMessage.providerID
+        });
+        const turnCompleteInput = mapAssistantTurnCompleteInput(assistantMessage, {
+            providerSource: sessionStats.primaryProviderSource || undefined,
+            compactionDelta
+        });
+        const eventsToPublish = [turnCompleteInput, mapAssistantLlmResponseInput(assistantMessage)].filter((eventInput) => eventInput !== undefined);
         if (!eventsToPublish.length) {
             return Promise.resolve();
         }
-        tracker.recordSessionStats(assistantMessage.sessionID, {
-            inputTokens: assistantMessage.tokens.input,
-            outputTokens: assistantMessage.tokens.output,
-            totalTokens: sumTokenUsage(assistantMessage.tokens),
-            turnCount: 1
-        });
         return publish(eventsToPublish);
     }
     const userMessage = readUserMessage(eventProperties.info);
@@ -50,6 +66,7 @@ export const handleMessageUpdated = (eventProperties, tracker, publish) => {
         if (tracker.hasProcessedUserMessage(userMessage.id)) {
             return Promise.resolve();
         }
+        tracker.recordSessionStart(userMessage.sessionID);
         tracker.markUserMessageProcessed(userMessage.id);
         return publish([mapUserMessageInput(userMessage)]);
     }
@@ -71,6 +88,7 @@ export const handleMessagePartUpdated = (eventProperties, tracker, publish) => {
             return Promise.resolve();
         }
         tracker.markPartProcessed(retryPart.id);
+        tracker.recordSessionStats(retryPart.sessionID, { retryCount: 1 });
         return publish([mapRetryPartInput(retryPart)]);
     }
     if (compactionPart) {
@@ -78,18 +96,24 @@ export const handleMessagePartUpdated = (eventProperties, tracker, publish) => {
             return Promise.resolve();
         }
         tracker.markPartProcessed(compactionPart.id);
-        return publish([mapCompactionPartInput(compactionPart)]);
+        const contextBeforeTokens = tracker.getSessionStats(compactionPart.sessionID).latestContextTokens;
+        tracker.recordCompactionPending(compactionPart.sessionID, contextBeforeTokens);
+        tracker.recordSessionStats(compactionPart.sessionID, { compactionCount: 1 });
+        return publish([mapCompactionPartInput(compactionPart, contextBeforeTokens)]);
     }
     return Promise.resolve();
 };
-export const handleSessionCompacted = (eventProperties, publish) => {
+export const handleSessionCompacted = (eventProperties, tracker, publish) => {
     const sessionId = readSessionIdFromProperties(eventProperties);
     if (!sessionId) {
         return Promise.resolve();
     }
-    return publish([mapCompactionInput(sessionId)]);
+    tracker.recordSessionStats(sessionId, { compactionCount: 1 });
+    const contextBeforeTokens = tracker.getSessionStats(sessionId).latestContextTokens;
+    tracker.recordCompactionPending(sessionId, contextBeforeTokens);
+    return publish([mapCompactionInput(sessionId, contextBeforeTokens)]);
 };
-export const handleSessionError = (eventProperties, publish) => {
+export const handleSessionError = (eventProperties, tracker, publish) => {
     const sessionId = readSessionIdFromProperties(eventProperties);
     const errorRecord = isRecord(eventProperties.error) ? eventProperties.error : undefined;
     const errorName = errorRecord && typeof errorRecord.name === 'string' ? errorRecord.name : 'unknown';
@@ -98,10 +122,11 @@ export const handleSessionError = (eventProperties, publish) => {
     if (!sessionId) {
         return Promise.resolve();
     }
+    tracker.recordSessionStats(sessionId, { errorCount: 1 });
     return publish([
         mapErrorInput(sessionId, {
             error_name: errorName,
-            error_message: errorMessage,
+            error_message_length: errorMessage.length,
             error_scope: 'session'
         })
     ]);
@@ -126,7 +151,7 @@ export const handleBusEvent = (event, tracker, publish) => {
     }
     switch (event.type) {
         case 'session.created':
-            return handleSessionCreated(eventProperties, publish);
+            return handleSessionCreated(eventProperties, tracker, publish);
         case 'session.status': {
             const statusRecord = isRecord(eventProperties.status) ? eventProperties.status : undefined;
             if (statusRecord?.type !== 'idle') {
@@ -141,9 +166,9 @@ export const handleBusEvent = (event, tracker, publish) => {
         case 'message.part.updated':
             return handleMessagePartUpdated(eventProperties, tracker, publish);
         case 'session.compacted':
-            return handleSessionCompacted(eventProperties, publish);
+            return handleSessionCompacted(eventProperties, tracker, publish);
         case 'session.error':
-            return handleSessionError(eventProperties, publish);
+            return handleSessionError(eventProperties, tracker, publish);
         case 'command.executed':
             return handleCommandExecuted(eventProperties, publish);
         default:

package/dist/event-tracker.d.ts

@@ -1,11 +1,45 @@
+export type CompactionDelta = {
+    contextBeforeTokens: number;
+    contextAfterTokens: number;
+    tokensSaved: number;
+};
 export type SessionStats = {
-    inputTokens: number;
+    billedInputTokens: number;
     outputTokens: number;
     totalTokens: number;
     turnCount: number;
     toolCallCount: number;
     requestCount: number;
     stepCount: number;
+    compactionCount: number;
+    retryCount: number;
+    errorCount: number;
+    cacheReadTokens: number;
+    cacheWriteTokens: number;
+    reasoningTokens: number;
+    peakContextTokens: number;
+    latestContextTokens: number;
+    contextAtStartTokens: number;
+    compactionTokensSaved: number;
+    totalToolOutputChars: number;
+    primaryProviderId: string;
+    primaryProviderSource: string;
+    startedAtMs?: number;
+    aiGenerationMs: number;
+};
+export type SessionTiming = {
+    sessionWallMs: number;
+    aiGenerationMs: number;
+    userWaitMs: number;
+};
+export type TurnTokenSnapshot = {
+    contextTokens: number;
+    cacheReadTokens: number;
+    cacheWriteTokens: number;
+    reasoningTokens: number;
+    billedInputTokens: number;
+    outputTokens: number;
+    totalTokens: number;
 };
 export type EventTracker = {
     hasProcessedMessage: (messageId: string) => boolean;
@@ -14,8 +48,14 @@ export type EventTracker = {
     markUserMessageProcessed: (messageId: string) => void;
     hasProcessedPart: (partId: string) => boolean;
     markPartProcessed: (partId: string) => void;
+    recordSessionStart: (sessionId: string, startedAtMs?: number) => void;
     recordSessionStats: (sessionId: string, delta: Partial<SessionStats>) => void;
+    recordProviderConnection: (sessionId: string, providerId: string, providerSource: string) => void;
+    recordCompactionPending: (sessionId: string, contextBeforeTokens: number) => void;
+    recordToolOutputChars: (sessionId: string, outputChars: number) => void;
+    recordTurnTokens: (sessionId: string, turnTokens: TurnTokenSnapshot) => CompactionDelta | undefined;
     getSessionStats: (sessionId: string) => SessionStats;
+    getSessionTiming: (sessionId: string, endedAtMs?: number) => SessionTiming;
 };
 export declare const createEventTracker: () => EventTracker;
 //# sourceMappingURL=event-tracker.d.ts.map

package/dist/event-tracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event-tracker.d.ts","sourceRoot":"","sources":["../src/event-tracker.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;CACjB,CAAA;AAYD,MAAM,MAAM,YAAY,GAAG;IAC1B,mBAAmB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAA;IACnD,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IACjD,uBAAuB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAA;IACvD,wBAAwB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IACrD,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAA;IAC7C,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAC3C,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAA;IAC7E,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,YAAY,CAAA;CACpD,CAAA;AAED,eAAO,MAAM,kBAAkB,QAAO,YAiCrC,CAAA"}
+{"version":3,"file":"event-tracker.d.ts","sourceRoot":"","sources":["../src/event-tracker.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC7B,mBAAmB,EAAE,MAAM,CAAA;IAC3B,kBAAkB,EAAE,MAAM,CAAA;IAC1B,WAAW,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAC1B,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,qBAAqB,EAAE,MAAM,CAAA;IAC7B,oBAAoB,EAAE,MAAM,CAAA;IAC5B,iBAAiB,EAAE,MAAM,CAAA;IACzB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;CACtB,CAAA;AAkCD,MAAM,MAAM,aAAa,GAAG;IAC3B,aAAa,EAAE,MAAM,CAAA;IACrB,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC/B,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,MAAM,CAAA;IACvB,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAC1B,mBAAmB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAA;IACnD,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IACjD,uBAAuB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAA;IACvD,wBAAwB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAA;IACrD,gBAAgB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAA;IAC7C,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;IAC3C,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACrE,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAA;IAC7E,wBAAwB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,IAAI,CAAA;IACjG,uBAAuB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,KAAK,IAAI,CAAA;IACjF,qBAAqB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI,CAAA;IACvE,gBAAgB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,KAAK,eAAe,GAAG,SAAS,CAAA;IACnG,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,YAAY,CAAA;IACpD,gBAAgB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,aAAa,CAAA;CAC1E,CAAA;AAgCD,eAAO,MAAM,kBAAkB,QAAO,YA6GrC,CAAA"}

package/dist/event-tracker.js

@@ -1,17 +1,63 @@
 const emptySessionStats = () => ({
-    inputTokens: 0,
+    billedInputTokens: 0,
     outputTokens: 0,
     totalTokens: 0,
     turnCount: 0,
     toolCallCount: 0,
     requestCount: 0,
-    stepCount: 0
+    stepCount: 0,
+    compactionCount: 0,
+    retryCount: 0,
+    errorCount: 0,
+    cacheReadTokens: 0,
+    cacheWriteTokens: 0,
+    reasoningTokens: 0,
+    peakContextTokens: 0,
+    latestContextTokens: 0,
+    contextAtStartTokens: 0,
+    compactionTokensSaved: 0,
+    totalToolOutputChars: 0,
+    primaryProviderId: '',
+    primaryProviderSource: '',
+    aiGenerationMs: 0
+});
+const INVALID_ID_VALUES = new Set(['', 'unknown', 'undefined', 'null']);
+const cleanIdentity = (value) => {
+    const cleanedValue = value.trim();
+    return INVALID_ID_VALUES.has(cleanedValue.toLowerCase()) ? '' : cleanedValue;
+};
+const mergeSessionStats = (currentStats, delta) => ({
+    billedInputTokens: currentStats.billedInputTokens + (delta.billedInputTokens ?? 0),
+    outputTokens: currentStats.outputTokens + (delta.outputTokens ?? 0),
+    totalTokens: currentStats.totalTokens + (delta.totalTokens ?? 0),
+    turnCount: currentStats.turnCount + (delta.turnCount ?? 0),
+    toolCallCount: currentStats.toolCallCount + (delta.toolCallCount ?? 0),
+    requestCount: currentStats.requestCount + (delta.requestCount ?? 0),
+    stepCount: currentStats.stepCount + (delta.stepCount ?? 0),
+    compactionCount: currentStats.compactionCount + (delta.compactionCount ?? 0),
+    retryCount: currentStats.retryCount + (delta.retryCount ?? 0),
+    errorCount: currentStats.errorCount + (delta.errorCount ?? 0),
+    cacheReadTokens: currentStats.cacheReadTokens + (delta.cacheReadTokens ?? 0),
+    cacheWriteTokens: currentStats.cacheWriteTokens + (delta.cacheWriteTokens ?? 0),
+    reasoningTokens: currentStats.reasoningTokens + (delta.reasoningTokens ?? 0),
+    peakContextTokens: Math.max(currentStats.peakContextTokens, delta.peakContextTokens ?? 0),
+    latestContextTokens: delta.latestContextTokens ?? currentStats.latestContextTokens,
+    contextAtStartTokens: currentStats.contextAtStartTokens > 0
+        ? currentStats.contextAtStartTokens
+        : (delta.contextAtStartTokens ?? currentStats.contextAtStartTokens),
+    compactionTokensSaved: currentStats.compactionTokensSaved + (delta.compactionTokensSaved ?? 0),
+    totalToolOutputChars: currentStats.totalToolOutputChars + (delta.totalToolOutputChars ?? 0),
+    primaryProviderId: delta.primaryProviderId !== undefined ? cleanIdentity(delta.primaryProviderId) : currentStats.primaryProviderId,
+    primaryProviderSource: delta.primaryProviderSource !== undefined ? cleanIdentity(delta.primaryProviderSource) : currentStats.primaryProviderSource,
+    startedAtMs: currentStats.startedAtMs,
+    aiGenerationMs: currentStats.aiGenerationMs + (delta.aiGenerationMs ?? 0)
 });
 export const createEventTracker = () => {
     const processedMessageIds = new Set();
     const processedUserMessageIds = new Set();
     const processedPartIds = new Set();
     const sessionStatsById = new Map();
+    const pendingCompactionContextBySession = new Map();
     return {
         hasProcessedMessage: (messageId) => processedMessageIds.has(messageId),
         markMessageProcessed: (messageId) => {
@@ -25,18 +71,80 @@ export const createEventTracker = () => {
         markPartProcessed: (partId) => {
             processedPartIds.add(partId);
         },
+        recordSessionStart: (sessionId, startedAtMs = Date.now()) => {
+            const currentStats = sessionStatsById.get(sessionId) ?? emptySessionStats();
+            if (currentStats.startedAtMs !== undefined) {
+                return;
+            }
+            sessionStatsById.set(sessionId, {
+                ...currentStats,
+                startedAtMs
+            });
+        },
         recordSessionStats: (sessionId, delta) => {
+            const currentStats = sessionStatsById.get(sessionId) ?? emptySessionStats();
+            sessionStatsById.set(sessionId, mergeSessionStats(currentStats, delta));
+        },
+        recordProviderConnection: (sessionId, providerId, providerSource) => {
             const currentStats = sessionStatsById.get(sessionId) ?? emptySessionStats();
             sessionStatsById.set(sessionId, {
-                inputTokens: currentStats.inputTokens + (delta.inputTokens ?? 0),
-                outputTokens: currentStats.outputTokens + (delta.outputTokens ?? 0),
-                totalTokens: currentStats.totalTokens + (delta.totalTokens ?? 0),
-                turnCount: currentStats.turnCount + (delta.turnCount ?? 0),
-                toolCallCount: currentStats.toolCallCount + (delta.toolCallCount ?? 0),
-                requestCount: currentStats.requestCount + (delta.requestCount ?? 0),
-                stepCount: currentStats.stepCount + (delta.stepCount ?? 0)
+                ...currentStats,
+                primaryProviderId: cleanIdentity(providerId),
+                primaryProviderSource: cleanIdentity(providerSource)
             });
         },
-        getSessionStats: (sessionId) => sessionStatsById.get(sessionId) ?? emptySessionStats()
+        recordCompactionPending: (sessionId, contextBeforeTokens) => {
+            if (contextBeforeTokens > 0) {
+                pendingCompactionContextBySession.set(sessionId, contextBeforeTokens);
+            }
+        },
+        recordToolOutputChars: (sessionId, outputChars) => {
+            const currentStats = sessionStatsById.get(sessionId) ?? emptySessionStats();
+            sessionStatsById.set(sessionId, {
+                ...currentStats,
+                totalToolOutputChars: currentStats.totalToolOutputChars + Math.max(0, outputChars)
+            });
+        },
+        recordTurnTokens: (sessionId, turnTokens) => {
+            const currentStats = sessionStatsById.get(sessionId) ?? emptySessionStats();
+            const isFirstTurn = currentStats.turnCount === 0;
+            const contextBeforeCompaction = pendingCompactionContextBySession.get(sessionId);
+            const compactionDelta = contextBeforeCompaction !== undefined && contextBeforeCompaction > turnTokens.contextTokens
+                ? {
+                    contextBeforeTokens: contextBeforeCompaction,
+                    contextAfterTokens: turnTokens.contextTokens,
+                    tokensSaved: contextBeforeCompaction - turnTokens.contextTokens
+                }
+                : undefined;
+            if (compactionDelta) {
+                pendingCompactionContextBySession.delete(sessionId);
+            }
+            sessionStatsById.set(sessionId, mergeSessionStats(currentStats, {
+                billedInputTokens: turnTokens.billedInputTokens,
+                outputTokens: turnTokens.outputTokens,
+                totalTokens: turnTokens.totalTokens,
+                cacheReadTokens: turnTokens.cacheReadTokens,
+                cacheWriteTokens: turnTokens.cacheWriteTokens,
+                reasoningTokens: turnTokens.reasoningTokens,
+                turnCount: 1,
+                peakContextTokens: turnTokens.contextTokens,
+                latestContextTokens: turnTokens.contextTokens,
+                contextAtStartTokens: isFirstTurn ? turnTokens.contextTokens : currentStats.contextAtStartTokens,
+                ...(compactionDelta ? { compactionTokensSaved: compactionDelta.tokensSaved } : {})
+            }));
+            return compactionDelta;
+        },
+        getSessionStats: (sessionId) => sessionStatsById.get(sessionId) ?? emptySessionStats(),
+        getSessionTiming: (sessionId, endedAtMs = Date.now()) => {
+            const currentStats = sessionStatsById.get(sessionId) ?? emptySessionStats();
+            const sessionWallMs = currentStats.startedAtMs !== undefined ? Math.max(0, endedAtMs - currentStats.startedAtMs) : 0;
+            const aiGenerationMs = currentStats.aiGenerationMs;
+            const userWaitMs = Math.max(0, sessionWallMs - aiGenerationMs);
+            return {
+                sessionWallMs,
+                aiGenerationMs,
+                userWaitMs
+            };
+        }
     };
 };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAgBjD,eAAO,MAAM,qBAAqB,EAAE,MA+DnC,CAAA;AAED,eAAe,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAgBjD,eAAO,MAAM,qBAAqB,EAAE,MAuEnC,CAAA;AAED,eAAe,qBAAqB,CAAA"}

package/dist/index.js

@@ -25,8 +25,10 @@ export const timeflyOpenCodePlugin = ({ client }) => {
         .then(() => Promise.resolve({
         event: (input) => runHookSafely(() => handleBusEvent(input.event, tracker, publisher.publish)),
         'chat.params': (input, output) => runHookSafely(() => {
+            tracker.recordSessionStart(input.sessionID);
             tracker.recordSessionStats(input.sessionID, { requestCount: 1 });
             const resolvedParams = resolveChatParams(input, output);
+            tracker.recordProviderConnection(resolvedParams.sessionID, resolvedParams.providerId, resolvedParams.providerSource);
             return publisher.publish([
                 mapLlmRequestInput({
                     sessionID: resolvedParams.sessionID,
@@ -44,15 +46,18 @@ export const timeflyOpenCodePlugin = ({ client }) => {
             tracker.recordSessionStats(input.sessionID, { toolCallCount: 1 });
             return publisher.publish([mapToolCallInput(input)]);
         }),
-        'tool.execute.after': (input, output) => runHookSafely(() => publisher.publish([
-            mapToolResultInput({
-                sessionID: input.sessionID,
-                tool: input.tool,
-                callID: input.callID,
-                hasOutput: Boolean(output.output),
-                outputLength: output.output.length
-            })
-        ])),
+        'tool.execute.after': (input, output) => runHookSafely(() => {
+            tracker.recordToolOutputChars(input.sessionID, output.output.length);
+            return publisher.publish([
+                mapToolResultInput({
+                    sessionID: input.sessionID,
+                    tool: input.tool,
+                    callID: input.callID,
+                    hasOutput: Boolean(output.output),
+                    outputLength: output.output.length
+                })
+            ]);
+        }),
         'experimental.session.compacting': (input) => runHookSafely(() => publisher.publish([mapCompactionInput(input.sessionID)]))
     }));
 };

package/dist/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":";AA8HA,eAAO,MAAM,UAAU,GAAI,eAAe,MAAM,EAAE,KAAG,OAAO,CAAC,IAAI,CAGhE,CAAA"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":";AAuJA,eAAO,MAAM,UAAU,GAAI,eAAe,MAAM,EAAE,KAAG,OAAO,CAAC,IAAI,CAGhE,CAAA"}

package/dist/install.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env bun
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, rm, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { resolveDefaultAuthFilePath } from '@timefly/ai-sdk';
-const PLUGIN_PACKAGE_NAME = '@timefly/opencode-plugin';
+const PLUGIN_PACKAGE_LATEST = '@timefly/opencode-plugin@latest';
+const TIMEFLY_PLUGIN_PATTERN = /^@timefly\/opencode-plugin(?:@|$)/;
 const PRICING_URL = 'https://timefly.dev/pricing';
 const currentDirectory = path.dirname(fileURLToPath(import.meta.url));
 const packageRoot = path.resolve(currentDirectory, '..');
@@ -36,6 +37,22 @@ const resolveConfigDestination = (options) => {
     }
     return path.join(homeDirectory, '.config', 'opencode', 'opencode.json');
 };
+const resolveOpenCodePluginCachePath = () => {
+    const homeDirectory = process.env.HOME ?? process.env.USERPROFILE;
+    if (!homeDirectory) {
+        return undefined;
+    }
+    return path.join(homeDirectory, '.cache', 'opencode', 'packages', '@timefly');
+};
+const clearOpenCodePluginCache = () => {
+    const cachePath = resolveOpenCodePluginCachePath();
+    if (!cachePath) {
+        return Promise.resolve();
+    }
+    return rm(cachePath, { recursive: true, force: true })
+        .then(() => undefined)
+        .catch(() => undefined);
+};
 const readConfigFile = (configPath) => readFile(configPath, 'utf8')
     .then((configContent) => JSON.parse(configContent))
     .catch((error) => {
@@ -44,16 +61,17 @@ const readConfigFile = (configPath) => readFile(configPath, 'utf8')
     }
     throw error;
 });
-const resolvePluginEntry = (options) => options.useLocalPath ? localPluginPath.replaceAll('\\', '/') : PLUGIN_PACKAGE_NAME;
-const pluginEntryExists = (pluginList, pluginEntry) => (pluginList ?? []).some((entry) => (Array.isArray(entry) ? entry[0] : entry) === pluginEntry);
+const resolvePluginEntry = (options) => options.useLocalPath ? localPluginPath.replaceAll('\\', '/') : PLUGIN_PACKAGE_LATEST;
+const pluginEntryName = (entry) => Array.isArray(entry) ? entry[0] : entry;
+const pluginEntryExists = (pluginList, pluginEntry) => (pluginList ?? []).some((entry) => pluginEntryName(entry) === pluginEntry);
 const mergePluginConfig = (config, pluginEntry) => {
-    if (pluginEntryExists(config.plugin, pluginEntry)) {
-        return config;
-    }
+    const pluginListWithoutStaleTimefly = (config.plugin ?? []).filter((entry) => !TIMEFLY_PLUGIN_PATTERN.test(pluginEntryName(entry)));
     return {
         ...config,
         $schema: config.$schema ?? 'https://opencode.ai/config.json',
-        plugin: [...(config.plugin ?? []), pluginEntry]
+        plugin: pluginEntryExists(pluginListWithoutStaleTimefly, pluginEntry)
+            ? pluginListWithoutStaleTimefly
+            : [...pluginListWithoutStaleTimefly, pluginEntry]
     };
 };
 const printPostInstallInstructions = (configPath) => {
@@ -69,9 +87,7 @@ const printPostInstallInstructions = (configPath) => {
     console.log(`     Upgrade: ${PRICING_URL}`);
     console.log('  3. Restart OpenCode.');
     console.log('');
-    console.log('Optional env overrides:');
-    console.log('  TIMEFLY_API_BASE_URL=https://api.timefly.dev');
-    console.log('  TIMEFLY_ACCESS_TOKEN=...  (manual token, expires in ~15 min without refresh file)');
+    console.log('To update later, run setup-opencode again — it refreshes @latest and clears the plugin cache.');
     console.log('');
     console.log(`Auth file: ${authFilePath}`);
 };
@@ -79,7 +95,8 @@ const installPlugin = (options) => {
     const configPath = resolveConfigDestination(options);
     const configDirectory = path.dirname(configPath);
     const pluginEntry = resolvePluginEntry(options);
-    return mkdir(configDirectory, { recursive: true })
+    return clearOpenCodePluginCache()
+        .then(() => mkdir(configDirectory, { recursive: true }))
         .then(() => readConfigFile(configPath))
         .then((config) => mergePluginConfig(config, pluginEntry))
         .then((mergedConfig) => writeFile(configPath, `${JSON.stringify(mergedConfig, null, 2)}\n`, 'utf8'))

package/dist/map-opencode-event.d.ts

@@ -1,19 +1,12 @@
 import type { CreateAiUsageEventInput } from '@timefly/ai-sdk';
 import type { OpenCodeAssistantMessage, OpenCodeCompactionPart, OpenCodeRetryPart, OpenCodeSessionInfo, OpenCodeStepFinishPart, OpenCodeUserMessage } from './opencode-readers.js';
+import type { SessionStats, SessionTiming, CompactionDelta } from './event-tracker.js';
 export type { OpenCodeAssistantMessage, OpenCodeCompactionPart, OpenCodeRetryPart, OpenCodeSessionInfo, OpenCodeStepFinishPart, OpenCodeUserMessage } from './opencode-readers.js';
 export type { OpenCodeTokenUsage } from './token-usage.js';
 export declare const readSessionIdOverride: (sessionId: string) => string;
 export declare const buildModelId: (providerId: string, modelId: string) => string;
 export declare const mapSessionStartInput: (sessionInfo: OpenCodeSessionInfo) => Pick<CreateAiUsageEventInput, "sessionId" | "metadata">;
-export declare const mapSessionEndInput: (sessionId: string, sessionStats: {
-    inputTokens: number;
-    outputTokens: number;
-    totalTokens: number;
-    turnCount: number;
-    toolCallCount: number;
-    requestCount: number;
-    stepCount: number;
-}) => Pick<CreateAiUsageEventInput, "sessionId" | "metadata">;
+export declare const mapSessionEndInput: (sessionId: string, sessionStats: SessionStats, sessionTiming: SessionTiming) => Pick<CreateAiUsageEventInput, "sessionId" | "metadata" | "durationMs">;
 export declare const mapLlmRequestInput: (input: {
     sessionID: string;
     agent: string;
@@ -24,11 +17,14 @@ export declare const mapLlmRequestInput: (input: {
     topP: number;
     maxOutputTokens?: number;
 }) => CreateAiUsageEventInput;
-export declare const mapAssistantTurnCompleteInput: (message: OpenCodeAssistantMessage) => CreateAiUsageEventInput | undefined;
+export declare const mapAssistantTurnCompleteInput: (message: OpenCodeAssistantMessage, options?: {
+    providerSource?: string;
+    compactionDelta?: CompactionDelta;
+}) => CreateAiUsageEventInput | undefined;
 export declare const mapAssistantLlmResponseInput: (message: OpenCodeAssistantMessage) => CreateAiUsageEventInput | undefined;
 export declare const mapStepFinishInput: (part: OpenCodeStepFinishPart) => CreateAiUsageEventInput;
 export declare const mapUserMessageInput: (message: OpenCodeUserMessage) => CreateAiUsageEventInput;
-export declare const mapCompactionInput: (sessionId: string, auto?: boolean) => CreateAiUsageEventInput;
+export declare const mapCompactionInput: (sessionId: string, contextBeforeTokens?: number, auto?: boolean) => CreateAiUsageEventInput;
 export declare const mapErrorInput: (sessionId: string, errorMetadata: Record<string, string | number | boolean>) => CreateAiUsageEventInput;
 export declare const mapToolCallInput: (input: {
     sessionID: string;
@@ -49,5 +45,5 @@ export declare const mapCommandExecutedInput: (input: {
     messageID: string;
 }) => CreateAiUsageEventInput;
 export declare const mapRetryPartInput: (part: OpenCodeRetryPart) => CreateAiUsageEventInput;
-export declare const mapCompactionPartInput: (part: OpenCodeCompactionPart) => CreateAiUsageEventInput;
+export declare const mapCompactionPartInput: (part: OpenCodeCompactionPart, contextBeforeTokens?: number) => CreateAiUsageEventInput;
 //# sourceMappingURL=map-opencode-event.d.ts.map

package/dist/map-opencode-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-opencode-event.d.ts","sourceRoot":"","sources":["../src/map-opencode-event.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"map-opencode-event.d.ts","sourceRoot":"","sources":["../src/map-opencode-event.ts"],"names":[],"mappings":"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"}

package/dist/map-opencode-event.js

@@ -2,7 +2,38 @@ import { buildTokenMetadata, buildTokenMetrics } from './token-usage.js';
 export const readSessionIdOverride = (sessionId) => typeof process !== 'undefined' && process.env.TIMEFLY_OPENCODE_SESSION_ID
     ? process.env.TIMEFLY_OPENCODE_SESSION_ID
     : sessionId;
-export const buildModelId = (providerId, modelId) => `${providerId}/${modelId}`;
+const INVALID_ID_VALUES = new Set(['', 'unknown', 'undefined', 'null']);
+const cleanText = (value) => value.trim();
+const cleanIdentity = (value) => {
+    const cleanedValue = cleanText(value);
+    return INVALID_ID_VALUES.has(cleanedValue.toLowerCase()) ? '' : cleanedValue;
+};
+const cleanNumber = (value) => Number.isFinite(value) ? value : 0;
+const cleanMetadata = (metadata) => Object.fromEntries(Object.entries(metadata).filter(([, metadataValue]) => {
+    if (metadataValue === undefined) {
+        return false;
+    }
+    if (typeof metadataValue === 'number') {
+        return Number.isFinite(metadataValue);
+    }
+    if (typeof metadataValue === 'string') {
+        return cleanText(metadataValue).length > 0;
+    }
+    return true;
+}));
+const identityMetadata = (providerId, modelId) => {
+    const cleanProviderId = cleanIdentity(providerId);
+    const cleanModelId = cleanIdentity(modelId);
+    return {
+        ...(cleanProviderId ? { provider_id: cleanProviderId } : {}),
+        ...(cleanModelId ? { model_id: cleanModelId } : {})
+    };
+};
+export const buildModelId = (providerId, modelId) => {
+    const cleanProviderId = cleanIdentity(providerId);
+    const cleanModelId = cleanIdentity(modelId);
+    return cleanProviderId && cleanModelId ? `${cleanProviderId}/${cleanModelId}` : cleanModelId;
+};
 export const mapSessionStartInput = (sessionInfo) => ({
     sessionId: readSessionIdOverride(sessionInfo.id),
     metadata: {
@@ -11,81 +42,112 @@ export const mapSessionStartInput = (sessionInfo) => ({
         directory: sessionInfo.directory
     }
 });
-export const mapSessionEndInput = (sessionId, sessionStats) => ({
+export const mapSessionEndInput = (sessionId, sessionStats, sessionTiming) => ({
     sessionId: readSessionIdOverride(sessionId),
+    durationMs: sessionTiming.sessionWallMs,
     metadata: {
-        session_input_tokens: sessionStats.inputTokens,
+        session_input_tokens: sessionStats.billedInputTokens,
+        session_billed_input_tokens: sessionStats.billedInputTokens,
         session_output_tokens: sessionStats.outputTokens,
         session_total_tokens: sessionStats.totalTokens,
         session_turn_count: sessionStats.turnCount,
         session_tool_call_count: sessionStats.toolCallCount,
         session_request_count: sessionStats.requestCount,
-        session_step_count: sessionStats.stepCount
-    }
-});
-export const mapLlmRequestInput = (input) => ({
-    sessionId: readSessionIdOverride(input.sessionID),
-    eventType: 'llm_request',
-    modelId: buildModelId(input.providerId, input.modelId),
-    planMode: input.agent,
-    metadata: {
-        provider_id: input.providerId,
-        model_id: input.modelId,
-        provider_source: input.providerSource,
-        agent: input.agent,
-        temperature: input.temperature,
-        top_p: input.topP,
-        ...(input.maxOutputTokens !== undefined ? { max_output_tokens: input.maxOutputTokens } : {})
+        session_step_count: sessionStats.stepCount,
+        session_compaction_count: sessionStats.compactionCount,
+        session_retry_count: sessionStats.retryCount,
+        session_error_count: sessionStats.errorCount,
+        session_cache_read_tokens: sessionStats.cacheReadTokens,
+        session_cache_write_tokens: sessionStats.cacheWriteTokens,
+        session_reasoning_tokens: sessionStats.reasoningTokens,
+        session_compaction_tokens_saved: sessionStats.compactionTokensSaved,
+        session_tool_output_chars: sessionStats.totalToolOutputChars,
+        primary_provider_id: sessionStats.primaryProviderId,
+        primary_provider_source: sessionStats.primaryProviderSource,
+        peak_context_tokens: sessionStats.peakContextTokens,
+        latest_context_tokens: sessionStats.latestContextTokens,
+        context_at_start_tokens: sessionStats.contextAtStartTokens,
+        session_wall_ms: sessionTiming.sessionWallMs,
+        ai_generation_ms: sessionTiming.aiGenerationMs,
+        user_wait_ms: sessionTiming.userWaitMs
     }
 });
-export const mapAssistantTurnCompleteInput = (message) => {
+export const mapLlmRequestInput = (input) => {
+    const modelId = buildModelId(input.providerId, input.modelId);
+    return {
+        sessionId: readSessionIdOverride(input.sessionID),
+        eventType: 'llm_request',
+        ...(modelId ? { modelId } : {}),
+        planMode: input.agent,
+        metadata: cleanMetadata({
+            ...identityMetadata(input.providerId, input.modelId),
+            provider_source: cleanIdentity(input.providerSource),
+            agent: input.agent,
+            temperature: cleanNumber(input.temperature),
+            top_p: cleanNumber(input.topP),
+            ...(input.maxOutputTokens !== undefined ? { max_output_tokens: cleanNumber(input.maxOutputTokens) } : {})
+        })
+    };
+};
+export const mapAssistantTurnCompleteInput = (message, options) => {
     if (message.time.completed === undefined) {
         return undefined;
     }
-    const durationMs = message.time.completed - message.time.created;
+    const durationMs = Math.max(0, message.time.completed - message.time.created);
     const tokenMetrics = buildTokenMetrics(message.tokens, durationMs);
+    const modelId = buildModelId(message.providerID, message.modelID);
     return {
         sessionId: readSessionIdOverride(message.sessionID),
         eventType: 'turn_complete',
-        modelId: buildModelId(message.providerID, message.modelID),
+        ...(modelId ? { modelId } : {}),
         planMode: message.mode,
         inputTokens: tokenMetrics.inputTokens,
         outputTokens: tokenMetrics.outputTokens,
         totalTokens: tokenMetrics.totalTokens,
         durationMs,
-        metadata: buildTokenMetadata(tokenMetrics, {
+        eventAtUtc: new Date(message.time.completed),
+        metadata: cleanMetadata(buildTokenMetadata(tokenMetrics, {
             message_id: message.id,
-            provider_id: message.providerID,
-            model_id: message.modelID,
-            cost: message.cost,
+            ...identityMetadata(message.providerID, message.modelID),
+            ...(options?.providerSource ? { provider_source: cleanIdentity(options.providerSource) } : {}),
+            context_tokens: tokenMetrics.inputTokens,
+            cost: cleanNumber(message.cost),
             ...(message.finish ? { finish_reason: message.finish } : {}),
             has_error: Boolean(message.error),
-            ...(message.error ? { error_name: message.error.name } : {})
-        })
+            ...(message.error ? { error_name: message.error.name } : {}),
+            ...(options?.compactionDelta
+                ? {
+                    context_before_compaction: options.compactionDelta.contextBeforeTokens,
+                    context_after_compaction: options.compactionDelta.contextAfterTokens,
+                    compaction_tokens_saved: options.compactionDelta.tokensSaved
+                }
+                : {})
+        }))
     };
 };
 export const mapAssistantLlmResponseInput = (message) => {
     if (message.time.completed === undefined) {
         return undefined;
     }
-    const durationMs = message.time.completed - message.time.created;
+    const durationMs = Math.max(0, message.time.completed - message.time.created);
     const tokenMetrics = buildTokenMetrics(message.tokens, durationMs);
+    const modelId = buildModelId(message.providerID, message.modelID);
     return {
         sessionId: readSessionIdOverride(message.sessionID),
         eventType: 'llm_response',
-        modelId: buildModelId(message.providerID, message.modelID),
+        ...(modelId ? { modelId } : {}),
         planMode: message.mode,
         inputTokens: tokenMetrics.inputTokens,
         outputTokens: tokenMetrics.outputTokens,
         totalTokens: tokenMetrics.totalTokens,
         durationMs,
-        metadata: buildTokenMetadata(tokenMetrics, {
+        eventAtUtc: new Date(message.time.completed),
+        metadata: cleanMetadata(buildTokenMetadata(tokenMetrics, {
             message_id: message.id,
-            provider_id: message.providerID,
-            model_id: message.modelID,
-            cost: message.cost,
+            ...identityMetadata(message.providerID, message.modelID),
+            cost: cleanNumber(message.cost),
             response_scope: 'message'
-        })
+        }))
     };
 };
 export const mapStepFinishInput = (part) => {
@@ -96,32 +158,37 @@ export const mapStepFinishInput = (part) => {
         inputTokens: tokenMetrics.inputTokens,
         outputTokens: tokenMetrics.outputTokens,
         totalTokens: tokenMetrics.totalTokens,
-        metadata: buildTokenMetadata(tokenMetrics, {
+        metadata: cleanMetadata(buildTokenMetadata(tokenMetrics, {
             message_id: part.messageID,
             part_id: part.id,
             step_reason: part.reason,
-            cost: part.cost,
+            cost: cleanNumber(part.cost),
             response_scope: 'step'
+        }))
+    };
+};
+export const mapUserMessageInput = (message) => {
+    const modelId = buildModelId(message.model.providerID, message.model.modelID);
+    return {
+        sessionId: readSessionIdOverride(message.sessionID),
+        eventType: 'llm_request',
+        ...(modelId ? { modelId } : {}),
+        planMode: message.agent,
+        metadata: cleanMetadata({
+            message_id: message.id,
+            ...identityMetadata(message.model.providerID, message.model.modelID),
+            agent: message.agent,
+            request_scope: 'user_message'
         })
     };
 };
-export const mapUserMessageInput = (message) => ({
-    sessionId: readSessionIdOverride(message.sessionID),
-    eventType: 'llm_request',
-    modelId: buildModelId(message.model.providerID, message.model.modelID),
-    planMode: message.agent,
-    metadata: {
-        message_id: message.id,
-        provider_id: message.model.providerID,
-        model_id: message.model.modelID,
-        agent: message.agent,
-        request_scope: 'user_message'
-    }
-});
-export const mapCompactionInput = (sessionId, auto) => ({
+export const mapCompactionInput = (sessionId, contextBeforeTokens, auto) => ({
     sessionId: readSessionIdOverride(sessionId),
     eventType: 'compaction',
     metadata: {
+        ...(contextBeforeTokens !== undefined && contextBeforeTokens > 0
+            ? { context_before_compaction: contextBeforeTokens }
+            : {}),
         ...(auto !== undefined ? { auto_compaction: auto } : {})
     }
 });
@@ -154,7 +221,7 @@ export const mapCommandExecutedInput = (input) => ({
     toolName: `command:${input.name}`,
     metadata: {
         command_name: input.name,
-        command_arguments: input.arguments,
+        command_arguments_length: input.arguments.length,
         message_id: input.messageID
     }
 });
@@ -168,12 +235,15 @@ export const mapRetryPartInput = (part) => ({
         error_scope: 'retry'
     }
 });
-export const mapCompactionPartInput = (part) => ({
+export const mapCompactionPartInput = (part, contextBeforeTokens) => ({
     sessionId: readSessionIdOverride(part.sessionID),
     eventType: 'compaction',
     metadata: {
         message_id: part.messageID,
         part_id: part.id,
-        auto_compaction: part.auto
+        auto_compaction: part.auto,
+        ...(contextBeforeTokens !== undefined && contextBeforeTokens > 0
+            ? { context_before_compaction: contextBeforeTokens }
+            : {})
     }
 });

package/dist/opencode-readers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-readers.d.ts","sourceRoot":"","sources":["../src/opencode-readers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"opencode-readers.d.ts","sourceRoot":"","sources":["../src/opencode-readers.ts"],"names":[],"mappings":"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"}

package/dist/opencode-readers.js

@@ -1,23 +1,30 @@
 const isRecord = (value) => typeof value === 'object' && value !== null;
+const isFiniteNumber = (value) => typeof value === 'number' && Number.isFinite(value);
+const readTelemetryNumber = (value) => typeof value === 'number' ? (Number.isFinite(value) ? value : 0) : undefined;
 const readTokenUsage = (value) => {
     if (!isRecord(value)) {
         return undefined;
     }
     const cacheRecord = isRecord(value.cache) ? value.cache : undefined;
-    if (typeof value.input !== 'number' ||
-        typeof value.output !== 'number' ||
-        typeof value.reasoning !== 'number' ||
-        typeof cacheRecord?.read !== 'number' ||
-        typeof cacheRecord?.write !== 'number') {
+    const inputTokens = readTelemetryNumber(value.input);
+    const outputTokens = readTelemetryNumber(value.output);
+    const reasoningTokens = readTelemetryNumber(value.reasoning);
+    const cacheReadTokens = readTelemetryNumber(cacheRecord?.read);
+    const cacheWriteTokens = readTelemetryNumber(cacheRecord?.write);
+    if (inputTokens === undefined ||
+        outputTokens === undefined ||
+        reasoningTokens === undefined ||
+        cacheReadTokens === undefined ||
+        cacheWriteTokens === undefined) {
         return undefined;
     }
     return {
-        input: value.input,
-        output: value.output,
-        reasoning: value.reasoning,
+        input: inputTokens,
+        output: outputTokens,
+        reasoning: reasoningTokens,
         cache: {
-            read: cacheRecord.read,
-            write: cacheRecord.write
+            read: cacheReadTokens,
+            write: cacheWriteTokens
         }
     };
 };
@@ -34,13 +41,14 @@ export const readAssistantMessage = (message) => {
     }
     const tokenUsage = readTokenUsage(message.tokens);
     const timeRecord = isRecord(message.time) ? message.time : undefined;
+    const cost = readTelemetryNumber(message.cost);
     if (typeof message.id !== 'string' ||
         typeof message.sessionID !== 'string' ||
         typeof message.modelID !== 'string' ||
         typeof message.providerID !== 'string' ||
         typeof message.mode !== 'string' ||
-        typeof message.cost !== 'number' ||
-        typeof timeRecord?.created !== 'number' ||
+        cost === undefined ||
+        !isFiniteNumber(timeRecord?.created) ||
         !tokenUsage) {
         return undefined;
     }
@@ -50,12 +58,12 @@ export const readAssistantMessage = (message) => {
         role: 'assistant',
         time: {
             created: timeRecord.created,
-            completed: typeof timeRecord.completed === 'number' ? timeRecord.completed : undefined
+            completed: isFiniteNumber(timeRecord.completed) ? timeRecord.completed : undefined
         },
         modelID: message.modelID,
         providerID: message.providerID,
         mode: message.mode,
-        cost: message.cost,
+        cost,
         tokens: tokenUsage,
         finish: typeof message.finish === 'string' ? message.finish : undefined,
         error: isRecord(message.error) && typeof message.error.name === 'string' ? { name: message.error.name } : undefined
@@ -100,11 +108,12 @@ export const readStepFinishPart = (part) => {
         return undefined;
     }
     const tokenUsage = readTokenUsage(part.tokens);
+    const cost = readTelemetryNumber(part.cost);
     if (typeof part.id !== 'string' ||
         typeof part.sessionID !== 'string' ||
         typeof part.messageID !== 'string' ||
         typeof part.reason !== 'string' ||
-        typeof part.cost !== 'number' ||
+        cost === undefined ||
         !tokenUsage) {
         return undefined;
     }
@@ -114,7 +123,7 @@ export const readStepFinishPart = (part) => {
         messageID: part.messageID,
         type: 'step-finish',
         reason: part.reason,
-        cost: part.cost,
+        cost,
         tokens: tokenUsage
     };
 };

package/dist/publish-events.js

@@ -5,7 +5,7 @@ const buildSyncFailureMessage = (error) => {
         return `TimeFly sync blocked: Supporter plan required. Upgrade at ${PRICING_URL}`;
     }
     if (error.isUnauthorized) {
-        return 'TimeFly sync blocked: not signed in. Run `bunx @timefly/opencode-plugin login` or set TIMEFLY_ACCESS_TOKEN.';
+        return 'TimeFly sync blocked: not signed in. Run `bunx @timefly/opencode-plugin login`.';
     }
     return `TimeFly sync failed (${error.statusCode}): ${error.message}`;
 };

package/dist/token-usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token-usage.d.ts","sourceRoot":"","sources":["../src/token-usage.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;KACb,CAAA;CACD,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,YAAY,kBAAkB,KAAG,MACH,CAAA;AAE5D,eAAO,MAAM,iBAAiB,GAAI,YAAY,kBAAkB,EAAE,aAAa,MAAM,KAAG,YAmBvF,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,cAAc,YAAY,EAAE,QAAO,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAM,KAAG,MAAM,CAC5H,MAAM,EACN,MAAM,GAAG,MAAM,GAAG,OAAO,CAUxB,CAAA"}
+{"version":3,"file":"token-usage.d.ts","sourceRoot":"","sources":["../src/token-usage.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;KACb,CAAA;CACD,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAC7B,CAAA;AAKD,eAAO,MAAM,aAAa,GAAI,YAAY,kBAAkB,KAAG,MACyD,CAAA;AAExH,eAAO,MAAM,iBAAiB,GAAI,YAAY,kBAAkB,EAAE,aAAa,MAAM,KAAG,YAmBvF,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,cAAc,YAAY,EAAE,QAAO,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAM,KAAG,MAAM,CAC5H,MAAM,EACN,MAAM,GAAG,MAAM,GAAG,OAAO,CAUxB,CAAA"}

package/dist/token-usage.js

@@ -1,17 +1,18 @@
-export const sumTokenUsage = (tokenUsage) => tokenUsage.input + tokenUsage.output + tokenUsage.reasoning;
+const sanitizeTokenCount = (value) => Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
+export const sumTokenUsage = (tokenUsage) => sanitizeTokenCount(tokenUsage.input) + sanitizeTokenCount(tokenUsage.output) + sanitizeTokenCount(tokenUsage.reasoning);
 export const buildTokenMetrics = (tokenUsage, durationMs) => {
-    const inputTokens = tokenUsage.input;
-    const outputTokens = tokenUsage.output;
-    const reasoningTokens = tokenUsage.reasoning;
+    const inputTokens = sanitizeTokenCount(tokenUsage.input);
+    const outputTokens = sanitizeTokenCount(tokenUsage.output);
+    const reasoningTokens = sanitizeTokenCount(tokenUsage.reasoning);
     const totalTokens = sumTokenUsage(tokenUsage);
-    const durationSeconds = durationMs && durationMs > 0 ? durationMs / 1000 : undefined;
+    const durationSeconds = durationMs && Number.isFinite(durationMs) && durationMs > 0 ? durationMs / 1000 : undefined;
     return {
         inputTokens,
         outputTokens,
         totalTokens,
         reasoningTokens,
-        cacheReadTokens: tokenUsage.cache.read,
-        cacheWriteTokens: tokenUsage.cache.write,
+        cacheReadTokens: sanitizeTokenCount(tokenUsage.cache.read),
+        cacheWriteTokens: sanitizeTokenCount(tokenUsage.cache.write),
         outputTokensPerSecond: durationSeconds !== undefined ? Math.round((outputTokens / durationSeconds) * 100) / 100 : undefined,
         totalTokensPerSecond: durationSeconds !== undefined ? Math.round((totalTokens / durationSeconds) * 100) / 100 : undefined
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@timefly/opencode-plugin",
-	"version": "0.2.3",
+	"version": "0.2.8",
 	"description": "TimeFly telemetry plugin for OpenCode — sessions, tokens, models, and tools",
 	"type": "module",
 	"bin": "./dist/cli.js",
@@ -50,19 +50,19 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"@timefly/ai-sdk": "^0.2.0"
+		"@timefly/ai-sdk": "^0.2.1"
 	},
 	"peerDependencies": {
 		"@opencode-ai/plugin": ">=1.0.0"
 	},
 	"devDependencies": {
 		"@opencode-ai/plugin": "^1.17.7",
-		"@timefly/ai-sdk": "workspace:*",
+		"@timefly/ai-sdk": "0.2.1",
 		"@types/bun": "^1.3.14",
 		"@types/node": "^22.15.21",
 		"typescript": "^5.9.3"
 	},
 	"engines": {
-		"node": ">=18"
+		"bun": ">=1.3.0"
 	}
 }