@synkro-sh/cli 1.10.10 → 1.10.11

package/dist/bootstrap.js

@@ -147,7 +147,7 @@ function getIdentity() {
   if (cached2) return cached2;
   let cliVersion2 = "0.0.0";
   try {
-    cliVersion2 = "1.10.10";
+    cliVersion2 = "1.10.11";
   } catch {
   }
   const creds = loadCredentialsIdentity();
@@ -7933,7 +7933,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.10";
+      if (true) return "1.10.11";
       try {
         const pkg = JSON.parse(readFileSync17(new URL("../../package.json", import.meta.url), "utf8"));
         if (pkg.version) return pkg.version;
@@ -8993,7 +8993,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle2(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle2(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle2(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle2("1.10.10")}`
+    `SYNKRO_VERSION=${shellQuoteSingle2("1.10.11")}`
   ];
   if (safeSynkroBin) lines2.push(`SYNKRO_CLI_BIN=${shellQuoteSingle2(safeSynkroBin)}`);
   if (safeUserId) lines2.push(`SYNKRO_USER_ID=${shellQuoteSingle2(safeUserId)}`);
@@ -9740,7 +9740,7 @@ async function installCommand(opts = {}) {
   await setTelemetryState({ enabled: true, remoteFlushEnabled: telemetryConsent });
   emit("install", {
     phase: "started",
-    cli_version_to: "1.10.10",
+    cli_version_to: "1.10.11",
     agents_detected: agents.map((a) => a.kind),
     with_github: false,
     with_local_cc: false,
@@ -18317,6 +18317,7 @@ var init_screen = __esm({
       cwd;
       write;
       transcript = [];
+      inlinePanel = [];
       draft = "";
       input = "";
       selectionAnchor = null;
@@ -18358,6 +18359,17 @@ var init_screen = __esm({
         this.selectionFocus = null;
         this.draw();
       }
+      setInlinePanel(lines2) {
+        this.inlinePanel = [...lines2];
+        this.scrollOffset = 0;
+        this.draw();
+      }
+      commitInlinePanel(lines2) {
+        this.inlinePanel = [];
+        this.transcript.push(...lines2);
+        this.scrollOffset = 0;
+        this.draw();
+      }
       selectionRange() {
         if (this.selectionAnchor === null || this.selectionFocus === null || this.selectionAnchor === this.selectionFocus) return null;
         return [Math.min(this.selectionAnchor, this.selectionFocus), Math.max(this.selectionAnchor, this.selectionFocus)];
@@ -18466,7 +18478,7 @@ var init_screen = __esm({
         const status = this.status === "Ready" ? S2.secondary + "  \xB7 Ready" + S2.reset : statusLine({ tick: this.tick, text: this.status, elapsedMs: Date.now() - this.statusSince, width });
         const rule = S2.border + "  " + "\u2500".repeat(inner) + S2.reset;
         const inputRows = this.inputRows(width);
-        const composer = [rule, ...inputRows.map((row2, i) => S2.composer + (i ? "    " : S2.user + "  \u276F ") + this.selectedText(row2) + (i === inputRows.length - 1 ? S2.user + " \u258C" : "") + S2.reset), rule];
+        const composer = this.inlinePanel.length ? [rule] : [rule, ...inputRows.map((row2, i) => S2.composer + (i ? "    " : S2.user + "  \u276F ") + this.selectedText(row2) + (i === inputRows.length - 1 ? S2.user + " \u258C" : "") + S2.reset), rule];
         const usedPercent = this.context ? Math.min(100, Math.round(this.used / this.context * 100)) : null;
         const contextUsage = usedPercent === null ? "\u2014 context" : usedPercent + "% context";
         const resetDate = this.weeklyResetsAt == null ? "" : "  \xB7  " + resetDateFormat.format(new Date(this.weeklyResetsAt * 1e3));
@@ -18477,7 +18489,7 @@ var init_screen = __esm({
         const right = badge + S2.secondary + "  \xB7  " + provider + (this.model ? "  " + cleanOutput(this.model) : "") + "  \xB7  \u29C9 powered by synkro  " + S2.reset + S2.canvas;
         const footer = left + " ".repeat(Math.max(1, width - visible(left) - visible(right))) + right;
         const viewport = Math.max(3, height - composer.length - 2);
-        const fullContent = [...this.transcript, ...draft, status];
+        const fullContent = [...this.transcript, ...draft, ...this.inlinePanel, status];
         const maxScroll = Math.max(0, fullContent.length - viewport);
         const effectiveOffset = Math.min(this.scrollOffset, maxScroll);
         const end = fullContent.length - effectiveOffset;
@@ -18566,17 +18578,22 @@ async function loadFixPoll(itemId, fetchImpl = fetch) {
     recommendedIdx
   };
 }
-async function recordFixPoll(itemId, chosenIdx, fetchImpl = fetch) {
+async function recordFixPoll(itemId, selection, fetchImpl = fetch) {
   const response = await fetchImpl(pollBaseUrl() + "/record", {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify({ item_id: itemId, chosen_idx: chosenIdx })
+    body: JSON.stringify({
+      item_id: itemId,
+      chosen_idx: selection.chosenIdx,
+      custom_response: selection.customResponse || void 0
+    })
   });
   return response.ok;
 }
-function fixPollLines(poll, selected, width = 100) {
+function fixPollLines(poll, selected, width = 100, customResponse = "", editingCustom = false) {
   const max = Math.max(32, width - 10);
-  const choices = [...poll.candidates, "None of the above"];
+  const choices = [...poll.candidates, CUSTOM_CHOICE, NONE_CHOICE];
+  const customIndex = poll.candidates.length;
   const scope = [poll.ruleId, poll.filePath].filter(Boolean).join("  \xB7  ");
   const lines2 = [
     "",
@@ -18590,40 +18607,101 @@ function fixPollLines(poll, selected, width = 100) {
     const text = wrap(index + 1 + ". " + recommendation + neutralizeTerminalControls(choice), max);
     lines2.push(prefix + (text[0] || "") + S2.reset);
     for (const continuation of text.slice(1)) lines2.push("      " + continuation);
+    if (index === customIndex && editingCustom) {
+      const answer = neutralizeTerminalControls(customResponse);
+      const answerLines = wrap("Your answer: " + answer + "\u258C", max - 2);
+      for (const answerLine of answerLines) lines2.push(S2.user + "      " + answerLine + S2.reset);
+    }
   });
-  lines2.push("", S2.dim + "  \u2191/\u2193 select  \xB7  Enter confirm  \xB7  1-" + choices.length + " choose" + S2.reset);
+  const footer = editingCustom ? "  Type your answer  \xB7  Enter submit  \xB7  Esc back" : "  \u2191/\u2193 select  \xB7  Enter confirm  \xB7  " + (choices.length === 10 ? "1-9/0" : "1-" + choices.length) + " choose";
+  lines2.push("", S2.dim + footer + S2.reset);
+  return lines2;
+}
+function fixPollResultLines(poll, selection, recorded, width = 100) {
+  const max = Math.max(32, width - 14);
+  const scope = [poll.ruleId, poll.filePath].filter(Boolean).join("  \xB7  ");
+  const selected = selection.customResponse ? "Custom answer: " + selection.customResponse : selection.chosenIdx >= 0 && selection.chosenIdx < poll.candidates.length ? "Selected: " + poll.candidates[selection.chosenIdx] : "Selected: " + NONE_CHOICE;
+  const lines2 = [
+    "",
+    (recorded ? S2.ok : S2.blocked) + S2.bold + "  " + (recorded ? "Synkro decision recorded" : "Synkro decision was not recorded") + S2.reset,
+    ...scope ? [S2.dim + "  " + neutralizeTerminalControls(scope) + S2.reset] : []
+  ];
+  const answer = wrap(neutralizeTerminalControls(selected), max);
+  answer.forEach((line, index) => lines2.push((index ? "      " : S2.user + "  \u23BF ") + line + S2.reset));
   return lines2;
 }
 async function pickFixPoll(poll, io = {}) {
   const input = io.input || process.stdin;
   const output = io.output || process.stdout;
-  if (!input.isTTY || !output.isTTY) return -1;
+  if (!input.isTTY || !output.isTTY) return { chosenIdx: -1, customResponse: "" };
+  const customIndex = poll.candidates.length;
+  const noneIndex = customIndex + 1;
+  const choices = poll.candidates.length + 2;
   let selected = poll.recommendedIdx >= 0 && poll.recommendedIdx < poll.candidates.length ? poll.recommendedIdx : 0;
+  let customResponse = "";
+  let editingCustom = false;
   let rendered = 0;
   const draw = () => {
-    if (rendered) output.write("\x1B[" + rendered + "A\x1B[J");
-    const lines2 = fixPollLines(poll, selected, Number(output.columns || 100));
-    output.write(lines2.join("\n") + "\n");
-    rendered = lines2.length;
+    const lines2 = fixPollLines(
+      poll,
+      selected,
+      Number(output.columns || 100),
+      customResponse,
+      editingCustom
+    );
+    if (io.render) io.render(lines2);
+    else {
+      if (rendered) output.write("\x1B[" + rendered + "A\x1B[J");
+      output.write(lines2.join("\n") + "\n");
+      rendered = lines2.length;
+    }
   };
-  const choice = await new Promise((resolve9) => {
-    const choices = poll.candidates.length + 1;
+  return new Promise((resolve9) => {
     const wasRaw = Boolean(input.isRaw);
-    const done = (index) => {
+    const done = (selection) => {
       input.off("data", onData);
       if (input.setRawMode) input.setRawMode(wasRaw);
-      resolve9(index === poll.candidates.length ? -1 : index);
+      resolve9(selection);
+    };
+    const confirmSelection = () => {
+      if (selected < customIndex) return done({ chosenIdx: selected, customResponse: "" });
+      if (selected === noneIndex) return done({ chosenIdx: -1, customResponse: "" });
+      editingCustom = true;
+      draw();
     };
     const onData = (chunk) => {
       const key2 = chunk.toString("utf8");
-      if (key2 === "") return done(poll.candidates.length);
-      if (key2 === "\x1B" || key2.toLowerCase() === "n") return done(poll.candidates.length);
-      if (key2 === "\r" || key2 === "\n") return done(selected);
+      if (editingCustom) {
+        if (key2 === "") return done({ chosenIdx: -1, customResponse: "" });
+        if (key2 === "\x1B") {
+          editingCustom = false;
+          draw();
+          return;
+        }
+        const typed = key2.replace(/\u001b\[[0-9;?]*[ -/]*[@-~]/g, "");
+        for (const char of typed) {
+          if (char === "\r" || char === "\n") {
+            const answer = customResponse.trim();
+            if (answer) return done({ chosenIdx: -2, customResponse: answer });
+          } else if (char === "\x7F" || char === "\b") customResponse = customResponse.slice(0, -1);
+          else if (char === "") customResponse = "";
+          else if (char === "") customResponse = customResponse.replace(/\s*\S+\s*$/, "");
+          else if (char >= " " && customResponse.length < MAX_CUSTOM_RESPONSE) customResponse += char;
+        }
+        draw();
+        return;
+      }
+      if (key2 === "") return done({ chosenIdx: -1, customResponse: "" });
+      if (key2 === "\x1B" || key2.toLowerCase() === "n") return done({ chosenIdx: -1, customResponse: "" });
+      if (key2 === "\r" || key2 === "\n") return confirmSelection();
       if (key2 === "\x1B[A" || key2 === "k") selected = (selected - 1 + choices) % choices;
       else if (key2 === "\x1B[B" || key2 === "j") selected = (selected + 1) % choices;
-      else if (/^[1-9]$/.test(key2)) {
-        const index = Number(key2) - 1;
-        if (index < choices) return done(index);
+      else if (/^[0-9]$/.test(key2)) {
+        const index = key2 === "0" ? 9 : Number(key2) - 1;
+        if (index < choices) {
+          selected = index;
+          return confirmSelection();
+        }
       } else return;
       draw();
     };
@@ -18632,7 +18710,6 @@ async function pickFixPoll(poll, io = {}) {
     input.on("data", onData);
     draw();
   });
-  return choice;
 }
 async function resolveFixPolls(events, io = {}) {
   const ids = Array.from(new Set(events.filter((event) => event.type === "tool-end").flatMap((event) => event.pollIds?.length ? event.pollIds : [event.pollId || ""]).filter(Boolean)));
@@ -18640,17 +18717,23 @@ async function resolveFixPolls(events, io = {}) {
   for (const itemId of ids) {
     const poll = await loadFixPoll(itemId, io.fetchImpl).catch(() => null);
     if (!poll) continue;
-    const chosen = await pickFixPoll(poll, io);
-    const ok = await recordFixPoll(itemId, chosen, io.fetchImpl).catch(() => false);
-    if (ok) recorded.push(chosen);
-    else (io.output || process.stdout).write(S2.blocked + "  Could not record that Synkro decision.\n" + S2.reset);
+    const selection = await pickFixPoll(poll, io);
+    const ok = await recordFixPoll(itemId, selection, io.fetchImpl).catch(() => false);
+    const result = fixPollResultLines(poll, selection, ok, Number((io.output || process.stdout).columns || 100));
+    if (io.commit) io.commit(result);
+    else (io.output || process.stdout).write(result.join("\n") + "\n");
+    if (ok) recorded.push(selection.chosenIdx);
   }
   return recorded;
 }
+var CUSTOM_CHOICE, NONE_CHOICE, MAX_CUSTOM_RESPONSE;
 var init_fixPoll = __esm({
   "cli/harness/fixPoll.ts"() {
     "use strict";
     init_render2();
+    CUSTOM_CHOICE = "Write my own answer";
+    NONE_CHOICE = "None of the above";
+    MAX_CUSTOM_RESPONSE = 4e3;
   }
 });
 
@@ -18659,6 +18742,12 @@ function deleteSelectedText(value, range) {
   if (!range) return value.slice(0, -1);
   return value.slice(0, range[0]) + value.slice(range[1]);
 }
+function idlePromptControl(data, hasSelection) {
+  if (data === "\x1B") return hasSelection ? "delete-selection" : "ignore";
+  if (data.includes("")) return "clear";
+  if (data.includes("")) return "exit";
+  return null;
+}
 function handleScrollInput(screen, data) {
   let handled = false;
   const mousePattern = /\x1b\[<(\d+);\d+;\d+[Mm]/g;
@@ -18739,19 +18828,24 @@ function readPrompt(screen) {
         screen.setInput(value);
         return;
       }
-      if (data === "\x1B") {
-        if (selection) {
-          value = deleteSelectedText(value, selection);
-          screen.setInput(value);
-        } else finish(null);
+      const control = idlePromptControl(data, Boolean(selection));
+      if (control === "delete-selection") {
+        value = deleteSelectedText(value, selection);
+        screen.setInput(value);
+        return;
+      }
+      if (control === "clear") {
+        value = "";
+        screen.setInput(value);
+        return;
+      }
+      if (control === "exit") {
+        finish(null);
         return;
       }
+      if (control === "ignore") return;
       if (data.startsWith("\x1B")) return;
       for (const char of data) {
-        if (char === "" || char === "") {
-          finish(null);
-          return;
-        }
         if (char === "\r" || char === "\n") {
           finish(value);
           return;
@@ -18789,12 +18883,11 @@ async function cancellable(screen, run2) {
 }
 async function resolveScreenFixPolls(screen, events) {
   if (!events.some((event) => event.type === "tool-end" && Boolean(event.pollId))) return;
-  screen.leave();
-  try {
-    await resolveFixPolls(events);
-  } finally {
-    screen.enter();
-  }
+  screen.setStatus("Decision required");
+  await resolveFixPolls(events, {
+    render: (lines2) => screen.setInlinePanel(lines2),
+    commit: (lines2) => screen.commitInlinePanel(lines2)
+  });
 }
 async function runSynkroSession(harness, cwd, prompt) {
   if (prompt) return runOnce(harness, cwd, prompt);
@@ -20169,7 +20262,7 @@ function pseudonymousHostnameHash(installationId, host) {
 }
 function cliVersion() {
   try {
-    return "1.10.10";
+    return "1.10.11";
   } catch {
     return "0.0.0";
   }
@@ -20939,7 +21032,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.10");
+  console.log("1.10.11");
 }
 function printHelp2() {
   console.log(`Synkro CLI \u2014 runtime safety for AI coding agents