@synkro-sh/cli 1.4.49 → 1.4.51

package/dist/bootstrap.js

@@ -4291,7 +4291,7 @@ log "Starting local-CC session..."
 log "claude version: $(claude --version 2>&1 | head -1)"
 
 # Kill any previous session so restarts come up clean.
-tmux kill-session -t "$SESSION" 2>/dev/null || true
+tmux kill-session -t "=$SESSION" 2>/dev/null || true
 
 # Start claude inside a detached tmux session so it has a real pty.
 # Redirect stderr to the log so we can see why it dies.
@@ -4302,7 +4302,7 @@ tmux new-session -d -s "$SESSION" \\
 # prompt: option 1 = "I am using this for local development" (accept),
 # option 2 = "Exit". Auto-accept by sending '1' + Enter.
 sleep 3
-if tmux has-session -t "$SESSION" 2>/dev/null; then
+if tmux has-session -t "=$SESSION" 2>/dev/null; then
   tmux send-keys -t "$SESSION" '1' 2>/dev/null || true
   sleep 1
   tmux send-keys -t "$SESSION" Enter 2>/dev/null || true
@@ -4322,7 +4322,7 @@ fi
 log "tmux session started successfully."
 
 # Block on the tmux session so pueue's task lifetime tracks claude's.
-while tmux has-session -t "$SESSION" 2>/dev/null; do
+while tmux has-session -t "=$SESSION" 2>/dev/null; do
   sleep 5
 done
 
@@ -4355,13 +4355,13 @@ fi
 log "Starting local-CC channel 2 (port ${CHANNEL_2_PORT})..."
 log "claude version: $(claude --version 2>&1 | head -1)"
 
-tmux kill-session -t "$SESSION" 2>/dev/null || true
+tmux kill-session -t "=$SESSION" 2>/dev/null || true
 
 tmux new-session -d -s "$SESSION" \\
   "SYNKRO_CHANNEL_PORT=${CHANNEL_2_PORT} claude --dangerously-load-development-channels server:synkro-local --dangerously-skip-permissions --setting-sources project,local --model claude-sonnet-4-6 2>>$LOG; echo 'claude exited with code '$'?' >> $LOG"
 
 sleep 3
-if tmux has-session -t "$SESSION" 2>/dev/null; then
+if tmux has-session -t "=$SESSION" 2>/dev/null; then
   tmux send-keys -t "$SESSION" '1' 2>/dev/null || true
   sleep 1
   tmux send-keys -t "$SESSION" Enter 2>/dev/null || true
@@ -4378,7 +4378,7 @@ fi
 
 log "tmux session started successfully (port ${CHANNEL_2_PORT})."
 
-while tmux has-session -t "$SESSION" 2>/dev/null; do
+while tmux has-session -t "=$SESSION" 2>/dev/null; do
   sleep 5
 done
 
