@yhong91/vibetime 0.1.72 → 0.1.74

package/bin/vibetime.mjs

@@ -2047,7 +2047,7 @@ function claudeStyleFileMetrics(tool, input) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.72" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.74" : "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;
@@ -5163,7 +5163,6 @@ async function parseCodexSessionFile(filePath, options) {
   let lastTurnIdForComplete;
   let turnIdAtLastUserMessage;
   let sessionMetaLocked = false;
-  let forkedSession = false;
   let lastTotalTokenUsage;
   let lastPerCallUsageKey;
   let compactionPending = false;
@@ -5184,7 +5183,6 @@ async function parseCodexSessionFile(filePath, options) {
       }
       sessionMetaLocked = true;
       const forkedFromId = stringField(payload, "forked_from_id");
-      forkedSession = Boolean(forkedFromId);
       const inherited = forkedFromId ? await readPersistedSessionContextFromOptions(options, forkedFromId) : void 0;
       sessionId = stringField(payload, "id") || sessionId;
       cwd = inherited?.cwd || stringField(payload, "cwd") || cwd;
@@ -5336,7 +5334,7 @@ async function parseCodexSessionFile(filePath, options) {
                 project,
                 model: rewriteCodexModelForTier(model, serviceTier),
                 confidence: "partial",
-                metrics: excludeForkInheritedCache(usage, forkedSession)
+                metrics: usage
               }), { filePath, sourcePathHash, lineNumber, topType, payloadType, options }));
               lastPerCallUsageKey = usageKey;
             }
@@ -5354,7 +5352,7 @@ async function parseCodexSessionFile(filePath, options) {
                 project,
                 model: rewriteCodexModelForTier(model, serviceTier),
                 confidence: "partial",
-                metrics: excludeForkInheritedCache({ ...lastUsage, reasoningEffort }, forkedSession)
+                metrics: { ...lastUsage, reasoningEffort }
               }), { filePath, sourcePathHash, lineNumber, topType, payloadType, options }));
             }
             lastTotalTokenUsage = { input, cached, output, reasoning, total };
@@ -5378,7 +5376,7 @@ async function parseCodexSessionFile(filePath, options) {
                 project,
                 model: rewriteCodexModelForTier(model, serviceTier),
                 confidence: "partial",
-                metrics: excludeForkInheritedCache({
+                metrics: {
                   tokensInput: deltaInput > 0 ? deltaInput : void 0,
                   tokensCachedInput: deltaCached > 0 ? deltaCached : void 0,
                   tokensOutput: deltaOutput > 0 ? deltaOutput : void 0,
@@ -5386,7 +5384,7 @@ async function parseCodexSessionFile(filePath, options) {
                   tokensTotal: deltaTotal > 0 ? deltaTotal : void 0,
                   modelContextWindow: usage.modelContextWindow,
                   reasoningEffort
-                }, forkedSession)
+                }
               }), { filePath, sourcePathHash, lineNumber, topType, payloadType, options }));
             }
           } else {
@@ -5399,7 +5397,7 @@ async function parseCodexSessionFile(filePath, options) {
               project,
               model: rewriteCodexModelForTier(model, serviceTier),
               confidence: "partial",
-              metrics: excludeForkInheritedCache({
+              metrics: {
                 tokensInput: input,
                 tokensCachedInput: cached,
                 tokensOutput: output,
@@ -5407,7 +5405,7 @@ async function parseCodexSessionFile(filePath, options) {
                 tokensTotal: total,
                 modelContextWindow: usage.modelContextWindow,
                 reasoningEffort
-              }, forkedSession)
+              }
             }), { filePath, sourcePathHash, lineNumber, topType, payloadType, options }));
           }
           lastTotalTokenUsage = { input, cached, output, reasoning, total };
@@ -5708,18 +5706,6 @@ function tokenUsageFromRecord(usage, info) {
     modelContextWindow: numberField(info, "model_context_window")
   };
 }
