@bakapiano/ccsm 0.21.0 → 0.21.1

package/lib/codexSeed.js

@@ -52,16 +52,23 @@ function execWithTimeout(exe, args, { timeoutMs = 8000 } = {}) {
   });
 }
 
-// Parse `CODEX_HOME    <path> (dir)` out of `codex doctor` output. Codex
-// formats it with variable whitespace; the `(dir)` / `(file)` suffix is
-// the easiest anchor to identify the path end. Some wrappers colour
-// the label (`\x1b[7mCODEX_HOME\x1b[0m`), so strip ANSI SGR codes first —
-// otherwise `CODEX_HOME` is followed by an escape, not whitespace, and the
-// match fails.
+// Pull CODEX_HOME out of a wrapper's `doctor` (or `--version`) output. Two
+// shapes appear, and we must handle BOTH:
+//   1. Diagnostic table:  `CODEX_HOME    <path> (dir)`  — only when `doctor`
+//      fully succeeds. Variable whitespace; the `(dir)`/`(file)` suffix marks
+//      the path end.
+//   2. Wrapper banner:    `CODEX_HOME=<path>`  — printed on EVERY invocation.
+//      Critical because in ccsm's non-interactive spawn `doctor` often exits
+//      non-zero (skipping the table) yet still prints this banner line, so it's
+//      the reliable source. Without it the probe returns null and the seed
+//      lands in ~/.codex instead of the wrapper's relocated home, breaking
+//      `resume <id>` ("No saved session found with ID …").
+// Some wrappers colour the label (`\x1b[7mCODEX_HOME\x1b[0m`); strip ANSI first.
 function parseCodexHomeFromDoctor(text) {
   if (!text) return null;
   const clean = String(text).replace(/\x1b\[[0-9;]*m/g, '');
-  const m = clean.match(/\bCODEX_HOME\s+(.+?)\s*\((?:dir|file)\)/);
+  let m = clean.match(/\bCODEX_HOME\s+(.+?)\s*\((?:dir|file)\)/);   // table form
+  if (!m) m = clean.match(/\bCODEX_HOME=(.+?)\s*$/m);               // banner form
   if (!m) return null;
   const p = m[1].trim();
   return p || null;

package/lib/webTerminal.js

@@ -54,7 +54,13 @@ function spawn({ command, args = [], cwd, env, cols = 120, rows = 30, meta = {},
     name: 'xterm-256color',
     cols, rows,
     cwd: cwd ? path.resolve(cwd) : process.cwd(),
-    env: { ...process.env, ...(env || {}) },
+    // Advertise 24-bit colour. xterm.js renders truecolor, and CLIs like
+    // claude paint their diffs with 24-bit DARK red/green backgrounds +
+    // white text when COLORTERM says so. Without it they downgrade to the
+    // bright ANSI-16 red/green backgrounds, which wash the white foreground
+    // out (the "white text gets buried" report). VSCode sets the same on its
+    // terminal PTYs; our ANSI-16 palette already matches VSCode's verbatim.
+    env: { ...process.env, ...(env || {}), COLORTERM: 'truecolor' },
   };
   if (process.platform === 'win32') {
     ptyOpts.useConpty = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakapiano/ccsm",
-  "version": "0.21.0",
+  "version": "0.21.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/components/TerminalView.js

@@ -183,6 +183,30 @@ export function TerminalView({ terminalId, cliType }) {
 
     const host = hostRef.current;
     term.open(host);
+
+    // Answer OSC 10/11 (default foreground / background colour) queries with
+    // the LIVE theme colours. CLIs like claude probe the terminal background
+    // (`OSC 11 ; ? ST`) to pick a light- or dark-tuned syntax theme. xterm.js
+    // doesn't answer these by default, so claude assumes a dark terminal and
+    // paints near-white tokens (comments, f-string interpolations, call
+    // names) that vanish on our light background — the "字体颜色和背景重复"
+    // bug. VSCode answers them; we match. Reply format is the xterm/X11
+    // `rgb:RRRR/GGGG/BBBB` (16-bit-per-channel) the query expects.
+    const answerColorOsc = (code, getHex) => (data) => {
+      if (data !== '?') return false;               // only the query form
+      const hex = getHex();                         // '#rrggbb'
+      const ch = (i) => parseInt(hex.slice(i, i + 2), 16);
+      const w = (v) => (v * 257).toString(16).padStart(4, '0');  // 8-bit → 16-bit
+      const reply = `\x1b]${code};rgb:${w(ch(1))}/${w(ch(3))}/${w(ch(5))}\x07`;
+      const ws = wsRef.current;
+      if (ws && ws.readyState === 1) ws.send(JSON.stringify({ type: 'input', data: reply }));
+      return true;
+    };
+    try {
+      term.parser.registerOscHandler(11, answerColorOsc(11, () => themeRef.current.background));
+      term.parser.registerOscHandler(10, answerColorOsc(10, () => themeRef.current.foreground));
+    } catch {}
+
     // Robust fit scheduler. A single requestAnimationFrame works most
     // of the time but races on tab/session switches: the .tab-panel
     // just flipped from display:none to display:flex and although the

package/server.js

@@ -291,15 +291,32 @@ function spawnCliSession({ cli, cwd, sessionId, meta, extraArgs = [] }) {
   // extraArgs into the single quoted command string — otherwise extraArgs
   // would become args to the shell itself, not the wrapped command.
   // Re-resolve here when extraArgs is present so the quoting is correct.
+  // Force a session-scoped theme=auto for claude so its syntax/diff colours
+  // follow the ccsm terminal background (which we report via OSC 10/11 in
+  // TerminalView). claude's DEFAULT theme is *dark*, whose near-white tokens
+  // (comments, f-string interpolations, call names) vanish on our light
+  // terminal — the "字体颜色和背景重复" bug. --settings is session-scoped, so
+  // the user's global ~/.claude/settings.json is left untouched, and ccsm
+  // sessions Just Work on a fresh machine without anyone running /theme auto.
+  // (Injected here as an integration arg, like --session-id — not via the
+  // user-editable cli.args, so it reaches existing configs too.)
+  // Skip the injection entirely if the user already put their own --settings
+  // in cli.args — claude deep-merges multiple --settings (verified: later ones
+  // win per-key), so ours would silently override a theme they set on purpose.
+  // Respect the user's explicit choice instead.
+  const userHasSettings = (cli.args || []).some(
+    (a) => a === '--settings' || String(a).startsWith('--settings='));
+  const baseArgs = [...(cli.args || [])];
+  if (cli.type === 'claude' && !userHasSettings) baseArgs.push('--settings', '{"theme":"auto"}');
   const resolved = resolveCommand(
     cli.command,
-    [...(cli.args || []), ...extraArgs],
+    [...baseArgs, ...extraArgs],
     cli.shell || 'direct',
   );
   const { exe, prefixArgs, fallbackExe, consumesUserArgs } = resolved;
   const args = consumesUserArgs
     ? prefixArgs
-    : [...prefixArgs, ...(cli.args || []), ...extraArgs];
+    : [...prefixArgs, ...baseArgs, ...extraArgs];
   // Merge user-scope PATH from registry into the env we hand the PTY.
   // spawnEnv() also strips duplicate path-case keys so our override
   // doesn't get shadowed by the inherited `Path` from process.env.