@yhong91/vibetime 0.1.65 → 0.1.66

package/bin/vibetime.mjs

@@ -2047,7 +2047,7 @@ function claudeStyleFileMetrics(tool, input) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.65" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.66" : "0.1.1";
 var GENERATED_MARKER = "Generated by vibetime.";
 var DEFAULT_API_URL = "http://121.196.224.82:3001";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
@@ -5832,12 +5832,46 @@ async function parseCopilotSessionFile(filePath, options) {
   let project;
   let model;
   let currentTurnId;
+  let currentTurnStartedAt;
+  let currentTurnLastEventAt;
   let sessionStartedAt;
   let reasoningEffort;
+  let emittedShutdownUsage = false;
+  let sawWorkSinceShutdown = false;
+  const lastShutdownUsage = /* @__PURE__ */ new Map();
   const pendingTools = /* @__PURE__ */ new Map();
   const turnTokenAccum = /* @__PURE__ */ new Map();
-  const pendingTurnUsage = [];
-  let emittedShutdownUsage = false;
+  const noteWork = (ts) => {
+    if (currentTurnId) {
+      currentTurnLastEventAt = ts;
+    }
+    sawWorkSinceShutdown = true;
+  };
+  const closeOpenTurn = () => {
+    if (!currentTurnId || !currentTurnLastEventAt && !currentTurnStartedAt) {
+      return;
+    }
+    const closedAt = currentTurnLastEventAt || currentTurnStartedAt;
+    if (!closedAt) {
+      return;
+    }
+    events.push(baseCopilotEvent({
+      ts: closedAt,
+      type: "turn.completed",
+      sessionId,
+      turnId: currentTurnId,
+      cwd,
+      project,
+      model,
+      confidence: "derived"
+    }));
+  };
+  const releaseTurn = () => {
+    closeOpenTurn();
+    currentTurnId = void 0;
+    currentTurnStartedAt = void 0;
+    currentTurnLastEventAt = void 0;
+  };
   for (const [index, line] of lines.entries()) {
     const lineNumber = index + 1;
     const raw = parseJsonLine(line);
@@ -5875,7 +5909,11 @@ async function parseCopilotSessionFile(filePath, options) {
         break;
       }
       case "user.message": {
+        closeOpenTurn();
         currentTurnId = `turn_${createStableHash([sessionId, lineNumber]).slice(0, 24)}`;
+        currentTurnStartedAt = ts;
+        currentTurnLastEventAt = ts;
+        sawWorkSinceShutdown = true;
         events.push(baseCopilotEvent({
           ts,
           type: "turn.started",
@@ -5913,8 +5951,8 @@ async function parseCopilotSessionFile(filePath, options) {
         if (msgModel) {
           model = msgModel;
         }
-        const msgTurnId = stringField(data, "turnId");
-        const turnId = msgTurnId === void 0 ? currentTurnId : `turn_${createStableHash([sessionId, msgTurnId]).slice(0, 24)}`;
+        const turnId = currentTurnId;
+        noteWork(ts);
         events.push(baseCopilotEvent({
           ts,
           type: "agent.operation",
@@ -5928,20 +5966,20 @@ async function parseCopilotSessionFile(filePath, options) {
           metrics: { modelCalls: 1 }
         }));
         const outputTokens = numberField(data, "outputTokens");
-        if (outputTokens && outputTokens > 0) {
-          const key = turnId || "unknown";
-          const accum = turnTokenAccum.get(key) || { tokensOutput: 0, modelCalls: 0 };
-          accum.tokensOutput = (accum.tokensOutput || 0) + outputTokens;
-          accum.modelCalls = (accum.modelCalls || 0) + 1;
-          turnTokenAccum.set(key, accum);
+        if (turnId && outputTokens && outputTokens > 0) {
+          const accum = turnTokenAccum.get(turnId) || { metrics: { tokensOutput: 0, modelCalls: 0 }, ts };
+          accum.metrics.tokensOutput = (accum.metrics.tokensOutput || 0) + outputTokens;
+          accum.metrics.modelCalls = (accum.metrics.modelCalls || 0) + 1;
+          accum.ts = ts;
+          turnTokenAccum.set(turnId, accum);
         }
         break;
       }
       case "tool.execution_start": {
         const toolCallId = stringField(data, "toolCallId");
         const toolName = stringField(data, "toolName") || "tool";
-        const toolTurnId = stringField(data, "turnId");
-        const turnId = toolTurnId === void 0 ? currentTurnId : `turn_${createStableHash([sessionId, toolTurnId]).slice(0, 24)}`;
+        const turnId = currentTurnId;
+        noteWork(ts);
         if (toolCallId) {
           pendingTools.set(toolCallId, { tool: toolName, startedAt: ts, turnId });
         }
@@ -5985,6 +6023,7 @@ async function parseCopilotSessionFile(filePath, options) {
         if (toolCallId) {
           pendingTools.delete(toolCallId);
         }
+        noteWork(ts);
         const success = data.success !== false;
         const durationMs = pending ? Math.max(0, new Date(ts).getTime() - new Date(pending.startedAt).getTime()) : void 0;
         events.push(baseCopilotEvent({
@@ -6027,54 +6066,27 @@ async function parseCopilotSessionFile(filePath, options) {
         break;
       }
       case "assistant.turn_end": {
-        const endTurnId = stringField(data, "turnId");
-        const turnId = endTurnId === void 0 ? currentTurnId : `turn_${createStableHash([sessionId, endTurnId]).slice(0, 24)}`;
-        const accum = turnId ? turnTokenAccum.get(turnId) : void 0;
-        if (accum && accum.tokensOutput && accum.tokensOutput > 0) {
-          accum.reasoningEffort = reasoningEffort;
-          pendingTurnUsage.push(baseCopilotEvent({
-            ts,
-            type: "model.usage",
-            sessionId,
-            turnId,
-            cwd,
-            project,
-            model,
-            confidence: "partial",
-            metrics: accum
-          }));
-          turnTokenAccum.delete(turnId);
-        }
-        events.push(baseCopilotEvent({
-          ts,
-          type: "turn.completed",
-          sessionId,
-          turnId,
-          cwd,
-          project,
-          model,
-          confidence: "derived"
-        }));
+        break;
+      }
+      case "session.resume": {
+        releaseTurn();
         break;
       }
       case "session.shutdown": {
+        releaseTurn();
         const modelMetrics2 = objectField(data, "modelMetrics");
         for (const [modelName, metricsRaw] of Object.entries(modelMetrics2)) {
           if (!isPlainObject(metricsRaw)) {
             continue;
           }
-          const usage = objectField(metricsRaw, "usage");
-          const inputTokens = numberField(usage, "inputTokens") || 0;
-          const outputTokens = numberField(usage, "outputTokens") || 0;
-          const cacheReadTokens = numberField(usage, "cacheReadTokens") || 0;
-          const cacheWriteTokens = numberField(usage, "cacheWriteTokens") || 0;
-          const reasoningTokens = numberField(usage, "reasoningTokens") || 0;
-          const total = inputTokens + outputTokens;
-          if (total <= 0) {
+          const next = readShutdownSnapshot(metricsRaw);
+          if (next.input + next.output <= 0) {
+            continue;
+          }
+          const delta = positiveShutdownDelta(lastShutdownUsage.get(modelName), next);
+          if (!delta) {
             continue;
           }
-          const requests = objectField(metricsRaw, "requests");
-          const requestCount = numberField(requests, "count");
           events.push(baseCopilotEvent({
             ts,
             type: "model.usage",
@@ -6083,38 +6095,100 @@ async function parseCopilotSessionFile(filePath, options) {
             project,
             model: modelName,
             confidence: "exact",
-            metrics: {
-              tokensInput: inputTokens || void 0,
-              tokensOutput: outputTokens || void 0,
-              tokensCachedInput: cacheReadTokens + cacheWriteTokens || void 0,
-              tokensCacheReadInput: cacheReadTokens || void 0,
-              tokensCacheCreationInput: cacheWriteTokens || void 0,
-              tokensReasoningOutput: reasoningTokens || void 0,
-              reasoningEffort,
-              tokensTotal: total,
-              modelCalls: requestCount || void 0
-            }
+            metrics: shutdownUsageMetrics(delta === "full" ? next : delta, reasoningEffort, delta === "full")
           }));
+          lastShutdownUsage.set(modelName, next);
           emittedShutdownUsage = true;
         }
-        events.push(baseCopilotEvent({
-          ts,
-          type: "session.ended",
-          sessionId,
-          cwd,
-          project,
-          model,
-          operation: "session end"
-        }));
+        if (sawWorkSinceShutdown) {
+          events.push(baseCopilotEvent({
+            ts,
+            type: "session.ended",
+            sessionId,
+            cwd,
+            project,
+            model,
+            operation: "session end"
+          }));
+          sawWorkSinceShutdown = false;
+        }
         break;
       }
     }
   }
+  if (isTurnIdle(currentTurnLastEventAt)) {
+    closeOpenTurn();
+  }
   if (!emittedShutdownUsage) {
-    events.push(...pendingTurnUsage);
+    for (const [turnId, accum] of turnTokenAccum) {
+      if (!accum.metrics.tokensOutput) {
+        continue;
+      }
+      accum.metrics.reasoningEffort = reasoningEffort;
+      events.push(baseCopilotEvent({
+        ts: accum.ts,
+        type: "model.usage",
+        sessionId,
+        turnId,
+        cwd,
+        project,
+        model,
+        confidence: "partial",
+        metrics: accum.metrics
+      }));
+    }
   }
   return events.filter((event) => validateCanonicalEvent(event).valid);
 }
+function readShutdownSnapshot(metricsRaw) {
+  const usage = objectField(metricsRaw, "usage");
+  const requests = objectField(metricsRaw, "requests");
+  return {
+    input: numberField(usage, "inputTokens") || 0,
+    output: numberField(usage, "outputTokens") || 0,
+    cacheRead: numberField(usage, "cacheReadTokens") || 0,
+    cacheWrite: numberField(usage, "cacheWriteTokens") || 0,
+    reasoning: numberField(usage, "reasoningTokens") || 0,
+    requests: numberField(requests, "count") || 0
+  };
+}
+function positiveShutdownDelta(prev, next) {
+  if (!prev) {
+    return "full";
+  }
+  const delta = {
+    input: next.input - prev.input,
+    output: next.output - prev.output,
+    cacheRead: next.cacheRead - prev.cacheRead,
+    cacheWrite: next.cacheWrite - prev.cacheWrite,
+    reasoning: next.reasoning - prev.reasoning,
+    requests: next.requests - prev.requests
+  };
+  if (delta.input <= 0 && delta.output <= 0 && delta.cacheRead <= 0 && delta.cacheWrite <= 0 && delta.requests <= 0) {
+    return null;
+  }
+  return delta;
+}
+function shutdownUsageMetrics(snapshot, reasoningEffort, full) {
+  const input = full ? snapshot.input : Math.max(0, snapshot.input);
+  const output = full ? snapshot.output : Math.max(0, snapshot.output);
+  const cacheRead = full ? snapshot.cacheRead : Math.max(0, snapshot.cacheRead);
+  const cacheWrite = full ? snapshot.cacheWrite : Math.max(0, snapshot.cacheWrite);
+  const reasoning = full ? snapshot.reasoning : Math.max(0, snapshot.reasoning);
+  const requests = full ? snapshot.requests : Math.max(0, snapshot.requests);
+  const total = input + output;
+  return {
+    tokensInput: input > 0 ? input : void 0,
+    tokensOutput: output > 0 ? output : void 0,
+    tokensCachedInput: cacheRead + cacheWrite > 0 ? cacheRead + cacheWrite : void 0,
+    tokensCacheReadInput: cacheRead > 0 ? cacheRead : void 0,
+    tokensCacheCreationInput: cacheWrite > 0 ? cacheWrite : void 0,
+    tokensReasoningOutput: reasoning > 0 ? reasoning : void 0,
+    reasoningEffort,
+    tokensTotal: total > 0 ? total : void 0,
+    modelCalls: requests > 0 ? requests : void 0
+  };
+}
 function copilotFileActivities(tool, args, ts, cwd) {
   const normalized = tool.toLowerCase();
   if (normalized === "apply_patch" && typeof args === "string") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yhong91/vibetime",
   "type": "module",
-  "version": "0.1.65",
+  "version": "0.1.66",
   "description": "vibetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi, Cursor) and report activity to vibetime.",
   "license": "MIT",
   "publishConfig": {