-function excludeForkInheritedCache(usage, forked) {
-  if (!forked || !usage) {
-    return usage;
-  }
-  const cached = usage.tokensCachedInput ?? 0;
-  return {
-    ...usage,
-    tokensInput: Math.max(0, (usage.tokensInput ?? 0) - cached) || void 0,
-    tokensCachedInput: void 0,
-    tokensTotal: Math.max(0, (usage.tokensTotal ?? 0) - cached) || void 0
-  };
-}
 function toolNameFromPayload(payload, payloadType) {
   if (payloadType === "web_search_call") {
     return "web_search";
@@ -9079,11 +9065,121 @@ function projectFromCwd(cwd, repoRoot) {
   const basis = repoRoot || cwd;
   return basis ? path15.basename(basis) || SOURCE : SOURCE;
 }
-function isoFromUnix(value) {
+function unixFrom(value) {
   if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) {
     return void 0;
   }
-  return timestampFrom(value);
+  return value;
+}
+function isoFromUnix(value) {
+  const unix = unixFrom(value);
+  return unix === void 0 ? void 0 : timestampFrom(unix);
+}
+function maxUnix(...values) {
+  let max;
+  for (const value of values) {
+    const unix = unixFrom(value);
+    if (unix === void 0) {
+      continue;
+    }
+    if (max === void 0 || unix > max) {
+      max = unix;
+    }
+  }
+  return max;
+}
+function isReapEndReason(reason) {
+  return reason === "ws_orphan_reap" || reason === "startup_orphan_reap";
+}
+function isSyntheticUserContent(content) {
+  if (!content) {
+    return false;
+  }
+  const trimmed = content.trim();
+  return trimmed.startsWith("[CONTEXT COMPACTION") || trimmed.startsWith("[IMPORTANT: Background process");
+}
+var INT_METRIC_KEYS = [
+  "tokensInput",
+  "tokensOutput",
+  "tokensCacheReadInput",
+  "tokensCacheCreationInput",
+  "tokensCachedInput",
+  "tokensReasoningOutput",
+  "tokensTotal",
+  "modelCalls"
+];
+function splitMetricBag(bag, fractions) {
+  if (fractions.length === 0) {
+    return [];
+  }
+  if (fractions.length === 1) {
+    return [{ ...bag }];
+  }
+  const out = fractions.map(() => ({}));
+  for (const key of INT_METRIC_KEYS) {
+    const value = bag[key];
+    if (typeof value !== "number" || !Number.isFinite(value) || value === 0) {
+      continue;
+    }
+    let allocated = 0;
+    for (let i = 0; i < fractions.length; i += 1) {
+      const part = i === fractions.length - 1 ? value - allocated : Math.floor(value * fractions[i]);
+      allocated += part;
+      if (part) {
+        out[i][key] = part;
+      }
+    }
+  }
+  const cost = bag.costUsd;
+  if (typeof cost === "number" && Number.isFinite(cost) && cost > 0) {
+    let allocated = 0;
+    for (let i = 0; i < fractions.length; i += 1) {
+      const part = i === fractions.length - 1 ? Math.round((cost - allocated) * 1e6) / 1e6 : Math.round(cost * fractions[i] * 1e6) / 1e6;
+      allocated += part;
+      if (part) {
+        out[i].costUsd = part;
+      }
+    }
+  }
+  return out;
+}
+function metricBagHasWork(bag) {
+  return INT_METRIC_KEYS.some((key) => (bag[key] || 0) > 0);
+}
+function allocateUsageAcrossTurns(usage, turns) {
+  const first = unixFrom(usage.first_seen);
+  const last = unixFrom(usage.last_seen);
+  const start = first ?? last;
+  const end = last ?? first;
+  if (start === void 0 || end === void 0) {
+    const turn = turns.at(-1);
+    return [{ turn, fraction: 1, tsUnix: turn?.endUnix || turn?.startedUnix || 0 }];
+  }
+  if (turns.length === 0) {
+    return [{ fraction: 1, tsUnix: end }];
+  }
+  if (end <= start) {
+    const turn = turns.find((item) => start >= item.startedUnix && start < item.endUnix) || [...turns].reverse().find((item) => item.startedUnix <= start) || turns[0];
+    return [{ turn, fraction: 1, tsUnix: start }];
+  }
+  const overlaps = [];
+  for (const turn of turns) {
+    const lo = Math.max(start, turn.startedUnix);
+    const hi = Math.min(end, turn.endUnix);
+    if (hi > lo) {
+      overlaps.push({ turn, overlap: hi - lo });
+    }
+  }
+  const total = overlaps.reduce((sum, item) => sum + item.overlap, 0);
+  if (total <= 0) {
+    const turn = [...turns].reverse().find((item) => item.startedUnix <= end) || turns[0];
+    return [{ turn, fraction: 1, tsUnix: Math.min(end, turn?.endUnix || end) }];
+  }
+  return overlaps.map((item) => ({
+    turn: item.turn,
+    fraction: item.overlap / total,
+    tsUnix: Math.min(end, item.turn.endUnix)
+  }));
 }
 function tableColumns(db, table) {
   try {
@@ -9260,6 +9356,7 @@ async function parseHermesDb(filePath, options) {
       "parent_session_id",
       "started_at",
       "ended_at",
+      "end_reason",
       "message_count",
       "tool_call_count",
       "input_tokens",
@@ -9349,8 +9446,9 @@ async function parseHermesDb(filePath, options) {
       if (!sessionHasWork(session, usageRows) && messages.length === 0) {
         continue;
       }
-      const startedTs = isoFromUnix(session.started_at);
-      if (!startedTs) {
+      const startedUnix = unixFrom(session.started_at);
+      const startedTs = isoFromUnix(startedUnix);
+      if (!startedUnix || !startedTs) {
         continue;
       }
       lineNumber += 1;
@@ -9378,7 +9476,15 @@ async function parseHermesDb(filePath, options) {
       if (started) {
         events.push(started);
       }
-      const endedTs = isoFromUnix(session.ended_at) || isoFromUnix(session.last_activity_at);
+      const lastMessageUnix = maxUnix(...messages.map((message) => message.timestamp));
+      const lastUsageUnix = maxUnix(
+        ...usageRows.flatMap((usage) => [usage.last_seen, usage.first_seen])
+      );
+      const lastActivityUnix = unixFrom(session.last_activity_at);
+      const endReason = stringField(session, "end_reason");
+      const closedUnix = isReapEndReason(endReason) ? void 0 : unixFrom(session.ended_at);
+      const endedUnix = maxUnix(lastMessageUnix, lastUsageUnix, closedUnix) ?? lastActivityUnix;
+      const endedTs = isoFromUnix(endedUnix);
       if (endedTs && endedTs !== startedTs) {
         lineNumber += 1;
         const ended = makeEvent({
@@ -9398,16 +9504,102 @@ async function parseHermesDb(filePath, options) {
           refs: refs({
             sourceId: `${ctx.rawId}:session:ended`,
             hermesPlatform: ctx.platform,
-            hermesProfile: ctx.profileName
+            hermesProfile: ctx.profileName,
+            hermesEndReason: endReason
           })
         }, lineNumber, filePath, options);
         if (ended) {
           events.push(ended);
         }
       }
+      const userTurns = [];
+      for (const message of messages) {
+        const tsUnix = unixFrom(message.timestamp);
+        if (!tsUnix) {
+          continue;
+        }
+        const role = stringField(message, "role");
+        if (role === "user") {
+          if (isSyntheticUserContent(stringField(message, "content"))) {
+            continue;
+          }
+          const index = userTurns.length + 1;
+          userTurns.push({
+            index,
+            turnId: `${ctx.sessionId}:turn:${index}`,
+            startedUnix: tsUnix,
+            endUnix: tsUnix
+          });
+          continue;
+        }
+        const current = userTurns[userTurns.length - 1];
+        if (current && (role === "assistant" || role === "tool")) {
+          current.endUnix = Math.max(current.endUnix, tsUnix);
+        }
+      }
       if (usageRows.length > 0) {
         for (const usage of usageRows) {
-          const ts = isoFromUnix(usage.last_seen) || isoFromUnix(usage.first_seen) || startedTs;
+          const allocations = allocateUsageAcrossTurns(usage, userTurns);
+          const metricsParts = splitMetricBag(usageMetrics2(usage), allocations.map((item) => item.fraction));
+          const model = stringField(usage, "model") || ctx.model;
+          const provider = stringField(usage, "billing_provider") || ctx.provider;
+          const task = stringField(usage, "task") || "main";
+          const billing = stringField(usage, "billing_provider") || "";
+          for (let i = 0; i < allocations.length; i += 1) {
+            const allocation = allocations[i];
+            const metrics = metricsParts[i];
+            if (!metrics || !metricBagHasWork(metrics)) {
+              continue;
+            }
+            const ts = isoFromUnix(allocation.tsUnix) || startedTs;
+            const turnId = allocation.turn?.turnId;
+            const slice = allocation.turn ? `:turn:${allocation.turn.index}` : "";
+            lineNumber += 1;
+            const event = makeEvent({
+              schemaVersion: AGENT_TIME_SCHEMA_VERSION,
+              ts,
+              type: "model.usage",
+              source: SOURCE,
+              workspaceId: ctx.workspaceId,
+              project: ctx.project,
+              cwd: ctx.cwd,
+              sessionId: ctx.sessionId,
+              turnId,
+              agent: SOURCE,
+              model,
+              provider,
+              success: true,
+              metrics,
+              confidence: allocations.length > 1 ? "derived" : "exact",
+              refs: refs({
+                sourceId: `${ctx.rawId}:model:${model || "unknown"}:${task}:${billing}${slice}`,
+                hermesPlatform: ctx.platform,
+                hermesProfile: ctx.profileName,
+                hermesTask: stringField(usage, "task"),
+                hermesBillingMode: stringField(usage, "billing_mode")
+              })
+            }, lineNumber, filePath, options);
+            if (event) {
+              events.push(event);
+            }
+          }
+        }
+      } else if ((numberField(session, "input_tokens") || 0) + (numberField(session, "output_tokens") || 0) > 0) {
+        const fallbackUsage = {
+          first_seen: startedUnix,
+          last_seen: endedUnix || startedUnix
+        };
+        const allocations = allocateUsageAcrossTurns(fallbackUsage, userTurns);
+        const metricsParts = splitMetricBag(usageMetrics2(session), allocations.map((item) => item.fraction));
+        for (let i = 0; i < allocations.length; i += 1) {
+          const allocation = allocations[i];
+          const metrics = metricsParts[i];
+          if (!metrics || !metricBagHasWork(metrics)) {
+            continue;
+          }
+          const ts = isoFromUnix(allocation.tsUnix) || startedTs;
+          const turnId = allocation.turn?.turnId;
+          const slice = allocation.turn ? `:turn:${allocation.turn.index}` : "";
           lineNumber += 1;
           const event = makeEvent({
             schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -9418,62 +9610,72 @@ async function parseHermesDb(filePath, options) {
             project: ctx.project,
             cwd: ctx.cwd,
             sessionId: ctx.sessionId,
+            turnId,
             agent: SOURCE,
-            model: stringField(usage, "model") || ctx.model,
-            provider: stringField(usage, "billing_provider") || ctx.provider,
+            model: ctx.model,
+            provider: ctx.provider,
             success: true,
-            metrics: usageMetrics2(usage),
-            confidence: "exact",
+            metrics,
+            confidence: "partial",
             refs: refs({
-              sourceId: `${ctx.rawId}:model:${stringField(usage, "model") || "unknown"}:${stringField(usage, "task") || "main"}:${stringField(usage, "billing_provider") || ""}`,
+              sourceId: `${ctx.rawId}:model:session${slice}`,
               hermesPlatform: ctx.platform,
-              hermesProfile: ctx.profileName,
-              hermesTask: stringField(usage, "task"),
-              hermesBillingMode: stringField(usage, "billing_mode")
+              hermesProfile: ctx.profileName
             })
           }, lineNumber, filePath, options);
           if (event) {
             events.push(event);
           }
         }
-      } else if ((numberField(session, "input_tokens") || 0) + (numberField(session, "output_tokens") || 0) > 0) {
+      }
+      let turnIndex = 0;
+      let activeTurnId;
+      let activeTurnStartedTs;
+      let lastWorkTs;
+      const closeActiveTurn = (ts) => {
+        if (!activeTurnId) {
+          return;
+        }
         lineNumber += 1;
-        const event = makeEvent({
+        const completed = makeEvent({
           schemaVersion: AGENT_TIME_SCHEMA_VERSION,
-          ts: endedTs || startedTs,
-          type: "model.usage",
+          ts,
+          type: "turn.completed",
           source: SOURCE,
           workspaceId: ctx.workspaceId,
           project: ctx.project,
           cwd: ctx.cwd,
           sessionId: ctx.sessionId,
+          turnId: activeTurnId,
           agent: SOURCE,
-          model: ctx.model,
-          provider: ctx.provider,
-          success: true,
-          metrics: usageMetrics2(session),
-          confidence: "partial",
-          refs: refs({
-            sourceId: `${ctx.rawId}:model:session`,
-            hermesPlatform: ctx.platform,
-            hermesProfile: ctx.profileName
-          })
+          confidence: "derived",
+          refs: refs({ sourceId: `${ctx.rawId}:turn:${turnIndex}:end` })
         }, lineNumber, filePath, options);
-        if (event) {
-          events.push(event);
+        if (completed) {
+          events.push(completed);
         }
-      }
-      let turnIndex = 0;
-      let activeTurnId;
+        activeTurnId = void 0;
+        activeTurnStartedTs = void 0;
+        lastWorkTs = void 0;
+      };
       for (const message of messages) {
-        const ts = isoFromUnix(message.timestamp);
-        if (!ts) {
+        const tsUnix = unixFrom(message.timestamp);
+        const ts = isoFromUnix(tsUnix);
+        if (!tsUnix || !ts) {
           continue;
         }
         const role = stringField(message, "role");
         if (role === "user") {
+          if (isSyntheticUserContent(stringField(message, "content"))) {
+            continue;
+          }
+          if (activeTurnId && activeTurnStartedTs) {
+            closeActiveTurn(lastWorkTs || activeTurnStartedTs);
+          }
           turnIndex += 1;
           activeTurnId = `${ctx.sessionId}:turn:${turnIndex}`;
+          activeTurnStartedTs = ts;
+          lastWorkTs = void 0;
           lineNumber += 1;
           const turnStarted = makeEvent({
             schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -9514,6 +9716,10 @@ async function parseHermesDb(filePath, options) {
           }
           continue;
         }
+        if (role !== "assistant" && role !== "tool") {
+          continue;
+        }
+        lastWorkTs = ts;
         if (role !== "assistant") {
           continue;
         }
@@ -9568,6 +9774,9 @@ async function parseHermesDb(filePath, options) {
           }
         }
       }
+      if (activeTurnId) {
+        closeActiveTurn(lastWorkTs || endedTs || startedTs);
+      }
     }
     return events.sort((a, b) => a.ts.localeCompare(b.ts) || (a.id || "").localeCompare(b.id || ""));
   } finally {
@@ -9628,7 +9837,6 @@ description: "VibeTime session sync \u2014 thin trigger that runs local backfill
 author: VibeTime
 hooks:
   - on_session_start
-  - on_session_end
   - on_session_finalize
   - post_tool_call
 `;
@@ -9639,6 +9847,10 @@ function pluginInit() {
 
 Thin trigger only: spawn \`vibetime hook --agent hermes\` on session/tool
 lifecycle events. Token usage is read from state.db by vibetime backfill.
+
+\`on_session_end\` is a per-turn observer in Hermes (end of every
+run_conversation). Do not map it to SessionEnd \u2014 that would fire a
+backfill after every prompt. Real session teardown is on_session_finalize.
 """
 from __future__ import annotations
 
@@ -9654,15 +9866,20 @@ def _report(payload: dict[str, Any]) -> None:
     if not command:
         return
     try:
-        subprocess.run(
+        # Popen + close stdin: do not block the Hermes tool loop waiting for
+        # vibetime hook / backfill. stdout/stderr inherited would spam the
+        # agent UI, so discard them.
+        proc = subprocess.Popen(
             [command, "hook", "--agent", "hermes"],
-            input=json.dumps(payload),
-            text=True,
-            capture_output=True,
-            timeout=10,
-            check=False,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
             env=os.environ.copy(),
+            start_new_session=True,
         )
+        if proc.stdin is not None:
+            proc.stdin.write(json.dumps(payload).encode())
+            proc.stdin.close()
     except Exception:
         return
 
@@ -9671,8 +9888,8 @@ def on_session_start(*, session_id: str = "", **_: Any) -> None:
     _report({"hook_event_name": "SessionStart", "session_id": session_id})
 
 
-def on_session_end(*, session_id: str = "", **_: Any) -> None:
-    _report({"hook_event_name": "SessionEnd", "session_id": session_id})
+def on_session_finalize(*, session_id: str = "", **_: Any) -> None:
+    _report({"hook_event_name": "SessionEnd", "session_id": session_id or ""})
 
 
 def on_post_tool_call(*, tool_name: str = "", session_id: str = "", **_: Any) -> None:
@@ -9685,8 +9902,7 @@ def on_post_tool_call(*, tool_name: str = "", session_id: str = "", **_: Any) ->
 
 def register(ctx) -> None:
     ctx.register_hook("on_session_start", on_session_start)
-    ctx.register_hook("on_session_end", on_session_end)
-    ctx.register_hook("on_session_finalize", on_session_end)
+    ctx.register_hook("on_session_finalize", on_session_finalize)
     ctx.register_hook("post_tool_call", on_post_tool_call)
 `;
 }

package/package.json

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