@synkro-sh/cli 1.7.68 → 1.7.71

package/dist/bootstrap.js

@@ -132,7 +132,7 @@ function getIdentity() {
   if (cached2) return cached2;
   let cliVersion = "0.0.0";
   try {
-    cliVersion = "1.7.68";
+    cliVersion = "1.7.71";
   } catch {
   }
   const creds = loadCredentialsIdentity();
@@ -795,7 +795,7 @@ var init_wire = __esm({
     BATCH_BYTES = 1024 * 1024;
     REQUEST_TIMEOUT_MS = 15e3;
     TELEMETRY_BODY_MAX = 4 * 1024 * 1024;
-    UNRECOVERABLE_STATUSES = [400, 413, 422];
+    UNRECOVERABLE_STATUSES = [400, 409, 413, 422];
   }
 });
 
@@ -2755,6 +2755,7 @@ process.stdout.write('{}\\n');
 // cli/auth/stub.ts
 var stub_exports = {};
 __export(stub_exports, {
+  authedFetch: () => authedFetch,
   authenticate: () => authenticate,
   clearCredentials: () => clearCredentials,
   ensureValidToken: () => ensureValidToken,
@@ -3049,8 +3050,10 @@ async function refreshToken() {
   }
 }
 async function ensureValidToken() {
-  if (!isAuthenticated()) return false;
+  const creds = loadCredentials();
+  if (!creds?.access_token && !creds?.refresh_token) return false;
   if (isTokenExpired()) {
+    if (!creds.refresh_token) return false;
     if (!refreshPromise) {
       refreshPromise = refreshToken().finally(() => {
         refreshPromise = null;
@@ -3058,12 +3061,23 @@ async function ensureValidToken() {
     }
     const refreshed = await refreshPromise;
     if (!refreshed) {
-      clearCredentials();
       return false;
     }
   }
   return true;
 }
+async function authedFetch(url, init = {}) {
+  const withToken = () => ({
+    ...init,
+    headers: { ...init.headers, Authorization: `Bearer ${getAccessToken() ?? ""}` }
+  });
+  await ensureValidToken();
+  let res = await fetch(url, withToken());
+  if (res.status === 401 && await refreshToken()) {
+    res = await fetch(url, withToken());
+  }
+  return res;
+}
 function clearCredentials() {
   if (existsSync14(AUTH_FILE)) {
     unlinkSync4(AUTH_FILE);
@@ -6467,7 +6481,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle2(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle2(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle2(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle2("1.7.68")}`
+    `SYNKRO_VERSION=${shellQuoteSingle2("1.7.71")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle2(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle2(safeUserId)}`);
@@ -7127,7 +7141,7 @@ async function installCommand(opts = {}) {
   await setTelemetryState({ enabled: true, remoteFlushEnabled: telemetryConsent });
   emit("install", {
     phase: "started",
-    cli_version_to: "1.7.68",
+    cli_version_to: "1.7.71",
     agents_detected: agents.map((a) => a.kind),
     with_github: false,
     with_local_cc: false,
@@ -10203,13 +10217,20 @@ function parseSession(filePath, sessionId) {
     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 _cr = msgObj?.content ?? e.content;
+    const isToolResult = kind === "user" && (!!e.toolUseResult || Array.isArray(_cr) && _cr.some((b) => b?.type === "tool_result" || b?.tool_use_id != null));
+    const finalKind = isToolResult ? "tool" : kind;
     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, 2e4), id: b.id }));
     if (!text.trim() && toolCalls.length === 0) continue;
     const msg = {
       message_index: i,
-      type: kind,
+      type: finalKind,
+      // CC's per-entry uuid is STABLE across transcript rewrites/compaction; message_index (line
+      // number) is not. The server keys conversation_messages on this uuid so re-imports update in
+      // place instead of orphaning/duplicating rows. Falls back to message_index server-side if absent.
+      uuid: typeof e.uuid === "string" ? e.uuid : void 0,
       content: text.trim() ? text.slice(0, 8e3) : "\u21B3 " + toolCalls.map((t) => t.name).join(", "),
       timestamp: e.timestamp || null
     };
@@ -11016,7 +11037,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.68");
+  console.log("1.7.71");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents