claude-code-session-manager 0.30.0 → 0.32.0

package/dist/index.html

@@ -7,7 +7,7 @@
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Newsreader:ital,opsz,wght@0,6..72,400;0,6..72,500;0,6..72,600;0,6..72,700;1,6..72,400&family=Geist:wght@300;400;500;600;700&family=IBM+Plex+Mono:wght@400;500;600&display=swap" rel="stylesheet">
-    <script type="module" crossorigin src="./assets/index-BBlKMDCL.js"></script>
+    <script type="module" crossorigin src="./assets/index-CHTpW79G.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/monaco-editor-BW5C4Iv1.js">
     <link rel="stylesheet" crossorigin href="./assets/monaco-editor-BTnBOi8r.css">
     <link rel="stylesheet" crossorigin href="./assets/index-DMIi9YZH.css">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-session-manager",
-  "version": "0.30.0",
+  "version": "0.32.0",
   "description": "Local cockpit for the Claude Code CLI — multi-tab terminal, full config surface, scheduler, voice dictation, and live observability.",
   "type": "module",
   "main": "src/main/index.cjs",
@@ -11,6 +11,7 @@
     "bin/",
     ".claude-plugin/",
     "plugins/",
+    "scripts/postinstall.cjs",
     "src/main/",
     "src/preload/",
     "dist/index.html",
@@ -26,7 +27,7 @@
     "build": "vite build",
     "typecheck": "tsc --noEmit",
     "start": "electron .",
-    "postinstall": "electron-rebuild -f -w node-pty",
+    "postinstall": "node scripts/postinstall.cjs",
     "prepublishOnly": "vite build",
     "test:unit": "vitest run",
     "test:verify": "node src/main/__tests__/runVerify.test.cjs",

package/scripts/postinstall.cjs

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+'use strict';
+
+/**
+ * postinstall — rebuild node-pty against the bundled Electron's ABI.
+ *
+ * The terminal needs node-pty's native binary to match the Electron we ship.
+ * We run electron-rebuild, but a failure here MUST NOT fail `npm i -g` — that
+ * would block the entire app (config tabs, scheduler, etc.) over one native
+ * module. So we run it best-effort and, on failure, print the exact manual fix
+ * and exit 0. pty.cjs surfaces the same guidance in-app if a tab can't start.
+ */
+
+const { spawnSync } = require('node:child_process');
+const fs = require('node:fs');
+const path = require('node:path');
+
+// Resolve the electron-rebuild bin from THIS package's own node_modules first,
+// so a global install never has `npx` reach out to the registry (and risk
+// pulling the wrong/deprecated `electron-rebuild` package). Fall back to npx.
+function rebuildArgv() {
+  const pkgRoot = path.join(__dirname, '..');
+  const local = path.join(pkgRoot, 'node_modules', '.bin', process.platform === 'win32' ? 'electron-rebuild.cmd' : 'electron-rebuild');
+  if (fs.existsSync(local)) return [local, ['-f', '-w', 'node-pty']];
+  return [process.platform === 'win32' ? 'npx.cmd' : 'npx', ['electron-rebuild', '-f', '-w', 'node-pty']];
+}
+
+function run() {
+  const [cmd, args] = rebuildArgv();
+  const r = spawnSync(cmd, args, { stdio: 'inherit', cwd: path.join(__dirname, '..') });
+  return r.status === 0 && !r.error;
+}
+
+if (run()) process.exit(0);
+
+const mac = process.platform === 'darwin';
+const bar = '─'.repeat(64);
+console.warn(`\n${bar}`);
+console.warn('claude-code-session-manager: node-pty rebuild did not complete.');
+console.warn('The app will still launch, but terminal tabs may not start until');
+console.warn('the native module is rebuilt for this Electron. To fix it:');
+console.warn('');
+console.warn('  cd "' + __dirname.replace(/\/scripts$/, '') + '"');
+console.warn('  npx electron-rebuild -f -w node-pty');
+if (mac) {
+  console.warn('');
+  console.warn('  # macOS: if the rebuild fails, install the compiler first:');
+  console.warn('  xcode-select --install');
+}
+console.warn(`${bar}\n`);
+// Exit 0 — never fail the install over the terminal native module.
+process.exit(0);

