@synkro-sh/cli 1.4.47 → 1.4.49

package/dist/bootstrap.js

@@ -1864,11 +1864,10 @@ async function main() {
         return;
       }
 
-      const proposedShort = proposed.slice(0, 4000);
       const graderPrompt = [
         'File: ' + filePath,
-        'Content (first 4000 chars):',
-        proposedShort,
+        'Content:',
+        proposed,
         '',
         'CWE rules to check against:',
         JSON.stringify(cweRules),
@@ -4465,9 +4464,14 @@ function findTask(channel = CHANNEL_PRIMARY) {
 function startTask(opts = {}) {
   const ch = opts.channel ?? CHANNEL_PRIMARY;
   const cwd = opts.cwd ?? ch.sessionDir;
-  const existing = findTask(ch);
-  if (existing) {
+  let existing = findTask(ch);
+  while (existing) {
+    if (existing.status === "Running") {
+      spawnSync2("tmux", ["kill-session", "-t", ch.tmuxSession], { encoding: "utf-8" });
+      spawnSync2("pueue", ["kill", String(existing.id)], { encoding: "utf-8" });
+    }
     spawnSync2("pueue", ["remove", String(existing.id)], { encoding: "utf-8" });
+    existing = findTask(ch);
   }
   const runScript = join8(cwd, "run-claude.sh");
   const args2 = [
@@ -4895,7 +4899,7 @@ __export(install_exports, {
 import { existsSync as existsSync11, mkdirSync as mkdirSync8, writeFileSync as writeFileSync7, chmodSync as chmodSync2, readFileSync as readFileSync10, readdirSync } from "fs";
 import { homedir as homedir10 } from "os";
 import { join as join11 } from "path";
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync5, spawnSync as spawnSync3 } from "child_process";
 import { createInterface as createInterface3 } from "readline";
 function sanitizeGatewayCandidate(raw) {
   if (!raw) return void 0;
@@ -4939,7 +4943,6 @@ function ensureSynkroDir() {
 function writeHookScripts() {
   const bashScriptPath = join11(HOOKS_DIR, "cc-bash-judge.ts");
   const bashFollowupScriptPath = join11(HOOKS_DIR, "cc-bash-followup.ts");
-  const editCaptureScriptPath = join11(HOOKS_DIR, "cc-edit-capture.sh");
   const editPrecheckScriptPath = join11(HOOKS_DIR, "cc-edit-precheck.ts");
   const cwePrecheckScriptPath = join11(HOOKS_DIR, "cc-cwe-precheck.ts");
   const cvePrecheckScriptPath = join11(HOOKS_DIR, "cc-cve-precheck.ts");
@@ -4956,7 +4959,6 @@ function writeHookScripts() {
   const cursorBashFollowupPath = join11(HOOKS_DIR, "cursor-bash-followup.sh");
   writeFileSync7(bashScriptPath, BASH_JUDGE_TS, "utf-8");
   writeFileSync7(bashFollowupScriptPath, BASH_FOLLOWUP_TS, "utf-8");
-  writeFileSync7(editCaptureScriptPath, "", "utf-8");
   writeFileSync7(editPrecheckScriptPath, EDIT_PRECHECK_TS, "utf-8");
   writeFileSync7(cwePrecheckScriptPath, CWE_PRECHECK_TS, "utf-8");
   writeFileSync7(cvePrecheckScriptPath, CVE_PRECHECK_TS, "utf-8");
@@ -4973,7 +4975,6 @@ function writeHookScripts() {
   writeFileSync7(cursorBashFollowupPath, CURSOR_BASH_FOLLOWUP_SCRIPT, "utf-8");
   chmodSync2(bashScriptPath, 493);
   chmodSync2(bashFollowupScriptPath, 493);
-  chmodSync2(editCaptureScriptPath, 493);
   chmodSync2(editPrecheckScriptPath, 493);
   chmodSync2(cwePrecheckScriptPath, 493);
   chmodSync2(cvePrecheckScriptPath, 493);
@@ -4991,7 +4992,6 @@ function writeHookScripts() {
   return {
     bashScript: bashScriptPath,
     bashFollowupScript: bashFollowupScriptPath,
-    editCaptureScript: editCaptureScriptPath,
     editPrecheckScript: editPrecheckScriptPath,
     cwePrecheckScript: cwePrecheckScriptPath,
     cvePrecheckScript: cvePrecheckScriptPath,
@@ -5035,7 +5035,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.4.47")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.4.49")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -5160,13 +5160,14 @@ function assertGatewayAllowed(gatewayUrl) {
 }
 function isAlreadyInstalled() {
   const requiredScripts = [
-    join11(HOOKS_DIR, "cc-bash-judge.sh"),
-    join11(HOOKS_DIR, "cc-bash-followup.sh"),
-    join11(HOOKS_DIR, "cc-edit-precheck.sh"),
-    join11(HOOKS_DIR, "cc-edit-capture.sh"),
-    join11(HOOKS_DIR, "cc-plan-judge.sh"),
-    join11(HOOKS_DIR, "cc-stop-summary.sh"),
-    join11(HOOKS_DIR, "cc-session-start.sh")
+    join11(HOOKS_DIR, "cc-bash-judge.ts"),
+    join11(HOOKS_DIR, "cc-bash-followup.ts"),
+    join11(HOOKS_DIR, "cc-edit-precheck.ts"),
+    join11(HOOKS_DIR, "cc-cwe-precheck.ts"),
+    join11(HOOKS_DIR, "cc-cve-precheck.ts"),
+    join11(HOOKS_DIR, "cc-plan-judge.ts"),
+    join11(HOOKS_DIR, "cc-stop-summary.ts"),
+    join11(HOOKS_DIR, "cc-session-start.ts")
   ];
   if (!requiredScripts.every((p) => existsSync11(p))) return false;
   if (!existsSync11(CONFIG_PATH3)) return false;
@@ -5186,6 +5187,35 @@ function isAlreadyInstalled() {
   }
   return true;
 }
+function printChannelDiagnostics() {
+  try {
+    const tmuxCheck = spawnSync3("tmux", ["has-session", "-t", "synkro-local-cc"], { encoding: "utf-8" });
+    console.warn(`    tmux session: ${tmuxCheck.status === 0 ? "running" : "not running"}`);
+    const pueueTask = findTask();
+    console.warn(`    pueue task: ${pueueTask ? `id=${pueueTask.id} status=${pueueTask.status}` : "not found"}`);
+    const bunCheck = spawnSync3("bun", ["--version"], { encoding: "utf-8" });
+    console.warn(`    bun: ${bunCheck.status === 0 ? bunCheck.stdout.trim() : "not found"}`);
+    const claudeCheck = spawnSync3("claude", ["--version"], { encoding: "utf-8" });
+    console.warn(`    claude: ${claudeCheck.status === 0 ? claudeCheck.stdout.trim().split("\n")[0] : "not found"}`);
+    if (pueueTask) {
+      const logs = tailLogs(15);
+      if (logs && logs !== "(no output)") {
+        console.warn(`    pueue logs (last 15 lines):`);
+        for (const line of logs.split("\n").slice(0, 15)) {
+          console.warn(`      ${line}`);
+        }
+      }
+    }
+    const logPath = join11(homedir10(), ".synkro", "cc_sessions", "run-claude.log");
+    if (existsSync11(logPath)) {
+      const logContent = readFileSync10(logPath, "utf-8").trim().split("\n").slice(-10);
+      console.warn(`    run-claude.log:`);
+      for (const line of logContent) console.warn(`      ${line}`);
+    }
+  } catch {
+  }
+  console.warn(`    Run \`synkro local-cc status\` and \`synkro local-cc logs --tmux\` to debug.`);
+}
 async function installCommand(opts = {}) {
   const gatewayUrl = opts.gatewayUrl || sanitizeGatewayCandidate(process.env.SYNKRO_GATEWAY_URL) || "https://api.synkro.sh";
   try {
@@ -5223,17 +5253,18 @@ async function installCommand(opts = {}) {
           assertPueueInstalled();
           assertTmuxInstalled();
           installLocalCC();
-          const t = ensureRunning();
-          console.log(`  pueue task: id=${t.id} status=${t.status}`);
-          console.log("  Waiting for channel...");
-          const ready = await waitForChannelReady(CHANNEL_PORT, 6e4, CHANNEL_HOST);
-          if (ready) console.log(`  channel ready at ${CHANNEL_HOST}:${CHANNEL_PORT}`);
-          else console.warn("  \u26A0 channel did not come up within 60s \u2014 check `synkro local-cc logs`");
+          const t1 = ensureRunning();
           const t2 = ensureRunning({ channel: CHANNEL_SECONDARY });
-          console.log(`  CWE channel: id=${t2.id} status=${t2.status}`);
-          const ready2 = await waitForChannelReady(CHANNEL_2_PORT, 6e4, CHANNEL_HOST, CHANNEL_SECONDARY.tmuxSession);
-          if (ready2) console.log(`  CWE channel ready at ${CHANNEL_HOST}:${CHANNEL_2_PORT}`);
-          else console.warn("  \u26A0 CWE channel did not come up within 60s");
+          console.log(`  channel 1: pueue id=${t1.id}  channel 2: pueue id=${t2.id}`);
+          console.log("  Waiting for both channels...");
+          const [ready1, ready2] = await Promise.all([
+            waitForChannelReady(CHANNEL_PORT, 6e4, CHANNEL_HOST),
+            waitForChannelReady(CHANNEL_2_PORT, 6e4, CHANNEL_HOST, CHANNEL_SECONDARY.tmuxSession)
+          ]);
+          if (ready1) console.log(`  channel 1 ready at ${CHANNEL_HOST}:${CHANNEL_PORT}`);
+          else console.warn("  \u26A0 channel 1 did not come up within 60s \u2014 check `synkro local-cc logs`");
+          if (ready2) console.log(`  channel 2 ready at ${CHANNEL_HOST}:${CHANNEL_2_PORT}`);
+          else console.warn("  \u26A0 channel 2 did not come up within 60s");
           updateLocalInferenceFlag(true);
         } catch (err) {
           console.warn(`  \u26A0 Local-CC setup skipped: ${err.message}`);
@@ -5306,7 +5337,6 @@ async function installCommand(opts = {}) {
   console.log("Wrote hook scripts:");
   console.log(`  ${scripts.bashScript}`);
   console.log(`  ${scripts.bashFollowupScript}`);
-  console.log(`  ${scripts.editCaptureScript}`);
   console.log(`  ${scripts.editPrecheckScript}`);
   console.log(`  ${scripts.planJudgeScript}`);
   console.log(`  ${scripts.stopSummaryScript}`);
@@ -5341,7 +5371,6 @@ async function installCommand(opts = {}) {
       installCCHooks(agent.settingsPath, {
         bashJudgeScriptPath: scripts.bashScript,
         bashFollowupScriptPath: scripts.bashFollowupScript,
-        editCaptureScriptPath: scripts.editCaptureScript,
         editPrecheckScriptPath: scripts.editPrecheckScript,
         cwePrecheckScriptPath: scripts.cwePrecheckScript,
         cvePrecheckScriptPath: scripts.cvePrecheckScript,
@@ -5443,72 +5472,64 @@ async function installCommand(opts = {}) {
     console.warn(`  \u26A0 Some dependencies missing \u2014 \`synkro local-cc enable\` may not work until they're installed.`);
   }
   console.log();
-  if (profile.localInference) {
+  const priorLocalFlag = (() => {
     try {
+      const content = readFileSync10(CONFIG_PATH3, "utf-8");
+      return content.includes("SYNKRO_LOCAL_INFERENCE='yes'");
+    } catch {
+      return false;
+    }
+  })();
+  if (profile.localInference || priorLocalFlag && localCcDeps.length === 3) {
+    try {
+      stopTask();
+      stopTask(CHANNEL_SECONDARY);
       const r = installLocalCC();
       console.log(`Installed local-CC channel plugin at ${r.pluginPath}`);
-      const t = ensureRunning();
-      console.log(`Local-CC pueue task: id=${t.id} status=${t.status}`);
-      console.log("Waiting for channel (up to 60s)...");
-      const ready = await waitForChannelReady(CHANNEL_PORT, 6e4, CHANNEL_HOST);
-      if (ready) {
-        console.log(`  channel ready at ${CHANNEL_HOST}:${CHANNEL_PORT}`);
-        try {
-          console.log("  warming up inference...");
-          await submitToChannel("grade-bash", "Proposed command: echo hello\nUser intent: warmup\nRecent user messages: []\nRecent actions: []\nOrg rules: []\n", { timeoutMs: 3e4 });
-          console.log("  inference warm\n");
-        } catch {
-          console.log("  warmup skipped (non-fatal)\n");
-        }
+      const t1 = startTask();
+      const t2 = startTask({ channel: CHANNEL_SECONDARY });
+      console.log(`Channel 1 (org rules):  pueue id=${t1.id} status=${t1.status}`);
+      console.log(`Channel 2 (CWE scan):   pueue id=${t2.id} status=${t2.status}`);
+      console.log("Waiting for both channels (up to 60s)...");
+      const [ready1, ready2] = await Promise.all([
+        waitForChannelReady(CHANNEL_PORT, 6e4, CHANNEL_HOST),
+        waitForChannelReady(CHANNEL_2_PORT, 6e4, CHANNEL_HOST, CHANNEL_SECONDARY.tmuxSession)
+      ]);
+      if (ready1) {
+        console.log(`  channel 1 ready at ${CHANNEL_HOST}:${CHANNEL_PORT}`);
       } else {
-        console.warn(`  \u26A0 Channel did not come up within 60s.`);
-        try {
-          const { spawnSync: sp } = await import("child_process");
-          const tmuxCheck = sp("tmux", ["has-session", "-t", "synkro-local-cc"], { encoding: "utf-8" });
-          console.warn(`    tmux session: ${tmuxCheck.status === 0 ? "running" : "not running"}`);
-          const pueueTask = findTask();
-          console.warn(`    pueue task: ${pueueTask ? `id=${pueueTask.id} status=${pueueTask.status}` : "not found"}`);
-          const bunCheck = sp("bun", ["--version"], { encoding: "utf-8" });
-          console.warn(`    bun: ${bunCheck.status === 0 ? bunCheck.stdout.trim() : "not found"}`);
-          const claudeCheck = sp("claude", ["--version"], { encoding: "utf-8" });
-          console.warn(`    claude: ${claudeCheck.status === 0 ? claudeCheck.stdout.trim().split("\n")[0] : "not found"}`);
-          if (pueueTask) {
-            const logs = tailLogs(15);
-            if (logs && logs !== "(no output)") {
-              console.warn(`    pueue logs (last 15 lines):`);
-              for (const line of logs.split("\n").slice(0, 15)) {
-                console.warn(`      ${line}`);
-              }
-            }
-          }
-          const logPath = join11(homedir10(), ".synkro", "cc_sessions", "run-claude.log");
-          if (existsSync11(logPath)) {
-            const logContent = readFileSync10(logPath, "utf-8").trim().split("\n").slice(-10);
-            console.warn(`    run-claude.log:`);
-            for (const line of logContent) console.warn(`      ${line}`);
-          }
-        } catch {
-        }
-        console.warn(`    Run \`synkro local-cc status\` and \`synkro local-cc logs --tmux\` to debug.
-`);
+        console.warn(`  \u26A0 Channel 1 did not come up within 60s.`);
+        printChannelDiagnostics();
       }
-      const t2 = ensureRunning({ channel: CHANNEL_SECONDARY });
-      console.log(`Local-CC CWE channel: id=${t2.id} status=${t2.status}`);
-      console.log("Waiting for CWE channel (up to 60s)...");
-      const ready2 = await waitForChannelReady(CHANNEL_2_PORT, 6e4, CHANNEL_HOST, CHANNEL_SECONDARY.tmuxSession);
       if (ready2) {
-        console.log(`  CWE channel ready at ${CHANNEL_HOST}:${CHANNEL_2_PORT}`);
-        try {
-          console.log("  warming up CWE inference...");
-          await submitToChannel("grade-cwe", 'File: /tmp/warmup.ts\nContent (first 4000 chars):\nconsole.log("hello");\n\nCWE rules to check against:\n[]\n', { timeoutMs: 3e4, port: CHANNEL_2_PORT });
-          console.log("  CWE inference warm\n");
-        } catch {
-          console.log("  CWE warmup skipped (non-fatal)\n");
-        }
+        console.log(`  channel 2 ready at ${CHANNEL_HOST}:${CHANNEL_2_PORT}`);
       } else {
-        console.warn(`  \u26A0 CWE channel did not come up within 60s.`);
-        console.warn(`    Run \`synkro local-cc status\` to debug.
-`);
+        console.warn(`  \u26A0 Channel 2 did not come up within 60s.`);
+        console.warn(`    Run \`synkro local-cc status\` to debug.`);
+      }
+      if (ready1 || ready2) {
+        console.log("Warming up inference...");
+        const warmups = [];
+        if (ready1) {
+          warmups.push(
+            submitToChannel("grade-bash", "Proposed command: echo hello\nUser intent: warmup\nRecent user messages: []\nRecent actions: []\nOrg rules: []\n", { timeoutMs: 3e4 }).then(() => {
+              console.log("  channel 1 warm");
+            }).catch(() => {
+              console.log("  channel 1 warmup skipped (non-fatal)");
+            })
+          );
+        }
+        if (ready2) {
+          warmups.push(
+            submitToChannel("grade-cwe", 'File: /tmp/warmup.ts\nContent (first 4000 chars):\nconsole.log("hello");\n\nCWE rules to check against:\n[]\n', { timeoutMs: 3e4, port: CHANNEL_2_PORT }).then(() => {
+              console.log("  channel 2 warm");
+            }).catch(() => {
+              console.log("  channel 2 warmup skipped (non-fatal)");
+            })
+          );
+        }
+        await Promise.all(warmups);
+        console.log();
       }
     } catch (err) {
       console.warn(`  \u26A0 Local-CC setup failed: ${err.message}
@@ -7004,7 +7025,7 @@ var localCc_exports = {};
 __export(localCc_exports, {
   localCcCommand: () => localCcCommand
 });
-import { spawnSync as spawnSync3 } from "child_process";
+import { spawnSync as spawnSync4 } from "child_process";
 import { homedir as homedir14 } from "os";
 import { join as join16 } from "path";
 import { existsSync as existsSync16, readFileSync as readFileSync14, writeFileSync as writeFileSync9 } from "fs";
@@ -7148,7 +7169,7 @@ async function cmdStatus() {
   }
   const ch1Up = await isChannelAvailable();
   console.log(`Channel 1 ${CHANNEL_HOST}:${CHANNEL_PORT}: ${ch1Up ? "reachable" : "unreachable"}`);
-  const tmux1 = spawnSync3("tmux", ["has-session", "-t", TMUX_SESSION_NAME], { encoding: "utf-8" });
+  const tmux1 = spawnSync4("tmux", ["has-session", "-t", TMUX_SESSION_NAME], { encoding: "utf-8" });
   console.log(`tmux '${TMUX_SESSION_NAME}': ${tmux1.status === 0 ? "live" : "absent"}`);
   const t2 = findTask(CHANNEL_SECONDARY);
   if (!t2) {
@@ -7158,7 +7179,7 @@ async function cmdStatus() {
   }
   const ch2Up = await isChannelAvailable(CHANNEL_2_PORT);
   console.log(`Channel 2 ${CHANNEL_HOST}:${CHANNEL_2_PORT}: ${ch2Up ? "reachable" : "unreachable"}`);
-  const tmux2 = spawnSync3("tmux", ["has-session", "-t", TMUX_SESSION_NAME_2], { encoding: "utf-8" });
+  const tmux2 = spawnSync4("tmux", ["has-session", "-t", TMUX_SESSION_NAME_2], { encoding: "utf-8" });
   console.log(`tmux '${TMUX_SESSION_NAME_2}': ${tmux2.status === 0 ? "live" : "absent"}`);
 }
 async function cmdEnable() {
@@ -7350,7 +7371,7 @@ function cmdLogs(rest) {
 function cmdAttach(rest) {
   assertTmuxInstalled();
   const readonly = rest.some((a) => a === "--readonly" || a === "-r");
-  const has = spawnSync3("tmux", ["has-session", "-t", TMUX_SESSION_NAME], { encoding: "utf-8" });
+  const has = spawnSync4("tmux", ["has-session", "-t", TMUX_SESSION_NAME], { encoding: "utf-8" });
   if (has.status !== 0) {
     console.error(`No tmux session '${TMUX_SESSION_NAME}' running. Start it with: synkro local-cc start`);
     process.exit(1);
@@ -7363,7 +7384,7 @@ function cmdAttach(rest) {
   console.log("Detach with Ctrl-B then D. (Do not press Ctrl-C \u2014 that would interrupt claude.)");
   console.log();
   const args2 = readonly ? ["attach-session", "-r", "-t", TMUX_SESSION_NAME] : ["attach-session", "-t", TMUX_SESSION_NAME];
-  const r = spawnSync3("tmux", args2, { stdio: "inherit" });
+  const r = spawnSync4("tmux", args2, { stdio: "inherit" });
   process.exit(r.status ?? 0);
 }
 async function cmdTest() {