@@ -4466,9 +4466,14 @@ function startTask(opts = {}) {
   const cwd = opts.cwd ?? ch.sessionDir;
   let existing = findTask(ch);
   while (existing) {
-    if (existing.status === "Running") {
-      spawnSync2("tmux", ["kill-session", "-t", ch.tmuxSession], { encoding: "utf-8" });
+    if (existing.status === "Running" || existing.status === "Queued") {
+      spawnSync2("tmux", ["kill-session", "-t", `=${ch.tmuxSession}`], { encoding: "utf-8" });
       spawnSync2("pueue", ["kill", String(existing.id)], { encoding: "utf-8" });
+      for (let i = 0; i < 10; i++) {
+        const check = findTask(ch);
+        if (!check || check.id !== existing.id || check.status !== "Running" && check.status !== "Queued") break;
+        spawnSync2("sleep", ["0.5"], { encoding: "utf-8" });
+      }
     }
     spawnSync2("pueue", ["remove", String(existing.id)], { encoding: "utf-8" });
     existing = findTask(ch);
@@ -4495,11 +4500,20 @@ function startTask(opts = {}) {
   return created;
 }
 function stopTask(channel = CHANNEL_PRIMARY) {
-  spawnSync2("tmux", ["kill-session", "-t", channel.tmuxSession], { encoding: "utf-8" });
-  const t = findTask(channel);
-  if (!t) return;
-  spawnSync2("pueue", ["kill", String(t.id)], { encoding: "utf-8" });
-  spawnSync2("pueue", ["remove", String(t.id)], { encoding: "utf-8" });
+  spawnSync2("tmux", ["kill-session", "-t", `=${channel.tmuxSession}`], { encoding: "utf-8" });
+  let t = findTask(channel);
+  while (t) {
+    if (t.status === "Running" || t.status === "Queued") {
+      spawnSync2("pueue", ["kill", String(t.id)], { encoding: "utf-8" });
+      for (let i = 0; i < 10; i++) {
+        const check = findTask(channel);
+        if (!check || check.id !== t.id || check.status !== "Running" && check.status !== "Queued") break;
+        spawnSync2("sleep", ["0.5"], { encoding: "utf-8" });
+      }
+    }
+    spawnSync2("pueue", ["remove", String(t.id)], { encoding: "utf-8" });
+    t = findTask(channel);
+  }
 }
 function tailLogs(lines = 80, channel = CHANNEL_PRIMARY) {
   const t = findTask(channel);
@@ -5035,7 +5049,7 @@ function writeConfigEnv(opts) {
     `SYNKRO_CREDENTIALS_PATH=${shellQuoteSingle(credsPath)}`,
     `SYNKRO_TIER=${shellQuoteSingle(safeTier)}`,
     `SYNKRO_INFERENCE=${shellQuoteSingle(safeInference)}`,
-    `SYNKRO_VERSION=${shellQuoteSingle("1.4.49")}`
+    `SYNKRO_VERSION=${shellQuoteSingle("1.4.51")}`
   ];
   if (safeSynkroBin) lines.push(`SYNKRO_CLI_BIN=${shellQuoteSingle(safeSynkroBin)}`);
   if (safeUserId) lines.push(`SYNKRO_USER_ID=${shellQuoteSingle(safeUserId)}`);
@@ -5247,14 +5261,16 @@ async function installCommand(opts = {}) {
     if (token2) {
       const profile2 = await fetchUserProfile(gatewayUrl, token2);
       if (profile2.localInference && !isLocalCCEnabled()) {
-        console.log("Local inference enabled in your profile \u2014 setting up local-CC channel...");
+        console.log("Local inference enabled \u2014 setting up local-CC channels...");
         try {
           assertClaudeInstalled();
           assertPueueInstalled();
           assertTmuxInstalled();
+          stopTask();
+          stopTask(CHANNEL_SECONDARY);
           installLocalCC();
-          const t1 = ensureRunning();
-          const t2 = ensureRunning({ channel: CHANNEL_SECONDARY });
+          const t1 = startTask();
+          const t2 = startTask({ channel: CHANNEL_SECONDARY });
           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([
@@ -5432,6 +5448,14 @@ async function installCommand(opts = {}) {
   } catch {
   }
   const profile = await fetchUserProfile(gatewayUrl, token);
+  const priorLocalFlag = (() => {
+    try {
+      const content = readFileSync10(CONFIG_PATH3, "utf-8");
+      return content.includes("SYNKRO_LOCAL_INFERENCE='yes'");
+    } catch {
+      return false;
+    }
+  })();
   const synkroBundle = resolveSynkroBundle();
   writeConfigEnv({ gatewayUrl, userId, orgId, email, tier: profile.tier, inference: profile.inference, synkroBin: synkroBundle, transcriptConsent, localInference: profile.localInference });
   console.log(`Wrote config to ${CONFIG_PATH3}`);
@@ -5472,15 +5496,7 @@ async function installCommand(opts = {}) {
     console.warn(`  \u26A0 Some dependencies missing \u2014 \`synkro local-cc enable\` may not work until they're installed.`);
   }
   console.log();
-  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) {
+  if (profile.localInference && localCcDeps.length === 3) {
     try {
       stopTask();
       stopTask(CHANNEL_SECONDARY);
@@ -7169,7 +7185,7 @@ async function cmdStatus() {
   }
   const ch1Up = await isChannelAvailable();
   console.log(`Channel 1 ${CHANNEL_HOST}:${CHANNEL_PORT}: ${ch1Up ? "reachable" : "unreachable"}`);
-  const tmux1 = spawnSync4("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) {
@@ -7179,7 +7195,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 = spawnSync4("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() {
@@ -7371,7 +7387,7 @@ function cmdLogs(rest) {
 function cmdAttach(rest) {
   assertTmuxInstalled();
   const readonly = rest.some((a) => a === "--readonly" || a === "-r");
-  const has = spawnSync4("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);