@synkro-sh/cli 1.10.4 → 1.10.5

package/dist/bootstrap.js

@@ -147,7 +147,7 @@ function getIdentity() {
   if (cached2) return cached2;
   let cliVersion2 = "0.0.0";
   try {
-    cliVersion2 = "1.10.4";
+    cliVersion2 = "1.10.5";
   } catch {
   }
   const creds = loadCredentialsIdentity();
@@ -7840,7 +7840,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.10.4";
+      if (true) return "1.10.5";
       try {
         const pkg = JSON.parse(readFileSync17(new URL("../../package.json", import.meta.url), "utf8"));
         if (pkg.version) return pkg.version;
@@ -8900,7 +8900,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle2(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle2(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle2(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle2("1.10.4")}`
+    `SYNKRO_VERSION=${shellQuoteSingle2("1.10.5")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle2(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle2(safeUserId)}`);
@@ -9647,7 +9647,7 @@ async function installCommand(opts = {}) {
   await setTelemetryState({ enabled: true, remoteFlushEnabled: telemetryConsent });
   emit("install", {
     phase: "started",
-    cli_version_to: "1.10.4",
+    cli_version_to: "1.10.5",
     agents_detected: agents.map((a) => a.kind),
     with_github: false,
     with_local_cc: false,
@@ -16705,11 +16705,14 @@ var init_events = __esm({
 });
 
 // cli/harness/cursor.ts
+function unwrapReplay(text) {
+  return text.replace(/<\/?user_query>/gi, "").trim();
+}
 function textOf(message) {
   const content = message?.content;
-  if (typeof content === "string") return content.trim();
+  if (typeof content === "string") return unwrapReplay(content);
   if (!Array.isArray(content)) return "";
-  return content.filter((part) => part && (part.type === "text" || typeof part.text === "string")).map((part) => String(part.text || "")).join("").trim();
+  return unwrapReplay(content.filter((part) => part && (part.type === "text" || typeof part.text === "string")).map((part) => String(part.text || "")).join(""));
 }
 function toolPayload(toolCall) {
   if (!toolCall) return { kind: "other", body: {} };
@@ -16784,6 +16787,15 @@ function parseCursorLine(line) {
     }
     return [];
   }
+  if (type === "retry") {
+    if (subtype !== "starting") return [];
+    const attempt = Number(frame.attempt || 0);
+    return [{
+      type: "notice",
+      kind: "retry",
+      text: "connection dropped, resuming" + (attempt ? " (attempt " + attempt + ")" : "") + "\u2026"
+    }];
+  }
   if (type === "result") {
     return [{
       type: "turn-end",
@@ -16924,49 +16936,94 @@ var init_render2 = __esm({
 
 // cli/harness/run.ts
 import { spawn as spawn9 } from "child_process";
-async function runCursorTurn(opts) {
-  const write2 = opts.write || ((text) => process.stdout.write(text));
-  const width = opts.width || Number(process.stdout.columns || 100);
+function replayKey(event) {
+  switch (event.type) {
+    case "user-message":
+      return "u:" + event.text;
+    case "assistant-message":
+      return "a:" + event.text;
+    case "tool-start":
+      return "s:" + event.id;
+    case "tool-end":
+      return "e:" + event.id;
+    default:
+      return "";
+  }
+}
+function createTurnSink(opts) {
   const events = [];
   let blocked = 0;
   let lastWasThinking = false;
+  let replaying = false;
+  const seen = /* @__PURE__ */ new Set();
+  let sawTurnEnd = false;
+  let sawAnswer = false;
+  let buffer = "";
+  const emit2 = (event) => {
+    events.push(event);
+    if (event.type === "tool-end" && event.blocked) blocked += 1;
+    opts.onEvent?.(event);
+    if (event.type === "thinking") {
+      if (lastWasThinking) return;
+      lastWasThinking = true;
+    } else {
+      lastWasThinking = false;
+    }
+    const rendered = renderEvent(event, opts.width);
+    if (rendered.length) opts.write(rendered.join("\n") + "\n");
+  };
+  const take = (event) => {
+    if (event.type === "notice" && event.kind === "retry") replaying = true;
+    const key = replayKey(event);
+    if (key) {
+      if (replaying && seen.has(key)) return;
+      seen.add(key);
+    }
+    if (event.type === "turn-end") sawTurnEnd = true;
+    if (event.type === "assistant-message") sawAnswer = true;
+    emit2(event);
+  };
+  return {
+    chunk(text) {
+      const { lines, rest } = feed(buffer, text);
+      buffer = rest;
+      for (const line of lines) for (const event of parseCursorLine(line)) take(event);
+    },
+    notice(text) {
+      emit2({ type: "notice", text });
+    },
+    finish(exit) {
+      if (!sawTurnEnd) {
+        if (exit !== 0) {
+          emit2({
+            type: "notice",
+            text: sawAnswer ? "cursor-agent exited " + exit + " after retrying; the reply above is complete" : "cursor-agent exited " + exit + " without completing the turn"
+          });
+        }
+        emit2({ type: "turn-end", ok: sawAnswer, text: "" });
+      }
+      return { events, blocked, exitCode: sawAnswer ? 0 : exit };
+    }
+  };
+}
+async function runCursorTurn(opts) {
+  const write2 = opts.write || ((text) => process.stdout.write(text));
+  const width = opts.width || Number(process.stdout.columns || 100);
+  const sink = createTurnSink({ write: write2, onEvent: opts.onEvent, width });
   return new Promise((resolve7) => {
     const child = spawn9("cursor-agent", cursorArgs(opts.prompt), {
       cwd: opts.cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
-    let buffer = "";
-    child.stdout.on("data", (chunk) => {
-      const { lines, rest } = feed(buffer, chunk.toString("utf8"));
-      buffer = rest;
-      for (const line of lines) {
-        for (const event of parseCursorLine(line)) {
-          events.push(event);
-          if (event.type === "tool-end" && event.blocked) blocked += 1;
-          opts.onEvent?.(event);
-          if (event.type === "thinking") {
-            if (lastWasThinking) continue;
-            lastWasThinking = true;
-          } else {
-            lastWasThinking = false;
-          }
-          const rendered = renderEvent(event, width);
-          if (rendered.length) write2(rendered.join("\n") + "\n");
-        }
-      }
-    });
+    child.stdout.on("data", (chunk) => sink.chunk(chunk.toString("utf8")));
     child.stderr.on("data", (chunk) => {
       const text = chunk.toString("utf8").trim();
-      if (/error|fatal/i.test(text) && !/RetriableError/i.test(text)) {
-        write2(renderEvent({ type: "notice", text }, width).join("\n") + "\n");
-      }
-    });
-    child.on("close", (code) => {
-      resolve7({ events, blocked, exitCode: code ?? 0 });
+      if (/error|fatal/i.test(text) && !/RetriableError/i.test(text)) sink.notice(text);
     });
+    child.on("close", (code) => resolve7(sink.finish(code ?? 0)));
     child.on("error", (error) => {
-      write2(renderEvent({ type: "notice", text: "failed to start cursor-agent: " + String(error) }, width).join("\n") + "\n");
-      resolve7({ events, blocked, exitCode: 1 });
+      sink.notice("failed to start cursor-agent: " + String(error));
+      resolve7(sink.finish(1));
     });
   });
 }
@@ -18312,7 +18369,7 @@ function pseudonymousHostnameHash(installationId, host) {
 }
 function cliVersion() {
   try {
-    return "1.10.4";
+    return "1.10.5";
   } catch {
     return "0.0.0";
   }
@@ -19082,7 +19139,7 @@ var subArgs = args.slice(1);
 var isDetachedChild = process.env.SYNKRO_TELEMETRY_DETACHED === "1";
 var FLUSH_SKIP = /* @__PURE__ */ new Set(["grade", "inventory-sync", "version", "--version", "-v", "help", "--help", "-h", ""]);
 function printVersion() {
-  console.log("1.10.4");
+  console.log("1.10.5");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents