@yhong91/vibetime 0.1.16 → 0.1.18

package/bin/vibetime.mjs

@@ -158,10 +158,11 @@ 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 { spawn as spawn2, spawnSync } from "node:child_process";
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { mkdir as mkdir5, open, rename as rename2, rm, stat as stat12, writeFile as writeFile4 } from "node:fs/promises";
+import os9 from "node:os";
+import path21 from "node:path";
 import { fileURLToPath } from "node:url";
 
 // ../shared/src/index.ts
@@ -295,6 +296,12 @@ function validateMetricBag(value, errors, prefix) {
   }
   for (const key of Object.keys(value)) {
     const metric = value[key];
+    if (key === "reasoningEffort") {
+      if (metric !== void 0 && typeof metric !== "string") {
+        errors.push(`${prefix}.${key} must be a string`);
+      }
+      continue;
+    }
     if (metric !== void 0 && (typeof metric !== "number" || !Number.isFinite(metric))) {
       errors.push(`${prefix}.${key} must be a finite number`);
     }
@@ -977,10 +984,10 @@ var cac = (name = "") => new CAC(name);
 
 // src/adapters/agy.ts
 import { exec } from "node:child_process";
-import { readFile as readFile2, stat as stat2, mkdir as mkdir2, writeFile as writeFile2 } from "node:fs/promises";
+import { mkdir as mkdir2, readFile as readFile2, stat as stat3, writeFile as writeFile2 } from "node:fs/promises";
 import * as https from "node:https";
 import * as os from "node:os";
-import path4 from "node:path";
+import path5 from "node:path";
 import { promisify } from "node:util";
 
 // src/lib/activity.ts
@@ -1195,7 +1202,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.16" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.18" : "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;
@@ -1432,6 +1439,254 @@ var SessionParserState = class {
   }
 };
 
+// src/adapters/agy-legacy-db.ts
+import { spawn } from "node:child_process";
+import { stat as stat2 } from "node:fs/promises";
+import path4 from "node:path";
+function readVarint(buffer, offset) {
+  let value = 0n;
+  let shift = 0n;
+  let cursor = offset;
+  while (cursor < buffer.length && shift <= 63n) {
+    const byte = buffer[cursor++];
+    value |= BigInt(byte & 127) << shift;
+    if ((byte & 128) === 0) {
+      return { value, offset: cursor };
+    }
+    shift += 7n;
+  }
+  throw new TypeError("invalid protobuf varint");
+}
+function decodeFields(buffer) {
+  const fields = [];
+  let offset = 0;
+  while (offset < buffer.length) {
+    const key = readVarint(buffer, offset);
+    offset = key.offset;
+    const keyNumber = Number(key.value);
+    if (!Number.isSafeInteger(keyNumber)) {
+      throw new TypeError("protobuf key exceeds safe integer range");
+    }
+    const field = keyNumber >>> 3;
+    const wire = keyNumber & 7;
+    if (field === 0) {
+      throw new Error("invalid protobuf field");
+    }
+    switch (wire) {
+      case 0: {
+        const decoded = readVarint(buffer, offset);
+        offset = decoded.offset;
+        fields.push({ field, wire, value: decoded.value });
+        break;
+      }
+      case 1: {
+        if (offset + 8 > buffer.length) {
+          throw new TypeError("truncated protobuf fixed64");
+        }
+        fields.push({ field, wire, value: buffer.subarray(offset, offset + 8) });
+        offset += 8;
+        break;
+      }
+      case 2: {
+        const decoded = readVarint(buffer, offset);
+        offset = decoded.offset;
+        const length = Number(decoded.value);
+        if (!Number.isSafeInteger(length)) {
+          throw new TypeError("protobuf byte length exceeds safe integer range");
+        }
+        const end = offset + length;
+        if (end > buffer.length) {
+          throw new TypeError("truncated protobuf bytes");
+        }
+        fields.push({ field, wire, value: buffer.subarray(offset, end) });
+        offset = end;
+        break;
+      }
+      case 5: {
+        if (offset + 4 > buffer.length) {
+          throw new TypeError("truncated protobuf fixed32");
+        }
+        fields.push({ field, wire, value: buffer.subarray(offset, offset + 4) });
+        offset += 4;
+        break;
+      }
+      default: {
+        throw new TypeError(`unsupported protobuf wire type ${wire}`);
+      }
+    }
+  }
+  return fields;
+}
+function bytesField(fields, field) {
+  const value = fields.find((item) => item.field === field && item.wire === 2)?.value;
+  return value instanceof Uint8Array ? value : void 0;
+}
+function numberField2(fields, field) {
+  const value = fields.find((item) => item.field === field && item.wire === 0)?.value;
+  if (typeof value !== "bigint") {
+    return void 0;
+  }
+  const number = Number(value);
+  return Number.isSafeInteger(number) ? number : void 0;
+}
+function stringField2(fields, field) {
+  const value = bytesField(fields, field);
+  if (!value) {
+    return void 0;
+  }
+  return new TextDecoder().decode(value);
+}
+function decodePackedVarints(buffer) {
+  if (!buffer) {
+    return [];
+  }
+  const values = [];
+  let offset = 0;
+  while (offset < buffer.length) {
+    const decoded = readVarint(buffer, offset);
+    const value = Number(decoded.value);
+    if (!Number.isSafeInteger(value)) {
+      throw new TypeError("packed protobuf varint exceeds safe integer range");
+    }
+    values.push(value);
+    offset = decoded.offset;
+  }
+  return values;
+}
+function decodeTimestamp(buffer) {
+  if (!buffer) {
+    return void 0;
+  }
+  const fields = decodeFields(buffer);
+  const seconds = numberField2(fields, 1);
+  if (seconds === void 0) {
+    return void 0;
+  }
+  const nanos = numberField2(fields, 2) ?? 0;
+  const date = new Date(seconds * 1e3 + Math.floor(nanos / 1e6));
+  return Number.isNaN(date.getTime()) ? void 0 : date.toISOString();
+}
+function decodeLegacyAgyGeneratorMetadata(data) {
+  try {
+    const fields = decodeFields(data);
+    const stepIndices = decodePackedVarints(bytesField(fields, 2));
+    const chatModelBytes = bytesField(fields, 1);
+    if (stepIndices.length === 0 || !chatModelBytes) {
+      return null;
+    }
+    const chatModelFields = decodeFields(chatModelBytes);
+    const usageBytes = bytesField(chatModelFields, 4);
+    if (!usageBytes) {
+      return null;
+    }
+    const usageFields = decodeFields(usageBytes);
+    const inputTokens = numberField2(usageFields, 2);
+    const outputTokens = numberField2(usageFields, 3);
+    if (inputTokens === void 0 || outputTokens === void 0) {
+      return null;
+    }
+    const cacheReadTokens = numberField2(usageFields, 5);
+    const thinkingOutputTokens = numberField2(usageFields, 9);
+    const createdAt = decodeTimestamp(bytesField(
+      decodeFields(bytesField(chatModelFields, 9) ?? new Uint8Array()),
+      4
+    ));
+    const modelDisplayName = stringField2(chatModelFields, 21);
+    const responseModel = stringField2(chatModelFields, 19);
+    return {
+      stepIndices,
+      chatModel: {
+        usage: {
+          inputTokens: String(inputTokens),
+          outputTokens: String(outputTokens),
+          ...cacheReadTokens === void 0 ? {} : { cacheReadTokens: String(cacheReadTokens) },
+          ...thinkingOutputTokens === void 0 ? {} : { thinkingOutputTokens: String(thinkingOutputTokens) }
+        },
+        ...modelDisplayName ? { modelDisplayName } : {},
+        ...responseModel ? { responseModel } : {},
+        ...createdAt ? { chatStartMetadata: { createdAt } } : {}
+      }
+    };
+  } catch {
+    return null;
+  }
+}
+async function readRowsWithNodeSqlite(dbPath) {
+  try {
+    const sqlite = await import("node:sqlite");
+    const db = new sqlite.DatabaseSync(dbPath, { readOnly: true });
+    try {
+      return db.prepare("SELECT data FROM gen_metadata ORDER BY idx").all().map(
+        (row) => ({ data: row.data })
+      );
+    } finally {
+      db.close();
+    }
+  } catch {
+    return null;
+  }
+}
+async function readRowsWithSqliteCli(dbPath) {
+  return new Promise((resolve) => {
+    const child = spawn("sqlite3", [
+      "-readonly",
+      dbPath,
+      "SELECT hex(data) FROM gen_metadata ORDER BY idx;"
+    ], {
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    const rows = [];
+    let pending = "";
+    let failed = false;
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      pending += chunk;
+      let newline = pending.indexOf("\n");
+      while (newline >= 0) {
+        const line = pending.slice(0, newline).trim();
+        pending = pending.slice(newline + 1);
+        if (line) {
+          try {
+            rows.push({ data: Buffer.from(line, "hex") });
+          } catch {
+            failed = true;
+            child.kill();
+            return;
+          }
+        }
+        newline = pending.indexOf("\n");
+      }
+    });
+    child.on("error", () => resolve(null));
+    child.on("close", (code) => {
+      if (!failed && code === 0) {
+        const line = pending.trim();
+        if (line) {
+          rows.push({ data: Buffer.from(line, "hex") });
+        }
+        resolve(rows);
+      } else {
+        resolve(null);
+      }
+    });
+  });
+}
+async function readLegacyAgyGeneratorMetadata(transcriptPath, sessionId) {
+  const antigravityCliDir = path4.resolve(path4.dirname(transcriptPath), "../../../..");
+  const dbPath = path4.join(antigravityCliDir, "conversations", `${sessionId}.db`);
+  try {
+    await stat2(dbPath);
+  } catch {
+    return null;
+  }
+  const rows = await readRowsWithNodeSqlite(dbPath) ?? await readRowsWithSqliteCli(dbPath);
+  if (!rows || rows.length === 0) {
+    return null;
+  }
+  const metadata = rows.map((row) => decodeLegacyAgyGeneratorMetadata(row.data)).filter((item) => item !== null);
+  return metadata.length > 0 ? metadata : null;
+}
+
 // src/adapters/agy.ts
 var execAsync = promisify(exec);
 var cachedRpcConnections = null;
