@synkro-sh/cli 1.7.93 → 1.7.95

package/dist/bootstrap.js

@@ -147,7 +147,7 @@ function getIdentity() {
   if (cached2) return cached2;
   let cliVersion = "0.0.0";
   try {
-    cliVersion = "1.7.93";
+    cliVersion = "1.7.95";
   } catch {
   }
   const creds = loadCredentialsIdentity();
@@ -2147,7 +2147,7 @@ var init_codexHookConfig = __esm({
 
 // cli/installer/codexHookTrust.ts
 import { spawn as spawn2 } from "child_process";
-function parseCodexHookTrustOutput(stdout) {
+function parseCodexHookTrustRecords(stdout) {
   for (const line of stdout.split("\n")) {
     let message;
     try {
@@ -2159,20 +2159,41 @@ function parseCodexHookTrustOutput(stdout) {
     if (!Array.isArray(data)) continue;
     const hooks = data.flatMap((entry) => Array.isArray(entry?.hooks) ? entry.hooks : []).filter((hook) => typeof hook.command === "string" && isSynkroHookCommand(hook.command));
     if (!hooks.length) return null;
-    return {
-      total: hooks.length,
-      trusted: hooks.filter((hook) => hook.trustStatus === "trusted" || hook.trustStatus === "managed").length,
-      needsReview: hooks.filter((hook) => hook.trustStatus === "modified" || hook.trustStatus === "untrusted").length,
-      disabled: hooks.filter((hook) => hook.enabled === false).length
-    };
+    return hooks;
   }
   return null;
 }
-function inspectCodexHookTrust(codexBinary = "codex", cwd = process.cwd()) {
+function summarizeCodexHookTrust(hooks) {
+  return {
+    total: hooks.length,
+    trusted: hooks.filter((hook) => hook.trustStatus === "trusted" || hook.trustStatus === "managed").length,
+    needsReview: hooks.filter((hook) => hook.trustStatus === "modified" || hook.trustStatus === "untrusted").length,
+    disabled: hooks.filter((hook) => hook.enabled === false).length
+  };
+}
+function parseCodexHookTrustOutput(stdout) {
+  const hooks = parseCodexHookTrustRecords(stdout);
+  return hooks ? summarizeCodexHookTrust(hooks) : null;
+}
+function buildCodexHookTrustEdits(hooks) {
+  const edits = /* @__PURE__ */ new Map();
+  for (const hook of hooks) {
+    if (typeof hook.command !== "string" || !isSynkroHookCommand(hook.command) || typeof hook.key !== "string" || !hook.key || typeof hook.currentHash !== "string" || !/^sha256:[0-9a-f]{64}$/i.test(hook.currentHash)) continue;
+    const edit = {
+      keyPath: `hooks.state.${JSON.stringify(hook.key)}.trusted_hash`,
+      value: hook.currentHash,
+      mergeStrategy: "upsert"
+    };
+    edits.set(edit.keyPath, edit);
+  }
+  return [...edits.values()];
+}
+function queryCodexHookTrust(codexBinary = "codex", cwd = process.cwd(), autoTrust = false) {
   return new Promise((resolve6) => {
     let settled = false;
     let stdout = "";
     let pending = "";
+    let hooks = null;
     let child;
     const finish = (summary) => {
       if (settled) return;
@@ -2217,7 +2238,32 @@ function inspectCodexHookTrust(codexBinary = "codex", cwd = process.cwd()) {
               params: { cwds: [cwd] }
             }) + "\n");
           } else if (message?.id === 2) {
-            finish(parseCodexHookTrustOutput(line));
+            hooks = parseCodexHookTrustRecords(line);
+            if (!hooks || !autoTrust) {
+              finish(hooks ? summarizeCodexHookTrust(hooks) : null);
+              continue;
+            }
+            const edits = buildCodexHookTrustEdits(hooks);
+            if (!edits.length) {
+              finish(summarizeCodexHookTrust(hooks));
+              continue;
+            }
+            child.stdin.write(JSON.stringify({
+              id: 3,
+              method: "config/batchWrite",
+              params: { edits, reloadUserConfig: true }
+            }) + "\n");
+          } else if (message?.id === 3) {
+            if (message?.result?.status !== "ok" || !hooks) {
+              finish(hooks ? summarizeCodexHookTrust(hooks) : null);
+              continue;
+            }
+            finish({
+              total: hooks.length,
+              trusted: hooks.length,
+              needsReview: 0,
+              disabled: hooks.filter((hook) => hook.enabled === false).length
+            });
           }
         }
       });
@@ -2234,6 +2280,9 @@ function inspectCodexHookTrust(codexBinary = "codex", cwd = process.cwd()) {
     }
   });
 }
+function trustCodexHooks(codexBinary = "codex", cwd = process.cwd()) {
+  return queryCodexHookTrust(codexBinary, cwd, true);
+}
 function codexHookTrustLines(summary) {
   if (!summary) {
     return [
@@ -2254,7 +2303,7 @@ function codexHookTrustLines(summary) {
   ];
 }
 async function reportCodexHookTrust(codexBinary, cwd) {
-  const summary = await inspectCodexHookTrust(codexBinary || "codex", cwd);
+  const summary = await trustCodexHooks(codexBinary || "codex", cwd);
   for (const line of codexHookTrustLines(summary)) console.log(line);
   return summary;
 }
@@ -2428,9 +2477,54 @@ function removeCodexManagedBlock(content, path) {
   if (inside) throw new Error(`Incomplete Synkro MCP marker block in ${path}`);
   return { content: out.join("\n").replace(/\n{3,}$/g, "\n\n"), removed };
 }
-function hasUnmanagedCodexEntry(content) {
-  const section = /^\s*\[\s*mcp_servers\s*\.\s*(?:"synkro-guardrails"|'synkro-guardrails'|synkro-guardrails)\s*\]\s*(?:#.*)?$/m;
-  return section.test(content);
+function findCodexMcpSection(content) {
+  const section = /^\s*\[\s*mcp_servers\s*\.\s*(?:"synkro-guardrails"|'synkro-guardrails'|synkro-guardrails)\s*\]\s*(?:#.*)?$/gm;
+  const match = section.exec(content);
+  if (!match) return null;
+  const nextSection = /^\s*\[{1,2}[^\r\n]+?\]{1,2}\s*(?:#.*)?$/gm;
+  nextSection.lastIndex = match.index + match[0].length;
+  const next = nextSection.exec(content);
+  return {
+    start: match.index,
+    end: next?.index ?? content.length,
+    body: content.slice(match.index, next?.index ?? content.length)
+  };
+}
+function readTomlString(block, key) {
+  const match = block.match(new RegExp(`^\\s*${key}\\s*=\\s*("(?:[^"\\\\]|\\\\.)*")\\s*$`, "m"));
+  if (!match) return null;
+  try {
+    return JSON.parse(match[1]);
+  } catch {
+    return null;
+  }
+}
+function isRecognizedCodexEntry(block, expectedUrl) {
+  const command = readTomlString(block, "command");
+  const argsLine = block.match(/^\s*args\s*=\s*(\[[^\r\n]*\])\s*$/m);
+  if (command && argsLine) {
+    try {
+      const args2 = JSON.parse(argsLine[1]);
+      if (/(?:^|[\\/])bun(?:\.exe)?$/i.test(command) && Array.isArray(args2) && args2.length === 2 && args2[0] === "run" && args2[1] === MCP_STDIO_PROXY_PATH) return true;
+    } catch {
+    }
+  }
+  const url = readTomlString(block, "url");
+  return Boolean(expectedUrl && url === expectedUrl);
+}
+function stripDetachedCodexMarkers(content) {
+  return content.split("\n").filter((line) => line.trim() !== CODEX_MCP_BEGIN && line.trim() !== CODEX_MCP_END).join("\n");
+}
+function removeRecognizedCodexEntry(content, path, expectedUrl) {
+  const range = findCodexMcpSection(content);
+  if (!range) return { content, removed: false };
+  if (!isRecognizedCodexEntry(range.body, expectedUrl)) {
+    throw new Error(
+      `${path} already defines ${CODEX_MCP_SECTION}; remove or rename that unmanaged entry before installing Synkro`
+    );
+  }
+  const next = `${content.slice(0, range.start)}${content.slice(range.end)}`;
+  return { content: next.replace(/\n{3,}$/g, "\n\n"), removed: true };
 }
 function tomlString(value) {
   return JSON.stringify(value);
@@ -2438,16 +2532,17 @@ function tomlString(value) {
 function installCodexMcpConfig(opts) {
   const path = codexConfigPath(opts.configPath);
   const current = readCodexToml(path);
-  const withoutManaged = removeCodexManagedBlock(current, path).content;
-  if (hasUnmanagedCodexEntry(withoutManaged)) {
-    throw new Error(
-      `${path} already defines ${CODEX_MCP_SECTION}; remove or rename that unmanaged entry before installing Synkro`
-    );
-  }
+  const targetUrl = opts.local ? `stdio://${MCP_STDIO_PROXY_PATH}` : `${opts.gatewayUrl.replace(/\/$/, "")}/api/v1/mcp/guardrails`;
+  const withoutManaged = stripDetachedCodexMarkers(removeCodexManagedBlock(current, path).content);
+  const withoutExisting = removeRecognizedCodexEntry(
+    withoutManaged,
+    path,
+    opts.local ? void 0 : targetUrl
+  ).content;
   let url;
   let body;
   if (opts.local) {
-    url = `stdio://${MCP_STDIO_PROXY_PATH}`;
+    url = targetUrl;
     body = [
       `[${CODEX_MCP_SECTION}]`,
       `command = ${tomlString(opts.bunBin || resolveBunBin2())}`,
@@ -2456,7 +2551,7 @@ function installCodexMcpConfig(opts) {
     ];
   } else {
     if (!opts.bearerToken) throw new Error("Codex cloud MCP registration requires a bearer token");
-    url = `${opts.gatewayUrl.replace(/\/$/, "")}/api/v1/mcp/guardrails`;
+    url = targetUrl;
     body = [
       `[${CODEX_MCP_SECTION}]`,
       `url = ${tomlString(url)}`,
@@ -2464,7 +2559,7 @@ function installCodexMcpConfig(opts) {
       "enabled = true"
     ];
   }
-  const prefix = withoutManaged.trimEnd();
+  const prefix = withoutExisting.trimEnd();
   const managed = [CODEX_MCP_BEGIN, ...body, CODEX_MCP_END].join("\n");
   writeCodexTomlAtomic(path, `${prefix}${prefix ? "\n\n" : ""}${managed}
 `);
@@ -2475,8 +2570,19 @@ function uninstallCodexMcpConfig(configPath) {
   if (!existsSync13(path)) return false;
   const current = readCodexToml(path);
   const next = removeCodexManagedBlock(current, path);
-  if (!next.removed) return false;
-  writeCodexTomlAtomic(path, next.content.trimEnd() ? `${next.content.trimEnd()}
+  let content = stripDetachedCodexMarkers(next.content);
+  let removed = next.removed;
+  if (!removed) {
+    try {
+      const recognized = removeRecognizedCodexEntry(content, path);
+      content = recognized.content;
+      removed = recognized.removed;
+    } catch {
+      return false;
+    }
+  }
+  if (!removed) return false;
+  writeCodexTomlAtomic(path, content.trimEnd() ? `${content.trimEnd()}
 ` : "");
   return true;
 }
@@ -6506,8 +6612,16 @@ async function dockerInstall(opts = {}) {
     ...process.env.SYNKRO_MAX_BATCH_SIZE ? ["-e", `SYNKRO_MAX_BATCH_SIZE=${process.env.SYNKRO_MAX_BATCH_SIZE}`] : [],
     // Full verifier prompt/response tracing is explicit opt-in because it contains source code.
     ...process.env.SYNKRO_VERIFY_TRACE === "1" ? ["-e", "SYNKRO_VERIFY_TRACE=1"] : [],
-    // Cursor grading model — tunable like SYNKRO_MAX_BATCH_SIZE.
-    ...process.env.SYNKRO_CURSOR_MODEL ? ["-e", `SYNKRO_CURSOR_MODEL=${process.env.SYNKRO_CURSOR_MODEL}`] : [],
+    // Explicit model overrides are preserved across local install/update for
+    // every provider and isolated lane. The server reports the resolved values
+    // in /healthz so operators can audit exactly what is spending tokens.
+    ...[
+      "SYNKRO_CLAUDE_MODEL",
+      "SYNKRO_CURSOR_MODEL",
+      "SYNKRO_CODEX_MODEL",
+      "SYNKRO_CONDUCTOR_MODEL",
+      "SYNKRO_ROUTE_MODEL"
+    ].flatMap((key) => process.env[key] ? ["-e", `${key}=${process.env[key]}`] : []),
     // Fix-poll kill switch. Default ON in the image; a benchmark/headless run
     // (e.g. sec-code-bench) sets SYNKRO_FIX_POLL=0 so ask-mode violations skip the
     // interactive AskUserQuestion poll and fall through to generate-the-fix. Only
@@ -6765,7 +6879,7 @@ var init_dockerInstall = __esm({
     HOST_PGLITE_PORT = parseInt(process.env.SYNKRO_HOST_PGLITE_PORT || "15433", 10);
     CONTAINER_NAME = resolveContainerName();
     defaultImageVersion = () => {
-      if (true) return "1.7.93";
+      if (true) return "1.7.95";
       try {
         const pkg = JSON.parse(readFileSync17(new URL("../../package.json", import.meta.url), "utf8"));
         if (pkg.version) return pkg.version;
@@ -7458,6 +7572,94 @@ var init_codexTranscriptMessages = __esm({
   }
 });
 
+// cli/scanning/claudeTranscriptUsage.ts
+function tokenCount(value) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : 0;
+}
+function isoDay(value, fallbackDay) {
+  if (typeof value === "string") {
+    const parsed = new Date(value);
+    if (Number.isFinite(parsed.getTime())) return parsed.toISOString().slice(0, 10);
+  }
+  return fallbackDay;
+}
+function parseClaudeTranscriptUsage(transcript, fallbackDay = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10), options = {}) {
+  const seen = options.seenStableIds ?? /* @__PURE__ */ new Set();
+  const rollups = /* @__PURE__ */ new Map();
+  const usage = {
+    input_tokens: 0,
+    output_tokens: 0,
+    cache_creation_input_tokens: 0,
+    cache_read_input_tokens: 0
+  };
+  let model = "";
+  let turns = 0;
+  let lineIndex = 0;
+  for (const line of transcript.split("\n")) {
+    lineIndex += 1;
+    const text = line.trim();
+    if (!text) continue;
+    try {
+      const entry = JSON.parse(text);
+      const message = entry?.message;
+      if (message?.role !== "assistant" || !message.usage || typeof message.usage !== "object") {
+        continue;
+      }
+      const stableId = typeof entry.uuid === "string" && entry.uuid ? `uuid:${entry.uuid}` : typeof message.id === "string" && message.id ? `message:${message.id}:${String(entry.timestamp || "")}` : `${options.sourceId || "transcript"}:line:${lineIndex}`;
+      if (seen.has(stableId)) continue;
+      seen.add(stableId);
+      const counts = {
+        input_tokens: tokenCount(message.usage.input_tokens),
+        output_tokens: tokenCount(message.usage.output_tokens),
+        cache_creation_input_tokens: tokenCount(message.usage.cache_creation_input_tokens),
+        cache_read_input_tokens: tokenCount(message.usage.cache_read_input_tokens)
+      };
+      const countTotal = counts.input_tokens + counts.output_tokens + counts.cache_creation_input_tokens + counts.cache_read_input_tokens;
+      if (countTotal === 0) continue;
+      const entryModel = typeof message.model === "string" && message.model ? message.model : "unknown";
+      if (entryModel !== "<synthetic>") model = entryModel;
+      const day = isoDay(entry.timestamp, fallbackDay);
+      const key = `${day}\0${entryModel}`;
+      const row = rollups.get(key) ?? {
+        day,
+        model: entryModel,
+        turns: 0,
+        input_tokens: 0,
+        output_tokens: 0,
+        cache_creation_input_tokens: 0,
+        cache_read_input_tokens: 0
+      };
+      row.turns += 1;
+      row.input_tokens += counts.input_tokens;
+      row.output_tokens += counts.output_tokens;
+      row.cache_creation_input_tokens += counts.cache_creation_input_tokens;
+      row.cache_read_input_tokens += counts.cache_read_input_tokens;
+      rollups.set(key, row);
+      turns += 1;
+      usage.input_tokens += counts.input_tokens;
+      usage.output_tokens += counts.output_tokens;
+      usage.cache_creation_input_tokens += counts.cache_creation_input_tokens;
+      usage.cache_read_input_tokens += counts.cache_read_input_tokens;
+    } catch {
+    }
+  }
+  if (turns === 0) return null;
+  return {
+    usage,
+    model: model || "unknown",
+    rollups: [...rollups.values()].sort(
+      (a, b) => a.day.localeCompare(b.day) || a.model.localeCompare(b.model)
+    ),
+    turns
+  };
+}
+var init_claudeTranscriptUsage = __esm({
+  "cli/scanning/claudeTranscriptUsage.ts"() {
+    "use strict";
+  }
+});
+
 // cli/commands/install.ts
 var install_exports = {};
 __export(install_exports, {
@@ -7475,7 +7677,7 @@ __export(install_exports, {
 });
 import { existsSync as existsSync22, mkdirSync as mkdirSync15, writeFileSync as writeFileSync17, chmodSync as chmodSync5, readFileSync as readFileSync21, readdirSync as readdirSync4, unlinkSync as unlinkSync7, statSync as statSync2 } from "fs";
 import { homedir as homedir21 } from "os";
-import { join as join19, isAbsolute, resolve as resolve4 } from "path";
+import { basename, join as join19, isAbsolute, resolve as resolve4, sep } from "path";
 import { execSync as execSync4, spawn as spawn5 } from "child_process";
 import { createInterface as createInterface2 } from "readline";
 import { createHash as createHash4 } from "crypto";
@@ -7734,7 +7936,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle2(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle2(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle2(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle2("1.7.93")}`
+    `SYNKRO_VERSION=${shellQuoteSingle2("1.7.95")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle2(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle2(safeUserId)}`);
@@ -7912,6 +8114,11 @@ async function provisionCloudContainer(opts) {
         cursor_workers: cursorWorkers,
         codex_workers: codexWorkers,
         conductor_provider: selectedKind,
+        claude_model: process.env.SYNKRO_CLAUDE_MODEL || "",
+        cursor_model: process.env.SYNKRO_CURSOR_MODEL || "",
+        codex_model: process.env.SYNKRO_CODEX_MODEL || "",
+        conductor_model: process.env.SYNKRO_CONDUCTOR_MODEL || "",
+        route_model: process.env.SYNKRO_ROUTE_MODEL || "",
         cursor_api_key: cursorApiKey,
         // never logged; gateway stores it as the org secret
         connected_repo: repo,
@@ -8476,7 +8683,7 @@ async function installCommand(opts = {}) {
   await setTelemetryState({ enabled: true, remoteFlushEnabled: telemetryConsent });
   emit("install", {
     phase: "started",
-    cli_version_to: "1.7.93",
+    cli_version_to: "1.7.95",
     agents_detected: agents.map((a) => a.kind),
     with_github: false,
     with_local_cc: false,
@@ -9543,8 +9750,8 @@ function ensureReachabilityGitHook() {
       }
       return "updated";
     }
-    const sep = cur.endsWith("\n") ? "" : "\n";
-    writeFileSync17(hookPath, cur + sep + "\n" + block + "\n");
+    const sep3 = cur.endsWith("\n") ? "" : "\n";
+    writeFileSync17(hookPath, cur + sep3 + "\n" + block + "\n");
     try {
       chmodSync5(hookPath, 493);
     } catch {
@@ -9571,10 +9778,33 @@ function detectGitRepo2() {
 }
 function getClaudeProjectsFolder() {
   const cwd = process.cwd();
-  const sanitized = "-" + cwd.replace(/\//g, "-");
+  const sanitized = cwd.replace(/\//g, "-");
   const projectsDir = join19(homedir21(), ".claude", "projects", sanitized);
   return existsSync22(projectsDir) ? projectsDir : null;
 }
+function getClaudeTranscriptFileEntries(projectsDir) {
+  let relativeFiles = [];
+  try {
+    relativeFiles = readdirSync4(projectsDir, { recursive: true, encoding: "utf-8" });
+  } catch {
+    return [];
+  }
+  return relativeFiles.filter((file) => file.endsWith(".jsonl")).map((file) => {
+    const parts = file.split(sep);
+    const subagentsIndex = parts.lastIndexOf("subagents");
+    if (subagentsIndex > 0) {
+      return {
+        filePath: join19(projectsDir, file),
+        sessionId: basename(file, ".jsonl"),
+        parentSessionId: parts[subagentsIndex - 1]
+      };
+    }
+    return {
+      filePath: join19(projectsDir, file),
+      sessionId: basename(file, ".jsonl")
+    };
+  });
+}
 function extractSessionInsights(projectsDir) {
   const insights = [];
   const files = readdirSync4(projectsDir).filter((f) => f.endsWith(".jsonl"));
@@ -9874,23 +10104,40 @@ function parseTranscriptFile(filePath) {
 async function syncTranscriptsLocal(mcpPort, mcpToken, repo) {
   const projectsDir = getClaudeProjectsFolder();
   if (!projectsDir) return { sessions: 0, messages: 0 };
-  const files = readdirSync4(projectsDir).filter((f) => f.endsWith(".jsonl"));
+  const files = getClaudeTranscriptFileEntries(projectsDir);
   if (files.length === 0) return { sessions: 0, messages: 0 };
   console.log(`  Found ${files.length} CC session transcripts, importing + embedding...`);
   let totalSessions = 0;
   let totalMessages = 0;
+  const seenStableIds = /* @__PURE__ */ new Set();
   for (let i = 0; i < files.length; i++) {
     const file = files[i];
-    const sessionId = file.replace(".jsonl", "");
-    const filePath = join19(projectsDir, file);
+    const sessionId = file.sessionId;
+    const filePath = file.filePath;
     try {
+      const transcript = readFileSync21(filePath, "utf-8");
+      const transcriptUsage = parseClaudeTranscriptUsage(
+        transcript,
+        statSync2(filePath).mtime.toISOString().slice(0, 10),
+        { seenStableIds, sourceId: file.parentSessionId ? `${file.parentSessionId}:subagent:${sessionId}` : sessionId }
+      );
       const allMessages = parseTranscriptFile(filePath);
       const messages = allMessages.length > 500 ? allMessages.slice(-500) : allMessages;
       if (messages.length === 0) continue;
       const resp = await fetch(`http://127.0.0.1:${mcpPort}/api/conversation-sync`, {
         method: "POST",
         headers: { "Content-Type": "application/json", Authorization: `Bearer ${mcpToken}` },
-        body: JSON.stringify({ session_id: sessionId, repo, messages }),
+        body: JSON.stringify({
+          session_id: sessionId,
+          parent_session_id: file.parentSessionId,
+          repo,
+          messages,
+          session_usage: transcriptUsage?.usage,
+          usage_rollups: transcriptUsage?.rollups ?? [],
+          model: transcriptUsage?.model,
+          harness: "claude-code",
+          usage_cumulative: true
+        }),
         signal: AbortSignal.timeout(15e3)
       });
       if (resp.ok) {
@@ -9904,9 +10151,10 @@ async function syncTranscriptsLocal(mcpPort, mcpToken, repo) {
       process.stdout.write(`\r  Progress: ${i + 1}/${files.length} sessions (${totalMessages} messages embedded)   `);
     }
     try {
-      const content = readFileSync21(join19(projectsDir, file), "utf-8");
+      const content = readFileSync21(filePath, "utf-8");
       const lineCount = content.split("\n").filter(Boolean).length;
-      writeFileSync17(join19(OFFSETS_DIR, sessionId), String(lineCount), "utf-8");
+      const offsetId = file.parentSessionId ? `${file.parentSessionId}_${sessionId}` : sessionId;
+      writeFileSync17(join19(OFFSETS_DIR, offsetId), String(lineCount), "utf-8");
     } catch {
     }
   }
@@ -9916,23 +10164,39 @@ async function syncTranscriptsLocal(mcpPort, mcpToken, repo) {
 async function syncTranscriptsBulk(gatewayUrl, token, repo) {
   const projectsDir = getClaudeProjectsFolder();
   if (!projectsDir) return { sessions: 0, messages: 0 };
-  const files = readdirSync4(projectsDir).filter((f) => f.endsWith(".jsonl"));
+  const files = getClaudeTranscriptFileEntries(projectsDir);
   if (files.length === 0) return { sessions: 0, messages: 0 };
   console.log(`Found ${files.length} CC session transcripts, syncing...`);
   const maxMessagesPerSession = 500;
   let totalSessions = 0;
   let totalMessages = 0;
+  const seenStableIds = /* @__PURE__ */ new Set();
   for (let i = 0; i < files.length; i += 5) {
     const batch = files.slice(i, i + 5);
     const sessions = [];
     for (const file of batch) {
-      const sessionId = file.replace(".jsonl", "");
-      const filePath = join19(projectsDir, file);
+      const sessionId = file.sessionId;
+      const filePath = file.filePath;
       try {
+        const transcript = readFileSync21(filePath, "utf-8");
+        const transcriptUsage = parseClaudeTranscriptUsage(
+          transcript,
+          statSync2(filePath).mtime.toISOString().slice(0, 10),
+          { seenStableIds, sourceId: file.parentSessionId ? `${file.parentSessionId}:subagent:${sessionId}` : sessionId }
+        );
         const allMessages = parseTranscriptFile(filePath);
         const messages = allMessages.length > maxMessagesPerSession ? allMessages.slice(-maxMessagesPerSession) : allMessages;
         if (messages.length > 0) {
-          sessions.push({ cc_session_id: sessionId, messages });
+          sessions.push({
+            cc_session_id: sessionId,
+            parent_session_id: file.parentSessionId,
+            messages,
+            model: transcriptUsage?.model,
+            session_usage: transcriptUsage?.usage,
+            usage_rollups: transcriptUsage?.rollups ?? [],
+            harness: "claude-code",
+            usage_cumulative: true
+          });
         }
       } catch {
       }
@@ -9955,12 +10219,13 @@ async function syncTranscriptsBulk(gatewayUrl, token, repo) {
     } catch {
     }
     for (const file of batch) {
-      const sessionId = file.replace(".jsonl", "");
-      const filePath = join19(projectsDir, file);
+      const sessionId = file.sessionId;
+      const filePath = file.filePath;
       try {
         const content = readFileSync21(filePath, "utf-8");
         const lineCount = content.split("\n").filter(Boolean).length;
-        writeFileSync17(join19(OFFSETS_DIR, sessionId), String(lineCount), "utf-8");
+        const offsetId = file.parentSessionId ? `${file.parentSessionId}_${sessionId}` : sessionId;
+        writeFileSync17(join19(OFFSETS_DIR, offsetId), String(lineCount), "utf-8");
       } catch {
       }
     }
@@ -10043,6 +10308,7 @@ var init_install = __esm({
     init_graderSmoke();
     init_codexTranscriptUsage();
     init_codexTranscriptMessages();
+    init_claudeTranscriptUsage();
     SYNKRO_DIR11 = join19(homedir21(), ".synkro");
     HOOKS_DIR = join19(SYNKRO_DIR11, "hooks");
     CONFIG_PATH4 = join19(SYNKRO_DIR11, "config.env");
@@ -12639,9 +12905,9 @@ var import_exports = {};
 __export(import_exports, {
   importCommand: () => importCommand
 });
-import { existsSync as existsSync29, readFileSync as readFileSync27, readdirSync as readdirSync6 } from "fs";
+import { existsSync as existsSync29, readFileSync as readFileSync27, readdirSync as readdirSync6, statSync as statSync4 } from "fs";
 import { homedir as homedir28 } from "os";
-import { join as join27 } from "path";
+import { basename as basename2, join as join27, sep as sep2 } from "path";
 import { execSync as execSync6 } from "child_process";
 import { createInterface as createInterface4 } from "readline";
 function readMcpJwt() {
@@ -12669,6 +12935,23 @@ function projectsFolder() {
   const dir = join27(homedir28(), ".claude", "projects", sanitized);
   return existsSync29(dir) ? dir : null;
 }
+function transcriptFiles(projectsDir) {
+  let relativeFiles = [];
+  try {
+    relativeFiles = readdirSync6(projectsDir, { recursive: true, encoding: "utf-8" });
+  } catch {
+    return [];
+  }
+  return relativeFiles.filter((file) => file.endsWith(".jsonl")).map((file) => {
+    const parts = file.split(sep2);
+    const subagentsIndex = parts.lastIndexOf("subagents");
+    return {
+      filePath: join27(projectsDir, file),
+      sessionId: basename2(file, ".jsonl"),
+      parentSessionId: subagentsIndex > 0 ? parts[subagentsIndex - 1] : void 0
+    };
+  });
+}
 function repoName() {
   try {
     const url = execSync6("git config --get remote.origin.url", { encoding: "utf-8" }).trim();
@@ -12705,8 +12988,18 @@ function extractToolResultText(content, e) {
   }
   return t;
 }
-function parseSession(filePath, sessionId) {
-  const lines = readFileSync27(filePath, "utf-8").split("\n").filter(Boolean);
+function parseSession(file, seenStableIds) {
+  const { filePath, sessionId, parentSessionId } = file;
+  const transcript = readFileSync27(filePath, "utf-8");
+  const lines = transcript.split("\n").filter(Boolean);
+  const transcriptUsage = parseClaudeTranscriptUsage(
+    transcript,
+    statSync4(filePath).mtime.toISOString().slice(0, 10),
+    {
+      seenStableIds,
+      sourceId: parentSessionId ? `${parentSessionId}:subagent:${sessionId}` : sessionId
+    }
+  );
   const messages = [];
   const actions = [];
   let step = 0;
@@ -12755,7 +13048,17 @@ function parseSession(filePath, sessionId) {
     }
     messages.push(msg);
   }
-  return { cc_session_id: sessionId, messages, actions };
+  return {
+    cc_session_id: sessionId,
+    parent_session_id: parentSessionId,
+    messages,
+    actions,
+    model: transcriptUsage?.model,
+    session_usage: transcriptUsage?.usage,
+    usage_rollups: transcriptUsage?.rollups ?? [],
+    harness: "claude-code",
+    usage_cumulative: true
+  };
 }
 function ask2(q) {
   const rl = createInterface4({ input: process.stdin, output: process.stdout });
@@ -12773,7 +13076,7 @@ async function importCommand() {
     console.log("No Claude Code transcripts found for this repo (~/.claude/projects).");
     return;
   }
-  const files = readdirSync6(dir).filter((f) => f.endsWith(".jsonl"));
+  const files = transcriptFiles(dir);
   if (!files.length) {
     console.log("No sessions to import.");
     return;
@@ -12786,7 +13089,8 @@ async function importCommand() {
       return;
     }
   }
-  const sessions = files.map((f) => parseSession(join27(dir, f), f.replace(".jsonl", ""))).filter((s) => s.messages.length > 0);
+  const seenStableIds = /* @__PURE__ */ new Set();
+  const sessions = files.map((file) => parseSession(file, seenStableIds)).filter((s) => s.messages.length > 0);
   const totalMsgs = sessions.reduce((n, s) => n + s.messages.length, 0);
   let ok = 0, fail = 0;
   if (isCloud) {
@@ -12832,7 +13136,19 @@ async function importCommand() {
         const r = await fetch(`http://127.0.0.1:${port}/api/ingest`, {
           method: "POST",
           headers: { "Content-Type": "application/json", Authorization: `Bearer ${mcpJwt2}` },
-          body: JSON.stringify({ capture_type: "transcript_sync", session_id: s.cc_session_id, repo, messages: s.messages, actions: s.actions }),
+          body: JSON.stringify({
+            capture_type: "transcript_sync",
+            session_id: s.cc_session_id,
+            parent_session_id: s.parent_session_id,
+            repo,
+            messages: s.messages,
+            actions: s.actions,
+            model: s.model,
+            session_usage: s.session_usage,
+            usage_rollups: s.usage_rollups,
+            harness: s.harness,
+            usage_cumulative: true
+          }),
           // A full session can carry thousands of turns — 15s timed out mid-import.
           signal: AbortSignal.timeout(12e4)
         });
@@ -12861,6 +13177,7 @@ var init_import = __esm({
   "cli/commands/import.ts"() {
     "use strict";
     init_stub();
+    init_claudeTranscriptUsage();
     CONFIG_PATH7 = join27(homedir28(), ".synkro", "config.env");
   }
 });
@@ -14233,7 +14550,7 @@ var subArgs = args.slice(1);
 var isDetachedChild = process.env.SYNKRO_TELEMETRY_DETACHED === "1";
 var FLUSH_SKIP = /* @__PURE__ */ new Set(["grade", "version", "--version", "-v", "help", "--help", "-h", ""]);
 function printVersion() {
-  console.log("1.7.93");
+  console.log("1.7.95");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents