@yhong91/vibetime 0.1.20 → 0.1.23

package/bin/vibetime.mjs

@@ -1202,7 +1202,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.20" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.23" : "0.1.1";
 var DEFAULT_API_URL = "http://121.196.224.82:3001";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
 var DEFAULT_BACKFILL_BATCH_BYTES = 800 * 1024;
@@ -2695,6 +2695,9 @@ async function parseClaudeCodeSessionFile(filePath, options) {
       continue;
     }
     if (topType === "user") {
+      if (isClaudeNoiseUserEntry(raw, message)) {
+        continue;
+      }
       const prompt = claudeTextStats(message.content);
       state.closeTurn(ts, lineNumber, topType);
       state.currentTurnId = stringField(raw, "uuid") || stringField(raw, "promptId") || `turn_${createStableHash([sessionId, lineNumber]).slice(0, 24)}`;
@@ -2978,6 +2981,23 @@ function claudeTextStats(value) {
     hash: textItems.length > 0 ? `sha256:${createStableHash(textItems)}` : void 0
   };
 }
+function isClaudeNoiseUserEntry(raw, message) {
+  if (raw.isMeta === true) {
+    return true;
+  }
+  const content = message.content;
+  let text = "";
+  if (typeof content === "string") {
+    text = content;
+  } else if (Array.isArray(content)) {
+    text = content.filter((item) => isPlainObject(item) && item.type === "text").map((item) => stringField(item, "text") || "").join("");
+  }
+  text = text.trim();
+  if (!text) {
+    return false;
+  }
+  return /^<(?:command-name|command-message|command-args|local-command-stdout|local-command-stderr|local-command-caveat)>/.test(text) || text === "[Request interrupted by user]";
+}
 async function claudeProjectContextFromLines(filePath, lines, options) {
   const projectDir = path7.basename(path7.dirname(filePath));
   const cwds = [];
@@ -4711,6 +4731,8 @@ async function parseCopilotSessionFile(filePath, options) {
   let reasoningEffort;
   const pendingTools = /* @__PURE__ */ new Map();
   const turnTokenAccum = /* @__PURE__ */ new Map();
+  const pendingTurnUsage = [];
+  let emittedShutdownUsage = false;
   for (const [index, line] of lines.entries()) {
     const lineNumber = index + 1;
     const raw = parseJsonLine(line);
@@ -4875,7 +4897,7 @@ async function parseCopilotSessionFile(filePath, options) {
         const accum = turnId ? turnTokenAccum.get(turnId) : void 0;
         if (accum && accum.tokensOutput && accum.tokensOutput > 0) {
           accum.reasoningEffort = reasoningEffort;
-          events.push(baseCopilotEvent({
+          pendingTurnUsage.push(baseCopilotEvent({
             ts,
             type: "model.usage",
             sessionId,
@@ -4939,6 +4961,7 @@ async function parseCopilotSessionFile(filePath, options) {
               modelCalls: requestCount || void 0
             }
           }));
+          emittedShutdownUsage = true;
         }
         events.push(baseCopilotEvent({
           ts,
@@ -4953,6 +4976,9 @@ async function parseCopilotSessionFile(filePath, options) {
       }
     }
   }
+  if (!emittedShutdownUsage) {
+    events.push(...pendingTurnUsage);
+  }
   return events.filter((event) => validateCanonicalEvent(event).valid);
 }
 function baseCopilotEvent(event) {
@@ -5179,33 +5205,7 @@ async function parseOpenCodeSessionFile(dbPath, options) {
           const createdTs = timeCreated;
           const tokens = opencodeUsageFromInfo(info);
           const cost = typeof info.cost === "number" && info.cost > 0 ? info.cost : void 0;
-          if (tokens) {
-            const metrics = {
-              tokensInput: tokens.tokensInput,
-              tokensOutput: tokens.tokensOutput,
-              tokensReasoningOutput: tokens.tokensReasoningOutput,
-              tokensCachedInput: tokens.tokensCachedInput,
-              tokensCacheReadInput: tokens.tokensCacheReadInput,
-              tokensCacheCreationInput: tokens.tokensCacheCreationInput,
-              tokensTotal: tokens.tokensTotal,
-              reasoningEffort
-            };
-            if (cost !== void 0) {
-              metrics.costUsd = cost;
-            }
-            events.push(baseOpenCodeEvent({
-              ts: msToIso(completedTs || createdTs),
-              type: "model.usage",
-              sessionId,
-              turnId: currentTurnId,
-              cwd: assistantCwd,
-              project: assistantProject,
-              model,
-              provider,
-              operation: "model usage",
-              metrics
-            }, assistantAgent));
-          }
+          let emittedStepUsage = false;
           try {
             const parts = db.prepare(
               "SELECT data FROM part WHERE message_id = ? ORDER BY id"
@@ -5306,6 +5306,7 @@ async function parseOpenCodeSessionFile(dbPath, options) {
                 const stepTokens = opencodeUsageFromInfo(pd);
                 const stepCost = typeof pd.cost === "number" && pd.cost > 0 ? pd.cost : void 0;
                 if (stepTokens) {
+                  emittedStepUsage = true;
                   const stepMetrics = {
                     tokensInput: stepTokens.tokensInput,
                     tokensOutput: stepTokens.tokensOutput,
@@ -5350,6 +5351,33 @@ async function parseOpenCodeSessionFile(dbPath, options) {
             }
           } catch {
           }
+          if (!emittedStepUsage && tokens) {
+            const metrics = {
+              tokensInput: tokens.tokensInput,
+              tokensOutput: tokens.tokensOutput,
+              tokensReasoningOutput: tokens.tokensReasoningOutput,
+              tokensCachedInput: tokens.tokensCachedInput,
+              tokensCacheReadInput: tokens.tokensCacheReadInput,
+              tokensCacheCreationInput: tokens.tokensCacheCreationInput,
+              tokensTotal: tokens.tokensTotal,
+              reasoningEffort
+            };
+            if (cost !== void 0) {
+              metrics.costUsd = cost;
+            }
+            events.push(baseOpenCodeEvent({
+              ts: msToIso(completedTs || createdTs),
+              type: "model.usage",
+              sessionId,
+              turnId: currentTurnId,
+              cwd: assistantCwd,
+              project: assistantProject,
+              model,
+              provider,
+              operation: "model usage",
+              metrics
+            }, assistantAgent));
+          }
           if (stringField(info, "finish")) {
             const durationMs = completedTs && createdTs ? completedTs - createdTs : void 0;
             events.push(baseOpenCodeEvent({
@@ -8349,7 +8377,10 @@ function buildSessionRollups(events) {
       grouped.set(key, [event]);
     }
   }
-  return [...grouped.entries()].map(([rollupKey, sessionEvents]) => buildSessionRollup(rollupKey, sessionEvents)).sort((a, b) => a.startedAt.localeCompare(b.startedAt));
+  return [...grouped.entries()].map(([rollupKey, sessionEvents]) => buildSessionRollup(rollupKey, sessionEvents)).filter((rollup) => !isPhantomRollup(rollup)).sort((a, b) => a.startedAt.localeCompare(b.startedAt));
+}
+function isPhantomRollup(rollup) {
+  return rollup.totalTokens === 0 && rollup.toolCallCount === 0 && rollup.commandCallCount === 0 && rollup.linesAdded === 0 && rollup.linesRemoved === 0;
 }
 function buildSessionRollup(rollupKey, events) {
   const ordered = [...events].sort((a, b) => a.ts.localeCompare(b.ts));

package/package.json

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