@bakapiano/ccsm 0.17.4 → 0.17.6

package/bin/ccsm.js

@@ -122,21 +122,29 @@ function isSameVersion(running) {
   // (b) bind port 7777 before the helper's own respawn does. Either
   // way the upgrade derails. Bail out instead — the helper's UI on
   // 7779 is already showing the user what's happening.
-  const lockPath = path.join(HOME, '.upgrade.lock');
-  try {
-    const raw = fs.readFileSync(lockPath, 'utf8');
-    const lock = JSON.parse(raw);
-    const ageMs = Date.now() - (lock.startedAt || 0);
-    const ownerAlive = lock.pid ? pidAlive(lock.pid) : false;
-    if (ownerAlive && ageMs < 10 * 60_000) {
-      console.log(`ccsm: upgrade in progress (helper pid=${lock.pid}, ${Math.round(ageMs/1000)}s ago, target=${lock.target || '?'})`);
-      console.log(`  see http://localhost:${lock.helperPort || 7779}/ for live progress`);
-      process.exit(0);
+  //
+  // Exception: the helper itself spawns ccsm.cmd at the END of the
+  // upgrade (after npm install completes) to bring the new backend up.
+  // It sets CCSM_FROM_UPGRADE=1 in that child's env. We MUST skip the
+  // lock check in that case, otherwise we'd refuse our own respawn and
+  // the user would be stuck staring at "Backend not running".
+  if (process.env.CCSM_FROM_UPGRADE !== '1') {
+    const lockPath = path.join(HOME, '.upgrade.lock');
+    try {
+      const raw = fs.readFileSync(lockPath, 'utf8');
+      const lock = JSON.parse(raw);
+      const ageMs = Date.now() - (lock.startedAt || 0);
+      const ownerAlive = lock.pid ? pidAlive(lock.pid) : false;
+      if (ownerAlive && ageMs < 10 * 60_000) {
+        console.log(`ccsm: upgrade in progress (helper pid=${lock.pid}, ${Math.round(ageMs/1000)}s ago, target=${lock.target || '?'})`);
+        console.log(`  see http://localhost:${lock.helperPort || 7779}/ for live progress`);
+        process.exit(0);
+      }
+      // Stale lock (pid dead OR > 10min) — clean up and continue.
+      try { fs.unlinkSync(lockPath); } catch {}
+    } catch {
+      // ENOENT or parse error → no lock, proceed.
     }
-    // Stale lock (pid dead OR > 10min) — clean up and continue.
-    try { fs.unlinkSync(lockPath); } catch {}
-  } catch {
-    // ENOENT or parse error → no lock, proceed.
   }
 
   // Case 1: existing instance on the preferred port

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakapiano/ccsm",
-  "version": "0.17.4",
+  "version": "0.17.6",
   "description": "Claude Code Session Manager — Windows web UI to manage many concurrent claude sessions: live list, snapshot/restore, focus existing window, new session in an isolated workspace with repo clones",
   "license": "MIT",
   "main": "server.js",

package/server.js

@@ -1380,10 +1380,16 @@ function openInBrowser(url) {
   console.log(`clis:            ${cfg.clis.map((c) => c.id).join(', ')} (default: ${cfg.defaultCliId})`);
 
   // CCSM_NO_BROWSER=1 (set by the ccsm:// protocol launcher) suppresses
-  // the auto-open entirely. Otherwise try app-mode (chromeless Edge/Chrome
-  // window); if no such browser is installed, openInBrowser falls back to
-  // the OS default browser on its own.
-  const opened = process.env.CCSM_NO_BROWSER === '1'
+  // the auto-open entirely. CCSM_FROM_UPGRADE=1 (set by upgrade-helper
+  // when it respawns ccsm post-install) does the same: the user is
+  // already in the helper UI which redirects to this fresh backend, so
+  // a second app-mode window would just shadow the first. Otherwise try
+  // app-mode (chromeless Edge/Chrome window); if no such browser is
+  // installed, openInBrowser falls back to the OS default browser on
+  // its own.
+  const suppressBrowser = process.env.CCSM_NO_BROWSER === '1'
+                       || process.env.CCSM_FROM_UPGRADE === '1';
+  const opened = suppressBrowser
     ? { kind: 'none', child: null }
     : openInBrowser(FRONTEND_URL);