@@ -1651,7 +1906,7 @@ function detectModel(content, currentModel) {
   return currentModel;
 }
 function resolveModelName(text) {
-  const cleaned = text.replace(/\s*\([^)]*\)\s*/g, " ").trim();
+  const cleaned = text.replaceAll(/\s*\([^)]*\)\s*/g, " ").trim();
   if (cleaned.includes("Claude Opus 4.7") || cleaned.includes("claude-opus-4.7")) {
     return "claude-opus-4.7";
   }
@@ -1720,11 +1975,11 @@ function usageMetadataFromGenerator(item) {
   };
 }
 async function readAgyModelSetting(filePath) {
-  const settingsPath = path4.resolve(path4.dirname(filePath), "../../../..", "settings.json");
+  const settingsPath = path5.resolve(path5.dirname(filePath), "../../../..", "settings.json");
   try {
     const [text, info] = await Promise.all([
       readFile2(settingsPath, "utf8"),
-      stat2(settingsPath)
+      stat3(settingsPath)
     ]);
     const configured = JSON.parse(text)?.model;
     const rawModel = typeof configured === "string" ? configured : null;
@@ -1747,16 +2002,16 @@ function extractProjectContext(rawLines) {
           if (args.DirectoryPath) {
             candidate = normalizePath(args.DirectoryPath);
           } else if (args.AbsolutePath) {
-            candidate = path4.dirname(normalizePath(args.AbsolutePath));
+            candidate = path5.dirname(normalizePath(args.AbsolutePath));
           } else if (args.SearchPath) {
             candidate = normalizePath(args.SearchPath);
           } else if (args.TargetFile) {
-            candidate = path4.dirname(normalizePath(args.TargetFile));
+            candidate = path5.dirname(normalizePath(args.TargetFile));
           } else if (args.Cwd) {
             candidate = normalizePath(args.Cwd);
           }
           if (candidate) {
-            const norm = candidate.replace(/\\/g, "/").toLowerCase();
+            const norm = candidate.replaceAll("\\", "/").toLowerCase();
             const isTemp = norm.startsWith("/var/") || norm.startsWith("/private/var/") || norm.startsWith("/tmp/") || norm.startsWith("/private/tmp/") || norm.includes("/tmp.");
             if (isTemp) {
               if (!fallbackCwd) {
@@ -1779,7 +2034,7 @@ function extractProjectContext(rawLines) {
   }
   if (cwd) {
     const match = cwd.match(/[/\\]projects[/\\]([^/\\]+)/i);
-    project = match && match[1] ? match[1] : path4.basename(cwd);
+    project = match && match[1] ? match[1] : path5.basename(cwd);
   }
   return { cwd, project };
 }
@@ -1791,7 +2046,7 @@ function normalizePath(p) {
   if (cleaned.startsWith("'") && cleaned.endsWith("'")) {
     cleaned = cleaned.slice(1, -1);
   }
-  return path4.normalize(cleaned);
+  return path5.normalize(cleaned);
 }
 async function parseAgySessionFile(filePath, options) {
   const text = await readFile2(filePath, "utf8");
@@ -1810,8 +2065,8 @@ async function parseAgySessionFile(filePath, options) {
   const sessionId = getSessionId(filePath);
   const modelSetting = await readAgyModelSetting(filePath);
   let generatorMetadata = options?.mockTrajectoryMetadata || await getTrajectoryGeneratorMetadata(sessionId).catch(() => null);
-  const cacheDir = path4.join(path4.dirname(path4.dirname(filePath)), "cache");
-  const cacheFile = path4.join(cacheDir, "trajectory_metadata.json");
+  const cacheDir = path5.join(path5.dirname(path5.dirname(filePath)), "cache");
+  const cacheFile = path5.join(cacheDir, "trajectory_metadata.json");
   if (generatorMetadata) {
     try {
       await mkdir2(cacheDir, { recursive: true });
@@ -1827,6 +2082,16 @@ async function parseAgySessionFile(filePath, options) {
     } catch {
     }
   }
+  if (!generatorMetadata) {
+    generatorMetadata = await readLegacyAgyGeneratorMetadata(filePath, sessionId);
+    if (generatorMetadata) {
+      try {
+        await mkdir2(cacheDir, { recursive: true });
+        await writeFile2(cacheFile, JSON.stringify(generatorMetadata, null, 2), "utf8");
+      } catch {
+      }
+    }
+  }
   const usageMap = /* @__PURE__ */ new Map();
   const usageEntries = [];
   const matchedUsageEntries = /* @__PURE__ */ new Set();
@@ -1931,7 +2196,6 @@ async function parseAgySessionFile(filePath, options) {
         })
       }), lineNumber, raw.type);
     } else if (raw.type === "PLANNER_RESPONSE") {
-      const content = stringField(raw, "content") || "";
       const usageMetadata = usageMap.get(raw.step_index);
       if (usageMetadata) {
         matchedUsageEntries.add(usageMetadata);
@@ -2143,27 +2407,27 @@ async function parseAgySessionFile(filePath, options) {
 function agyDataDirs(home, env) {
   const override = env?.ANTIGRAVITY_DATA_DIR || env?.AGY_DATA_DIR;
   if (override && override.trim()) {
-    return override.split(",").map((entry) => entry.trim()).filter(Boolean).map((entry) => path4.resolve(entry));
+    return override.split(",").map((entry) => entry.trim()).filter(Boolean).map((entry) => path5.resolve(entry));
   }
-  return [path4.join(home, ".gemini", "antigravity-cli", "brain")];
+  return [path5.join(home, ".gemini", "antigravity-cli", "brain")];
 }
 async function agyBackfillFiles(sourceRoot, home, env) {
-  const roots = sourceRoot ? [path4.resolve(sourceRoot)] : agyDataDirs(home, env);
+  const roots = sourceRoot ? [path5.resolve(sourceRoot)] : agyDataDirs(home, env);
   const fileLists = await Promise.all(roots.map((root) => listFilesByExtensions(root, [".jsonl"])));
   const files = fileLists.flat().filter((f) => f.endsWith("transcript.jsonl")).sort();
   return Promise.all(files.map(async (filePath) => {
-    const info = await stat2(filePath);
+    const info = await stat3(filePath);
     return { path: filePath, modifiedAt: info.mtime.toISOString() };
   }));
 }
-var agyHandler = (msg) => {
+function agyHandler(msg) {
   return {
     type: "command",
     command: "vibetime hook --agent agy",
     timeout: 10,
     statusMessage: msg
   };
-};
+}
 function hookConfig() {
   const anyTool = [{ matcher: "", hooks: [agyHandler("Reporting tool activity")] }];
   const lifecycle = (msg) => [{ matcher: "", hooks: [agyHandler(msg)] }];
@@ -2228,18 +2492,18 @@ function createAgyAdapter() {
       return agyDataDirs(home, env)[0];
     },
     installedPath(home, env) {
-      return path4.join(path4.dirname(agyDataDirs(home, env)[0]), "hooks.json");
+      return path5.join(path5.dirname(agyDataDirs(home, env)[0]), "hooks.json");
     },
     async isInstalled(home, env) {
-      const base = path4.dirname(agyDataDirs(home, env)[0]);
-      const settingsPath = path4.join(base, "settings.json");
-      const hooksPath = path4.join(base, "hooks.json");
+      const base = path5.dirname(agyDataDirs(home, env)[0]);
+      const settingsPath = path5.join(base, "settings.json");
+      const hooksPath = path5.join(base, "hooks.json");
       return await checkEnableJsonHooks(settingsPath) && await isAgyHooksInstalled(hooksPath, "vibetime hook --agent agy");
     },
     installEntries(home, env) {
-      const base = path4.dirname(agyDataDirs(home, env)[0]);
-      const settingsPath = path4.join(base, "settings.json");
-      const hooksPath = path4.join(base, "hooks.json");
+      const base = path5.dirname(agyDataDirs(home, env)[0]);
+      const settingsPath = path5.join(base, "settings.json");
+      const hooksPath = path5.join(base, "hooks.json");
       return [
         {
           kind: "hooks-json",
@@ -2261,12 +2525,12 @@ function createAgyAdapter() {
 }
 
 // src/adapters/claude-code.ts
-import { readdir as readdir2, readFile as readFile3, stat as stat3 } from "node:fs/promises";
+import { readdir as readdir2, readFile as readFile3, stat as stat4 } from "node:fs/promises";
 import os2 from "node:os";
-import path6 from "node:path";
+import path7 from "node:path";
 
 // src/lib/adapter-helpers.ts
-import path5 from "node:path";
+import path6 from "node:path";
 var TURN_IDLE_MS = 6e4;
 function isTurnIdle(lastEventAt) {
   if (!lastEventAt) {
@@ -2279,7 +2543,7 @@ function isTurnIdle(lastEventAt) {
   return Date.now() - lastMs > TURN_IDLE_MS;
 }
 function sessionIdFromFilePath(filePath, prefix) {
-  const match = path5.basename(filePath).match(/([0-9a-f]{8}-[0-9a-f-]{27,})/);
+  const match = path6.basename(filePath).match(/([0-9a-f]{8}-[0-9a-f-]{27,})/);
   return match?.[1] || `${prefix}_${createStableHash(filePath).slice(0, 24)}`;
 }
 function hookHandler(agentId, statusMessage) {
@@ -2343,7 +2607,7 @@ async function parseClaudeCodeSessionFile(filePath, options) {
     sessionId = stringField(raw, "sessionId") || sessionId;
     state.sessionId = sessionId;
     cwd = stringField(raw, "cwd") || cwd;
-    project = projectContext.project || (cwd ? path6.basename(cwd) : project || await claudeProjectFromFilePath(filePath, options));
+    project = projectContext.project || (cwd ? path7.basename(cwd) : project || await claudeProjectFromFilePath(filePath, options));
     if (!ts) {
       continue;
     }
@@ -2715,17 +2979,17 @@ function claudeTextStats(value) {
   };
 }
 async function claudeProjectContextFromLines(filePath, lines, options) {
-  const projectDir = path6.basename(path6.dirname(filePath));
+  const projectDir = path7.basename(path7.dirname(filePath));
   const cwds = [];
   for (const line of lines) {
     const raw = parseJsonLine(line);
     const cwd = raw ? stringField(raw, "cwd") : void 0;
-    if (cwd && path6.isAbsolute(cwd)) {
+    if (cwd && path7.isAbsolute(cwd)) {
       cwds.push(cwd);
     }
   }
   const root = await gitRootFromCwds(cwds) || claudeProjectRootFromCwds(projectDir, cwds);
-  const project = cwds.length > 0 ? path6.basename(cwds[0]) : root ? path6.basename(root) : await claudeProjectFromFilePath(filePath, options);
+  const project = cwds.length > 0 ? path7.basename(cwds[0]) : root ? path7.basename(root) : await claudeProjectFromFilePath(filePath, options);
   return {
     project,
     workspaceId: createWorkspaceId({ projectName: project, repoRoot: root })
@@ -2734,15 +2998,15 @@ async function claudeProjectContextFromLines(filePath, lines, options) {
 async function gitRootFromCwds(cwds) {
   const seen = /* @__PURE__ */ new Set();
   for (const cwd of cwds) {
-    let current = path6.resolve(cwd);
+    let current = path7.resolve(cwd);
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat3(path6.join(current, ".git"));
+        await stat4(path7.join(current, ".git"));
         return current;
       } catch {
       }
-      const parent = path6.dirname(current);
+      const parent = path7.dirname(current);
       if (parent === current) {
         break;
       }
@@ -2753,12 +3017,12 @@ async function gitRootFromCwds(cwds) {
 }
 function claudeProjectRootFromCwds(projectDir, cwds) {
   for (const cwd of cwds) {
-    let current = path6.resolve(cwd);
+    let current = path7.resolve(cwd);
     while (true) {
       if (encodeClaudeProjectPath(current) === projectDir) {
         return current;
       }
-      const parent = path6.dirname(current);
+      const parent = path7.dirname(current);
       if (parent === current) {
         break;
       }
@@ -2768,10 +3032,10 @@ function claudeProjectRootFromCwds(projectDir, cwds) {
   return void 0;
 }
 function encodeClaudeProjectPath(value) {
-  return path6.resolve(value).split(path6.sep).join("-").replace(/_/g, "-");
+  return path7.resolve(value).split(path7.sep).join("-").replace(/_/g, "-");
 }
 function rawClaudeProjectPath(value) {
-  return path6.resolve(value).split(path6.sep).join("-");
+  return path7.resolve(value).split(path7.sep).join("-");
 }
 function claudeEncodedVariants(value) {
   const raw = rawClaudeProjectPath(value);
@@ -2787,11 +3051,11 @@ function claudeEncodedProjectSuffix(projectDir, home) {
   return void 0;
 }
 async function claudeProjectFromFilePath(filePath, options) {
-  const projectDir = path6.basename(path6.dirname(filePath));
-  const home = options ? path6.resolve(stringOption(options.home) || os2.homedir()) : os2.homedir();
+  const projectDir = path7.basename(path7.dirname(filePath));
+  const home = options ? path7.resolve(stringOption(options.home) || os2.homedir()) : os2.homedir();
   const resolved = await resolveClaudeProjectPath(projectDir, home);
   if (resolved) {
-    return path6.basename(resolved);
+    return path7.basename(resolved);
   }
   const suffix = claudeEncodedProjectSuffix(projectDir, home);
   if (suffix) {
@@ -2817,7 +3081,7 @@ async function resolveClaudeProjectPath(projectDir, home) {
         if (!entry.isDirectory()) {
           continue;
         }
-        const candidate = path6.join(current, entry.name);
+        const candidate = path7.join(current, entry.name);
         const candidateVariants = claudeEncodedVariants(candidate);
         if (candidateVariants.includes(projectDir)) {
           return candidate;
@@ -2862,9 +3126,9 @@ function hookConfig2() {
 function claudeConfigDir(home, env) {
   const override = env?.CLAUDE_CONFIG_DIR;
   if (override && override.trim()) {
-    return path6.resolve(override);
+    return path7.resolve(override);
   }
-  return path6.join(home, ".claude");
+  return path7.join(home, ".claude");
 }
 function createClaudeCodeAdapter() {
   return {
@@ -2876,27 +3140,27 @@ function createClaudeCodeAdapter() {
       return claudeConfigDir(home, env);
     },
     installedPath(home, env) {
-      return path6.join(claudeConfigDir(home, env), "settings.json");
+      return path7.join(claudeConfigDir(home, env), "settings.json");
     },
     async isInstalled(home, env) {
       return isHooksJsonInstalled(
-        path6.join(claudeConfigDir(home, env), "settings.json"),
+        path7.join(claudeConfigDir(home, env), "settings.json"),
         "vibetime hook --agent claude"
       );
     },
     installEntries(home, env) {
       return [{
         kind: "hooks-json",
-        path: path6.join(claudeConfigDir(home, env), "settings.json"),
+        path: path7.join(claudeConfigDir(home, env), "settings.json"),
         content: hookConfig2()
       }];
     },
     sourcePaths(home, env) {
       const base = claudeConfigDir(home, env);
       return [
-        path6.join(base, "projects"),
-        path6.join(base, ".claude.json"),
-        path6.join(home, ".claude.json")
+        path7.join(base, "projects"),
+        path7.join(base, ".claude.json"),
+        path7.join(home, ".claude.json")
       ];
     },
     parseSessionFile: parseClaudeCodeSessionFile
@@ -2904,21 +3168,21 @@ function createClaudeCodeAdapter() {
 }
 
 // src/adapters/claude-cowork.ts
-import { readdir as readdir3, readFile as readFile4, stat as stat4 } from "node:fs/promises";
+import { readdir as readdir3, readFile as readFile4, stat as stat5 } from "node:fs/promises";
 import os3 from "node:os";
-import path7 from "node:path";
+import path8 from "node:path";
 init_fs();
 var COWORK_PREFIX = "cowork:";
 function coworkDataDirs(home, env) {
   const override = env?.COWORK_DIR || env?.CLAUDE_COWORK_DIR;
   if (override && override.trim()) {
-    return override.split(",").map((item) => item.trim()).filter(Boolean).map((item) => path7.resolve(item));
+    return override.split(",").map((item) => item.trim()).filter(Boolean).map((item) => path8.resolve(item));
   }
   return [
-    path7.join(home, "Library", "Application Support", "Claude", "local-agent-mode-sessions"),
-    path7.join(home, ".config", "Claude", "local-agent-mode-sessions"),
-    path7.join(home, "AppData", "Local", "Packages", "Claude_pzs8sxrjxfjjc", "LocalCache", "Roaming", "Claude", "local-agent-mode-sessions"),
-    path7.join(home, "AppData", "Roaming", "Claude", "local-agent-mode-sessions")
+    path8.join(home, "Library", "Application Support", "Claude", "local-agent-mode-sessions"),
+    path8.join(home, ".config", "Claude", "local-agent-mode-sessions"),
+    path8.join(home, "AppData", "Local", "Packages", "Claude_pzs8sxrjxfjjc", "LocalCache", "Roaming", "Claude", "local-agent-mode-sessions"),
+    path8.join(home, "AppData", "Roaming", "Claude", "local-agent-mode-sessions")
   ];
 }
 function isCoworkMetaFileName(name) {
@@ -2934,7 +3198,7 @@ async function readCoworkMeta(filePath) {
 }
 async function isRegularFile(filePath) {
   try {
-    return (await stat4(filePath)).isFile();
+    return (await stat5(filePath)).isFile();
   } catch {
     return false;
   }
@@ -2943,7 +3207,7 @@ async function resolveCoworkTranscript(sessionDir, cliSessionId) {
   if (!sessionDir || !cliSessionId) {
     return void 0;
   }
-  const projectsDir = path7.join(sessionDir, ".claude", "projects");
+  const projectsDir = path8.join(sessionDir, ".claude", "projects");
   let entries;
   try {
     entries = await readdir3(projectsDir, { withFileTypes: true });
@@ -2955,7 +3219,7 @@ async function resolveCoworkTranscript(sessionDir, cliSessionId) {
     if (!entry.isDirectory() && !entry.isSymbolicLink()) {
       continue;
     }
-    const candidate = path7.join(projectsDir, entry.name, target);
+    const candidate = path8.join(projectsDir, entry.name, target);
     if (await isRegularFile(candidate)) {
       return candidate;
     }
@@ -2963,7 +3227,7 @@ async function resolveCoworkTranscript(sessionDir, cliSessionId) {
   return void 0;
 }
 async function coworkSubagentTranscripts(mainTranscript, cliSessionId) {
-  const root = path7.join(path7.dirname(mainTranscript), cliSessionId, "subagents");
+  const root = path8.join(path8.dirname(mainTranscript), cliSessionId, "subagents");
   const out = [];
   async function walk(dir) {
     let entries;
@@ -2973,7 +3237,7 @@ async function coworkSubagentTranscripts(mainTranscript, cliSessionId) {
       return;
     }
     await Promise.all(entries.map(async (entry) => {
-      const entryPath = path7.join(dir, entry.name);
+      const entryPath = path8.join(dir, entry.name);
       if (entry.isDirectory()) {
         await walk(entryPath);
         return;
@@ -2996,7 +3260,7 @@ async function discoverCoworkTranscripts(root) {
       return;
     }
     await Promise.all(entries.map(async (entry) => {
-      const entryPath = path7.join(dir, entry.name);
+      const entryPath = path8.join(dir, entry.name);
       if (entry.isDirectory()) {
         if (entry.name.startsWith("local_") || entry.name === "skills-plugin" || entry.name === "node_modules" || entry.name === ".git") {
           return;
@@ -3026,7 +3290,7 @@ async function discoverCoworkTranscripts(root) {
   return transcripts.sort((a, b) => a.transcriptPath.localeCompare(b.transcriptPath));
 }
 function coworkMetaPathForTranscript(transcriptPath) {
-  const marker = `${path7.sep}.claude${path7.sep}projects${path7.sep}`;
+  const marker = `${path8.sep}.claude${path8.sep}projects${path8.sep}`;
   const index = transcriptPath.indexOf(marker);
   if (index < 0) {
     return void 0;
@@ -3041,9 +3305,9 @@ function projectFromMeta(meta) {
   if (!folder) {
     return { project: "cowork" };
   }
-  const resolved = path7.resolve(folder);
+  const resolved = path8.resolve(folder);
   return {
-    project: path7.basename(resolved).replace(/-/g, "_") || "cowork",
+    project: path8.basename(resolved).replace(/-/g, "_") || "cowork",
     cwd: resolved
   };
 }
@@ -3103,13 +3367,13 @@ async function parseClaudeCoworkSessionFile(filePath, options) {
   });
 }
 async function claudeCoworkBackfillFiles(sourceRoot, home, env) {
-  const roots = sourceRoot ? [path7.resolve(sourceRoot)] : coworkDataDirs(home, env);
+  const roots = sourceRoot ? [path8.resolve(sourceRoot)] : coworkDataDirs(home, env);
   const discovered = (await Promise.all(roots.map(discoverCoworkTranscripts))).flat();
   return Promise.all(discovered.map(async ({ transcriptPath, metadataPath }) => {
-    const transcriptInfo = await stat4(transcriptPath);
+    const transcriptInfo = await stat5(transcriptPath);
     let modifiedAt = transcriptInfo.mtime;
     try {
-      const metaInfo = await stat4(metadataPath);
+      const metaInfo = await stat5(metadataPath);
       if (metaInfo.mtime > modifiedAt) {
         modifiedAt = metaInfo.mtime;
       }
@@ -3125,7 +3389,7 @@ function createClaudeCoworkAdapter() {
     agentName: "claude-cowork",
     kind: "agent",
     detectPath(home, env) {
-      return coworkDataDirs(home, env)[0] || path7.join(os3.homedir(), "Library", "Application Support", "Claude", "local-agent-mode-sessions");
+      return coworkDataDirs(home, env)[0] || path8.join(os3.homedir(), "Library", "Application Support", "Claude", "local-agent-mode-sessions");
     },
     installedPath(home, env) {
       return this.detectPath(home, env);
@@ -3150,7 +3414,7 @@ function createClaudeCoworkAdapter() {
 
 // src/adapters/codebuddy.ts
 import { readFile as readFile5, readdir as readdir4 } from "node:fs/promises";
-import path8 from "node:path";
+import path9 from "node:path";
 var ENDPOINT_MODEL_ID_RE = /^(?:ep|endpoint)-/i;
 async function parseCodebuddyTraceFile(filePath, options) {
   const text = await readFile5(filePath, "utf8");
@@ -3177,7 +3441,7 @@ async function parseCodebuddyTraceFile(filePath, options) {
   if (!cwd && trace.startedAt) {
     cwd = await cwdFromHistoryFile(trace.startedAt, options);
   }
-  const project = cwd ? path8.basename(cwd) : void 0;
+  const project = cwd ? path9.basename(cwd) : void 0;
   const workspaceId = createWorkspaceId({ projectName: project, repoRoot: cwd });
   const model = resolveCodebuddyModel(trace, spans);
   const baseEvent = (event) => ({
@@ -3544,11 +3808,11 @@ function modelUsageFromTrace(trace, generationIndex, totalGenerations) {
   return { modelCalls: 1 };
 }
 function sessionIdFromTracePath(filePath) {
-  const match = path8.basename(filePath).match(/trace_([0-9a-f]{32})/);
+  const match = path9.basename(filePath).match(/trace_([0-9a-f]{32})/);
   return match?.[1] ? `codebuddy_${match[1]}` : `codebuddy_${createStableHash(filePath).slice(0, 24)}`;
 }
 function resolveHome(options) {
-  return options.home ? path8.resolve(String(options.home)) : process.env.HOME || __require("node:os").homedir();
+  return options.home ? path9.resolve(String(options.home)) : process.env.HOME || __require("node:os").homedir();
 }
 async function readCwdFromSession(sessionPath, matchSessionId) {
   try {
@@ -3569,9 +3833,9 @@ async function readCwdFromSession(sessionPath, matchSessionId) {
 }
 async function cwdFromSessionFile(pid, traceSessionId, options) {
   const home = resolveHome(options);
-  const sessionsDir = path8.join(home, ".codebuddy", "sessions");
+  const sessionsDir = path9.join(home, ".codebuddy", "sessions");
   if (pid) {
-    const cwd = await readCwdFromSession(path8.join(sessionsDir, `${pid}.json`));
+    const cwd = await readCwdFromSession(path9.join(sessionsDir, `${pid}.json`));
     if (cwd) {
       return cwd;
     }
@@ -3584,7 +3848,7 @@ async function cwdFromSessionFile(pid, traceSessionId, options) {
           continue;
         }
         const cwd = await readCwdFromSession(
-          path8.join(sessionsDir, f),
+          path9.join(sessionsDir, f),
           traceSessionId
         );
         if (cwd) {
@@ -3598,7 +3862,7 @@ async function cwdFromSessionFile(pid, traceSessionId, options) {
 }
 async function cwdFromHistoryFile(traceStartedAt, options) {
   const home = resolveHome(options);
-  const historyPath = path8.join(home, ".codebuddy", "history.jsonl");
+  const historyPath = path9.join(home, ".codebuddy", "history.jsonl");
   const traceMs = Date.parse(traceStartedAt);
   if (Number.isNaN(traceMs)) {
     return void 0;
@@ -3660,9 +3924,9 @@ function hookConfig3() {
 function codebuddyConfigDir(home, env) {
   const override = env?.CODEBUDDY_CONFIG_DIR;
   if (override && override.trim()) {
-    return path8.resolve(override);
+    return path9.resolve(override);
   }
-  return path8.join(home, ".codebuddy");
+  return path9.join(home, ".codebuddy");
 }
 function createCodebuddyAdapter() {
   return {
@@ -3674,32 +3938,32 @@ function createCodebuddyAdapter() {
       return codebuddyConfigDir(home, env);
     },
     installedPath(home, env) {
-      return path8.join(codebuddyConfigDir(home, env), "settings.json");
+      return path9.join(codebuddyConfigDir(home, env), "settings.json");
     },
     async isInstalled(home, env) {
       return isHooksJsonInstalled(
-        path8.join(codebuddyConfigDir(home, env), "settings.json"),
+        path9.join(codebuddyConfigDir(home, env), "settings.json"),
         "vibetime hook --agent codebuddy"
       );
     },
     installEntries(home, env) {
       return [{
         kind: "hooks-json",
-        path: path8.join(codebuddyConfigDir(home, env), "settings.json"),
+        path: path9.join(codebuddyConfigDir(home, env), "settings.json"),
         content: hookConfig3()
       }];
     },
     sourcePaths(home, env) {
       const base = codebuddyConfigDir(home, env);
       return [
-        path8.join(base, "traces")
+        path9.join(base, "traces")
       ];
     },
     parseSessionFile: parseCodebuddyTraceFile
   };
 }
 async function codebuddyBackfillFiles(sourceRoot, home, env) {
-  const base = sourceRoot || path8.join(codebuddyConfigDir(home, env), "traces");
+  const base = sourceRoot || path9.join(codebuddyConfigDir(home, env), "traces");
   const files = [];
   try {
     const pidDirs = await readdir4(base, { withFileTypes: true });
@@ -3707,17 +3971,17 @@ async function codebuddyBackfillFiles(sourceRoot, home, env) {
       if (!pidDir.isDirectory()) {
         continue;
       }
-      const traceDir = path8.join(base, pidDir.name);
+      const traceDir = path9.join(base, pidDir.name);
       try {
         const entries = await readdir4(traceDir);
         for (const entry of entries) {
           if (!entry.endsWith(".json") || !entry.startsWith("trace_")) {
             continue;
           }
-          const filePath = path8.join(traceDir, entry);
+          const filePath = path9.join(traceDir, entry);
           try {
-            const stat12 = await import("node:fs/promises").then((fs) => fs.stat(filePath));
-            files.push({ path: filePath, modifiedAt: stat12.mtime.toISOString() });
+            const stat13 = await import("node:fs/promises").then((fs) => fs.stat(filePath));
+            files.push({ path: filePath, modifiedAt: stat13.mtime.toISOString() });
           } catch {
           }
         }
@@ -3731,7 +3995,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 path11 from "node:path";
 
 // src/lib/diff.ts
 function diffStats(diff) {
@@ -3776,6 +4040,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 path10 from "node:path";
+var SESSION_CONTEXT_VERSION = 1;
+function sessionContextDir(home) {
+  return path10.join(home, ".vibetime", "session-context");
+}
+function sessionContextPath(home, sessionId) {
+  return path10.join(sessionContextDir(home), `${encodeURIComponent(sessionId)}.json`);
+}
+function resolveHome2(options) {
+  return options ? path10.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 || !path10.isAbsolute(cwd)) {
+    return;
+  }
+  const project = path10.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 +4129,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 ? path11.basename(cwd) : project);
       model = stringField(payload, "model_provider") || model;
       events.push(withBackfillRefs({
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
@@ -3833,7 +4154,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 ? path11.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 +4601,11 @@ function functionCallArguments(payload) {
   }
 }
 function displayFilePath2(filePath, cwd) {
-  if (!cwd || !path9.isAbsolute(filePath)) {
+  if (!cwd || !path11.isAbsolute(filePath)) {
     return filePath;
   }
-  const relative = path9.relative(cwd, filePath);
-  return relative && !relative.startsWith("..") && !path9.isAbsolute(relative) ? relative : filePath;
+  const relative = path11.relative(cwd, filePath);
+  return relative && !relative.startsWith("..") && !path11.isAbsolute(relative) ? relative : filePath;
 }
 var codexHandler = (msg) => hookHandler("codex", msg);
 function hookConfig4() {
@@ -4303,9 +4624,9 @@ function hookConfig4() {
 function codexHome(home, env) {
   const override = env?.CODEX_HOME;
   if (override && override.trim()) {
-    return path9.resolve(override);
+    return path11.resolve(override);
   }
-  return path9.join(home, ".codex");
+  return path11.join(home, ".codex");
 }
 function createCodexAdapter() {
   return {
@@ -4317,26 +4638,26 @@ function createCodexAdapter() {
       return codexHome(home, env);
     },
     installedPath(home, env) {
-      return path9.join(codexHome(home, env), "hooks.json");
+      return path11.join(codexHome(home, env), "hooks.json");
     },
     async isInstalled(home, env) {
       return isHooksJsonInstalled(
-        path9.join(codexHome(home, env), "hooks.json"),
+        path11.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: path11.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")
+        path11.join(base, "sessions"),
+        path11.join(base, "history.jsonl")
       ];
     },
     parseSessionFile: parseCodexSessionFile
@@ -4344,9 +4665,9 @@ 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 { readdir as readdir5, readFile as readFile7, stat as stat6 } from "node:fs/promises";
+import os5 from "node:os";
+import path12 from "node:path";
 async function parseCopilotSessionFile(filePath, options) {
   const text = await readFile7(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
@@ -4382,7 +4703,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 ? path12.basename(cwd) : void 0);
         sessionStartedAt = ts;
         events.push(baseCopilotEvent({
           ts,
@@ -4613,8 +4934,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 || path12.join(home, ".copilot", "session-state");
   const results = [];
   let entries;
   try {
@@ -4626,8 +4947,8 @@ async function copilotBackfillFiles(sourceRoot, home = os4.homedir(), _env) {
     if (entry.startsWith("pending-session")) {
       continue;
     }
-    const eventsPath = path10.join(sessionDir, entry, "events.jsonl");
-    const info = await stat5(eventsPath).catch(() => null);
+    const eventsPath = path12.join(sessionDir, entry, "events.jsonl");
+    const info = await stat6(eventsPath).catch(() => null);
     if (info) {
       results.push({ path: eventsPath, modifiedAt: info.mtime.toISOString() });
     }
@@ -4644,9 +4965,9 @@ function copilotPluginContent() {
 function copilotHome(home, env) {
   const override = env?.COPILOT_HOME;
   if (override && override.trim()) {
-    return path10.resolve(override);
+    return path12.resolve(override);
   }
-  return path10.join(home, ".copilot");
+  return path12.join(home, ".copilot");
 }
 function createCopilotAdapter() {
   return {
@@ -4658,12 +4979,12 @@ function createCopilotAdapter() {
       return copilotHome(home, env);
     },
     installedPath(home, env) {
-      return path10.join(copilotHome(home, env), ".vibetime");
+      return path12.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(path12.join(copilotHome(home, env), ".vibetime"));
       } catch {
         return false;
       }
@@ -4671,20 +4992,20 @@ function createCopilotAdapter() {
     installEntries(home, env) {
       return [{
         kind: "file",
-        path: path10.join(copilotHome(home, env), ".vibetime"),
+        path: path12.join(copilotHome(home, env), ".vibetime"),
         content: copilotPluginContent()
       }];
     },
     sourcePaths(home, env) {
-      return [path10.join(copilotHome(home, env), "session-state")];
+      return [path12.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 path13 from "node:path";
 async function parseOpenCodeSessionFile(dbPath, options) {
   const { DatabaseSync } = await import("node:sqlite");
   if (!dbPath.endsWith(".db")) {
@@ -4715,7 +5036,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 ? path13.basename(cwd) : void 0;
       const sessionTs = msToIso(session.time_created);
       events.push(baseOpenCodeEvent({
         ts: sessionTs,
@@ -4823,7 +5144,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 ? path13.basename(assistantCwd) : project;
           const completedTs = numberField(objectField(info, "time"), "completed");
           const createdTs = timeCreated;
           const tokens = opencodeUsageFromInfo(info);
@@ -5069,33 +5390,33 @@ function opencodeUsageFromInfo(info) {
 function opencodeConfigDir(home, env) {
   const override = env?.OPENCODE_CONFIG_DIR;
   if (override && override.trim()) {
-    return path11.resolve(override);
+    return path13.resolve(override);
   }
   const xdgConfig = env?.XDG_CONFIG_HOME;
   if (xdgConfig && xdgConfig.trim()) {
-    return path11.join(path11.resolve(xdgConfig), "opencode");
+    return path13.join(path13.resolve(xdgConfig), "opencode");
   }
-  return path11.join(home, ".config", "opencode");
+  return path13.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() ? path13.join(path13.resolve(xdgData), "opencode", "opencode.db") : path13.join(home, ".local", "share", "opencode", "opencode.db");
+  return [primary, path13.join(home, ".opencode", "opencode.db")];
 }
-async function opencodeBackfillFiles(sourceRoot, home = os5.homedir(), env) {
-  const { stat: stat12 } = await import("node:fs/promises");
+async function opencodeBackfillFiles(sourceRoot, home = os6.homedir(), env) {
+  const { stat: stat13 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
       return [];
     }
-    const info = await stat12(sourceRoot).catch(() => null);
+    const info = await stat13(sourceRoot).catch(() => null);
     if (!info) {
       return [];
     }
     return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
   }
   for (const candidatePath of opencodeDataCandidates(home, env)) {
-    const info = await stat12(candidatePath).catch(() => null);
+    const info = await stat13(candidatePath).catch(() => null);
     if (info) {
       return [{ path: candidatePath, modifiedAt: info.mtime.toISOString() }];
     }
@@ -5170,12 +5491,12 @@ function createOpenCodeAdapter() {
       return opencodeConfigDir(home, env);
     },
     installedPath(home, env) {
-      return path11.join(opencodeConfigDir(home, env), PLUGIN_PATH);
+      return path13.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(path13.join(opencodeConfigDir(home, env), PLUGIN_PATH)) || await pathExists2(path13.join(".opencode", PLUGIN_PATH));
       } catch {
         return false;
       }
@@ -5183,7 +5504,7 @@ function createOpenCodeAdapter() {
     installEntries(home, env) {
       return [{
         kind: "file",
-        path: path11.join(opencodeConfigDir(home, env), PLUGIN_PATH),
+        path: path13.join(opencodeConfigDir(home, env), PLUGIN_PATH),
         content: opencodePluginContent()
       }];
     },
@@ -5196,7 +5517,7 @@ function createOpenCodeAdapter() {
 
 // src/adapters/pi.ts
 import { readFile as readFile8 } from "node:fs/promises";
-import path12 from "node:path";
+import path14 from "node:path";
 async function parsePiSessionFile(filePath, options) {
   const text = await readFile8(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
@@ -5229,7 +5550,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 ? path14.basename(cwd) : project;
       continue;
     }
     if (entryType === "model_change") {
@@ -5638,16 +5959,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 path14.resolve(override);
   }
-  return path12.join(home, ".pi", "agent");
+  return path14.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 path14.resolve(override);
   }
-  return path12.join(piAgentDir(home, env), "sessions");
+  return path14.join(piAgentDir(home, env), "sessions");
 }
 function createPiAdapter() {
   return {
@@ -5659,12 +5980,12 @@ function createPiAdapter() {
       return piAgentDir(home, env);
     },
     installedPath(home, env) {
-      return path12.join(piAgentDir(home, env), "extensions", "vibetime.ts");
+      return path14.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(path14.join(piAgentDir(home, env), "extensions", "vibetime.ts"));
       } catch {
         return false;
       }
@@ -5672,7 +5993,7 @@ function createPiAdapter() {
     installEntries(home, env) {
       return [{
         kind: "file",
-        path: path12.join(piAgentDir(home, env), "extensions", "vibetime.ts"),
+        path: path14.join(piAgentDir(home, env), "extensions", "vibetime.ts"),
         content: piExtensionContent()
       }];
     },
@@ -5684,11 +6005,11 @@ 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 { readdir as readdir6, readFile as readFile9, stat as stat7 } from "node:fs/promises";
+import os7 from "node:os";
+import path15 from "node:path";
 function parseQoderCnPaths(filePath) {
-  const parts = filePath.split(path13.sep);
+  const parts = filePath.split(path15.sep);
   const subagentsIdx = parts.lastIndexOf("subagents");
   let sessionId = "";
   let projectName = "";
@@ -5697,19 +6018,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(path15.sep);
   } else {
     const filename = parts.at(-1) || "";
-    sessionId = path13.basename(filename, ".jsonl");
+    sessionId = path15.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(path15.sep);
   }
   return { configDir: configDir2, projectName, sessionId };
 }
 async function loadQoderCnModelNames(configDir2) {
   try {
-    const dynamicTextsPath = path13.join(configDir2, ".auth", "dynamic-texts.json");
+    const dynamicTextsPath = path15.join(configDir2, ".auth", "dynamic-texts.json");
     const content = await readFile9(dynamicTextsPath, "utf8");
     const json = JSON.parse(content);
     const texts = json.texts || {};
@@ -5727,7 +6048,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 = path15.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
   const modelCalls = [];
   try {
     const files = await readdir6(segmentsPath);
@@ -5735,7 +6056,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(path15.join(segmentsPath, file), "utf8");
       let currentTurnIsSubagent = false;
       for (const line of content.split("\n").filter(Boolean)) {
         const raw = parseJsonLine(line);
@@ -5803,7 +6124,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 ? path15.basename(cwd) : project || await qoderCnProjectFromFilePath(filePath, options));
     if (!ts) {
       continue;
     }
@@ -6232,35 +6553,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(`${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 && path13.isAbsolute(cwd)) {
+    if (cwd && path15.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 && path15.isAbsolute(inherited.cwd)) {
+      cwds = [inherited.cwd];
+    } else {
+      const parentSessionPath = path15.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 && path15.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 ? path15.basename(cwds[0]) : root ? path15.basename(root) : await qoderCnProjectFromFilePath(filePath, options));
   return {
     project,
     workspaceId: createWorkspaceId({ projectName: project, repoRoot: root })
@@ -6269,15 +6595,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 = path15.resolve(cwd);
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat6(path13.join(current, ".git"));
+        await stat7(path15.join(current, ".git"));
         return current;
       } catch {
       }
-      const parent = path13.dirname(current);
+      const parent = path15.dirname(current);
       if (parent === current) {
         break;
       }
@@ -6288,12 +6614,12 @@ async function gitRootFromCwds2(cwds) {
 }
 function qoderCnProjectRootFromCwds(projectDir, cwds) {
   for (const cwd of cwds) {
-    let current = path13.resolve(cwd);
+    let current = path15.resolve(cwd);
     while (true) {
       if (encodeQoderCnProjectPath(current) === projectDir) {
         return current;
       }
-      const parent = path13.dirname(current);
+      const parent = path15.dirname(current);
       if (parent === current) {
         break;
       }
@@ -6303,14 +6629,14 @@ function qoderCnProjectRootFromCwds(projectDir, cwds) {
   return void 0;
 }
 function encodeQoderCnProjectPath(value) {
-  return path13.resolve(value).split(path13.sep).join("-").replace(/_/g, "-");
+  return path15.resolve(value).split(path15.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 = path15.basename(path15.dirname(filePath));
+  const home = options ? path15.resolve(stringOption(options.home) || os7.homedir()) : os7.homedir();
   const resolved = await resolveQoderCnProjectPath(projectDir, home);
   if (resolved) {
-    return path13.basename(resolved);
+    return path15.basename(resolved);
   }
   const homePrefix = `${encodeQoderCnProjectPath(home)}-`;
   if (projectDir.startsWith(homePrefix)) {
@@ -6335,7 +6661,7 @@ async function resolveQoderCnProjectPath(projectDir, home) {
         if (!entry.isDirectory()) {
           continue;
         }
-        const candidate = path13.join(current, entry.name);
+        const candidate = path15.join(current, entry.name);
         const encoded = encodeQoderCnProjectPath(candidate);
         if (encoded === projectDir) {
           return candidate;
@@ -6380,9 +6706,9 @@ function hookConfig5() {
 function qoderCnConfigDir(home, env) {
   const override = env?.QODER_CN_CONFIG_DIR;
   if (override && override.trim()) {
-    return path13.resolve(override);
+    return path15.resolve(override);
   }
-  return path13.join(home, ".qoder-cn");
+  return path15.join(home, ".qoder-cn");
 }
 function createQoderCnAdapter() {
   return {
@@ -6394,27 +6720,27 @@ function createQoderCnAdapter() {
       return qoderCnConfigDir(home, env);
     },
     installedPath(home, env) {
-      return path13.join(qoderCnConfigDir(home, env), "settings.json");
+      return path15.join(qoderCnConfigDir(home, env), "settings.json");
     },
     async isInstalled(home, env) {
       return isHooksJsonInstalled(
-        path13.join(qoderCnConfigDir(home, env), "settings.json"),
+        path15.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: path15.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")
+        path15.join(base, "projects"),
+        path15.join(base, ".qoder.json"),
+        path15.join(home, ".qoder.json")
       ];
     },
     parseSessionFile: parseQoderCnSessionFile
@@ -6422,11 +6748,11 @@ 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 { readdir as readdir7, readFile as readFile10, stat as stat8 } from "node:fs/promises";
+import os8 from "node:os";
+import path16 from "node:path";
 function parseQoderPaths(filePath) {
-  const parts = filePath.split(path14.sep);
+  const parts = filePath.split(path16.sep);
   const subagentsIdx = parts.lastIndexOf("subagents");
   let sessionId = "";
   let projectName = "";
@@ -6435,19 +6761,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(path16.sep);
   } else {
     const filename = parts.at(-1) || "";
-    sessionId = path14.basename(filename, ".jsonl");
+    sessionId = path16.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(path16.sep);
   }
   return { configDir: configDir2, projectName, sessionId };
 }
 async function loadQoderModelNames(configDir2) {
   try {
-    const dynamicTextsPath = path14.join(configDir2, ".auth", "dynamic-texts.json");
+    const dynamicTextsPath = path16.join(configDir2, ".auth", "dynamic-texts.json");
     const content = await readFile10(dynamicTextsPath, "utf8");
     const json = JSON.parse(content);
     const texts = json.texts || {};
@@ -6465,7 +6791,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 = path16.join(configDir2, "logs", "sessions", projectName, sessionId, "segments");
   const modelCalls = [];
   try {
     const files = await readdir7(segmentsPath);
@@ -6473,7 +6799,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(path16.join(segmentsPath, file), "utf8");
       let currentTurnIsSubagent = false;
       for (const line of content.split("\n").filter(Boolean)) {
         const raw = parseJsonLine(line);
@@ -6541,7 +6867,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 ? path16.basename(cwd) : project || await qoderProjectFromFilePath(filePath, options));
     if (!ts) {
       continue;
     }
@@ -6936,35 +7262,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(`${path16.sep}subagents${path16.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 && path16.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 && path16.isAbsolute(inherited.cwd)) {
+      cwds = [inherited.cwd];
+    } else {
+      const parentSessionPath = path16.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 && path16.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 ? path16.basename(cwds[0]) : root ? path16.basename(root) : await qoderProjectFromFilePath(filePath, options));
   return {
     project,
     workspaceId: createWorkspaceId({ projectName: project, repoRoot: root })
@@ -6973,15 +7304,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 = path16.resolve(cwd);
     while (!seen.has(current)) {
       seen.add(current);
       try {
-        await stat7(path14.join(current, ".git"));
+        await stat8(path16.join(current, ".git"));
         return current;
       } catch {
       }
-      const parent = path14.dirname(current);
+      const parent = path16.dirname(current);
       if (parent === current) {
         break;
       }
@@ -6992,12 +7323,12 @@ async function gitRootFromCwds3(cwds) {
 }
 function qoderProjectRootFromCwds(projectDir, cwds) {
   for (const cwd of cwds) {
-    let current = path14.resolve(cwd);
+    let current = path16.resolve(cwd);
     while (true) {
       if (encodeQoderProjectPath(current) === projectDir) {
         return current;
       }
-      const parent = path14.dirname(current);
+      const parent = path16.dirname(current);
       if (parent === current) {
         break;
       }
@@ -7007,10 +7338,10 @@ function qoderProjectRootFromCwds(projectDir, cwds) {
   return void 0;
 }
 function encodeQoderProjectPath(value) {
-  return path14.resolve(value).split(path14.sep).join("-").replace(/_/g, "-");
+  return path16.resolve(value).split(path16.sep).join("-").replace(/_/g, "-");
 }
 function rawQoderProjectPath(value) {
-  return path14.resolve(value).split(path14.sep).join("-");
+  return path16.resolve(value).split(path16.sep).join("-");
 }
 function qoderEncodedVariants(value) {
   const raw = rawQoderProjectPath(value);
@@ -7026,11 +7357,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 = path16.basename(path16.dirname(filePath));
+  const home = options ? path16.resolve(stringOption(options.home) || os8.homedir()) : os8.homedir();
   const resolved = await resolveQoderProjectPath(projectDir, home);
   if (resolved) {
-    return path14.basename(resolved);
+    return path16.basename(resolved);
   }
   const suffix = qoderEncodedProjectSuffix(projectDir, home);
   if (suffix) {
@@ -7056,7 +7387,7 @@ async function resolveQoderProjectPath(projectDir, home) {
         if (!entry.isDirectory()) {
           continue;
         }
-        const candidate = path14.join(current, entry.name);
+        const candidate = path16.join(current, entry.name);
         const candidateVariants = qoderEncodedVariants(candidate);
         if (candidateVariants.includes(projectDir)) {
           return candidate;
@@ -7101,9 +7432,9 @@ function hookConfig6() {
 function qoderConfigDir(home, env) {
   const override = env?.QODER_CONFIG_DIR;
   if (override && override.trim()) {
-    return path14.resolve(override);
+    return path16.resolve(override);
   }
-  return path14.join(home, ".qoder");
+  return path16.join(home, ".qoder");
 }
 function createQoderAdapter() {
   return {
@@ -7115,27 +7446,27 @@ function createQoderAdapter() {
       return qoderConfigDir(home, env);
     },
     installedPath(home, env) {
-      return path14.join(qoderConfigDir(home, env), "settings.json");
+      return path16.join(qoderConfigDir(home, env), "settings.json");
     },
     async isInstalled(home, env) {
       return isHooksJsonInstalled(
-        path14.join(qoderConfigDir(home, env), "settings.json"),
+        path16.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: path16.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")
+        path16.join(base, "projects"),
+        path16.join(base, ".qoder.json"),
+        path16.join(home, ".qoder.json")
       ];
     },
     parseSessionFile: parseQoderSessionFile
@@ -7170,21 +7501,21 @@ 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 { readFile as readFile11, readdir as readdir8, stat as stat9 } from "node:fs/promises";
+import path17 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 path17.resolve(override, override.endsWith("projects") ? "" : "projects");
   }
-  return path15.join(home, ".workbuddy", "projects");
+  return path17.join(home, ".workbuddy", "projects");
 }
 function projectFromCwd(cwd, fallback) {
   if (!cwd) {
     return fallback;
   }
-  return path15.basename(cwd) || fallback;
+  return path17.basename(cwd) || fallback;
 }
 function sourceHash(filePath) {
   return `sha256:${createStableHash(filePath)}`;
@@ -7286,8 +7617,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") || path17.basename(filePath, ".jsonl");
+  const fallbackProject = path17.basename(path17.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,12 +7792,12 @@ async function workbuddyBackfillFiles(sourceRoot, home, env) {
       if (!project.isDirectory()) {
         continue;
       }
-      const projectDir = path15.join(base, project.name);
+      const projectDir = path17.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 info = await stat8(filePath);
+          const filePath = path17.join(projectDir, entry.name);
+          const info = await stat9(filePath);
           files.push({ path: filePath, modifiedAt: info.mtime.toISOString() });
         }
       }
@@ -7503,26 +7834,26 @@ 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 { readFile as readFile12, stat as stat10 } from "node:fs/promises";
+import path18 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 path18.resolve(override, override.endsWith("cli") ? "" : "cli");
   }
-  return path16.join(home, ".zcode", "cli");
+  return path18.join(home, ".zcode", "cli");
 }
 function zcodeDbPath(home, env) {
-  return path16.join(zcodeCliDir(home, env), "db", "db.sqlite");
+  return path18.join(zcodeCliDir(home, env), "db", "db.sqlite");
 }
 var providerNameCache = null;
 async function loadProviderNames(configPath2) {
   let fileMtime = 0;
   try {
-    const info = await stat9(configPath2);
+    const info = await stat10(configPath2);
     fileMtime = info.mtimeMs;
   } catch {
     return /* @__PURE__ */ new Map();
@@ -7550,7 +7881,7 @@ function sourceHash2(filePath) {
   return `sha256:${createStableHash(filePath)}`;
 }
 function projectFromDirectory(directory) {
-  return directory ? path16.basename(directory) || "zcode" : "zcode";
+  return directory ? path18.basename(directory) || "zcode" : "zcode";
 }
 function isoFromMs(value) {
   return timestampFrom(typeof value === "number" ? value : Number(value));
@@ -7706,16 +8037,16 @@ async function parseZCodeDb(filePath, options) {
   if (rows.length === 0) {
     return [];
   }
-  let candidate = path16.resolve(filePath);
+  let candidate = path18.resolve(filePath);
   let configPath2 = "";
   for (let i = 0; i < 12; i++) {
-    const probe = path16.join(candidate, ".zcode", "v2", "config.json");
+    const probe = path18.join(candidate, ".zcode", "v2", "config.json");
     try {
-      await stat9(probe);
+      await stat10(probe);
       configPath2 = probe;
       break;
     } catch {
-      const parent = path16.dirname(candidate);
+      const parent = path18.dirname(candidate);
       if (parent === candidate) break;
       candidate = parent;
     }
@@ -7931,9 +8262,9 @@ 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 : path18.join(candidate, "db", "db.sqlite");
   try {
-    const info = await stat9(filePath);
+    const info = await stat10(filePath);
     return [{ path: filePath, modifiedAt: info.mtime.toISOString() }];
   } catch {
     return [];
@@ -8305,7 +8636,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 +8657,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 +8736,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 path19 from "node:path";
 function configDir(home = homedir()) {
-  return path17.join(home, ".vibetime");
+  return path19.join(home, ".vibetime");
 }
 function configPath(home = homedir()) {
-  return path17.join(configDir(home), "config.json");
+  return path19.join(configDir(home), "config.json");
 }
 function machineIdPath(home = homedir()) {
-  return path17.join(configDir(home), "machine-id");
+  return path19.join(configDir(home), "machine-id");
 }
 function readConfig(home = homedir()) {
   const file = configPath(home);
@@ -8460,15 +8791,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 stat11 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import path18 from "node:path";
+import path20 from "node:path";
 var MAX_BYTES = 1 * 1024 * 1024;
 function logDir(home = homedir2()) {
-  return path18.join(home, ".vibetime", "logs");
+  return path20.join(home, ".vibetime", "logs");
 }
 function logPath(home = homedir2(), name = "cli.log") {
-  return path18.join(logDir(home), name);
+  return path20.join(logDir(home), name);
 }
 function serializeError(error) {
   if (error instanceof Error) {
@@ -8478,7 +8809,7 @@ function serializeError(error) {
 }
 async function rotateIfNeeded(file) {
   try {
-    const info = await stat10(file);
+    const info = await stat11(file);
     if (info.size > MAX_BYTES) {
       await rename(file, `${file}.1`).catch(() => {
       });
@@ -8489,7 +8820,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 +8974,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, path22) {
+  return new URL(path22, base.endsWith("/") ? base : `${base}/`).toString();
 }
 async function postRollupBatch(remote, rollups, options = {}) {
   const response = await remote.fetchImpl(joinUrl(remote.baseUrl, "/v3/agent/ingest"), {
@@ -8709,7 +9040,7 @@ async function deleteMachine(remote, id) {
 }
 
 // src/lib/types.ts
-var BACKFILL_STATE_SCHEMA_VERSION = 5;
+var BACKFILL_STATE_SCHEMA_VERSION = 6;
 
 // src/cli.ts
 function createRegistry() {
@@ -8734,7 +9065,7 @@ var defaultContext = {
   stdout: process.stdout,
   stderr: process.stderr,
   fetch: globalThis.fetch,
-  spawn
+  spawn: spawn2
 };
 async function run(argv, context = {}) {
   const ctx = { ...defaultContext, ...context };
@@ -8816,7 +9147,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 +9176,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);
@@ -8885,7 +9216,9 @@ async function fetchLatestVersion() {
       headers: { Accept: "application/json" },
       signal: AbortSignal.timeout(1e4)
     });
-    if (!response.ok) return null;
+    if (!response.ok) {
+      return null;
+    }
     const data = await response.json();
     return typeof data.version === "string" ? data.version : null;
   } catch {
@@ -8898,8 +9231,12 @@ function compareVersions(a, b) {
   for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
     const na = pa[i] ?? 0;
     const nb = pb[i] ?? 0;
-    if (na > nb) return 1;
-    if (na < nb) return -1;
+    if (na > nb) {
+      return 1;
+    }
+    if (na < nb) {
+      return -1;
+    }
   }
   return 0;
 }
@@ -8943,7 +9280,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 +9293,7 @@ async function hookCommand(options, ctx) {
 `);
       return 0;
     }
+    await persistHookSessionContext(home, payload);
     return await syncLocalTriggerCommand({
       ...options,
       agent,
@@ -8969,7 +9307,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));
@@ -9001,18 +9339,38 @@ async function syncLocalTriggerCommand(options, ctx, _registry) {
 `);
     return 0;
   }
-  const child = spawnSyncLocalRunner({ options, ctx, home, lockPath, statePath, triggeredAt: now });
-  if (typeof child.pid !== "number") {
-    throw new TypeError("Could not start background sync-local runner");
+  const acquired = await acquireSyncLocalLock(lockPath, {
+    pid: process.pid,
+    startedAt: now
+  });
+  if (!acquired) {
+    const current = await readSyncLocalLock(lockPath);
+    if (options.json) {
+      write(ctx.stdout, `${JSON.stringify({
+        status: "already-running",
+        ...current ? { pid: current.pid, startedAt: current.startedAt } : {}
+      }, null, 2)}
+`);
+    }
+    return 0;
+  }
+  try {
+    const child = spawnSyncLocalRunner({ options, ctx, home, lockPath, statePath, triggeredAt: now });
+    if (typeof child.pid !== "number") {
+      throw new TypeError("Could not start background sync-local runner");
+    }
+    state.lastTriggeredAt = now;
+    state.pid = child.pid;
+    await writeSyncLocalTriggerState(statePath, state);
+    await writeSyncLocalLock(lockPath, { pid: child.pid, startedAt: now });
+    return 0;
+  } catch (error) {
+    await clearSyncLocalLock(lockPath);
+    throw error;
   }
-  state.lastTriggeredAt = now;
-  state.pid = child.pid;
-  await writeSyncLocalTriggerState(statePath, state);
-  await writeSyncLocalLock(lockPath, { pid: child.pid, startedAt: now });
-  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 +9430,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 +9499,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,31 +9549,31 @@ 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)));
   const files = fileLists.flat().sort().slice(0, numberOption(options.limit) || void 0);
   return Promise.all(files.map(async (filePath) => {
-    const info = await stat11(filePath);
+    const info = await stat12(filePath);
     return { path: filePath, modifiedAt: info.mtime.toISOString() };
   }));
 }
@@ -9292,7 +9650,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 +9719,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 +9823,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 +9842,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 +9886,13 @@ function selectBackfillFilesForImport(files, watermarkTs) {
   });
 }
 function backfillIncrementalStatePath(home) {
-  return path19.join(home, ".vibetime", "backfill-state.json");
+  return path21.join(home, ".vibetime", "backfill-state.json");
 }
 function syncLocalTriggerStatePath(home) {
-  return path19.join(home, ".vibetime", "sync-local-trigger.json");
+  return path21.join(home, ".vibetime", "sync-local-trigger.json");
 }
 function syncLocalTriggerLockPath(home) {
-  return path19.join(home, ".vibetime", "sync-local-trigger.lock");
+  return path21.join(home, ".vibetime", "sync-local-trigger.lock");
 }
 function backfillRemoteKey(baseUrl) {
   try {
@@ -9596,8 +9954,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(path21.dirname(statePath), { recursive: true });
+  await writeFile4(statePath, `${JSON.stringify(file, null, 2)}
 `, "utf8");
 }
 async function readBackfillIncrementalState(home, remoteKey, ctx) {
@@ -9645,9 +10003,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(path21.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,10 +10020,28 @@ 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(path21.dirname(lockPath), { recursive: true });
+  await writeFile4(lockPath, `${JSON.stringify(lock, null, 2)}
 `, "utf8");
 }
+async function acquireSyncLocalLock(lockPath, lock) {
+  await mkdir5(path21.dirname(lockPath), { recursive: true });
+  try {
+    const handle = await open(lockPath, "wx");
+    try {
+      await handle.writeFile(`${JSON.stringify(lock, null, 2)}
+`, "utf8");
+    } finally {
+      await handle.close();
+    }
+    return true;
+  } catch (error) {
+    if (error.code === "EEXIST") {
+      return false;
+    }
+    throw error;
+  }
+}
 async function clearSyncLocalLock(lockPath) {
   try {
     await rm(lockPath, { force: true });
@@ -9701,12 +10077,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 +10105,10 @@ function syncLocalRunnerEntryArgs(cliPath) {
   if (cliPath.endsWith(".ts")) {
     return ["--import", "tsx", cliPath];
   }
-  return [path19.resolve(path19.dirname(cliPath), "../bin/vibetime.mjs")];
+  return [path21.resolve(path21.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 path21.resolve(stringOption(options.home) || ctx.env.HOME || os9.homedir());
 }
 function requestedTargets(options) {
   const value = options.target || options.targets;
@@ -9788,7 +10171,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 +10243,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) {