@bakapiano/ccsm 0.15.0 → 0.15.1

package/lib/config.js

@@ -130,26 +130,20 @@ function mergeWithDefaults(partial) {
     if (existing) {
       existing.builtin = true;
       // Backfill defaults from the built-in template for any field the
-      // user's saved copy is missing — keeps old configs aligned with new
-      // schema additions (resumeIdArgs, type, etc.) without clobbering
-      // the user's customisations.
-      if (existing.resumeIdArgs == null) existing.resumeIdArgs = def.resumeIdArgs;
-      if (existing.newSessionIdArgs == null) existing.newSessionIdArgs = def.newSessionIdArgs;
-      // Drop the v0.x `resumeArgs` fallback — all builtins now have
-      // pre-assigned UUIDs (claude/copilot via flag, codex via seed) so
-      // resumeIdArgs always applies on resume.
+      // user's saved copy is missing OR has as an empty array. Empty
+      // arrays matter because users upgrading from a pre-0.15 config
+      // never wrote `newSessionIdArgs` (didn't exist), AND a partial
+      // 0.14→0.15 dev iteration shipped codex with `[]`. Treat both
+      // the same: a builtin with no template means "use the canonical
+      // one ccsm now knows about", since these fields are the
+      // integration contract with the upstream CLI — not user knobs.
+      const needsBackfill = (v) => v == null || (Array.isArray(v) && v.length === 0);
+      if (needsBackfill(existing.resumeIdArgs)) existing.resumeIdArgs = def.resumeIdArgs;
+      if (needsBackfill(existing.newSessionIdArgs)) existing.newSessionIdArgs = def.newSessionIdArgs;
+      // Drop the v0.x `resumeArgs` fallback — every builtin now has a
+      // pre-assigned UUID (claude/copilot via flag, codex via seed) so
+      // resumeIdArgs always applies on resume; the field is dead weight.
       delete existing.resumeArgs;
-      // Special-case codex: an unreleased earlier iteration of this
-      // schema shipped `newSessionIdArgs: []` for codex. The seeded-file
-      // trick (lib/codexSeed) now lets us pre-assign, so backfill the
-      // ['resume','<id>'] template over an empty array too.
-      if (existing.id === 'codex'
-          && Array.isArray(existing.newSessionIdArgs)
-          && existing.newSessionIdArgs.length === 0
-          && Array.isArray(def.newSessionIdArgs)
-          && def.newSessionIdArgs.length > 0) {
-        existing.newSessionIdArgs = def.newSessionIdArgs;
-      }
       if (!existing.type) existing.type = def.type;
     } else {
       out.clis.unshift({ ...def });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakapiano/ccsm",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "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/public/js/pages/AboutPage.js

@@ -65,8 +65,16 @@ function UpgradeCard() {
     if (!info?.updateAvailable) return;
     setUpgrading(true);
     try {
-      await api('POST', '/api/upgrade', { target: 'latest' });
+      const r = await api('POST', '/api/upgrade', { target: 'latest' });
       setToast(`upgrading to v${info.latest} · backend will restart`);
+      if (r?.closeFrontend) {
+        // Backend will respawn with a fresh browser window — close this
+        // one so the user isn't stuck on the OfflineBanner during the
+        // upgrade window. window.close() only works when the window was
+        // script-opened (Edge --app=, our spawned browser); regular tabs
+        // ignore it silently, which is fine (OfflineBanner takes over).
+        setTimeout(() => { try { window.close(); } catch {} }, 400);
+      }
     } catch (e) {
       setUpgrading(false);
       setToast(e.message, 'error');

package/public/js/pages/ConfigurePage.js

@@ -431,8 +431,16 @@ function RestartButton() {
     if (!ok) return;
     setBusy(true);
     try {
-      await restartBackend();
+      const r = await restartBackend();
       setToast('restarting backend…');
+      if (r?.closeFrontend) {
+        // Backend respawn will pop a fresh browser window — close this
+        // one so the user isn't stuck on the OfflineBanner during the
+        // ~3s downtime. window.close() only fires in script-opened
+        // windows (Edge --app=); regular tabs ignore it and stay open,
+        // which is the right behavior for them.
+        setTimeout(() => { try { window.close(); } catch {} }, 400);
+      }
     } catch (e) {
       setBusy(false);
       setToast(e.message, 'error');

package/scripts/restart-helper.js

@@ -62,7 +62,12 @@ function pidAlive(pid) {
 
   const isWin = process.platform === 'win32';
   const ccsmCmd = isWin ? 'ccsm.cmd' : 'ccsm';
-  const childEnv = { ...process.env, CCSM_NO_BROWSER: '1' };
+  // Inherit env but DROP CCSM_NO_BROWSER so the respawned server pops a
+  // fresh browser window — the frontend that triggered the restart
+  // called window.close() in parallel, and the new window takes its
+  // place without the OfflineBanner gap.
+  const childEnv = { ...process.env };
+  delete childEnv.CCSM_NO_BROWSER;
   let exe, exeArgs;
   if (isWin) {
     exe = process.env.ComSpec || 'cmd.exe';

package/scripts/upgrade-helper.js

@@ -126,7 +126,12 @@ function pidAlive(pid) {
   const ccsmCmd = installPrefix
     ? (isWin ? path.join(installPrefix, 'ccsm.cmd') : path.join(installPrefix, 'bin', 'ccsm'))
     : (isWin ? 'ccsm.cmd' : 'ccsm');
-  const childEnv = { ...process.env, CCSM_NO_BROWSER: '1' };
+  // Drop CCSM_NO_BROWSER so the post-upgrade server pops a fresh window
+  // — the frontend that triggered the upgrade window.close()'d in
+  // parallel, and the new window takes its place. Skips the
+  // OfflineBanner gap that used to bridge the upgrade.
+  const childEnv = { ...process.env };
+  delete childEnv.CCSM_NO_BROWSER;
   let exe, exeArgs;
   if (isWin) {
     exe = process.env.ComSpec || 'cmd.exe';

package/server.js

@@ -926,7 +926,7 @@ app.post('/api/restart', asyncH(async (_req, res) => {
   restartInFlight = true;
 
   if (process.env.CCSM_DEV === '1') {
-    res.json({ ok: true, started: true, mode: 'dev' });
+    res.json({ ok: true, started: true, mode: 'dev', closeFrontend: false });
     setImmediate(() => gracefulShutdown('restart (dev)'));
     return;
   }
@@ -941,7 +941,11 @@ app.post('/api/restart', asyncH(async (_req, res) => {
     return res.status(500).json({ error: `helper copy failed: ${e.message}` });
   }
   const args = [helperTmp, String(currentPort), String(process.pid)];
-  res.json({ ok: true, started: true, helper: helperTmp });
+  // closeFrontend asks the calling tab to window.close() itself — the
+  // helper will respawn ccsm WITHOUT CCSM_NO_BROWSER, so a fresh window
+  // pops up once the new backend is listening. Net effect: the user
+  // never sees the OfflineBanner during a restart.
+  res.json({ ok: true, started: true, helper: helperTmp, closeFrontend: true });
 
   setImmediate(() => {
     const { spawn } = require('node:child_process');
@@ -1081,7 +1085,7 @@ app.post('/api/upgrade', asyncH(async (req, res) => {
   }
   const args = [helperTmp, target, String(currentPort), String(process.pid), installPrefix, respawn];
 
-  res.json({ ok: true, started: true, target, helper: helperTmp });
+  res.json({ ok: true, started: true, target, helper: helperTmp, closeFrontend: true });
 
   // Flush response, then spawn helper detached and gracefulShutdown so
   // the helper's npm install isn't fighting our open file handles.