@yhong91/vibetime 0.1.16 → 0.1.17

package/bin/vibetime.mjs

@@ -159,9 +159,10 @@ var init_fs = __esm({
 
 // src/cli.ts
 import { spawn, spawnSync } from "node:child_process";
-import { mkdir as mkdir4, rename as rename2, rm, stat as stat11, writeFile as writeFile3 } from "node:fs/promises";
-import os8 from "node:os";
-import path19 from "node:path";
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { mkdir as mkdir5, rename as rename2, rm, stat as stat11, writeFile as writeFile4 } from "node:fs/promises";
+import os9 from "node:os";
+import path20 from "node:path";
 import { fileURLToPath } from "node:url";
 
 // ../shared/src/index.ts
@@ -1195,7 +1196,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.16" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.17" : "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;
@@ -3731,7 +3732,7 @@ async function codebuddyBackfillFiles(sourceRoot, home, env) {
 
 // src/adapters/codex.ts
 import { readFile as readFile6 } from "node:fs/promises";
-import path9 from "node:path";
+import path10 from "node:path";
 
 // src/lib/diff.ts
 function diffStats(diff) {
@@ -3776,6 +3777,61 @@ function fileActivitiesFromPatchChanges(changes, ts, cwd, displayFilePath3) {
   });
 }
 
+// src/lib/session-context.ts
+init_fs();
+import { mkdir as mkdir3, writeFile as writeFile3 } from "node:fs/promises";
+import os4 from "node:os";
+import path9 from "node:path";
+var SESSION_CONTEXT_VERSION = 1;
+function sessionContextDir(home) {
+  return path9.join(home, ".vibetime", "session-context");
+}
+function sessionContextPath(home, sessionId) {
+  return path9.join(sessionContextDir(home), `${encodeURIComponent(sessionId)}.json`);
+}
+function resolveHome2(options) {
+  return options ? path9.resolve(stringOption(options.home) || os4.homedir()) : os4.homedir();
+}
+async function readPersistedSessionContext(home, sessionId) {
+  const raw = await readJsonIfExists(sessionContextPath(home, sessionId));
+  if (!isPlainObject(raw)) {
+    return void 0;
+  }
+  if (raw.version !== SESSION_CONTEXT_VERSION || raw.sessionId !== sessionId) {
+    return void 0;
+  }
+  if (typeof raw.updatedAt !== "string") {
+    return void 0;
+  }
+  const cwd = typeof raw.cwd === "string" && raw.cwd.length > 0 ? raw.cwd : void 0;
+  const project = typeof raw.project === "string" && raw.project.length > 0 ? raw.project : void 0;
+  return { version: SESSION_CONTEXT_VERSION, sessionId, cwd, project, updatedAt: raw.updatedAt };
+}
+async function readPersistedSessionContextFromOptions(options, sessionId) {
+  return readPersistedSessionContext(resolveHome2(options), sessionId);
+}
+async function persistHookSessionContext(home, payload) {
+  if (!isPlainObject(payload)) {
+    return;
+  }
+  const sessionId = typeof payload.session_id === "string" ? payload.session_id.trim() : typeof payload.sessionId === "string" ? payload.sessionId.trim() : "";
+  const cwd = typeof payload.cwd === "string" ? payload.cwd.trim() : "";
+  if (!sessionId || !cwd || !path9.isAbsolute(cwd)) {
+    return;
+  }
+  const project = path9.basename(cwd) || void 0;
+  const context = {
+    version: SESSION_CONTEXT_VERSION,
+    sessionId,
+    cwd,
+    project,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  await mkdir3(sessionContextDir(home), { recursive: true });
+  await writeFile3(sessionContextPath(home, sessionId), `${JSON.stringify(context, null, 2)}
+`, "utf8");
+}
+
 // src/adapters/codex.ts
 async function parseCodexSessionFile(filePath, options) {
   const text = await readFile6(filePath, "utf8");
@@ -3810,9 +3866,11 @@ async function parseCodexSessionFile(filePath, options) {
         continue;
       }
       sessionMetaLocked = true;
+      const forkedFromId = stringField(payload, "forked_from_id");
+      const inherited = forkedFromId ? await readPersistedSessionContextFromOptions(options, forkedFromId) : void 0;
       sessionId = stringField(payload, "id") || sessionId;
-      cwd = stringField(payload, "cwd") || cwd;
-      project = cwd ? path9.basename(cwd) : project;
+      cwd = inherited?.cwd || stringField(payload, "cwd") || cwd;
+      project = inherited?.project || (cwd ? path10.basename(cwd) : project);
       model = stringField(payload, "model_provider") || model;
       events.push(withBackfillRefs({
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -3833,7 +3891,7 @@ async function parseCodexSessionFile(filePath, options) {
     if (topType === "turn_context") {
       currentTurnId = stringField(payload, "turn_id") || currentTurnId;
       cwd = stringField(payload, "cwd") || cwd;
-      project = cwd ? path9.basename(cwd) : project;
+      project = cwd ? path10.basename(cwd) : project;
       model = stringField(payload, "model") || model;
       const effort = stringField(payload, "effort") || stringField(objectField(objectField(payload, "collaboration_mode"), "settings"), "reasoning_effort");
       if (effort) {
@@ -4280,11 +4338,11 @@ function functionCallArguments(payload) {
   }
 }
 function displayFilePath2(filePath, cwd) {
-  if (!cwd || !path9.isAbsolute(filePath)) {
+  if (!cwd || !path10.isAbsolute(filePath)) {
     return filePath;
   }
-  const relative = path9.relative(cwd, filePath);
-  return relative && !relative.startsWith("..") && !path9.isAbsolute(relative) ? relative : filePath;
+  const relative = path10.relative(cwd, filePath);
+  return relative && !relative.startsWith("..") && !path10.isAbsolute(relative) ? relative : filePath;
 }
 var codexHandler = (msg) => hookHandler("codex", msg);
 function hookConfig4() {
@@ -4303,9 +4361,9 @@ function hookConfig4() {
 function codexHome(home, env) {
   const override = env?.CODEX_HOME;
   if (override && override.trim()) {
-    return path9.resolve(override);
+    return path10.resolve(override);
   }
-  return path9.join(home, ".codex");
+  return path10.join(home, ".codex");
 }
 function createCodexAdapter() {
   return {
@@ -4317,26 +4375,26 @@ function createCodexAdapter() {
       return codexHome(home, env);
     },
     installedPath(home, env) {
-      return path9.join(codexHome(home, env), "hooks.json");
+      return path10.join(codexHome(home, env), "hooks.json");
     },
     async isInstalled(home, env) {
       return isHooksJsonInstalled(
-        path9.join(codexHome(home, env), "hooks.json"),
+        path10.join(codexHome(home, env), "hooks.json"),
         "vibetime hook --agent codex"
       );
     },
     installEntries(home, env) {
       return [{
         kind: "hooks-json",
-        path: path9.join(codexHome(home, env), "hooks.json"),
+        path: path10.join(codexHome(home, env), "hooks.json"),
         content: hookConfig4()
       }];
     },
     sourcePaths(home, env) {
       const base = codexHome(home, env);
       return [
-        path9.join(base, "sessions"),
-        path9.join(base, "history.jsonl")
+        path10.join(base, "sessions"),
+        path10.join(base, "history.jsonl")
       ];
     },
     parseSessionFile: parseCodexSessionFile
@@ -4345,8 +4403,8 @@ function createCodexAdapter() {
 
 // src/adapters/copilot.ts
 import { readdir as readdir5, readFile as readFile7, stat as stat5 } from "node:fs/promises";
-import os4 from "node:os";
-import path10 from "node:path";
+import os5 from "node:os";
+import path11 from "node:path";
 async function parseCopilotSessionFile(filePath, options) {
   const text = await readFile7(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
@@ -4382,7 +4440,7 @@ async function parseCopilotSessionFile(filePath, options) {
         }
         const context = objectField(data, "context");
         cwd = stringField(context, "cwd") || stringField(context, "gitRoot") || cwd;
-        project = stringField(context, "repository") || (cwd ? path10.basename(cwd) : void 0);
+        project = stringField(context, "repository") || (cwd ? path11.basename(cwd) : void 0);
         sessionStartedAt = ts;
         events.push(baseCopilotEvent({
           ts,
@@ -4613,8 +4671,8 @@ function baseCopilotEvent(event) {
     ...event
   };
 }
-async function copilotBackfillFiles(sourceRoot, home = os4.homedir(), _env) {
-  const sessionDir = sourceRoot || path10.join(home, ".copilot", "session-state");
+async function copilotBackfillFiles(sourceRoot, home = os5.homedir(), _env) {
+  const sessionDir = sourceRoot || path11.join(home, ".copilot", "session-state");
   const results = [];
   let entries;
   try {
@@ -4626,7 +4684,7 @@ async function copilotBackfillFiles(sourceRoot, home = os4.homedir(), _env) {
     if (entry.startsWith("pending-session")) {
       continue;
     }
-    const eventsPath = path10.join(sessionDir, entry, "events.jsonl");
+    const eventsPath = path11.join(sessionDir, entry, "events.jsonl");
     const info = await stat5(eventsPath).catch(() => null);
     if (info) {
       results.push({ path: eventsPath, modifiedAt: info.mtime.toISOString() });
@@ -4644,9 +4702,9 @@ function copilotPluginContent() {
 function copilotHome(home, env) {
   const override = env?.COPILOT_HOME;
   if (override && override.trim()) {
-    return path10.resolve(override);
+    return path11.resolve(override);
   }
-  return path10.join(home, ".copilot");
+  return path11.join(home, ".copilot");
 }
 function createCopilotAdapter() {
   return {
@@ -4658,12 +4716,12 @@ function createCopilotAdapter() {
       return copilotHome(home, env);
     },
     installedPath(home, env) {
-      return path10.join(copilotHome(home, env), ".vibetime");
+      return path11.join(copilotHome(home, env), ".vibetime");
     },
     async isInstalled(home, env) {
       try {
         const { pathExists: pathExists2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
-        return await pathExists2(path10.join(copilotHome(home, env), ".vibetime"));
+        return await pathExists2(path11.join(copilotHome(home, env), ".vibetime"));
       } catch {
         return false;
       }
@@ -4671,20 +4729,20 @@ function createCopilotAdapter() {
     installEntries(home, env) {
       return [{
         kind: "file",
-        path: path10.join(copilotHome(home, env), ".vibetime"),
+        path: path11.join(copilotHome(home, env), ".vibetime"),
         content: copilotPluginContent()
       }];
     },
     sourcePaths(home, env) {
-      return [path10.join(copilotHome(home, env), "session-state")];
+      return [path11.join(copilotHome(home, env), "session-state")];
     },
     parseSessionFile: parseCopilotSessionFile
   };
 }
 
 // src/adapters/opencode.ts
-import os5 from "node:os";
-import path11 from "node:path";
+import os6 from "node:os";
+import path12 from "node:path";
 async function parseOpenCodeSessionFile(dbPath, options) {
   const { DatabaseSync } = await import("node:sqlite");
   if (!dbPath.endsWith(".db")) {
@@ -4715,7 +4773,7 @@ async function parseOpenCodeSessionFile(dbPath, options) {
     for (const session of sessions) {
       const sessionId = session.id;
       const cwd = session.directory || session.path || void 0;
-      const project = cwd ? path11.basename(cwd) : void 0;
+      const project = cwd ? path12.basename(cwd) : void 0;
       const sessionTs = msToIso(session.time_created);
       events.push(baseOpenCodeEvent({
         ts: sessionTs,
@@ -4823,7 +4881,7 @@ async function parseOpenCodeSessionFile(dbPath, options) {
           const provider = currentProvider;
           const pathObj = objectField(info, "path");
           const assistantCwd = stringField(pathObj, "cwd") || cwd;
-          const assistantProject = assistantCwd ? path11.basename(assistantCwd) : project;
+          const assistantProject = assistantCwd ? path12.basename(assistantCwd) : project;
           const completedTs = numberField(objectField(info, "time"), "completed");
           const createdTs = timeCreated;
           const tokens = opencodeUsageFromInfo(info);
@@ -5069,20 +5127,20 @@ function opencodeUsageFromInfo(info) {
 function opencodeConfigDir(home, env) {
   const override = env?.OPENCODE_CONFIG_DIR;
   if (override && override.trim()) {
-    return path11.resolve(override);
+    return path12.resolve(override);
   }
   const xdgConfig = env?.XDG_CONFIG_HOME;
   if (xdgConfig && xdgConfig.trim()) {
-    return path11.join(path11.resolve(xdgConfig), "opencode");
+    return path12.join(path12.resolve(xdgConfig), "opencode");
   }
-  return path11.join(home, ".config", "opencode");
+  return path12.join(home, ".config", "opencode");
 }
 function opencodeDataCandidates(home, env) {
   const xdgData = env?.XDG_DATA_HOME;
-  const primary = xdgData && xdgData.trim() ? path11.join(path11.resolve(xdgData), "opencode", "opencode.db") : path11.join(home, ".local", "share", "opencode", "opencode.db");
-  return [primary, path11.join(home, ".opencode", "opencode.db")];
+  const primary = xdgData && xdgData.trim() ? path12.join(path12.resolve(xdgData), "opencode", "opencode.db") : path12.join(home, ".local", "share", "opencode", "opencode.db");
+  return [primary, path12.join(home, ".opencode", "opencode.db")];
 }
-async function opencodeBackfillFiles(sourceRoot, home = os5.homedir(), env) {
+async function opencodeBackfillFiles(sourceRoot, home = os6.homedir(), env) {
   const { stat: stat12 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
@@ -5170,12 +5228,12 @@ function createOpenCodeAdapter() {
       return opencodeConfigDir(home, env);
     },
     installedPath(home, env) {
-      return path11.join(opencodeConfigDir(home, env), PLUGIN_PATH);
+      return path12.join(opencodeConfigDir(home, env), PLUGIN_PATH);
     },
     async isInstalled(home, env) {
       try {
         const { pathExists: pathExists2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
-        return await pathExists2(path11.join(opencodeConfigDir(home, env), PLUGIN_PATH)) || await pathExists2(path11.join(".opencode", PLUGIN_PATH));
+        return await pathExists2(path12.join(opencodeConfigDir(home, env), PLUGIN_PATH)) || await pathExists2(path12.join(".opencode", PLUGIN_PATH));
       } catch {
         return false;
       }
@@ -5183,7 +5241,7 @@ function createOpenCodeAdapter() {
     installEntries(home, env) {
       return [{
         kind: "file",
-        path: path11.join(opencodeConfigDir(home, env), PLUGIN_PATH),
+        path: path12.join(opencodeConfigDir(home, env), PLUGIN_PATH),
         content: opencodePluginContent()
       }];
     },
@@ -5196,7 +5254,7 @@ function createOpenCodeAdapter() {
 
 // src/adapters/pi.ts
 import { readFile as readFile8 } from "node:fs/promises";
-import path12 from "node:path";
+import path13 from "node:path";
 async function parsePiSessionFile(filePath, options) {
   const text = await readFile8(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
@@ -5229,7 +5287,7 @@ async function parsePiSessionFile(filePath, options) {
       sessionId = stringField(raw, "id") || state.sessionId;
       state.sessionId = sessionId || state.sessionId;
       cwd = stringField(raw, "cwd") || cwd;
-      project = cwd ? path12.basename(cwd) : project;
+      project = cwd ? path13.basename(cwd) : project;
       continue;
     }
     if (entryType === "model_change") {
@@ -5638,16 +5696,16 @@ export default function (pi: ExtensionAPI) {
 function piAgentDir(home, env) {
   const override = env?.PI_CODING_AGENT_DIR;
   if (override && override.trim()) {
-    return path12.resolve(override);
+    return path13.resolve(override);
   }
-  return path12.join(home, ".pi", "agent");
+  return path13.join(home, ".pi", "agent");
 }
 function piSessionDir(home, env) {
   const override = env?.PI_CODING_AGENT_SESSION_DIR;
   if (override && override.trim()) {
-    return path12.resolve(override);
+    return path13.resolve(override);
   }
-  return path12.join(piAgentDir(home, env), "sessions");
+  return path13.join(piAgentDir(home, env), "sessions");
 }
 function createPiAdapter() {
   return {
@@ -5659,12 +5717,12 @@ function createPiAdapter() {
       return piAgentDir(home, env);
     },
     installedPath(home, env) {
-      return path12.join(piAgentDir(home, env), "extensions", "vibetime.ts");
+      return path13.join(piAgentDir(home, env), "extensions", "vibetime.ts");
     },
     async isInstalled(home, env) {
       try {
         const { pathExists: pathExists2 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
-        return await pathExists2(path12.join(piAgentDir(home, env), "extensions", "vibetime.ts"));
+        return await pathExists2(path13.join(piAgentDir(home, env), "extensions", "vibetime.ts"));
       } catch {
         return false;
       }
@@ -5672,7 +5730,7 @@ function createPiAdapter() {
     installEntries(home, env) {
       return [{
         kind: "file",
-        path: path12.join(piAgentDir(home, env), "extensions", "vibetime.ts"),
+        path: path13.join(piAgentDir(home, env), "extensions", "vibetime.ts"),
         content: piExtensionContent()
       }];
     },
@@ -5685,10 +5743,10 @@ function createPiAdapter() {
 
 // src/adapters/qoder-cn.ts
 import { readdir as readdir6, readFile as readFile9, stat as stat6 } from "node:fs/promises";
-import os6 from "node:os";
-import path13 from "node:path";
+import os7 from "node:os";
+import path14 from "node:path";
 function parseQoderCnPaths(filePath) {
-  const parts = filePath.split(path13.sep);
+  const parts = filePath.split(path14.sep);
   const subagentsIdx = parts.lastIndexOf("subagents");
   let sessionId = "";
   let projectName = "";
@@ -5697,19 +5755,19 @@ function parseQoderCnPaths(filePath) {
     sessionId = parts[subagentsIdx - 1];
     projectName = parts[subagentsIdx - 2];
     const projectsIdx = parts.lastIndexOf("projects");
-    configDir2 = parts.slice(0, projectsIdx).join(path13.sep);
+    configDir2 = parts.slice(0, projectsIdx).join(path14.sep);
   } else {
     const filename = parts.at(-1) || "";
-    sessionId = path13.basename(filename, ".jsonl");
+    sessionId = path14.basename(filename, ".jsonl");
     projectName = parts.at(-2) || "";
     const projectsIdx = parts.lastIndexOf("projects");
-    configDir2 = parts.slice(0, projectsIdx).join(path13.sep);
+    configDir2 = parts.slice(0, projectsIdx).join(path14.sep);
   }
   return { configDir: configDir2, projectName, sessionId };
 }
 async function loadQoderCnModelNames(configDir2) {
   try {
-    const dynamicTextsPath = path13.join(configDir2, ".auth", "dynamic-texts.json");
+    const dynamicTextsPath = path14.join(configDir2, ".auth", "dynamic-texts.json");
     const content = await readFile9(dynamicTextsPath, "utf8");
     const json = JSON.parse(content);
     const texts = json.texts || {};
@@ -5727,7 +5785,7 @@ async function loadQoderCnModelNames(configDir2) {
 }
 async function loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMap) {
   const { configDir: configDir2, projectName, sessionId } = parseQoderCnPaths(filePath);
-  const segmentsPath = path13.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
+  const segmentsPath = path14.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
   const modelCalls = [];
   try {
     const files = await readdir6(segmentsPath);
@@ -5735,7 +5793,7 @@ async function loadQoderCnSegmentModelCalls(filePath, isSubagentSession, modelMa
       if (!file.endsWith(".jsonl")) {
         continue;
       }
-      const content = await readFile9(path13.join(segmentsPath, file), "utf8");
+      const content = await readFile9(path14.join(segmentsPath, file), "utf8");
       let currentTurnIsSubagent = false;
       for (const line of content.split("\n").filter(Boolean)) {
         const raw = parseJsonLine(line);
@@ -5803,7 +5861,7 @@ async function parseQoderCnSessionFile(filePath, options) {
     sessionId = stringField(raw, "sessionId") || sessionId;
     state.sessionId = sessionId;
     cwd = stringField(raw, "cwd") || cwd;
-    project = projectContext.project || (cwd ? path13.basename(cwd) : project || await qoderCnProjectFromFilePath(filePath, options));
+    project = projectContext.project || (cwd ? path14.basename(cwd) : project || await qoderCnProjectFromFilePath(filePath, options));
     if (!ts) {
       continue;
     }
@@ -6232,35 +6290,40 @@ function isNoisePrompt(text) {
 }
 async function qoderCnProjectContextFromLines(filePath, lines, options, configDir2) {
   const { projectName: projectDir, sessionId } = parseQoderCnPaths(filePath);
-  const isSubagent = filePath.includes(`${path13.sep}subagents${path13.sep}`);
+  const isSubagent = filePath.includes(`${path14.sep}subagents${path14.sep}`);
+  const inherited = isSubagent ? await readPersistedSessionContextFromOptions(options, sessionId) : void 0;
   let cwds = [];
   for (const line of lines) {
     const raw = parseJsonLine(line);
     const cwd = raw ? stringField(raw, "cwd") : void 0;
-    if (cwd && path13.isAbsolute(cwd)) {
+    if (cwd && path14.isAbsolute(cwd)) {
       cwds.push(cwd);
     }
   }
   if (isSubagent) {
-    const parentSessionPath = path13.join(configDir2, "projects", projectDir, `${sessionId}.jsonl`);
-    try {
-      const parentText = await readFile9(parentSessionPath, "utf8");
-      const parentCwds = [];
-      for (const line of parentText.split("\n").filter(Boolean)) {
-        const raw = parseJsonLine(line);
-        const cwd = raw ? stringField(raw, "cwd") : void 0;
-        if (cwd && path13.isAbsolute(cwd)) {
-          parentCwds.push(cwd);
+    if (inherited?.cwd && path14.isAbsolute(inherited.cwd)) {
+      cwds = [inherited.cwd];
+    } else {
+      const parentSessionPath = path14.join(configDir2, "projects", projectDir, `${sessionId}.jsonl`);
+      try {
+        const parentText = await readFile9(parentSessionPath, "utf8");
+        const parentCwds = [];
+        for (const line of parentText.split("\n").filter(Boolean)) {
+          const raw = parseJsonLine(line);
+          const cwd = raw ? stringField(raw, "cwd") : void 0;
+          if (cwd && path14.isAbsolute(cwd)) {
+            parentCwds.push(cwd);
+          }
         }
+        if (parentCwds.length > 0) {
+          cwds = parentCwds;
+        }
+      } catch {
       }
-      if (parentCwds.length > 0) {
-        cwds = parentCwds;
-      }
-    } catch {
     }
   }
   const root = await gitRootFromCwds2(cwds) || qoderCnProjectRootFromCwds(projectDir, cwds);
-  const project = cwds.length > 0 ? path13.basename(cwds[0]) : root ? path13.basename(root) : await qoderCnProjectFromFilePath(filePath, options);
+  const project = inherited?.project || (cwds.length > 0 ? path14.basename(cwds[0]) : root ? path14.basename(root) : await qoderCnProjectFromFilePath(filePath, options));
   return {
     project,
     workspaceId: createWorkspaceId({ projectName: project, repoRoot: root })
@@ -6269,15 +6332,15 @@ async function qoderCnProjectContextFromLines(filePath, lines, options, configDi
 async function gitRootFromCwds2(cwds) {
   const seen = /* @__PURE__ */ new Set();
   for (const cwd of cwds) {
-    let current = path13.resolve(cwd);
+    let current = path14.resolve(cwd);
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat6(path13.join(current, ".git"));
+        await stat6(path14.join(current, ".git"));
         return current;
       } catch {
       }
-      const parent = path13.dirname(current);
+      const parent = path14.dirname(current);
       if (parent === current) {
         break;
       }
@@ -6288,12 +6351,12 @@ async function gitRootFromCwds2(cwds) {
 }
 function qoderCnProjectRootFromCwds(projectDir, cwds) {
   for (const cwd of cwds) {
-    let current = path13.resolve(cwd);
+    let current = path14.resolve(cwd);
     while (true) {
       if (encodeQoderCnProjectPath(current) === projectDir) {
         return current;
       }
-      const parent = path13.dirname(current);
+      const parent = path14.dirname(current);
       if (parent === current) {
         break;
       }
@@ -6303,14 +6366,14 @@ function qoderCnProjectRootFromCwds(projectDir, cwds) {
   return void 0;
 }
 function encodeQoderCnProjectPath(value) {
-  return path13.resolve(value).split(path13.sep).join("-").replace(/_/g, "-");
+  return path14.resolve(value).split(path14.sep).join("-").replace(/_/g, "-");
 }
 async function qoderCnProjectFromFilePath(filePath, options) {
-  const projectDir = path13.basename(path13.dirname(filePath));
-  const home = options ? path13.resolve(stringOption(options.home) || os6.homedir()) : os6.homedir();
+  const projectDir = path14.basename(path14.dirname(filePath));
+  const home = options ? path14.resolve(stringOption(options.home) || os7.homedir()) : os7.homedir();
   const resolved = await resolveQoderCnProjectPath(projectDir, home);
   if (resolved) {
-    return path13.basename(resolved);
+    return path14.basename(resolved);
   }
   const homePrefix = `${encodeQoderCnProjectPath(home)}-`;
   if (projectDir.startsWith(homePrefix)) {
@@ -6335,7 +6398,7 @@ async function resolveQoderCnProjectPath(projectDir, home) {
         if (!entry.isDirectory()) {
           continue;
         }
-        const candidate = path13.join(current, entry.name);
+        const candidate = path14.join(current, entry.name);
         const encoded = encodeQoderCnProjectPath(candidate);
         if (encoded === projectDir) {
           return candidate;
@@ -6380,9 +6443,9 @@ function hookConfig5() {
 function qoderCnConfigDir(home, env) {
   const override = env?.QODER_CN_CONFIG_DIR;
   if (override && override.trim()) {
-    return path13.resolve(override);
+    return path14.resolve(override);
   }
-  return path13.join(home, ".qoder-cn");
+  return path14.join(home, ".qoder-cn");
 }
 function createQoderCnAdapter() {
   return {
@@ -6394,27 +6457,27 @@ function createQoderCnAdapter() {
       return qoderCnConfigDir(home, env);
     },
     installedPath(home, env) {
-      return path13.join(qoderCnConfigDir(home, env), "settings.json");
+      return path14.join(qoderCnConfigDir(home, env), "settings.json");
     },
     async isInstalled(home, env) {
       return isHooksJsonInstalled(
-        path13.join(qoderCnConfigDir(home, env), "settings.json"),
+        path14.join(qoderCnConfigDir(home, env), "settings.json"),
         "vibetime hook --agent qoder-cn"
       );
     },
     installEntries(home, env) {
       return [{
         kind: "hooks-json",
-        path: path13.join(qoderCnConfigDir(home, env), "settings.json"),
+        path: path14.join(qoderCnConfigDir(home, env), "settings.json"),
         content: hookConfig5()
       }];
     },
     sourcePaths(home, env) {
       const base = qoderCnConfigDir(home, env);
       return [
-        path13.join(base, "projects"),
-        path13.join(base, ".qoder.json"),
-        path13.join(home, ".qoder.json")
+        path14.join(base, "projects"),
+        path14.join(base, ".qoder.json"),
+        path14.join(home, ".qoder.json")
       ];
     },
     parseSessionFile: parseQoderCnSessionFile
@@ -6423,10 +6486,10 @@ function createQoderCnAdapter() {
 
 // src/adapters/qoder.ts
 import { readdir as readdir7, readFile as readFile10, stat as stat7 } from "node:fs/promises";
-import os7 from "node:os";
-import path14 from "node:path";
+import os8 from "node:os";
+import path15 from "node:path";
 function parseQoderPaths(filePath) {
-  const parts = filePath.split(path14.sep);
+  const parts = filePath.split(path15.sep);
   const subagentsIdx = parts.lastIndexOf("subagents");
   let sessionId = "";
   let projectName = "";
@@ -6435,19 +6498,19 @@ function parseQoderPaths(filePath) {
     sessionId = parts[subagentsIdx - 1];
     projectName = parts[subagentsIdx - 2];
     const projectsIdx = parts.lastIndexOf("projects");
-    configDir2 = parts.slice(0, projectsIdx).join(path14.sep);
+    configDir2 = parts.slice(0, projectsIdx).join(path15.sep);
   } else {
     const filename = parts.at(-1) || "";
-    sessionId = path14.basename(filename, ".jsonl");
+    sessionId = path15.basename(filename, ".jsonl");
     projectName = parts.at(-2) || "";
     const projectsIdx = parts.lastIndexOf("projects");
-    configDir2 = parts.slice(0, projectsIdx).join(path14.sep);
+    configDir2 = parts.slice(0, projectsIdx).join(path15.sep);
   }
   return { configDir: configDir2, projectName, sessionId };
 }
 async function loadQoderModelNames(configDir2) {
   try {
-    const dynamicTextsPath = path14.join(configDir2, ".auth", "dynamic-texts.json");
+    const dynamicTextsPath = path15.join(configDir2, ".auth", "dynamic-texts.json");
     const content = await readFile10(dynamicTextsPath, "utf8");
     const json = JSON.parse(content);
     const texts = json.texts || {};
@@ -6465,7 +6528,7 @@ async function loadQoderModelNames(configDir2) {
 }
 async function loadQoderSegmentModelCalls(filePath, isSubagentSession, modelMap) {
   const { configDir: configDir2, projectName, sessionId } = parseQoderPaths(filePath);
-  const segmentsPath = path14.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
+  const segmentsPath = path15.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
   const modelCalls = [];
   try {
     const files = await readdir7(segmentsPath);
@@ -6473,7 +6536,7 @@ async function loadQoderSegmentModelCalls(filePath, isSubagentSession, modelMap)
       if (!file.endsWith(".jsonl")) {
         continue;
       }
-      const content = await readFile10(path14.join(segmentsPath, file), "utf8");
+      const content = await readFile10(path15.join(segmentsPath, file), "utf8");
       let currentTurnIsSubagent = false;
       for (const line of content.split("\n").filter(Boolean)) {
         const raw = parseJsonLine(line);
@@ -6541,7 +6604,7 @@ async function parseQoderSessionFile(filePath, options) {
     sessionId = stringField(raw, "sessionId") || sessionId;
     state.sessionId = sessionId;
     cwd = stringField(raw, "cwd") || cwd;
-    project = projectContext.project || (cwd ? path14.basename(cwd) : project || await qoderProjectFromFilePath(filePath, options));
+    project = projectContext.project || (cwd ? path15.basename(cwd) : project || await qoderProjectFromFilePath(filePath, options));
     if (!ts) {
       continue;
     }
@@ -6936,35 +6999,40 @@ function qoderExtractText(value) {
 }
 async function qoderProjectContextFromLines(filePath, lines, options, configDir2) {
   const { projectName: projectDir, sessionId } = parseQoderPaths(filePath);
-  const isSubagent = filePath.includes(`${path14.sep}subagents${path14.sep}`);
+  const isSubagent = filePath.includes(`${path15.sep}subagents${path15.sep}`);
+  const inherited = isSubagent ? await readPersistedSessionContextFromOptions(options, sessionId) : void 0;
   let cwds = [];
   for (const line of lines) {
     const raw = parseJsonLine(line);
     const cwd = raw ? stringField(raw, "cwd") : void 0;
-    if (cwd && path14.isAbsolute(cwd)) {
+    if (cwd && path15.isAbsolute(cwd)) {
       cwds.push(cwd);
     }
   }
   if (isSubagent) {
-    const parentSessionPath = path14.join(configDir2, "projects", projectDir, `${sessionId}.jsonl`);
-    try {
-      const parentText = await readFile10(parentSessionPath, "utf8");
-      const parentCwds = [];
-      for (const line of parentText.split("\n").filter(Boolean)) {
-        const raw = parseJsonLine(line);
-        const cwd = raw ? stringField(raw, "cwd") : void 0;
-        if (cwd && path14.isAbsolute(cwd)) {
-          parentCwds.push(cwd);
+    if (inherited?.cwd && path15.isAbsolute(inherited.cwd)) {
+      cwds = [inherited.cwd];
+    } else {
+      const parentSessionPath = path15.join(configDir2, "projects", projectDir, `${sessionId}.jsonl`);
+      try {
+        const parentText = await readFile10(parentSessionPath, "utf8");
+        const parentCwds = [];
+        for (const line of parentText.split("\n").filter(Boolean)) {
+          const raw = parseJsonLine(line);
+          const cwd = raw ? stringField(raw, "cwd") : void 0;
+          if (cwd && path15.isAbsolute(cwd)) {
+            parentCwds.push(cwd);
+          }
         }
+        if (parentCwds.length > 0) {
+          cwds = parentCwds;
+        }
+      } catch {
       }
-      if (parentCwds.length > 0) {
-        cwds = parentCwds;
-      }
-    } catch {
     }
   }
   const root = await gitRootFromCwds3(cwds) || qoderProjectRootFromCwds(projectDir, cwds);
-  const project = cwds.length > 0 ? path14.basename(cwds[0]) : root ? path14.basename(root) : await qoderProjectFromFilePath(filePath, options);
+  const project = inherited?.project || (cwds.length > 0 ? path15.basename(cwds[0]) : root ? path15.basename(root) : await qoderProjectFromFilePath(filePath, options));
   return {
     project,
     workspaceId: createWorkspaceId({ projectName: project, repoRoot: root })
@@ -6973,15 +7041,15 @@ async function qoderProjectContextFromLines(filePath, lines, options, configDir2
 async function gitRootFromCwds3(cwds) {
   const seen = /* @__PURE__ */ new Set();
   for (const cwd of cwds) {
-    let current = path14.resolve(cwd);
+    let current = path15.resolve(cwd);
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat7(path14.join(current, ".git"));
+        await stat7(path15.join(current, ".git"));
         return current;
       } catch {
       }
-      const parent = path14.dirname(current);
+      const parent = path15.dirname(current);
       if (parent === current) {
         break;
       }
@@ -6992,12 +7060,12 @@ async function gitRootFromCwds3(cwds) {
 }
 function qoderProjectRootFromCwds(projectDir, cwds) {
   for (const cwd of cwds) {
-    let current = path14.resolve(cwd);
+    let current = path15.resolve(cwd);
     while (true) {
       if (encodeQoderProjectPath(current) === projectDir) {
         return current;
       }
-      const parent = path14.dirname(current);
+      const parent = path15.dirname(current);
       if (parent === current) {
         break;
       }
@@ -7007,10 +7075,10 @@ function qoderProjectRootFromCwds(projectDir, cwds) {
   return void 0;
 }
 function encodeQoderProjectPath(value) {
-  return path14.resolve(value).split(path14.sep).join("-").replace(/_/g, "-");
+  return path15.resolve(value).split(path15.sep).join("-").replace(/_/g, "-");
 }
 function rawQoderProjectPath(value) {
-  return path14.resolve(value).split(path14.sep).join("-");
+  return path15.resolve(value).split(path15.sep).join("-");
 }
 function qoderEncodedVariants(value) {
   const raw = rawQoderProjectPath(value);
@@ -7026,11 +7094,11 @@ function qoderEncodedProjectSuffix(projectDir, home) {
   return void 0;
 }
 async function qoderProjectFromFilePath(filePath, options) {
-  const projectDir = path14.basename(path14.dirname(filePath));
-  const home = options ? path14.resolve(stringOption(options.home) || os7.homedir()) : os7.homedir();
+  const projectDir = path15.basename(path15.dirname(filePath));
+  const home = options ? path15.resolve(stringOption(options.home) || os8.homedir()) : os8.homedir();
   const resolved = await resolveQoderProjectPath(projectDir, home);
   if (resolved) {
-    return path14.basename(resolved);
+    return path15.basename(resolved);
   }
   const suffix = qoderEncodedProjectSuffix(projectDir, home);
   if (suffix) {
@@ -7056,7 +7124,7 @@ async function resolveQoderProjectPath(projectDir, home) {
         if (!entry.isDirectory()) {
           continue;
         }
-        const candidate = path14.join(current, entry.name);
+        const candidate = path15.join(current, entry.name);
         const candidateVariants = qoderEncodedVariants(candidate);
         if (candidateVariants.includes(projectDir)) {
           return candidate;
@@ -7101,9 +7169,9 @@ function hookConfig6() {
 function qoderConfigDir(home, env) {
   const override = env?.QODER_CONFIG_DIR;
   if (override && override.trim()) {
-    return path14.resolve(override);
+    return path15.resolve(override);
   }
-  return path14.join(home, ".qoder");
+  return path15.join(home, ".qoder");
 }
 function createQoderAdapter() {
   return {
@@ -7115,27 +7183,27 @@ function createQoderAdapter() {
       return qoderConfigDir(home, env);
     },
     installedPath(home, env) {
-      return path14.join(qoderConfigDir(home, env), "settings.json");
+      return path15.join(qoderConfigDir(home, env), "settings.json");
     },
     async isInstalled(home, env) {
       return isHooksJsonInstalled(
-        path14.join(qoderConfigDir(home, env), "settings.json"),
+        path15.join(qoderConfigDir(home, env), "settings.json"),
         "vibetime hook --agent qoder"
       );
     },
     installEntries(home, env) {
       return [{
         kind: "hooks-json",
-        path: path14.join(qoderConfigDir(home, env), "settings.json"),
+        path: path15.join(qoderConfigDir(home, env), "settings.json"),
         content: hookConfig6()
       }];
     },
     sourcePaths(home, env) {
       const base = qoderConfigDir(home, env);
       return [
-        path14.join(base, "projects"),
-        path14.join(base, ".qoder.json"),
-        path14.join(home, ".qoder.json")
+        path15.join(base, "projects"),
+        path15.join(base, ".qoder.json"),
+        path15.join(home, ".qoder.json")
       ];
     },
     parseSessionFile: parseQoderSessionFile
@@ -7171,20 +7239,20 @@ function normalizeId(id) {
 
 // src/adapters/workbuddy.ts
 import { readFile as readFile11, readdir as readdir8, stat as stat8 } from "node:fs/promises";
-import path15 from "node:path";
+import path16 from "node:path";
 init_fs();
 function workbuddyProjectsDir(home, env) {
   const override = env?.WORKBUDDY_PROJECTS_DIR || env?.WORKBUDDY_HOME;
   if (override && override.trim()) {
-    return path15.resolve(override, override.endsWith("projects") ? "" : "projects");
+    return path16.resolve(override, override.endsWith("projects") ? "" : "projects");
   }
-  return path15.join(home, ".workbuddy", "projects");
+  return path16.join(home, ".workbuddy", "projects");
 }
 function projectFromCwd(cwd, fallback) {
   if (!cwd) {
     return fallback;
   }
-  return path15.basename(cwd) || fallback;
+  return path16.basename(cwd) || fallback;
 }
 function sourceHash(filePath) {
   return `sha256:${createStableHash(filePath)}`;
@@ -7286,8 +7354,8 @@ async function parseWorkbuddySessionFile(filePath, options) {
   }
   const events = [];
   const first = lines[0].record;
-  const sessionId = stringField(first, "sessionId") || path15.basename(filePath, ".jsonl");
-  const fallbackProject = path15.basename(path15.dirname(filePath));
+  const sessionId = stringField(first, "sessionId") || path16.basename(filePath, ".jsonl");
+  const fallbackProject = path16.basename(path16.dirname(filePath));
   const cwd = lines.map((line) => stringField(line.record, "cwd")).find(Boolean);
   const project = projectFromCwd(cwd, fallbackProject);
   const workspaceId = createWorkspaceId({ projectName: project, repoRoot: cwd });
@@ -7461,11 +7529,11 @@ async function workbuddyBackfillFiles(sourceRoot, home, env) {
       if (!project.isDirectory()) {
         continue;
       }
-      const projectDir = path15.join(base, project.name);
+      const projectDir = path16.join(base, project.name);
       const entries = await readdir8(projectDir, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.isFile() && entry.name.endsWith(".jsonl")) {
-          const filePath = path15.join(projectDir, entry.name);
+          const filePath = path16.join(projectDir, entry.name);
           const info = await stat8(filePath);
           files.push({ path: filePath, modifiedAt: info.mtime.toISOString() });
         }
@@ -7504,19 +7572,19 @@ function createWorkbuddyAdapter() {
 // src/adapters/zcode.ts
 import { execFile } from "node:child_process";
 import { readFile as readFile12, stat as stat9 } from "node:fs/promises";
-import path16 from "node:path";
+import path17 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;
   if (override && override.trim()) {
-    return path16.resolve(override, override.endsWith("cli") ? "" : "cli");
+    return path17.resolve(override, override.endsWith("cli") ? "" : "cli");
   }
-  return path16.join(home, ".zcode", "cli");
+  return path17.join(home, ".zcode", "cli");
 }
 function zcodeDbPath(home, env) {
-  return path16.join(zcodeCliDir(home, env), "db", "db.sqlite");
+  return path17.join(zcodeCliDir(home, env), "db", "db.sqlite");
 }
 var providerNameCache = null;
 async function loadProviderNames(configPath2) {
@@ -7550,7 +7618,7 @@ function sourceHash2(filePath) {
   return `sha256:${createStableHash(filePath)}`;
 }
 function projectFromDirectory(directory) {
-  return directory ? path16.basename(directory) || "zcode" : "zcode";
+  return directory ? path17.basename(directory) || "zcode" : "zcode";
 }
 function isoFromMs(value) {
   return timestampFrom(typeof value === "number" ? value : Number(value));
@@ -7706,16 +7774,16 @@ async function parseZCodeDb(filePath, options) {
   if (rows.length === 0) {
     return [];
   }
-  let candidate = path16.resolve(filePath);
+  let candidate = path17.resolve(filePath);
   let configPath2 = "";
   for (let i = 0; i < 12; i++) {
-    const probe = path16.join(candidate, ".zcode", "v2", "config.json");
+    const probe = path17.join(candidate, ".zcode", "v2", "config.json");
     try {
       await stat9(probe);
       configPath2 = probe;
       break;
     } catch {
-      const parent = path16.dirname(candidate);
+      const parent = path17.dirname(candidate);
       if (parent === candidate) break;
       candidate = parent;
     }
@@ -7931,7 +7999,7 @@ async function parseZCodeDb(filePath, options) {
 }
 async function zcodeBackfillFiles(sourceRoot, home, env) {
   const candidate = sourceRoot || zcodeDbPath(home, env);
-  const filePath = candidate.endsWith(".sqlite") ? candidate : path16.join(candidate, "db", "db.sqlite");
+  const filePath = candidate.endsWith(".sqlite") ? candidate : path17.join(candidate, "db", "db.sqlite");
   try {
     const info = await stat9(filePath);
     return [{ path: filePath, modifiedAt: info.mtime.toISOString() }];
@@ -8305,7 +8373,7 @@ async function installEntry(entry, options) {
   });
 }
 async function mergeHooksJson(filePath, content, { dryRun, force, onWrite }) {
-  const { mkdir: mkdir5, writeFile: writeFile4 } = await import("node:fs/promises");
+  const { mkdir: mkdir6, writeFile: writeFile5 } = await import("node:fs/promises");
   const pathMod = await import("node:path");
   if (dryRun) {
     onWrite(`Would merge ${filePath}`);
@@ -8326,8 +8394,8 @@ async function mergeHooksJson(filePath, content, { dryRun, force, onWrite }) {
     onWrite(`Already installed ${filePath}`);
     return;
   }
-  await mkdir5(pathMod.dirname(filePath), { recursive: true });
-  await writeFile4(filePath, nextText, "utf8");
+  await mkdir6(pathMod.dirname(filePath), { recursive: true });
+  await writeFile5(filePath, nextText, "utf8");
   onWrite(`Installed ${filePath}`);
 }
 function mergeAgyHooksJson(existing, addition) {
@@ -8405,15 +8473,15 @@ function hookCommandFromGroup(group) {
 import { randomUUID } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { homedir, hostname } from "node:os";
-import path17 from "node:path";
+import path18 from "node:path";
 function configDir(home = homedir()) {
-  return path17.join(home, ".vibetime");
+  return path18.join(home, ".vibetime");
 }
 function configPath(home = homedir()) {
-  return path17.join(configDir(home), "config.json");
+  return path18.join(configDir(home), "config.json");
 }
 function machineIdPath(home = homedir()) {
-  return path17.join(configDir(home), "machine-id");
+  return path18.join(configDir(home), "machine-id");
 }
 function readConfig(home = homedir()) {
   const file = configPath(home);
@@ -8460,15 +8528,15 @@ function defaultMachineName() {
 init_fs();
 
 // src/lib/logger.ts
-import { appendFile, mkdir as mkdir3, rename, stat as stat10 } from "node:fs/promises";
+import { appendFile, mkdir as mkdir4, rename, stat as stat10 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import path18 from "node:path";
+import path19 from "node:path";
 var MAX_BYTES = 1 * 1024 * 1024;
 function logDir(home = homedir2()) {
-  return path18.join(home, ".vibetime", "logs");
+  return path19.join(home, ".vibetime", "logs");
 }
 function logPath(home = homedir2(), name = "cli.log") {
-  return path18.join(logDir(home), name);
+  return path19.join(logDir(home), name);
 }
 function serializeError(error) {
   if (error instanceof Error) {
@@ -8489,7 +8557,7 @@ async function rotateIfNeeded(file) {
 async function writeLog(entry, home = homedir2(), fileName = "cli.log") {
   try {
     const dir = logDir(home);
-    await mkdir3(dir, { recursive: true });
+    await mkdir4(dir, { recursive: true });
     const file = logPath(home, fileName);
     await rotateIfNeeded(file);
     const record = {
@@ -8643,8 +8711,8 @@ function buildHeaders(token, machine) {
     ...machine?.platform ? { "x-machine-platform": machine.platform } : {}
   };
 }
-function joinUrl(base, path20) {
-  return new URL(path20, base.endsWith("/") ? base : `${base}/`).toString();
+function joinUrl(base, path21) {
+  return new URL(path21, base.endsWith("/") ? base : `${base}/`).toString();
 }
 async function postRollupBatch(remote, rollups, options = {}) {
   const response = await remote.fetchImpl(joinUrl(remote.baseUrl, "/v3/agent/ingest"), {
@@ -8816,7 +8884,7 @@ function normalizeOptions(options) {
   return normalized;
 }
 async function detectCommand(options, ctx, registry) {
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   const env = ctx.env;
   const adapters = registry.all();
   const targets = await Promise.all(adapters.map(async (adapter) => {
@@ -8845,7 +8913,7 @@ async function detectCommand(options, ctx, registry) {
   }
 }
 async function installCommand(options, ctx, registry) {
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   const env = ctx.env;
   const dryRun = Boolean(options["dry-run"]);
   const force = Boolean(options.force);
@@ -8943,7 +9011,7 @@ Upgraded ${current} \u2192 ${latest}
   return 0;
 }
 async function hookCommand(options, ctx) {
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   try {
     const agent = requiredOption(options, "agent");
     const payload = await readHookPayload(ctx.stdin);
@@ -8956,6 +9024,7 @@ async function hookCommand(options, ctx) {
 `);
       return 0;
     }
+    await persistHookSessionContext(home, payload);
     return await syncLocalTriggerCommand({
       ...options,
       agent,
@@ -8969,7 +9038,7 @@ async function hookCommand(options, ctx) {
   }
 }
 async function syncLocalTriggerCommand(options, ctx, _registry) {
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   const statePath = syncLocalTriggerStatePath(home);
   const lockPath = syncLocalTriggerLockPath(home);
   const minIntervalSeconds = Math.max(0, Math.floor(numberOption(options["min-interval"]) ?? DEFAULT_HOOK_SYNC_MIN_INTERVAL_SECONDS));
@@ -9012,7 +9081,7 @@ async function syncLocalTriggerCommand(options, ctx, _registry) {
   return 0;
 }
 async function syncLocalRunnerCommand(options, ctx, _registry) {
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   const lockPath = stringOption(options["lock-file"]) || syncLocalTriggerLockPath(home);
   const statePath = stringOption(options["state-file"]) || syncLocalTriggerStatePath(home);
   const state = await readSyncLocalTriggerState(statePath);
@@ -9072,7 +9141,7 @@ async function backfillCommand(options, ctx, registry) {
   return importBackfillPlan(plan, options, ctx, reg);
 }
 async function createBackfillPlanFromOptions(options, ctx, action, registry) {
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   const env = ctx.env;
   const source = normalizeBackfillSource(stringOption(options.source) || "all");
   const sourceDefs = source === "all" ? registry.all().map((a) => ({ id: a.id, label: a.label, paths: a.sourcePaths(home, env) })) : (() => {
@@ -9141,7 +9210,7 @@ async function createBackfillPlanFromOptions(options, ctx, action, registry) {
 }
 async function createBackfillEventsFromDefs(sourceDefs, options, registry, ctx, overrideFiles) {
   const events = [];
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   for (const item of sourceDefs) {
     const parser = registry.getParser(item.id);
     if (!parser) {
@@ -9191,25 +9260,25 @@ async function createBackfillCandidates(source, options) {
 }
 async function listBackfillSourceFiles(source, options, ctx) {
   if (source.id === "opencode") {
-    return opencodeBackfillFiles(stringOption(options["source-root"]), resolveHome2(options, ctx), ctx.env);
+    return opencodeBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
   if (source.id === "agy") {
-    return agyBackfillFiles(stringOption(options["source-root"]), resolveHome2(options, ctx), ctx.env);
+    return agyBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
   if (source.id === "claude-cowork") {
-    return claudeCoworkBackfillFiles(stringOption(options["source-root"]), resolveHome2(options, ctx), ctx.env);
+    return claudeCoworkBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
   if (source.id === "codebuddy") {
-    return codebuddyBackfillFiles(stringOption(options["source-root"]), resolveHome2(options, ctx), ctx.env);
+    return codebuddyBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
   if (source.id === "workbuddy") {
-    return workbuddyBackfillFiles(stringOption(options["source-root"]), resolveHome2(options, ctx), ctx.env);
+    return workbuddyBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
   if (source.id === "zcode") {
-    return zcodeBackfillFiles(stringOption(options["source-root"]), resolveHome2(options, ctx), ctx.env);
+    return zcodeBackfillFiles(stringOption(options["source-root"]), resolveHome3(options, ctx), ctx.env);
   }
   if (source.id === "copilot") {
-    return copilotBackfillFiles(stringOption(options["source-root"]), resolveHome2(options, ctx), ctx.env);
+    return copilotBackfillFiles(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)));
@@ -9292,7 +9361,7 @@ function writeBackfillPlan(plan, options, ctx) {
 async function importBackfillPlan(plan, options, ctx, registry) {
   const source = normalizeBackfillSource(stringOption(options.source) || "all");
   const supportedSources = new Set(BACKFILL_SOURCE_IDS);
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   if (source !== "all" && !supportedSources.has(source)) {
     write(ctx.stderr, `Unsupported backfill source: ${source}
 `);
@@ -9361,7 +9430,7 @@ async function purgeForcedSources(sourceDefs, home, remoteKey, options, ctx) {
 async function collectCanonicalEvents(sourceDefs, registry, incrementalState, options, ctx) {
   const selectedFilesBySource = /* @__PURE__ */ new Map();
   const canonicalEvents = [];
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   for (const item of sourceDefs) {
     const parser = registry.getParser(item.id);
     if (!parser) {
@@ -9465,7 +9534,7 @@ async function sendSessionRollupBatch(rollups, options, ctx) {
   if (!remote) {
     throw new Error("No fetch available for HTTP upload");
   }
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   const cfg = readConfig(home);
   const machine = {
     id: ensureLocalMachineId(home),
@@ -9484,7 +9553,7 @@ async function deleteSessionRollupsBySourceAPI(source, options, ctx) {
   if (!remote) {
     throw new Error("No fetch available for HTTP delete");
   }
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   return deleteRollupsBySource(remote, source, {
     id: ensureLocalMachineId(home),
     hostname: defaultMachineName(),
@@ -9528,13 +9597,13 @@ function selectBackfillFilesForImport(files, watermarkTs) {
   });
 }
 function backfillIncrementalStatePath(home) {
-  return path19.join(home, ".vibetime", "backfill-state.json");
+  return path20.join(home, ".vibetime", "backfill-state.json");
 }
 function syncLocalTriggerStatePath(home) {
-  return path19.join(home, ".vibetime", "sync-local-trigger.json");
+  return path20.join(home, ".vibetime", "sync-local-trigger.json");
 }
 function syncLocalTriggerLockPath(home) {
-  return path19.join(home, ".vibetime", "sync-local-trigger.lock");
+  return path20.join(home, ".vibetime", "sync-local-trigger.lock");
 }
 function backfillRemoteKey(baseUrl) {
   try {
@@ -9596,8 +9665,8 @@ async function readBackfillIncrementalStateFile(home, ctx) {
 }
 async function writeBackfillIncrementalStateFile(home, file) {
   const statePath = backfillIncrementalStatePath(home);
-  await mkdir4(path19.dirname(statePath), { recursive: true });
-  await writeFile3(statePath, `${JSON.stringify(file, null, 2)}
+  await mkdir5(path20.dirname(statePath), { recursive: true });
+  await writeFile4(statePath, `${JSON.stringify(file, null, 2)}
 `, "utf8");
 }
 async function readBackfillIncrementalState(home, remoteKey, ctx) {
@@ -9645,9 +9714,9 @@ async function readSyncLocalTriggerState(statePath) {
   return nextState;
 }
 async function writeSyncLocalTriggerState(statePath, state) {
-  await mkdir4(path19.dirname(statePath), { recursive: true });
-  const tmpPath = `${statePath}.tmp`;
-  await writeFile3(tmpPath, `${JSON.stringify(state, null, 2)}
+  await mkdir5(path20.dirname(statePath), { recursive: true });
+  const tmpPath = `${statePath}.${process.pid}.${randomUUID2()}.tmp`;
+  await writeFile4(tmpPath, `${JSON.stringify(state, null, 2)}
 `, "utf8");
   await rename2(tmpPath, statePath);
 }
@@ -9662,8 +9731,8 @@ async function readSyncLocalLock(lockPath) {
   return { pid: lock.pid, startedAt: lock.startedAt };
 }
 async function writeSyncLocalLock(lockPath, lock) {
-  await mkdir4(path19.dirname(lockPath), { recursive: true });
-  await writeFile3(lockPath, `${JSON.stringify(lock, null, 2)}
+  await mkdir5(path20.dirname(lockPath), { recursive: true });
+  await writeFile4(lockPath, `${JSON.stringify(lock, null, 2)}
 `, "utf8");
 }
 async function clearSyncLocalLock(lockPath) {
@@ -9701,12 +9770,19 @@ function spawnSyncLocalRunner(input) {
   const child = input.ctx.spawn(process.execPath, args, {
     detached: true,
     stdio: "ignore",
-    cwd: process.cwd(),
-    env: process.env
+    cwd: resolveSpawnCwd(input.home),
+    env: input.ctx.env
   });
   child.unref();
   return child;
 }
+function resolveSpawnCwd(home) {
+  try {
+    return process.cwd();
+  } catch {
+    return home;
+  }
+}
 function syncLocalRunnerArgs(input) {
   const args = syncLocalRunnerEntryArgs(fileURLToPath(import.meta.url));
   args.push("sync-local-runner", "--home", input.home, "--lock-file", input.lockPath, "--state-file", input.statePath);
@@ -9722,10 +9798,10 @@ function syncLocalRunnerEntryArgs(cliPath) {
   if (cliPath.endsWith(".ts")) {
     return ["--import", "tsx", cliPath];
   }
-  return [path19.resolve(path19.dirname(cliPath), "../bin/vibetime.mjs")];
+  return [path20.resolve(path20.dirname(cliPath), "../bin/vibetime.mjs")];
 }
-function resolveHome2(options, ctx) {
-  return path19.resolve(stringOption(options.home) || ctx.env.HOME || os8.homedir());
+function resolveHome3(options, ctx) {
+  return path20.resolve(stringOption(options.home) || ctx.env.HOME || os9.homedir());
 }
 function requestedTargets(options) {
   const value = options.target || options.targets;
@@ -9788,7 +9864,7 @@ function maskToken(token) {
 }
 async function tokenCommand(action, value, options, ctx) {
   const verb = action || "show";
-  const home = resolveHome2(options, ctx);
+  const home = resolveHome3(options, ctx);
   if (verb === "set") {
     if (!value || value.trim().length === 0) {
       write(ctx.stderr, "Usage: vibetime token set <token> [--remote <url>]\n");
@@ -9860,7 +9936,7 @@ async function machineCommand(action, options, ctx) {
     return 0;
   }
   if (verb === "rename") {
-    const home = resolveHome2(options, ctx);
+    const home = resolveHome3(options, ctx);
     const id = stringOption(options.id) || ensureLocalMachineId(home);
     const name = stringOption(options.name);
     if (!name) {

package/package.json

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