@yhong91/vibetime 0.1.60 → 0.1.62

package/bin/vibetime.mjs

@@ -2047,7 +2047,7 @@ function claudeStyleFileMetrics(tool, input) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.60" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.62" : "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;
@@ -3364,9 +3364,12 @@ async function isHooksJsonInstalled(filePath, command) {
     if (!isPlainObject(config) || !isPlainObject(config.hooks)) {
       return false;
     }
-    return Object.values(config.hooks).some(
-      (groups) => Array.isArray(groups) && groups.some(
-        (group) => isPlainObject(group) && Array.isArray(group.hooks) && group.hooks.some((hook) => hook.command === command)
+    const hookScopes = [config.hooks, isPlainObject(config.hooks.events) ? config.hooks.events : {}];
+    return hookScopes.some(
+      (scope) => Object.values(scope).some(
+        (groups) => Array.isArray(groups) && groups.some(
+          (group) => isPlainObject(group) && Array.isArray(group.hooks) && group.hooks.some((hook) => hook.command === command)
+        )
       )
     );
   } catch {
@@ -3375,11 +3378,7 @@ async function isHooksJsonInstalled(filePath, command) {
 }
 
 // src/adapters/claude-code.ts
-init_fs();
 async function parseClaudeCodeSessionFile(filePath, options) {
-  if (path7.basename(filePath) === "usage.jsonl" && path7.basename(path7.dirname(filePath)) === ".viberouter") {
-    return parseClaudeRouterUsageFile(filePath, options);
-  }
   const text = await readFile3(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
   const projectContext = await claudeProjectContextFromLines(filePath, lines, options);
@@ -3646,86 +3645,6 @@ async function parseClaudeCodeSessionFile(filePath, options) {
   }
   return state.events.filter((event) => validateCanonicalEvent(event).valid);
 }
-async function parseClaudeRouterUsageFile(filePath, options) {
-  const rows = (await readFile3(filePath, "utf8")).split("\n").map(parseJsonLine).filter((row) => Boolean(
-    row && row.surface === "claude" && (numberField(row, "timestamp") ?? 0) > 0 && Object.keys(objectField(row, "usage")).length > 0
-  ));
-  if (rows.length === 0) {
-    return [];
-  }
-  const timestamps = rows.map((row) => numberField(row, "timestamp") ?? 0);
-  const firstTs = Math.min(...timestamps) - 6e4;
-  const lastTs = Math.max(...timestamps) + 6e4;
-  const home = path7.resolve(stringOption(options.home) || path7.dirname(path7.dirname(filePath)));
-  const transcriptCounts = /* @__PURE__ */ new Map();
-  for (const transcript of await listJsonlFiles(path7.join(claudeConfigDir(home, process.env), "projects"))) {
-    const seen = /* @__PURE__ */ new Set();
-    for (const line of (await readFile3(transcript, "utf8")).split("\n")) {
-      const raw = parseJsonLine(line);
-      const ts = raw ? Date.parse(timestampFrom(raw.timestamp) || "") : Number.NaN;
-      if (!raw || stringField(raw, "type") !== "assistant" || ts < firstTs || ts > lastTs) {
-        continue;
-      }
-      const message = objectField(raw, "message");
-      const messageId = stringField(message, "id");
-      const usageKey = messageId ? `${messageId}:${stringField(raw, "requestId")}` : null;
-      if (usageKey && seen.has(usageKey)) {
-        continue;
-      }
-      if (usageKey) {
-        seen.add(usageKey);
-      }
-      const usage = claudeUsageFromMessage(message);
-      if (!usage) {
-        continue;
-      }
-      const key = `${usage.tokensInput || 0}:${usage.tokensOutput || 0}`;
-      transcriptCounts.set(key, (transcriptCounts.get(key) || 0) + 1);
-    }
-  }
-  const sourcePathHash = `sha256:${createStableHash(filePath)}`;
-  const events = [];
-  for (const row of rows) {
-    const usage = objectField(row, "usage");
-    const input = numberField(usage, "inputTokens") || 0;
-    const output = numberField(usage, "outputTokens") || 0;
-    const key = `${input}:${output}`;
-    const matched = transcriptCounts.get(key) || 0;
-    if (matched > 0) {
-      transcriptCounts.set(key, matched - 1);
-      continue;
-    }
-    const timestamp = numberField(row, "timestamp") ?? 0;
-    const requestId = stringField(row, "requestId") || createStableHash(row).slice(0, 24);
-    const cacheCreation = numberField(usage, "cacheCreationInputTokens") || 0;
-    const cacheRead = numberField(usage, "cacheReadInputTokens") || 0;
-    const cached = numberField(usage, "cachedInputTokens") || cacheCreation + cacheRead;
-    const event = baseClaudeEvent({
-      ts: new Date(timestamp).toISOString(),
-      type: "model.usage",
-      sessionId: `viberouter:${new Date(timestamp).toISOString().slice(0, 10)}`,
-      project: "unknown",
-      model: stringField(row, "resolvedModel") || stringField(row, "requestedModel") || stringField(row, "model"),
-      provider: stringField(row, "provider"),
-      confidence: "exact",
-      metrics: {
-        tokensInput: input || void 0,
-        tokensCachedInput: cached || void 0,
-        tokensCacheCreationInput: cacheCreation || void 0,
-        tokensCacheReadInput: cacheRead || void 0,
-        tokensOutput: output || void 0,
-        tokensReasoningOutput: numberField(usage, "reasoningOutputTokens") || void 0,
-        tokensTotal: numberField(usage, "totalTokens") || input + output || void 0,
-        modelCalls: 1
-      },
-      refs: stringRefs({ sourceId: requestId, sourcePathHash, importKey: `claude-code:viberouter:${requestId}` })
-    });
-    if (validateCanonicalEvent(event).valid) {
-      events.push(event);
-    }
-  }
-  return events;
-}
 function baseClaudeEvent(event) {
   return {
     schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -4062,7 +3981,6 @@ function createClaudeCodeAdapter() {
       const base = claudeConfigDir(home, env);
       return [
         path7.join(base, "projects"),
-        path7.join(home, ".viberouter", "usage.jsonl"),
         path7.join(base, ".claude.json"),
         path7.join(home, ".claude.json")
       ];
@@ -6833,11 +6751,12 @@ async function readCursorAccessTokenFromHome(options) {
   return void 0;
 }
 function cloudUsageToPersisted(row, index = 0) {
+  const tokensInput = (row.tokensInput || 0) + (row.tokensCacheReadInput || 0) + (row.tokensCacheCreationInput || 0);
   return {
     generationId: `${CURSOR_CLOUD_USAGE_GENERATION_ID}:${index}:${row.tokensInput}:${row.tokensOutput}:${row.tokensCacheReadInput}`,
     ts: row.ts,
     model: row.model,
-    tokensInput: row.tokensInput || void 0,
+    tokensInput: tokensInput || void 0,
     tokensOutput: row.tokensOutput || void 0,
     tokensCacheReadInput: row.tokensCacheReadInput || void 0,
     tokensCacheCreationInput: row.tokensCacheCreationInput || void 0
@@ -13232,7 +13151,6 @@ import { execFile } from "node:child_process";
 import { readFile as readFile15, stat as stat14 } from "node:fs/promises";
 import path22 from "node:path";
 import { promisify as promisify2 } from "node:util";
-init_fs();
 var execFileAsync = promisify2(execFile);
 function zcodeCliDir(home, env) {
   const override = env?.ZCODE_CLI_DIR || env?.ZCODE_HOME;
@@ -13244,6 +13162,27 @@ function zcodeCliDir(home, env) {
 function zcodeDbPath(home, env) {
   return path22.join(zcodeCliDir(home, env), "db", "db.sqlite");
 }
+function zcodeConfigPath(home, env) {
+  return path22.join(zcodeCliDir(home, env), "config.json");
+}
+var zcodeHandler = (msg) => hookHandler("zcode", msg);
+function hookConfig9() {
+  const anyTool = [{ matcher: ".*", hooks: [zcodeHandler("Reporting tool activity")] }];
+  return {
+    hooks: {
+      enabled: true,
+      events: {
+        SessionStart: [{ hooks: [zcodeHandler("Reporting session start")] }],
+        UserPromptSubmit: [{ hooks: [zcodeHandler("Reporting prompt activity")] }],
+        PreToolUse: anyTool,
+        PermissionRequest: anyTool,
+        PostToolUse: anyTool,
+        PostToolUseFailure: anyTool,
+        Stop: [{ hooks: [zcodeHandler("Reporting turn completion")] }]
+      }
+    }
+  };
+}
 var providerNameCache = null;
 async function loadProviderNames(configPath2) {
   let fileMtime = 0;
@@ -13325,10 +13264,14 @@ async function readZCodeRows(dbPath) {
       'id',id,
       'parent_id',parent_id,
       'directory',directory,
+      'workspace_id',workspace_id,
       'title',title,
       'task_type',task_type,
       'time_created',time_created,
-      'time_updated',time_updated
+      'time_updated',time_updated,
+      'summary_additions',summary_additions,
+      'summary_deletions',summary_deletions,
+      'summary_files',summary_files
     ) from session order by time_created, id;`,
     `select json_object(
       'kind','turn',
@@ -13355,6 +13298,7 @@ async function readZCodeRows(dbPath) {
       'query_source',query_source,
       'provider_id',provider_id,
       'model_id',model_id,
+      'variant',variant,
       'agent',agent,
       'mode',mode,
       'status',status,
@@ -13368,7 +13312,9 @@ async function readZCodeRows(dbPath) {
       'cache_read_input_tokens',cache_read_input_tokens,
       'provider_total_tokens',provider_total_tokens,
       'computed_total_tokens',computed_total_tokens,
-      'tool_call_count',tool_call_count
+      'tool_call_count',tool_call_count,
+      'retry_count',retry_count,
+      'error_type',error_type
     ) from model_usage order by started_at, id;`,
     `select json_object(
       'kind','tool',
@@ -13386,7 +13332,8 @@ async function readZCodeRows(dbPath) {
       'completed_at',completed_at,
       'duration_ms',duration_ms,
       'output_bytes',output_bytes,
-      'exit_code',exit_code
+      'exit_code',exit_code,
+      'error_type',error_type
     ) from tool_usage order by started_at, id;`
   ];
   const results = await Promise.all(queries.map((query) => sqliteJsonRows(dbPath, query)));
@@ -13408,6 +13355,7 @@ function modelMetrics(row) {
   const alignedInput = input > 0 ? input + (cacheIsSeparate ? cached : 0) : cached;
   const alignedTotal = alignedInput + output;
   const durationMs = numberField(row, "duration_ms");
+  const variant = stringField(row, "variant");
   return {
     tokensInput: alignedInput || void 0,
     tokensOutput: output,
@@ -13416,6 +13364,7 @@ function modelMetrics(row) {
     tokensCacheCreationInput: cacheCreation,
     tokensCacheReadInput: cacheRead,
     tokensTotal: alignedTotal,
+    reasoningEffort: variant || void 0,
     modelDurationMs: durationMs,
     durationMs,
     modelCalls: 1,
@@ -13445,13 +13394,14 @@ function sessionContext(row, sessions) {
   const cwd = stringField(session, "directory");
   const project = projectFromDirectory(cwd);
   const rootSessionId = resolveRootSessionId2(sessionId, sessions);
+  const workspaceId = stringField(session, "workspace_id") || createWorkspaceId({ projectName: project, repoRoot: cwd });
   return {
     rawSessionId: sessionId,
     sessionId: `zcode:${rootSessionId}`,
     isSubagent: rootSessionId !== sessionId,
     cwd,
     project,
-    workspaceId: createWorkspaceId({ projectName: project, repoRoot: cwd }),
+    workspaceId,
     parentSessionId: stringField(session, "parent_id") ? `zcode:${stringField(session, "parent_id")}` : void 0
   };
 }
@@ -13515,6 +13465,9 @@ async function parseZCodeDb(filePath, options) {
       if (event) events.push(event);
       const completedTs = isoFromMs(numberField(row, "time_updated"));
       if (completedTs && completedTs !== ts) {
+        const linesAdded = numberField(row, "summary_additions");
+        const linesRemoved = numberField(row, "summary_deletions");
+        const filesChanged = numberField(row, "summary_files");
         const completed = makeEvent2({
           schemaVersion: AGENT_TIME_SCHEMA_VERSION,
           ts: completedTs,
@@ -13527,6 +13480,7 @@ async function parseZCodeDb(filePath, options) {
           parentAgentInstanceId: ctx.parentSessionId,
           agent: "zcode",
           confidence: "exact",
+          metrics: linesAdded || linesRemoved || filesChanged ? { linesAdded: linesAdded || void 0, linesRemoved: linesRemoved || void 0, filesChanged: filesChanged || void 0 } : void 0,
           refs: { sourceId: `${id}:session:ended` }
         }, row, rowNumber, filePath, options);
         if (completed) events.push(completed);
@@ -13615,7 +13569,10 @@ async function parseZCodeDb(filePath, options) {
           sourceId: stringField(row, "id") || `${ctx.rawSessionId}:model:${rowNumber}`,
           zcodeQuerySource: stringField(row, "query_source"),
           zcodeMode: stringField(row, "mode"),
-          zcodeStatus: stringField(row, "status")
+          zcodeStatus: stringField(row, "status"),
+          zcodeVariant: stringField(row, "variant"),
+          zcodeErrorType: stringField(row, "error_type"),
+          zcodeRetryCount: numberField(row, "retry_count") || void 0
         })
       }, row, rowNumber, filePath, options);
       if (usage) events.push(usage);
@@ -13678,7 +13635,8 @@ async function parseZCodeDb(filePath, options) {
           refs: refs({
             sourceId: `${toolCallId}:completed`,
             zcodeStatus: status,
-            zcodeExitCode: numberField(row, "exit_code")
+            zcodeExitCode: numberField(row, "exit_code"),
+            zcodeErrorType: stringField(row, "error_type")
           })
         }, row, rowNumber, filePath, options);
         if (completed) events.push(completed);
@@ -13692,7 +13650,15 @@ async function zcodeBackfillFiles(sourceRoot, home, env) {
   const filePath = candidate.endsWith(".sqlite") ? candidate : path22.join(candidate, "db", "db.sqlite");
   try {
     const info = await stat14(filePath);
-    return [{ path: filePath, modifiedAt: info.mtime.toISOString() }];
+    let modifiedMs = info.mtimeMs;
+    for (const suffix of ["-wal", "-shm"]) {
+      try {
+        const sidecar = await stat14(`${filePath}${suffix}`);
+        modifiedMs = Math.max(modifiedMs, sidecar.mtimeMs);
+      } catch {
+      }
+    }
+    return [{ path: filePath, modifiedAt: new Date(modifiedMs).toISOString() }];
   } catch {
     return [];
   }
@@ -13707,13 +13673,20 @@ function createZCodeAdapter() {
       return zcodeCliDir(home, env);
     },
     installedPath(home, env) {
-      return zcodeDbPath(home, env);
+      return zcodeConfigPath(home, env);
     },
     async isInstalled(home, env) {
-      return pathExists(zcodeDbPath(home, env));
+      return isHooksJsonInstalled(
+        zcodeConfigPath(home, env),
+        "vibetime hook --agent zcode"
+      );
     },
-    installEntries() {
-      return [];
+    installEntries(home, env) {
+      return [{
+        kind: "hooks-json",
+        path: zcodeConfigPath(home, env),
+        content: hookConfig9()
+      }];
     },
     sourcePaths(home, env) {
       return [zcodeDbPath(home, env)];
@@ -14639,11 +14612,24 @@ function mergeHookObjects(existing, addition) {
   const additionHooks = isPlainObject(additionObject.hooks) ? additionObject.hooks : {};
   merged.hooks = isPlainObject(merged.hooks) ? merged.hooks : {};
   const mergedHooks = merged.hooks;
-  for (const [event, groups] of Object.entries(additionHooks)) {
+  mergeHookEvents(mergedHooks, additionHooks);
+  const additionEvents = isPlainObject(additionHooks.events) ? additionHooks.events : {};
+  if (Object.keys(additionEvents).length > 0) {
+    const mergedEvents = isPlainObject(mergedHooks.events) ? mergedHooks.events : {};
+    mergeHookEvents(mergedEvents, additionEvents);
+    mergedHooks.events = mergedEvents;
+    if (additionHooks.enabled === true) {
+      mergedHooks.enabled = true;
+    }
+  }
+  return merged;
+}
+function mergeHookEvents(target, addition) {
+  for (const [event, groups] of Object.entries(addition)) {
     if (!Array.isArray(groups)) {
       continue;
     }
-    const existingGroups = Array.isArray(mergedHooks[event]) ? mergedHooks[event] : [];
+    const existingGroups = Array.isArray(target[event]) ? target[event] : [];
     const nextGroups = [...existingGroups];
     for (const group of groups) {
       const command = hookCommandFromGroup(group);
@@ -14654,9 +14640,8 @@ function mergeHookObjects(existing, addition) {
         nextGroups.push(group);
       }
     }
-    mergedHooks[event] = nextGroups;
+    target[event] = nextGroups;
   }
-  return merged;
 }
 function hookCommandFromGroup(group) {
   if (!isPlainObject(group) || !Array.isArray(group.hooks)) {
@@ -14745,6 +14730,12 @@ function collectHookCommandsFromJsonContent(content) {
     for (const groups of Object.values(content.hooks)) {
       walkGroups(groups);
     }
+    const nestedEvents = content.hooks.events;
+    if (isPlainObject(nestedEvents)) {
+      for (const groups of Object.values(nestedEvents)) {
+        walkGroups(groups);
+      }
+    }
   }
   for (const [key, value] of Object.entries(content)) {
     if (key === "hooks" || key === "enable_json_hooks" || !isPlainObject(value)) {
@@ -14809,7 +14800,33 @@ async function uninstallHooksJson(filePath, content, { dryRun, onWrite }) {
         }
       }
     }
-    if (isPlainObject(next.hooks) && Object.keys(next.hooks).length === 0) {
+    if (isPlainObject(next.hooks.events)) {
+      for (const [event, groups] of Object.entries(next.hooks.events)) {
+        const stripped = stripHookCommandsFromGroups(groups, commands);
+        if (JSON.stringify(stripped) !== JSON.stringify(groups)) {
+          changed = true;
+          if (Array.isArray(stripped) && stripped.length === 0) {
+            delete next.hooks.events[event];
+          } else {
+            next.hooks.events[event] = stripped;
+          }
+        }
+      }
+      if (Object.keys(next.hooks.events).length === 0) {
+        delete next.hooks.events;
+      }
+    }
+    const eventsObject = isPlainObject(next.hooks.events) ? next.hooks.events : {};
+    const hooksHasGroups = Object.values(next.hooks).some((value) => Array.isArray(value) && value.length > 0) || Object.values(eventsObject).some((value) => Array.isArray(value) && value.length > 0);
+    if (!hooksHasGroups) {
+      if (next.hooks.enabled !== void 0) {
+        delete next.hooks.enabled;
+      }
+      if (Object.keys(next.hooks).length === 0) {
+        delete next.hooks;
+        changed = true;
+      }
+    } else if (isPlainObject(next.hooks) && Object.keys(next.hooks).length === 0) {
       delete next.hooks;
       changed = true;
     }

package/package.json

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