package/src/main/lib/cleanEnv.cjs

@@ -25,10 +25,14 @@ function userBinDirs() {
   ];
 }
 
-/** Electron's PATH prefixed with the user/Homebrew bin dirs — the value to put
- *  in a spawned child's PATH so `claude`, node, git, etc. resolve on macOS. */
+/** Electron's PATH with the user/Homebrew bin dirs APPENDED as a fallback — the
+ *  value to put in a spawned child's PATH so `claude`, node, git, etc. resolve
+ *  on macOS even under a stripped Finder/Dock PATH. Appended (not prepended) so
+ *  a user's version manager (nvm/asdf/volta/mise) earlier in PATH still wins and
+ *  isn't shadowed by /opt/homebrew. */
 function pathWithUserBins() {
-  return `${userBinDirs().join(':')}:${process.env.PATH || ''}`;
+  const base = process.env.PATH || '';
+  return base ? `${base}:${userBinDirs().join(':')}` : userBinDirs().join(':');
 }
 
 function cleanChildEnv(extra = {}) {

package/src/main/pluginInstall.cjs

@@ -17,7 +17,16 @@
  */
 
 const { ipcMain } = require('electron');
-const pty = require('node-pty');
+// Guard like pty.cjs: a node-pty ABI mismatch must not crash the whole app at
+// module load (index.cjs requires this unconditionally). install() reports a
+// clean error if the native module is unavailable.
+let pty = null;
+try {
+  pty = require('node-pty');
+} catch (e) {
+  // eslint-disable-next-line no-console
+  console.error('[pluginInstall] node-pty failed to load:', e?.message);
+}
 const path = require('node:path');
 const os = require('node:os');
 const fs = require('node:fs');
@@ -72,6 +81,10 @@ function childEnv() {
  */
 function runStep({ slug, args, register, unregister }) {
   return new Promise((resolve) => {
+    if (!pty) {
+      resolve({ ok: false, exitCode: -1, error: 'node-pty unavailable (native module failed to load)' });
+      return;
+    }
     const claudeBin = resolveClaudeBin();
     let proc;
     try {

package/src/main/pty.cjs

@@ -1,4 +1,17 @@
-const pty = require('node-pty');
+// Load the native node-pty lazily-guarded: if its prebuilt/rebuilt binary
+// doesn't match this Electron's ABI, a bare top-level require would throw and
+// crash the WHOLE app at startup (index.cjs requires this module). Instead we
+// capture the error and surface an actionable message when a tab is opened, so
+// the app still boots and the user sees exactly how to fix the terminal.
+let pty = null;
+let ptyLoadError = null;
+try {
+  pty = require('node-pty');
+} catch (e) {
+  ptyLoadError = e;
+  // eslint-disable-next-line no-console
+  console.error('[pty] node-pty failed to load:', e?.message);
+}
 const { ipcMain } = require('electron');
 const path = require('node:path');
 const os = require('node:os');
@@ -8,6 +21,37 @@ const { cleanChildEnv, pathWithUserBins } = require('./lib/cleanEnv.cjs');
 const { checkInsideHome } = require('./lib/insideHome.cjs');
 const { sendIfAlive } = require('./lib/sendToRenderer.cjs');
 
+// Absolute path to the installed package root (src/main/ -> ../../), shown in
+// the remediation message so the user can cd there and rebuild.
+const PKG_DIR = path.join(__dirname, '..', '..');
+
+/**
+ * ANSI-formatted terminal text explaining a native-module / immediate-exit
+ * failure and exactly how to fix it. Written straight into the tab's output so
+ * a dead terminal explains itself instead of just going blank.
+ */
+function nativeModuleHelp(reason) {
+  const mac = process.platform === 'darwin';
+  const lines = [
+    '',
+    `\x1b[1;33m[session-manager] Terminal could not start.\x1b[0m`,
+    `\x1b[33m${reason}\x1b[0m`,
+    '',
+    `This is almost always the node-pty native module not matching this`,
+    `Electron build. Rebuild it once:`,
+    '',
+    `  \x1b[36mcd ${PKG_DIR}\x1b[0m`,
+    `  \x1b[36mnpx electron-rebuild -f -w node-pty\x1b[0m`,
+    '',
+    mac ? `macOS: if the rebuild fails, install the compiler first:` : '',
+    mac ? `  \x1b[36mxcode-select --install\x1b[0m` : '',
+    mac ? '' : '',
+    `Then quit and reopen session-manager.`,
+    '',
+  ].filter((l) => l !== '');
+  return lines.join('\r\n') + '\r\n';
+}
+
 /**
  * PtyManager — owns every claude PTY process, keyed by tabId (renderer-generated UUID).
  * Streams output to the renderer via IPC channels scoped by tabId.
@@ -26,6 +70,15 @@ class PtyManager {
   spawn({ tabId, cwd, cols = 120, rows = 30 }) {
     console.log('[pty] spawn requested', { tabId });
 
+    // Native module unavailable — explain in the tab and report a clean exit
+    // rather than throwing (which would surface as an opaque IPC error).
+    if (!pty || ptyLoadError) {
+      const reason = `node-pty failed to load: ${ptyLoadError?.message ?? 'module missing'}`;
+      sendIfAlive(this.window, `pty:data:${tabId}`, nativeModuleHelp(reason));
+      setImmediate(() => sendIfAlive(this.window, `pty:exit:${tabId}`, { exitCode: 1, signal: undefined }));
+      return { pid: null, cwd, reattached: false, error: 'node-pty unavailable' };
+    }
+
     // Validate that cwd is inside homedir before widening the allowed-root set.
     if (cwd) {
       const r = checkInsideHome(cwd);
@@ -88,11 +141,19 @@ class PtyManager {
       });
     } catch (err) {
       console.error('[pty] pty.spawn threw:', err);
-      throw err;
+      // Surface the cause in the tab + report a clean exit rather than throwing
+      // an opaque IPC error (covers a missing/invalid cwd or a native fault).
+      sendIfAlive(this.window, `pty:data:${tabId}`, nativeModuleHelp(`pty.spawn failed: ${err?.message ?? String(err)}`));
+      setImmediate(() => sendIfAlive(this.window, `pty:exit:${tabId}`, { exitCode: 1, signal: undefined }));
+      return { pid: null, cwd, reattached: false, error: String(err?.message || 'spawn-failed') };
     }
     console.log('[pty] spawned pid=', proc.pid, 'for tabId=', tabId);
 
+    const spawnedAt = Date.now();
+    let gotData = false;
+
     proc.onData((data) => {
+      gotData = true;
       sendIfAlive(this.window, `pty:data:${tabId}`, data);
     });
 
@@ -105,11 +166,19 @@ class PtyManager {
         this.sessions.delete(tabId);
         return;
       }
+      // Fast-exit detector: a shell that dies in <1.2s with a non-zero status
+      // and never printed anything almost certainly couldn't exec (broken
+      // node-pty spawn-helper / ABI on macOS). Explain it in the tab instead of
+      // leaving a blank, instantly-closed terminal. Guarded by !gotData so a
+      // real interactive shell (which prints a prompt immediately) is exempt.
+      if (!gotData && exitCode !== 0 && Date.now() - spawnedAt < 1200) {
+        sendIfAlive(this.window, `pty:data:${tabId}`, nativeModuleHelp(`The shell exited immediately (code ${exitCode}).`));
+      }
       sendIfAlive(this.window, `pty:exit:${tabId}`, { exitCode, signal });
       this.sessions.delete(tabId);
     });
 
-    this.sessions.set(tabId, { proc, cwd, created: Date.now() });
+    this.sessions.set(tabId, { proc, cwd, created: spawnedAt });
     return { pid: proc.pid, cwd, reattached: false };
   }