@synkro-sh/cli 1.6.80 → 1.6.82

package/dist/bootstrap.js

@@ -2989,36 +2989,51 @@ export async function syncConversationTranscript(
       const entry = JSON.parse(allLines[i]) as Record<string, unknown>;
       const kind = transcriptEntryType(entry);
       if (kind !== 'user' && kind !== 'assistant') continue;
-      const text = extractTranscriptEntryText(entry, 8000, sessionId);
-      if (!text) continue;
-
       const msgObj = entry.message as Record<string, unknown> | undefined;
       const content = (msgObj && typeof msgObj === 'object' ? msgObj.content : undefined) ?? entry.content;
       const singleBlock = transcriptContentBlock(entry);
+      // Tool calls FIRST \u2014 a tool-only assistant turn (Edit/Bash/Read, no text) is
+      // most of a coding session and must still be captured; skipping on empty text
+      // dropped both the turn and its tool calls.
+      const blocks = (kind === 'assistant')
+        ? (Array.isArray(content) ? content : (singleBlock ? [singleBlock] : []))
+        : [];
+      const toolCalls = blocks
+        .filter((c: unknown) => {
+          const b = c as Record<string, unknown>;
+          return b?.type === 'tool_use' || b?.type === 'tool_call';
+        })
+        .map((c: unknown) => {
+          const b = c as Record<string, unknown>;
+          return {
+            name: b.name,
+            input: JSON.stringify(b.input || b.arguments || {}).slice(0, 500),
+            id: b.id,
+          };
+        });
+      const text = extractTranscriptEntryText(entry, 8000, sessionId);
+      if (!text && toolCalls.length === 0) continue;
+
       const msg: Record<string, unknown> = {
         message_index: i,
         type: kind,
-        content: text,
+        content: text || ('\u21B3 ' + toolCalls.map((t: any) => t.name).join(', ')),
         ts: entry.timestamp || null,
       };
       if (kind === 'assistant') {
-        const blocks = Array.isArray(content)
-          ? content
-          : (singleBlock ? [singleBlock] : []);
-        const toolCalls = blocks
-          .filter((c: unknown) => {
-            const b = c as Record<string, unknown>;
-            return b?.type === 'tool_use' || b?.type === 'tool_call';
-          })
-          .map((c: unknown) => {
-            const b = c as Record<string, unknown>;
-            return {
-              name: b.name,
-              input: JSON.stringify(b.input || b.arguments || {}).slice(0, 500),
-              id: b.id,
-            };
-          });
         if (toolCalls.length > 0) msg.tool_calls = toolCalls;
+        // Per-turn usage + model so the session view can show input/output/cache
+        // tokens and cost line-by-line (not just the session aggregate).
+        if (msgObj && typeof msgObj.model === 'string') msg.model = msgObj.model;
+        const u = msgObj && (msgObj.usage as Record<string, unknown> | undefined);
+        if (u && typeof u === 'object') {
+          msg.usage = {
+            input_tokens: Number(u.input_tokens) || 0,
+            output_tokens: Number(u.output_tokens) || 0,
+            cache_creation_input_tokens: Number(u.cache_creation_input_tokens) || 0,
+            cache_read_input_tokens: Number(u.cache_read_input_tokens) || 0,
+          };
+        }
         if (msgObj && typeof msgObj === 'object') {
           msg.model = msgObj.model || null;
           const u = msgObj.usage as Record<string, unknown> | undefined;
@@ -10466,7 +10481,7 @@ async function promptAgentSelection(detected) {
   detected.forEach((a, i) => console.log(`  ${i + 1}. ${a.name}`));
   console.log(`  ${detected.length + 1}. Both / all (default)`);
   const rl = createInterface3({ input: process.stdin, output: process.stdout });
-  const ask2 = () => new Promise((resolve4) => {
+  const ask3 = () => new Promise((resolve4) => {
     rl.question(`Pick [1-${detected.length + 1}] (default: all): `, (answer) => {
       const t = answer.trim().toLowerCase();
       if (t === "" || t === String(detected.length + 1) || t === "both" || t === "all") {
@@ -10479,10 +10494,10 @@ async function promptAgentSelection(detected) {
         return resolve4([detected[n - 1]]);
       }
       console.log("Invalid choice. Try again.");
-      resolve4(ask2());
+      resolve4(ask3());
     });
   });
-  return ask2();
+  return ask3();
 }
 async function promptCursorApiKey(opts) {
   const { cursorApiKeyConfigured: cursorApiKeyConfigured2, writeCursorApiKey: writeCursorApiKey2, validateCursorApiKey: validateCursorApiKey2 } = await Promise.resolve().then(() => (init_macKeychain(), macKeychain_exports));
@@ -10534,7 +10549,7 @@ async function promptDeployLocation() {
 async function promptTranscriptSources(wantCC, wantCursor) {
   if (!wantCC && !wantCursor) return { cc: false, cursor: false };
   const rl = createInterface3({ input: process.stdin, output: process.stdout });
-  const ask2 = (q) => new Promise((res) => rl.question(q, (a) => res(a.trim().toLowerCase())));
+  const ask3 = (q) => new Promise((res) => rl.question(q, (a) => res(a.trim().toLowerCase())));
   try {
     if (wantCC && wantCursor) {
       console.log("Import and embed past session history? This indexes sessions so Ask Synkro");
@@ -10543,14 +10558,14 @@ async function promptTranscriptSources(wantCC, wantCursor) {
       console.log("  2. Claude Code only");
       console.log("  3. Both");
       console.log("  n. Skip");
-      const a2 = await ask2("Choose [1/2/3/n] (default: 3): ");
+      const a2 = await ask3("Choose [1/2/3/n] (default: 3): ");
       if (a2 === "n" || a2 === "no") return { cc: false, cursor: false };
       if (a2 === "1") return { cc: false, cursor: true };
       if (a2 === "2") return { cc: true, cursor: false };
       return { cc: true, cursor: true };
     }
     const which2 = wantCursor ? "Cursor" : "Claude Code";
-    const a = await ask2(
+    const a = await ask3(
       `Import and embed your ${which2} session history?
 This indexes past sessions so Ask Synkro can answer questions about your
 coding patterns and the dashboard shows full history. (Y/n) `
@@ -10738,7 +10753,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.6.80")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.6.82")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -14133,6 +14148,192 @@ var init_localCc = __esm({
   }
 });
 
+// cli/commands/import.ts
+var import_exports = {};
+__export(import_exports, {
+  importCommand: () => importCommand
+});
+import { existsSync as existsSync17, readFileSync as readFileSync15, readdirSync as readdirSync5 } from "fs";
+import { homedir as homedir17 } from "os";
+import { join as join17 } from "path";
+import { execSync as execSync7 } from "child_process";
+import { createInterface as createInterface5 } from "readline";
+function readConfigEnv() {
+  const out = {};
+  try {
+    for (const line of readFileSync15(CONFIG_PATH5, "utf-8").split("\n")) {
+      const t = line.trim();
+      if (!t || t.startsWith("#")) continue;
+      const eq = t.indexOf("=");
+      if (eq > 0) out[t.slice(0, eq).trim()] = t.slice(eq + 1).trim().replace(/^['"]|['"]$/g, "");
+    }
+  } catch {
+  }
+  return out;
+}
+function projectsFolder() {
+  const sanitized = process.cwd().replace(/\//g, "-");
+  const dir = join17(homedir17(), ".claude", "projects", sanitized);
+  return existsSync17(dir) ? dir : null;
+}
+function repoName() {
+  try {
+    const url = execSync7("git config --get remote.origin.url", { encoding: "utf-8" }).trim();
+    const m = url.match(/[:/]([^/:]+\/[^/]+?)(?:\.git)?$/);
+    if (m) return m[1];
+  } catch {
+  }
+  try {
+    return execSync7("git rev-parse --show-toplevel", { encoding: "utf-8" }).trim().split("/").pop() || "repo";
+  } catch {
+    return process.cwd().split("/").pop() || "repo";
+  }
+}
+function extractText(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.map((b) => typeof b === "string" ? b : b?.type === "text" ? b.text || "" : "").filter(Boolean).join("\n");
+  }
+  return "";
+}
+function parseSession(filePath, sessionId) {
+  const lines = readFileSync15(filePath, "utf-8").split("\n").filter(Boolean);
+  const messages = [];
+  const actions = [];
+  let step = 0;
+  for (let i = 0; i < lines.length; i++) {
+    let e;
+    try {
+      e = JSON.parse(lines[i]);
+    } catch {
+      continue;
+    }
+    const kind = e.type === "assistant" || e.message?.role === "assistant" ? "assistant" : e.type === "user" || e.message?.role === "user" ? "user" : "";
+    if (!kind) continue;
+    const msgObj = e.message;
+    const text = extractText(msgObj?.content ?? e.content);
+    const blocks = kind === "assistant" && Array.isArray(msgObj?.content) ? msgObj.content : [];
+    const toolCalls = blocks.filter((b) => b?.type === "tool_use").map((b) => ({ name: b.name, input: JSON.stringify(b.input || {}).slice(0, 500), id: b.id }));
+    if (!text.trim() && toolCalls.length === 0) continue;
+    const msg = {
+      message_index: i,
+      type: kind,
+      content: text.trim() ? text.slice(0, 8e3) : "\u21B3 " + toolCalls.map((t) => t.name).join(", "),
+      timestamp: e.timestamp || null
+    };
+    if (kind === "assistant") {
+      if (typeof msgObj?.model === "string") msg.model = msgObj.model;
+      const u = msgObj?.usage;
+      if (u && typeof u === "object") {
+        msg.usage = {
+          input_tokens: Number(u.input_tokens) || 0,
+          output_tokens: Number(u.output_tokens) || 0,
+          cache_creation_input_tokens: Number(u.cache_creation_input_tokens) || 0,
+          cache_read_input_tokens: Number(u.cache_read_input_tokens) || 0
+        };
+      }
+      if (toolCalls.length) {
+        msg.tool_calls = toolCalls;
+        for (const t of toolCalls) actions.push({ step: ++step, tool: t.name, summary: "", file: null, outcome: null });
+      }
+    }
+    messages.push(msg);
+  }
+  return { cc_session_id: sessionId, messages, actions };
+}
+function ask2(q) {
+  const rl = createInterface5({ input: process.stdin, output: process.stdout });
+  return new Promise((resolve4) => rl.question(q, (a) => {
+    rl.close();
+    resolve4(/^y(es)?$/i.test(a.trim()));
+  }));
+}
+async function importCommand() {
+  const config = readConfigEnv();
+  const isCloud = config.SYNKRO_DEPLOY_LOCATION === "cloud" || config.SYNKRO_STORAGE_MODE === "cloud";
+  const repo = repoName();
+  const dir = projectsFolder();
+  if (!dir) {
+    console.log("No Claude Code transcripts found for this repo (~/.claude/projects).");
+    return;
+  }
+  const files = readdirSync5(dir).filter((f) => f.endsWith(".jsonl"));
+  if (!files.length) {
+    console.log("No sessions to import.");
+    return;
+  }
+  console.log(`Found ${files.length} session(s) for "${repo}" (${isCloud ? "cloud" : "local"} mode).`);
+  if (!isCloud) {
+    const ok2 = await ask2(`Import all ${files.length} historical session(s) into your on-device store? [y/N] `);
+    if (!ok2) {
+      console.log("Aborted \u2014 nothing imported.");
+      return;
+    }
+  }
+  const sessions = files.map((f) => parseSession(join17(dir, f), f.replace(".jsonl", ""))).filter((s) => s.messages.length > 0);
+  const totalMsgs = sessions.reduce((n, s) => n + s.messages.length, 0);
+  let ok = 0, fail = 0;
+  if (isCloud) {
+    await ensureValidToken();
+    const token = getAccessToken();
+    if (!token) {
+      console.log("Not authenticated \u2014 run `synkro login` first.");
+      return;
+    }
+    const gateway = config.SYNKRO_GATEWAY_URL || "https://api.synkro.sh";
+    for (const s of sessions) {
+      try {
+        const r = await fetch(`${gateway}/api/v1/cli/sync-transcripts`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json", Authorization: `Bearer ${token}` },
+          body: JSON.stringify({ repo, sessions: [s] }),
+          signal: AbortSignal.timeout(6e4)
+        });
+        if (r.ok) {
+          ok++;
+          process.stdout.write(".");
+        } else {
+          fail++;
+          console.warn(`
+  ${String(s.cc_session_id).slice(0, 8)} failed: HTTP ${r.status}`);
+        }
+      } catch (e) {
+        fail++;
+        console.warn(`
+  ${String(s.cc_session_id).slice(0, 8)} error: ${e.message}`);
+      }
+    }
+    process.stdout.write("\n");
+  } else {
+    const port = config.SYNKRO_MCP_PORT || "18931";
+    for (const s of sessions) {
+      try {
+        const r = await fetch(`http://127.0.0.1:${port}/api/ingest`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ capture_type: "transcript_sync", session_id: s.cc_session_id, repo, messages: s.messages, actions: s.actions }),
+          signal: AbortSignal.timeout(15e3)
+        });
+        if (r.ok) ok++;
+        else fail++;
+      } catch {
+        fail++;
+      }
+    }
+    if (fail && ok === 0) console.log("  (is the local container running? `synkro status`)");
+  }
+  console.log(`
+\u2713 Imported ${ok} session(s) (${totalMsgs} messages)${fail ? `, ${fail} failed` : ""}.`);
+}
+var CONFIG_PATH5;
+var init_import = __esm({
+  "cli/commands/import.ts"() {
+    "use strict";
+    init_stub();
+    CONFIG_PATH5 = join17(homedir17(), ".synkro", "config.env");
+  }
+});
+
 // cli/commands/lifecycle.ts
 var lifecycle_exports = {};
 __export(lifecycle_exports, {
@@ -14245,13 +14446,13 @@ var config_exports = {};
 __export(config_exports, {
   configCommand: () => configCommand
 });
-import { readFileSync as readFileSync15, writeFileSync as writeFileSync11, existsSync as existsSync17 } from "fs";
-import { join as join17 } from "path";
-import { homedir as homedir17 } from "os";
-function readConfigEnv() {
-  if (!existsSync17(CONFIG_PATH5)) return {};
+import { readFileSync as readFileSync16, writeFileSync as writeFileSync11, existsSync as existsSync18 } from "fs";
+import { join as join18 } from "path";
+import { homedir as homedir18 } from "os";
+function readConfigEnv2() {
+  if (!existsSync18(CONFIG_PATH6)) return {};
   const out = {};
-  for (const line of readFileSync15(CONFIG_PATH5, "utf-8").split("\n")) {
+  for (const line of readFileSync16(CONFIG_PATH6, "utf-8").split("\n")) {
     const t = line.trim();
     if (!t || t.startsWith("#")) continue;
     const eq = t.indexOf("=");
@@ -14260,11 +14461,11 @@ function readConfigEnv() {
   return out;
 }
 function updateConfigValue(key, value) {
-  if (!existsSync17(CONFIG_PATH5)) {
+  if (!existsSync18(CONFIG_PATH6)) {
     console.error("No config found. Run `synkro install` first.");
     process.exit(1);
   }
-  const lines = readFileSync15(CONFIG_PATH5, "utf-8").split("\n");
+  const lines = readFileSync16(CONFIG_PATH6, "utf-8").split("\n");
   const pattern = new RegExp(`^${key}=`);
   let found = false;
   const updated = lines.map((line) => {
@@ -14275,10 +14476,10 @@ function updateConfigValue(key, value) {
     return line;
   });
   if (!found) updated.splice(updated.length - 1, 0, `${key}='${value}'`);
-  writeFileSync11(CONFIG_PATH5, updated.join("\n"), "utf-8");
+  writeFileSync11(CONFIG_PATH6, updated.join("\n"), "utf-8");
 }
 async function reconcileContainer() {
-  const cfg = readConfigEnv();
+  const cfg = readConfigEnv2();
   const cloudOnly = (cfg.SYNKRO_GRADING_MODE || "local") === "byok" && (cfg.SYNKRO_STORAGE_MODE || "local") === "cloud";
   try {
     const { dockerInstall: dockerInstall2, dockerSafeStop: dockerSafeStop2, readContainerConfig: readContainerConfig2, assertDockerAvailable: assertDockerAvailable2, waitForContainerReady: waitForContainerReady2 } = await Promise.resolve().then(() => (init_dockerInstall(), dockerInstall_exports));
@@ -14302,7 +14503,7 @@ async function reconcileContainer() {
 }
 async function configCommand(args2) {
   if (args2.length === 0) {
-    const config2 = readConfigEnv();
+    const config2 = readConfigEnv2();
     console.log("Synkro config:\n");
     console.log(`  grading:    ${config2.SYNKRO_GRADING_MODE || "local"}`);
     console.log(`  storage:    ${config2.SYNKRO_STORAGE_MODE || "local"}`);
@@ -14357,7 +14558,7 @@ To change:`);
     process.exit(1);
   }
   const token = getAccessToken();
-  const config = readConfigEnv();
+  const config = readConfigEnv2();
   const gatewayUrl = (config.SYNKRO_GATEWAY_URL || "https://api.synkro.sh").replace(/\/$/, "");
   try {
     const resp = await fetch(`${gatewayUrl}/api/v1/cli/me`, {
@@ -14380,25 +14581,25 @@ To change:`);
   updateConfigValue("SYNKRO_INFERENCE", inferenceValue);
   console.log(`\u2713 Inference set to '${inferenceValue}'.`);
 }
-var SYNKRO_DIR7, CONFIG_PATH5;
+var SYNKRO_DIR7, CONFIG_PATH6;
 var init_config = __esm({
   "cli/commands/config.ts"() {
     "use strict";
     init_stub();
-    SYNKRO_DIR7 = join17(homedir17(), ".synkro");
-    CONFIG_PATH5 = join17(SYNKRO_DIR7, "config.env");
+    SYNKRO_DIR7 = join18(homedir18(), ".synkro");
+    CONFIG_PATH6 = join18(SYNKRO_DIR7, "config.env");
   }
 });
 
 // cli/bootstrap.js
-import { readFileSync as readFileSync16, existsSync as existsSync18 } from "fs";
+import { readFileSync as readFileSync17, existsSync as existsSync19 } from "fs";
 import { resolve as resolve3 } from "path";
 var envCandidates = [
   resolve3(process.env.HOME ?? "", ".synkro", "config.env")
 ];
 for (const envPath of envCandidates) {
-  if (!existsSync18(envPath)) continue;
-  const envContent = readFileSync16(envPath, "utf-8");
+  if (!existsSync19(envPath)) continue;
+  const envContent = readFileSync17(envPath, "utf-8");
   for (const line of envContent.split("\n")) {
     const trimmed = line.trim();
     if (!trimmed || trimmed.startsWith("#")) continue;
@@ -14413,7 +14614,7 @@ var args = process.argv.slice(2);
 var cmd = args[0] || "";
 var subArgs = args.slice(1);
 function printVersion() {
-  console.log("1.6.80");
+  console.log("1.6.82");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents
@@ -14487,6 +14688,11 @@ async function main() {
       await localCcCommand2(subArgs);
       break;
     }
+    case "import": {
+      const { importCommand: importCommand2 } = await Promise.resolve().then(() => (init_import(), import_exports));
+      await importCommand2();
+      break;
+    }
     case "version":
     case "--version":
     case "-v": {