@yhong91/vibetime 0.1.52 → 0.1.54

package/bin/vibetime.mjs

@@ -18,7 +18,7 @@ var __export = (target, all) => {
 // src/lib/fs.ts
 var fs_exports = {};
 __export(fs_exports, {
-  GENERATED_MARKER: () => GENERATED_MARKER,
+  GENERATED_MARKER: () => GENERATED_MARKER2,
   countDirectoryEntries: () => countDirectoryEntries,
   listFilesByExtensions: () => listFilesByExtensions,
   listJsonlFiles: () => listJsonlFiles,
@@ -72,7 +72,7 @@ async function writeGeneratedFile(filePath, content, { dryRun, force, onWrite })
     onWrite(`Already installed ${filePath}`);
     return;
   }
-  if (existing !== null && !existing.includes(GENERATED_MARKER) && !existing.includes(LEGACY_GENERATED_MARKER) && !force) {
+  if (existing !== null && !existing.includes(GENERATED_MARKER2) && !existing.includes(LEGACY_GENERATED_MARKER) && !force) {
     throw new Error(
       `Refusing to overwrite non-vibetime file: ${filePath}. Re-run with --force if this is intentional.`
     );
@@ -148,11 +148,11 @@ async function countDirectoryEntries(candidatePath) {
     throw error;
   }
 }
-var GENERATED_MARKER, LEGACY_GENERATED_MARKER;
+var GENERATED_MARKER2, LEGACY_GENERATED_MARKER;
 var init_fs = __esm({
   "src/lib/fs.ts"() {
     "use strict";
-    GENERATED_MARKER = "Generated by vibetime.";
+    GENERATED_MARKER2 = "Generated by vibetime.";
     LEGACY_GENERATED_MARKER = "Generated by codetime.";
   }
 });
@@ -884,8 +884,8 @@ var init_esm = __esm({
 
 // src/cli.ts
 import { spawn as spawn2, spawnSync } from "node:child_process";
-import { mkdir as mkdir5, open, rm, stat as stat13, writeFile as writeFile4 } from "node:fs/promises";
-import os11 from "node:os";
+import { mkdir as mkdir5, open, rm, stat as stat14, writeFile as writeFile4 } from "node:fs/promises";
+import os12 from "node:os";
 import path25 from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -2047,7 +2047,8 @@ function claudeStyleFileMetrics(tool, input) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.52" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.54" : "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;
 var DEFAULT_BACKFILL_BATCH_BYTES = 800 * 1024;
@@ -3330,6 +3331,9 @@ function isTurnIdle(lastEventAt) {
   }
   return Date.now() - lastMs > TURN_IDLE_MS;
 }
+function withoutSubagentTurnEvents(events) {
+  return events.filter((event) => event.type !== "turn.started" && event.type !== "turn.completed");
+}
 function sessionIdFromFilePath(filePath, prefix) {
   const match = path6.basename(filePath).match(/([0-9a-f]{8}-[0-9a-f-]{27,})/);
   return match?.[1] || `${prefix}_${createStableHash(filePath).slice(0, 24)}`;
@@ -4252,7 +4256,8 @@ async function parseClaudeCoworkSessionFile(filePath, options) {
   const parentSourcePathHash = subagentInfo ? `sha256:${createStableHash(subagentInfo.mainTranscriptPath)}` : void 0;
   const parentSessionId = subagentInfo ? prefixCoworkId(subagentInfo.cliSessionId) : void 0;
   const events = await parser(filePath, options);
-  return events.map((event) => {
+  const foldable = subagentInfo ? withoutSubagentTurnEvents(events).map((event) => ({ ...event, turnId: void 0 })) : events;
+  return foldable.map((event) => {
     const sessionId = parentSessionId || prefixCoworkId(event.sessionId);
     const turnId = prefixCoworkId(event.turnId);
     const workspaceId = createWorkspaceId({ projectName: project, repoRoot: cwd });
@@ -5006,8 +5011,8 @@ async function codebuddyBackfillFiles(sourceRoot, home, env) {
           }
           const filePath = path9.join(traceDir, entry);
           try {
-            const stat14 = await import("node:fs/promises").then((fs) => fs.stat(filePath));
-            files.push({ path: filePath, modifiedAt: stat14.mtime.toISOString(), groupId: pidDir.name });
+            const stat15 = await import("node:fs/promises").then((fs) => fs.stat(filePath));
+            files.push({ path: filePath, modifiedAt: stat15.mtime.toISOString(), groupId: pidDir.name });
           } catch {
           }
         }
@@ -6938,6 +6943,154 @@ function createGrokBuildAdapter() {
 // src/adapters/kimi-code.ts
 import { readFile as readFile9 } from "node:fs/promises";
 import path14 from "node:path";
+
+// src/lib/toml-hooks.ts
+init_fs();
+async function hasTomlHookCommand(filePath, command) {
+  const text = await readTextIfExists(filePath);
+  if (!text) {
+    return false;
+  }
+  return parseTomlHookRules(text).some((rule) => rule.command === command);
+}
+function parseTomlHookRules(text) {
+  const rules = [];
+  const chunks = text.split(/^\[\[hooks\]\][ \t]*\r?\n?/m);
+  for (const chunk of chunks.slice(1)) {
+    const body = chunk.split(/^\[[^\]]+\]/m)[0] ?? "";
+    const event = tomlStringField(body, "event");
+    const command = tomlStringField(body, "command");
+    if (!event || !command) {
+      continue;
+    }
+    const matcher = tomlStringField(body, "matcher");
+    const timeout = tomlNumberField(body, "timeout");
+    const rule = { event, command };
+    if (matcher !== void 0) {
+      rule.matcher = matcher;
+    }
+    if (timeout !== void 0) {
+      rule.timeout = timeout;
+    }
+    rules.push(rule);
+  }
+  return rules;
+}
+function mergeTomlHookRules(existingText, desired) {
+  const existingKeys = new Set(parseTomlHookRules(existingText).map(ruleKey));
+  const toAppend = desired.filter((rule) => !existingKeys.has(ruleKey(rule)));
+  if (toAppend.length === 0) {
+    return existingText;
+  }
+  let base = existingText;
+  if (base.length > 0 && !base.endsWith("\n")) {
+    base += "\n";
+  }
+  if (base.length > 0 && !base.endsWith("\n\n") && base.trim().length > 0) {
+    base += "\n";
+  }
+  const blocks = toAppend.map(serializeTomlHookRule).join("\n\n");
+  return `${base}${blocks}
+`;
+}
+function removeTomlHookRulesByCommand(existingText, commands) {
+  const commandSet = new Set(commands.filter(Boolean));
+  if (commandSet.size === 0 || !existingText) {
+    return existingText;
+  }
+  const parts = [];
+  let cursor = 0;
+  const headerRe = /^\[\[hooks\]\][ \t]*\r?\n?/gm;
+  let match = headerRe.exec(existingText);
+  let removed = 0;
+  while (match) {
+    const headerStart = match.index;
+    const bodyStart = headerRe.lastIndex;
+    const rest = existingText.slice(bodyStart);
+    const nextHeader = rest.search(/^\[[^\]]+\]/m);
+    const bodyEnd = nextHeader === -1 ? existingText.length : bodyStart + nextHeader;
+    const body = existingText.slice(bodyStart, bodyEnd);
+    const command = tomlStringField(body, "command");
+    parts.push(existingText.slice(cursor, headerStart));
+    if (command && commandSet.has(command)) {
+      removed += 1;
+    } else {
+      parts.push(existingText.slice(headerStart, bodyEnd));
+    }
+    cursor = bodyEnd;
+    match = headerRe.exec(existingText);
+  }
+  if (removed === 0) {
+    return existingText;
+  }
+  parts.push(existingText.slice(cursor));
+  let next = parts.join("");
+  next = next.replace(/\n{3,}/g, "\n\n");
+  if (next.length > 0 && !next.endsWith("\n")) {
+    next += "\n";
+  }
+  return next;
+}
+function looksLikeToml(text) {
+  const sample = text.trim();
+  if (!sample) {
+    return true;
+  }
+  if (sample.startsWith("{")) {
+    return false;
+  }
+  if (/^\s*\[\s*\{/.test(sample)) {
+    return false;
+  }
+  return true;
+}
+function ruleKey(rule) {
+  return `${rule.event}\0${rule.command}`;
+}
+function serializeTomlHookRule(rule) {
+  const lines = [
+    "[[hooks]]",
+    `event = "${escapeTomlString(rule.event)}"`
+  ];
+  if (rule.matcher !== void 0 && rule.matcher !== "") {
+    lines.push(`matcher = "${escapeTomlString(rule.matcher)}"`);
+  }
+  lines.push(`command = "${escapeTomlString(rule.command)}"`);
+  if (rule.timeout !== void 0) {
+    lines.push(`timeout = ${Math.floor(rule.timeout)}`);
+  }
+  return lines.join("\n");
+}
+function escapeTomlString(value) {
+  return value.replaceAll("\\", "\\\\").replaceAll('"', '\\"').replaceAll("\n", "\\n").replaceAll("	", "\\t");
+}
+function tomlStringField(body, key) {
+  const re = new RegExp(
+    `^\\s*${key}\\s*=\\s*(?:"((?:\\\\.|[^"\\\\])*)"|'([^']*)')\\s*$`,
+    "m"
+  );
+  const match = body.match(re);
+  if (!match) {
+    return void 0;
+  }
+  if (match[1] !== void 0) {
+    return match[1].replaceAll("\\n", "\n").replaceAll("\\t", "	").replaceAll('\\"', '"').replaceAll("\\\\", "\\");
+  }
+  return match[2];
+}
+function tomlNumberField(body, key) {
+  const re = new RegExp(`^\\s*${key}\\s*=\\s*(-?\\d+)\\s*$`, "m");
+  const match = body.match(re);
+  if (!match?.[1]) {
+    return void 0;
+  }
+  const n = Number.parseInt(match[1], 10);
+  return Number.isFinite(n) ? n : void 0;
+}
+
+// src/adapters/kimi-code.ts
+var HOOK_COMMAND2 = "vibetime hook --agent kimi-code";
+var HOOK_TIMEOUT_SECONDS = 10;
 function kimiCodeHome(home, env) {
   const override = env?.KIMI_CODE_HOME || env?.KIMI_HOME;
   if (override && override.trim()) {
@@ -6948,6 +7101,28 @@ function kimiCodeHome(home, env) {
 function kimiCodeSessionsDir(home, env) {
   return path14.join(kimiCodeHome(home, env), "sessions");
 }
+function kimiCodeConfigPath(home, env) {
+  return path14.join(kimiCodeHome(home, env), "config.toml");
+}
+function kimiHookRules() {
+  const events = [
+    "SessionStart",
+    "SessionEnd",
+    "UserPromptSubmit",
+    "TurnStarted",
+    "PostToolUse",
+    "PostToolUseFailure",
+    "Stop",
+    "StopFailure",
+    "PermissionResult",
+    "SubagentStop"
+  ];
+  return events.map((event) => ({
+    event,
+    command: HOOK_COMMAND2,
+    timeout: HOOK_TIMEOUT_SECONDS
+  }));
+}
 function baseKimiEvent(event) {
   return {
     schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -7387,13 +7562,17 @@ function createKimiCodeAdapter() {
       return kimiCodeHome(home, env);
     },
     installedPath(home, env) {
-      return path14.join(kimiCodeHome(home, env), "vibetime-marker");
+      return kimiCodeConfigPath(home, env);
     },
-    async isInstalled() {
-      return false;
+    async isInstalled(home, env) {
+      return hasTomlHookCommand(kimiCodeConfigPath(home, env), HOOK_COMMAND2);
     },
-    installEntries(_home, _env) {
-      return [];
+    installEntries(home, env) {
+      return [{
+        kind: "hooks-toml",
+        path: kimiCodeConfigPath(home, env),
+        content: { hooks: kimiHookRules() }
+      }];
     },
     sourcePaths(home, env) {
       return [kimiCodeSessionsDir(home, env)];
@@ -7460,6 +7639,8 @@ async function parseOpenCodeSessionFile(dbPath, options) {
     for (const session of sessions) {
       const rawSessionId = session.id;
       const sessionId = rootIdByRawId.get(rawSessionId) || rawSessionId;
+      const isSubagent = sessionId !== rawSessionId;
+      const sessionEventStart = events.length;
       const cwd = session.directory || session.path || void 0;
       const project = cwd ? path15.basename(cwd) : void 0;
       const sessionTs = msToIso(session.time_created);
@@ -7776,6 +7957,9 @@ async function parseOpenCodeSessionFile(dbPath, options) {
           operation: "session end"
         }));
       }
+      if (isSubagent) {
+        events.push(...withoutSubagentTurnEvents(events.splice(sessionEventStart)).map((event) => ({ ...event, turnId: void 0 })));
+      }
     }
   } finally {
     db.close();
@@ -7854,19 +8038,19 @@ function opencodeDataCandidates(home, env) {
   return [primary, path15.join(home, ".opencode", "opencode.db")];
 }
 async function opencodeBackfillFiles(sourceRoot, home = os6.homedir(), env) {
-  const { stat: stat14 } = await import("node:fs/promises");
+  const { stat: stat15 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
       return [];
     }
-    const info = await stat14(sourceRoot).catch(() => null);
+    const info = await stat15(sourceRoot).catch(() => null);
     if (!info) {
       return [];
     }
     return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
   }
   for (const candidatePath of opencodeDataCandidates(home, env)) {
-    const info = await stat14(candidatePath).catch(() => null);
+    const info = await stat15(candidatePath).catch(() => null);
     if (info) {
       return [{ path: candidatePath, modifiedAt: info.mtime.toISOString() }];
     }
@@ -7966,8 +8150,10 @@ function createOpenCodeAdapter() {
 }
 
 // src/adapters/pi.ts
-import { readFile as readFile10 } from "node:fs/promises";
+import { readdir as readdir7, readFile as readFile10, stat as stat8 } from "node:fs/promises";
+import os7 from "node:os";
 import path16 from "node:path";
+init_fs();
 function parsePiSubagentLink(filePath, headerParentSession) {
   if (headerParentSession) {
     const parentFile = path16.isAbsolute(headerParentSession) ? headerParentSession : void 0;
@@ -8012,11 +8198,15 @@ async function resolveParentContext(link, options) {
   return void 0;
 }
 function foldEventsIntoParent(events, link) {
-  const childSessionId = events.find((event) => event.sessionId)?.sessionId;
-  return events.map((event) => {
+  const folded = withoutSubagentTurnEvents(events);
+  const childSessionId = folded.find((event) => event.sessionId)?.sessionId;
+  return folded.map((event) => {
     const rewritten = {
       ...event,
-      sessionId: link.parentSessionId
+      sessionId: link.parentSessionId,
+      // Subagent turns don't exist in the host session; drop the reference so
+      // buildSessionRollups doesn't synthesize phantom turn rollups.
+      turnId: void 0
     };
     if (childSessionId && childSessionId !== link.parentSessionId) {
       rewritten.refs = {
@@ -8272,6 +8462,100 @@ async function parsePiSessionFile(filePath, options) {
   }
   return state.events.filter((event) => matchesBackfillFilters(event, options));
 }
+async function parsePiFile(filePath, options) {
+  if (filePath.endsWith(".json")) {
+    return parsePiWorkflowRunFile(filePath, options);
+  }
+  return parsePiSessionFile(filePath, options);
+}
+async function parsePiWorkflowRunFile(filePath, options) {
+  let raw;
+  try {
+    raw = JSON.parse(await readFile10(filePath, "utf8"));
+  } catch {
+    return [];
+  }
+  if (!isPlainObject(raw)) {
+    return [];
+  }
+  const sessionId = stringField(raw, "sessionId");
+  const agents = Array.isArray(raw.agents) ? raw.agents.filter((agent) => isPlainObject(agent)) : [];
+  if (!sessionId || agents.length === 0) {
+    return [];
+  }
+  const runUpdatedAt = timestampFrom(raw.updatedAt);
+  const parentSessionFile = await findPiSessionFileById(sessionId, options);
+  const host = await resolveParentContext(
+    { parentSessionId: sessionId, parentSessionFile, explicit: true },
+    options
+  );
+  const cwd = host?.cwd;
+  const project = host?.project;
+  const state = new SessionParserState(filePath, options, (event) => basePiEvent({ ...event, cwd, project, model: event.model }));
+  const push = (event, ln) => {
+    state.push(
+      { ...event, workspaceId: event.workspaceId || createWorkspaceId({ projectName: project, repoRoot: cwd }) },
+      ln,
+      "workflow-run",
+      event.type
+    );
+  };
+  for (const [index, agent] of agents.entries()) {
+    const lineNumber = index + 1;
+    const usage = objectField(agent, "tokenUsage");
+    const input = numberField(usage, "input") || 0;
+    const output = numberField(usage, "output") || 0;
+    const cacheRead = numberField(usage, "cacheRead") || 0;
+    const cacheWrite = numberField(usage, "cacheWrite") || 0;
+    const breakdown = input + output + cacheRead + cacheWrite;
+    const total = numberField(usage, "total") || breakdown || numberField(agent, "tokens") || 0;
+    if (total <= 0) {
+      continue;
+    }
+    const model = stringField(agent, "model")?.replace(/:(off|minimal|low|medium|high|xhigh|max)$/, "");
+    const ts = timestampFrom(agent.endedAt) || timestampFrom(agent.startedAt) || runUpdatedAt || (/* @__PURE__ */ new Date()).toISOString();
+    push(basePiEvent({
+      ts,
+      type: "model.usage",
+      sessionId,
+      cwd,
+      project,
+      model,
+      confidence: breakdown > 0 ? "exact" : "derived",
+      metrics: {
+        tokensInput: breakdown > 0 ? input + cacheRead + cacheWrite || void 0 : void 0,
+        tokensOutput: breakdown > 0 ? output || void 0 : void 0,
+        tokensCachedInput: breakdown > 0 ? cacheRead + cacheWrite || void 0 : void 0,
+        tokensCacheReadInput: breakdown > 0 ? cacheRead || void 0 : void 0,
+        tokensCacheCreationInput: breakdown > 0 ? cacheWrite || void 0 : void 0,
+        tokensTotal: total,
+        costUsd: numberField(usage, "cost") || void 0
+      },
+      refs: stringRefs({
+        sourceId: stringField(agent, "callId") || stringField(agent, "label")
+      })
+    }), lineNumber);
+  }
+  return state.events.filter((event) => matchesBackfillFilters(event, options));
+}
+async function findPiSessionFileById(sessionId, options) {
+  const sessionsDir = piSessionDir(path16.resolve(stringOption(options.home) || os7.homedir()));
+  try {
+    const projectDirs = await readdir7(sessionsDir, { withFileTypes: true });
+    for (const dir of projectDirs) {
+      if (!dir.isDirectory()) {
+        continue;
+      }
+      const names = await readdir7(path16.join(sessionsDir, dir.name));
+      const hit = names.find((name) => name.endsWith(`_${sessionId}.jsonl`));
+      if (hit) {
+        return path16.join(sessionsDir, dir.name, hit);
+      }
+    }
+  } catch {
+  }
+  return void 0;
+}
 function basePiEvent(event) {
   return {
     schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -8518,6 +8802,20 @@ function piSessionDir(home, env) {
   }
   return path16.join(piAgentDir(home, env), "sessions");
 }
+function piWorkflowProjectsDir(home) {
+  return path16.join(home, ".pi", "workflows", "projects");
+}
+async function piBackfillFiles(sourceRoot, home = os7.homedir(), env) {
+  const lists = sourceRoot ? [await listFilesByExtensions(sourceRoot, [".jsonl", ".json"])] : await Promise.all([
+    listFilesByExtensions(piSessionDir(home, env), [".jsonl"]),
+    listFilesByExtensions(piWorkflowProjectsDir(home), [".json"])
+  ]);
+  const files = lists.flat().sort();
+  return Promise.all(files.map(async (filePath) => {
+    const info = await stat8(filePath);
+    return { path: filePath, modifiedAt: info.mtime.toISOString() };
+  }));
+}
 function createPiAdapter() {
   return {
     id: "pi",
@@ -8546,20 +8844,20 @@ function createPiAdapter() {
       }];
     },
     sourcePaths(home, env) {
-      return [piSessionDir(home, env)];
+      return [piSessionDir(home, env), piWorkflowProjectsDir(home)];
     },
-    parseSessionFile: parsePiSessionFile
+    parseSessionFile: parsePiFile
   };
 }
 
 // src/adapters/qoder-cn.ts
-import { readdir as readdir7, readFile as readFile11, stat as stat8 } from "node:fs/promises";
-import os8 from "node:os";
+import { readdir as readdir8, readFile as readFile11, stat as stat9 } from "node:fs/promises";
+import os9 from "node:os";
 import path18 from "node:path";
 
 // src/adapters/qoder-local-db.ts
 import { access } from "node:fs/promises";
-import os7 from "node:os";
+import os8 from "node:os";
 import path17 from "node:path";
 function takeQoderDbModelCall(calls, requestId, blockStart) {
   if (requestId) {
@@ -8577,7 +8875,7 @@ function takeQoderDbModelCall(calls, requestId, blockStart) {
   }
   return calls.ordered.shift();
 }
-function appDataRoot(appDirName, home = os7.homedir()) {
+function appDataRoot(appDirName, home = os8.homedir()) {
   if (process.platform === "darwin") {
     return path17.join(home, "Library", "Application Support", appDirName);
   }
@@ -8830,7 +9128,7 @@ async function loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMa
   const segmentsPath = path18.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
   const modelCalls = [];
   try {
-    const files = await readdir7(segmentsPath);
+    const files = await readdir8(segmentsPath);
     for (const file of files) {
       if (!file.endsWith(".jsonl")) {
         continue;
@@ -8880,7 +9178,7 @@ async function parseQoderCnSessionFile(filePath, options) {
   let cwd;
   let project = projectContext.project;
   let model;
-  const home = path18.resolve(stringOption(options.home) || os8.homedir());
+  const home = path18.resolve(stringOption(options.home) || os9.homedir());
   const modelMap = await loadQoderCnModelNames(configDir2, home);
   const isSubagentSession = filePath.includes("subagents");
   const segmentModelCalls = await loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMap);
@@ -9448,7 +9746,7 @@ async function gitRootFromCwds2(cwds) {
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat8(path18.join(current, ".git"));
+        await stat9(path18.join(current, ".git"));
         return current;
       } catch {
       }
@@ -9482,7 +9780,7 @@ function encodeQoderCnProjectPath(value) {
 }
 async function qoderCnProjectFromFilePath(filePath, options) {
   const projectDir = path18.basename(path18.dirname(filePath));
-  const home = options ? path18.resolve(stringOption(options.home) || os8.homedir()) : os8.homedir();
+  const home = options ? path18.resolve(stringOption(options.home) || os9.homedir()) : os9.homedir();
   const resolved = await resolveQoderCnProjectPath(projectDir, home);
   if (resolved) {
     return path18.basename(resolved);
@@ -9505,7 +9803,7 @@ async function resolveQoderCnProjectPath(projectDir, home) {
   while (projectDir.startsWith(`${currentEncoded}-`)) {
     let matchedChild;
     try {
-      const entries = await readdir7(current, { withFileTypes: true });
+      const entries = await readdir8(current, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) {
           continue;
@@ -9598,8 +9896,8 @@ function createQoderCnAdapter() {
 
 // src/adapters/qoder.ts
 import { existsSync } from "node:fs";
-import { readdir as readdir8, readFile as readFile12, stat as stat9 } from "node:fs/promises";
-import os9 from "node:os";
+import { readdir as readdir9, readFile as readFile12, stat as stat10 } from "node:fs/promises";
+import os10 from "node:os";
 import path19 from "node:path";
 function parseQoderPaths(filePath) {
   const parts = filePath.split(path19.sep);
@@ -9708,7 +10006,7 @@ async function loadQoderSegmentModelCalls(filePath, isSubagentSession, modelMap)
   const segmentsPath = path19.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
   const modelCalls = [];
   try {
-    const files = await readdir8(segmentsPath);
+    const files = await readdir9(segmentsPath);
     for (const file of files) {
       if (!file.endsWith(".jsonl")) {
         continue;
@@ -9758,7 +10056,7 @@ async function parseQoderSessionFile(filePath, options) {
   let cwd;
   let project = projectContext.project;
   let model;
-  const home = path19.resolve(stringOption(options.home) || os9.homedir());
+  const home = path19.resolve(stringOption(options.home) || os10.homedir());
   const modelMap = await loadQoderModelNames(configDir2, home);
   const qwenworkRoot = isQwenworkConfigRoot(configDir2);
   const isSubagentSession = filePath.includes("subagents");
@@ -10292,7 +10590,7 @@ async function gitRootFromCwds3(cwds) {
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat9(path19.join(current, ".git"));
+        await stat10(path19.join(current, ".git"));
         return current;
       } catch {
       }
@@ -10344,7 +10642,7 @@ function qoderEncodedProjectSuffix(projectDir, home) {
 }
 async function qoderProjectFromFilePath(filePath, options) {
   const projectDir = path19.basename(path19.dirname(filePath));
-  const home = options ? path19.resolve(stringOption(options.home) || os9.homedir()) : os9.homedir();
+  const home = options ? path19.resolve(stringOption(options.home) || os10.homedir()) : os10.homedir();
   const resolved = await resolveQoderProjectPath(projectDir, home);
   if (resolved) {
     return path19.basename(resolved);
@@ -10368,7 +10666,7 @@ async function resolveQoderProjectPath(projectDir, home) {
   while (currentEncodedVariants.some((prefix) => projectDir.startsWith(`${prefix}-`))) {
     let matchedChild;
     try {
-      const entries = await readdir8(current, { withFileTypes: true });
+      const entries = await readdir9(current, { withFileTypes: true });
       for (const entry of entries) {
         if (!entry.isDirectory()) {
           continue;
@@ -10500,7 +10798,7 @@ function normalizeId(id) {
 }
 
 // src/adapters/workbuddy.ts
-import { readdir as readdir9, readFile as readFile13, stat as stat10 } from "node:fs/promises";
+import { readdir as readdir10, readFile as readFile13, stat as stat11 } from "node:fs/promises";
 import path20 from "node:path";
 function workbuddyProjectsDir(home, env) {
   const override = env?.WORKBUDDY_PROJECTS_DIR || env?.WORKBUDDY_HOME;
@@ -10943,17 +11241,17 @@ async function workbuddyBackfillFiles(sourceRoot, home, env) {
   const base = sourceRoot || workbuddyProjectsDir(home, env);
   const files = [];
   try {
-    const projects = await readdir9(base, { withFileTypes: true });
+    const projects = await readdir10(base, { withFileTypes: true });
     for (const project of projects) {
       if (!project.isDirectory()) {
         continue;
       }
       const projectDir = path20.join(base, project.name);
-      const entries = await readdir9(projectDir, { withFileTypes: true });
+      const entries = await readdir10(projectDir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isFile() && entry.name.endsWith(".jsonl")) {
           const filePath = path20.join(projectDir, entry.name);
-          const info = await stat10(filePath);
+          const info = await stat11(filePath);
           files.push({ path: filePath, modifiedAt: info.mtime.toISOString() });
         }
       }
@@ -11014,7 +11312,7 @@ function createWorkbuddyAdapter() {
 
 // src/adapters/zcode.ts
 import { execFile } from "node:child_process";
-import { readFile as readFile14, stat as stat11 } from "node:fs/promises";
+import { readFile as readFile14, stat as stat12 } from "node:fs/promises";
 import path21 from "node:path";
 import { promisify as promisify2 } from "node:util";
 init_fs();
@@ -11033,7 +11331,7 @@ var providerNameCache = null;
 async function loadProviderNames(configPath2) {
   let fileMtime = 0;
   try {
-    const info = await stat11(configPath2);
+    const info = await stat12(configPath2);
     fileMtime = info.mtimeMs;
   } catch {
     return /* @__PURE__ */ new Map();
@@ -11233,6 +11531,7 @@ function sessionContext(row, sessions) {
   return {
     rawSessionId: sessionId,
     sessionId: `zcode:${rootSessionId}`,
+    isSubagent: rootSessionId !== sessionId,
     cwd,
     project,
     workspaceId: createWorkspaceId({ projectName: project, repoRoot: cwd }),
@@ -11249,7 +11548,7 @@ async function parseZCodeDb(filePath, options) {
   for (let i = 0; i < 12; i++) {
     const probe = path21.join(candidate, ".zcode", "v2", "config.json");
     try {
-      await stat11(probe);
+      await stat12(probe);
       configPath2 = probe;
       break;
     } catch {
@@ -11324,6 +11623,9 @@ async function parseZCodeDb(filePath, options) {
         return;
       }
       const ctx = sessionContext(row, sessions);
+      if (ctx.isSubagent) {
+        return;
+      }
       const turnId = `zcode:${rawTurnId}`;
       const started = makeEvent2({
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -11384,7 +11686,8 @@ async function parseZCodeDb(filePath, options) {
         project: ctx.project,
         cwd: ctx.cwd,
         sessionId: ctx.sessionId,
-        turnId: stringField(row, "turn_id") ? `zcode:${stringField(row, "turn_id")}` : void 0,
+        // Subagent turns are dropped; keep their events out of turn rollups.
+        turnId: !ctx.isSubagent && stringField(row, "turn_id") ? `zcode:${stringField(row, "turn_id")}` : void 0,
         agent: stringField(row, "agent") || "zcode",
         provider: nameMap.get(stringField(row, "provider_id") || "") || stringField(row, "provider_id"),
         model: modelId,
@@ -11410,7 +11713,7 @@ async function parseZCodeDb(filePath, options) {
         return;
       }
       const ctx = sessionContext(row, sessions);
-      const turnId = stringField(row, "turn_id") ? `zcode:${stringField(row, "turn_id")}` : void 0;
+      const turnId = !ctx.isSubagent && stringField(row, "turn_id") ? `zcode:${stringField(row, "turn_id")}` : void 0;
       const spanId = `${ctx.sessionId}:tool:${toolCallId}`;
       const started = makeEvent2({
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -11471,7 +11774,7 @@ async function zcodeBackfillFiles(sourceRoot, home, env) {
   const candidate = sourceRoot || zcodeDbPath(home, env);
   const filePath = candidate.endsWith(".sqlite") ? candidate : path21.join(candidate, "db", "db.sqlite");
   try {
-    const info = await stat11(filePath);
+    const info = await stat12(filePath);
     return [{ path: filePath, modifiedAt: info.mtime.toISOString() }];
   } catch {
     return [];
@@ -11503,7 +11806,7 @@ function createZCodeAdapter() {
 }
 
 // src/adapters/zed.ts
-import os10 from "node:os";
+import os11 from "node:os";
 import path22 from "node:path";
 function zedThreadsCandidates(home, env) {
   const candidates = [];
@@ -11855,20 +12158,20 @@ async function parseZedSessionFile(dbPath, options) {
   }
   return events.filter((event) => matchesBackfillFilters(event, options));
 }
-async function zedBackfillFiles(sourceRoot, home = os10.homedir(), env) {
-  const { stat: stat14 } = await import("node:fs/promises");
+async function zedBackfillFiles(sourceRoot, home = os11.homedir(), env) {
+  const { stat: stat15 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
       return [];
     }
-    const info = await stat14(sourceRoot).catch(() => null);
+    const info = await stat15(sourceRoot).catch(() => null);
     if (!info) {
       return [];
     }
     return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
   }
   for (const candidatePath of zedThreadsCandidates(home, env)) {
-    const info = await stat14(candidatePath).catch(() => null);
+    const info = await stat15(candidatePath).catch(() => null);
     if (info) {
       return [{ path: candidatePath, modifiedAt: info.mtime.toISOString() }];
     }
@@ -12260,11 +12563,26 @@ async function installEntry(entry, options) {
     await mergeHooksJson(entry.path, entry.content, options);
     return;
   }
+  if (entry.kind === "hooks-toml" && typeof entry.content === "object") {
+    await mergeHooksToml(entry.path, entry.content, options);
+    return;
+  }
   await writeGeneratedFile(entry.path, String(entry.content), {
     ...options,
     onWrite: options.onWrite
   });
 }
+async function uninstallEntry(entry, options) {
+  if (entry.kind === "hooks-toml" && typeof entry.content === "object") {
+    await uninstallHooksToml(entry.path, entry.content, options);
+    return;
+  }
+  if (entry.kind === "hooks-json" && typeof entry.content === "object") {
+    await uninstallHooksJson(entry.path, entry.content, options);
+    return;
+  }
+  await uninstallGeneratedFile(entry.path, options);
+}
 async function mergeHooksJson(filePath, content, { dryRun, force, onWrite }) {
   const { mkdir: mkdir6, writeFile: writeFile5 } = await import("node:fs/promises");
   const pathMod = await import("node:path");
@@ -12361,6 +12679,218 @@ function hookCommandFromGroup(group) {
   const hook = group.hooks[0];
   return isPlainObject(hook) && typeof hook.command === "string" ? hook.command : void 0;
 }
+async function mergeHooksToml(filePath, content, { dryRun, force, onWrite }) {
+  const { mkdir: mkdir6, writeFile: writeFile5 } = await import("node:fs/promises");
+  const pathMod = await import("node:path");
+  if (dryRun) {
+    onWrite(`Would merge ${filePath}`);
+    return;
+  }
+  const existingText = await readTextIfExists(filePath);
+  if (existingText !== null && existingText.trim() !== "" && !looksLikeToml(existingText) && !force) {
+    throw new Error(
+      `Refusing to update non-TOML file: ${filePath}. Re-run with --force if this is intentional.`
+    );
+  }
+  const desired = Array.isArray(content.hooks) ? content.hooks : [];
+  const nextText = mergeTomlHookRules(existingText ?? "", desired);
+  if (existingText === nextText || existingText === null && nextText === "") {
+    onWrite(`Already installed ${filePath}`);
+    return;
+  }
+  if (existingText !== null) {
+    const existingKeys = new Set(
+      parseTomlHookRules(existingText).map((rule) => `${rule.event}\0${rule.command}`)
+    );
+    const allPresent = desired.every((rule) => existingKeys.has(`${rule.event}\0${rule.command}`));
+    if (allPresent && desired.length > 0) {
+      onWrite(`Already installed ${filePath}`);
+      return;
+    }
+  }
+  await mkdir6(pathMod.dirname(filePath), { recursive: true });
+  await writeFile5(filePath, nextText, "utf8");
+  onWrite(`Installed ${filePath}`);
+}
+async function uninstallHooksToml(filePath, content, { dryRun, onWrite }) {
+  const existingText = await readTextIfExists(filePath);
+  if (existingText === null) {
+    onWrite(`Already uninstalled ${filePath}`);
+    return;
+  }
+  const commands = Array.from(new Set(
+    (Array.isArray(content.hooks) ? content.hooks : []).map((rule) => rule.command).filter((cmd) => typeof cmd === "string" && cmd.length > 0)
+  ));
+  if (commands.length === 0) {
+    onWrite(`Already uninstalled ${filePath}`);
+    return;
+  }
+  const nextText = removeTomlHookRulesByCommand(existingText, commands);
+  if (nextText === existingText) {
+    onWrite(`Already uninstalled ${filePath}`);
+    return;
+  }
+  if (dryRun) {
+    onWrite(`Would uninstall ${filePath}`);
+    return;
+  }
+  const { writeFile: writeFile5 } = await import("node:fs/promises");
+  await writeFile5(filePath, nextText, "utf8");
+  onWrite(`Uninstalled ${filePath}`);
+}
+function collectHookCommandsFromJsonContent(content) {
+  const commands = /* @__PURE__ */ new Set();
+  const walkGroups = (groups) => {
+    if (!Array.isArray(groups)) {
+      return;
+    }
+    for (const group of groups) {
+      if (!isPlainObject(group) || !Array.isArray(group.hooks)) {
+        continue;
+      }
+      for (const hook of group.hooks) {
+        if (isPlainObject(hook) && typeof hook.command === "string" && hook.command) {
+          commands.add(hook.command);
+        }
+      }
+    }
+  };
+  if (isPlainObject(content.hooks)) {
+    for (const groups of Object.values(content.hooks)) {
+      walkGroups(groups);
+    }
+  }
+  for (const [key, value] of Object.entries(content)) {
+    if (key === "hooks" || key === "enable_json_hooks" || !isPlainObject(value)) {
+      continue;
+    }
+    for (const groups of Object.values(value)) {
+      walkGroups(groups);
+    }
+  }
+  return [...commands];
+}
+function stripHookCommandsFromGroups(groups, commands) {
+  if (!Array.isArray(groups)) {
+    return groups;
+  }
+  return groups.map((group) => {
+    if (!isPlainObject(group) || !Array.isArray(group.hooks)) {
+      return group;
+    }
+    const nextHooks = group.hooks.filter(
+      (hook) => !(isPlainObject(hook) && typeof hook.command === "string" && commands.has(hook.command))
+    );
+    if (nextHooks.length === 0) {
+      return null;
+    }
+    return { ...group, hooks: nextHooks };
+  }).filter(Boolean);
+}
+async function uninstallHooksJson(filePath, content, { dryRun, onWrite }) {
+  const existingText = await readTextIfExists(filePath);
+  if (existingText === null) {
+    onWrite(`Already uninstalled ${filePath}`);
+    return;
+  }
+  let existing;
+  try {
+    existing = JSON.parse(existingText);
+  } catch {
+    onWrite(`Skipped non-JSON file ${filePath}`);
+    return;
+  }
+  if (!isPlainObject(existing)) {
+    onWrite(`Skipped non-object JSON file ${filePath}`);
+    return;
+  }
+  const commands = new Set(collectHookCommandsFromJsonContent(content));
+  if (commands.size === 0) {
+    onWrite(`Already uninstalled ${filePath}`);
+    return;
+  }
+  const next = structuredClone(existing);
+  let changed = false;
+  if (isPlainObject(next.hooks)) {
+    for (const [event, groups] of Object.entries(next.hooks)) {
+      const stripped = stripHookCommandsFromGroups(groups, commands);
+      if (JSON.stringify(stripped) !== JSON.stringify(groups)) {
+        changed = true;
+        if (Array.isArray(stripped) && stripped.length === 0) {
+          delete next.hooks[event];
+        } else {
+          next.hooks[event] = stripped;
+        }
+      }
+    }
+    if (isPlainObject(next.hooks) && Object.keys(next.hooks).length === 0) {
+      delete next.hooks;
+      changed = true;
+    }
+  }
+  for (const [key, value] of Object.entries(next)) {
+    if (key === "hooks" || key === "enable_json_hooks" || !isPlainObject(value)) {
+      continue;
+    }
+    if (!Object.prototype.hasOwnProperty.call(content, key)) {
+      continue;
+    }
+    for (const [event, groups] of Object.entries(value)) {
+      const stripped = stripHookCommandsFromGroups(groups, commands);
+      if (JSON.stringify(stripped) !== JSON.stringify(groups)) {
+        changed = true;
+        if (Array.isArray(stripped) && stripped.length === 0) {
+          delete value[event];
+        } else {
+          value[event] = stripped;
+        }
+      }
+    }
+    if (Object.keys(value).length === 0) {
+      delete next[key];
+      changed = true;
+    }
+  }
+  if (Object.prototype.hasOwnProperty.call(content, "enable_json_hooks") && next.enable_json_hooks === true) {
+    const stillHasNamedHooks = Object.entries(next).some(
+      ([key, value]) => key !== "hooks" && key !== "enable_json_hooks" && isPlainObject(value) && Object.values(value).some((groups) => Array.isArray(groups) && groups.length > 0)
+    );
+    if (!stillHasNamedHooks) {
+      delete next.enable_json_hooks;
+      changed = true;
+    }
+  }
+  if (!changed) {
+    onWrite(`Already uninstalled ${filePath}`);
+    return;
+  }
+  if (dryRun) {
+    onWrite(`Would uninstall ${filePath}`);
+    return;
+  }
+  const { writeFile: writeFile5 } = await import("node:fs/promises");
+  await writeFile5(filePath, `${JSON.stringify(next, null, 2)}
+`, "utf8");
+  onWrite(`Uninstalled ${filePath}`);
+}
+async function uninstallGeneratedFile(filePath, { dryRun, onWrite }) {
+  const existingText = await readTextIfExists(filePath);
+  if (existingText === null) {
+    onWrite(`Already uninstalled ${filePath}`);
+    return;
+  }
+  if (!existingText.includes(GENERATED_MARKER) && !existingText.includes("Generated by codetime.")) {
+    onWrite(`Skipped non-vibetime file ${filePath}`);
+    return;
+  }
+  if (dryRun) {
+    onWrite(`Would uninstall ${filePath}`);
+    return;
+  }
+  const { unlink } = await import("node:fs/promises");
+  await unlink(filePath);
+  onWrite(`Uninstalled ${filePath}`);
+}
 
 // src/lib/config.ts
 import { randomUUID } from "node:crypto";
@@ -12421,7 +12951,7 @@ function defaultMachineName() {
 init_fs();
 
 // src/lib/logger.ts
-import { appendFile, mkdir as mkdir4, rename, stat as stat12 } from "node:fs/promises";
+import { appendFile, mkdir as mkdir4, rename, stat as stat13 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import path24 from "node:path";
 var MAX_BYTES = 1 * 1024 * 1024;
@@ -12439,7 +12969,7 @@ function serializeError(error) {
 }
 async function rotateIfNeeded(file) {
   try {
-    const info = await stat12(file);
+    const info = await stat13(file);
     if (info.size > MAX_BYTES) {
       await rename(file, `${file}.1`).catch(() => {
       });
@@ -12753,6 +13283,7 @@ function createCli(ctx, registry) {
   });
   cli.command("detect", "Show supported local targets and install status").action((options) => detectCommand(normalizeOptions(options), ctx, registry).then(() => 0));
   cli.command("install", "Install integration files into detected or requested targets").option("--target <targets>", "Target integrations, comma-separated").option("--targets <targets>", "Target integrations, comma-separated").option("--all", "Install all supported integrations").option("--force", "Overwrite existing non-generated files when needed").action((options) => installCommand(normalizeOptions(options), ctx, registry));
+  cli.command("uninstall", "Remove vibetime integration hooks/files from targets").option("--target <targets>", "Target integrations, comma-separated").option("--targets <targets>", "Target integrations, comma-separated").option("--all", "Uninstall all supported integrations").action((options) => uninstallCommand(normalizeOptions(options), ctx, registry));
   cli.command("upgrade", "Check for updates and upgrade to the latest version").option("--check", "Only check for updates, do not install").action((options) => upgradeCommand(normalizeOptions(options), ctx, registry));
   cli.command("hook", "Read agent hook JSON from stdin and report a throttled event").option("--agent <name>", "Agent name").option("--project <name>", "Project name").option("--min-interval <seconds>", "Minimum seconds between similar hook reports").action((options) => hookCommand(normalizeOptions(options), ctx));
   cli.command("sync-local-trigger", "Trigger one background local sync with throttle and locking").option("--min-interval <seconds>", "Minimum seconds between sync triggers").action((options) => syncLocalTriggerCommand(normalizeOptions(options), ctx, registry));
@@ -12849,6 +13380,44 @@ async function installCommand(options, ctx, registry) {
   }
   return 0;
 }
+async function uninstallCommand(options, ctx, registry) {
+  const home = resolveHome3(options, ctx);
+  const env = ctx.env;
+  const dryRun = Boolean(options["dry-run"]);
+  const allAdapters = registry.all();
+  const requested = requestedTargets(options);
+  const unknown = requested.filter((id) => !allAdapters.some((a) => a.id === id));
+  if (unknown.length > 0) {
+    throw new Error(`Unknown target(s): ${unknown.join(", ")}`);
+  }
+  const installed = [];
+  for (const adapter of allAdapters) {
+    if (await adapter.isInstalled(home, env)) {
+      installed.push(adapter.id);
+    }
+  }
+  const selectedIds = requested.length > 0 ? requested : options.all ? allAdapters.map((a) => a.id) : installed;
+  if (selectedIds.length === 0) {
+    write(ctx.stderr, "No installed vibetime integrations were found. Use --target <id> or --all.\n");
+    return 1;
+  }
+  for (const adapter of allAdapters.filter((a) => selectedIds.includes(a.id))) {
+    const entries = adapter.installEntries(home, env);
+    if (entries.length === 0) {
+      write(ctx.stdout, `Nothing to uninstall for ${adapter.id}
+`);
+      continue;
+    }
+    for (const entry of entries) {
+      await uninstallEntry(entry, {
+        dryRun,
+        onWrite: (msg) => write(ctx.stdout, `${msg}
+`)
+      });
+    }
+  }
+  return 0;
+}
 var NPM_PACKAGE = "@yhong91/vibetime";
 async function fetchLatestVersion() {
   try {
@@ -13219,11 +13788,14 @@ async function listBackfillSourceFiles(source, options, ctx) {
   if (source.id === "zed") {
     return zedBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
+  if (source.id === "pi") {
+    return piBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
+  }
   const roots = stringOption(options["source-root"]) ? [requiredOption(options, "source-root")] : source.paths;
   const fileLists = await Promise.all(roots.map((r) => listJsonlFiles(r)));
   const files = fileLists.flat().sort().slice(0, numberOption(options.limit) || void 0);
   return Promise.all(files.map(async (filePath) => {
-    const info = await stat13(filePath);
+    const info = await stat14(filePath);
     return { path: filePath, modifiedAt: info.mtime.toISOString() };
   }));
 }
@@ -13811,7 +14383,7 @@ function syncLocalRunnerEntryArgs(cliPath) {
   return [path25.resolve(path25.dirname(cliPath), "../bin/vibetime.mjs")];
 }
 function resolveHome3(options, ctx) {
-  return path25.resolve(stringOption(options.home) || ctx.env.HOME || os11.homedir());
+  return path25.resolve(stringOption(options.home) || ctx.env.HOME || os12.homedir());
 }
 function requestedTargets(options) {
   const value = options.target || options.targets;
@@ -13982,6 +14554,7 @@ function helpText() {
 Usage:
   vibetime detect [--json] [--home <path>]
   vibetime install [--target codex,claude,opencode,pi] [--all] [--dry-run] [--force] [--home <path>]
+  vibetime uninstall [--target codex,claude,opencode,pi] [--all] [--dry-run] [--home <path>]
   vibetime upgrade [--check]
   vibetime hook --agent <name>
   vibetime backfill discover|plan|import|verify --source codex|claude-code|opencode|pi|all --dry-run [--json] [--batch-size <count>] [--force [--purge-all]]
@@ -13996,6 +14569,7 @@ Setup:
 Commands:
   detect    Show supported local targets and install status.
   install   Install integration files into detected or requested targets.
+  uninstall Remove vibetime hooks/files from detected or requested targets.
   upgrade   Check for updates and upgrade to the latest version.
   hook      Read agent hook JSON from stdin and report a throttled event.
   backfill  Discover local history and create metadata-only import plans.

package/package.json

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