@bakapiano/ccsm 0.21.2 → 0.21.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakapiano/ccsm",
-  "version": "0.21.2",
+  "version": "0.21.4",
   "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/api.js

@@ -3,7 +3,7 @@
 
 import { signal } from '@preact/signals';
 import * as S from './state.js';
-import { httpBase, getToken, getDeviceId, getDeviceCode, isRemoteAccess } from './backend.js';
+import { httpBase, getToken, getDeviceId, getDeviceCode, isRemoteAccess, estimateTermSize } from './backend.js';
 
 // Global pending-approval signal. Flipped to true whenever any /api
 // call returns 403 {pending:true}; PendingApprovalOverlay watches this
@@ -286,6 +286,9 @@ export function resumeSession(sessionId) {
       // Resolved terminal theme → backend sets a matching COLORFGBG so the
       // CLI's light/dark auto-detection follows the ccsm terminal.
       theme: document.documentElement.dataset.theme,
+      // Seed the PTY at the pane's real size so alt-screen CLIs (claude)
+      // don't lay out at node-pty's 30-row default and get stranded short.
+      ...(estimateTermSize() || {}),
     });
     await loadSessions();
     return r.launched;

package/public/js/backend.js

@@ -83,6 +83,45 @@ export function getDeviceId() {
   }
 }
 
+// ── Initial terminal geometry ─────────────────────────────────────
+// Estimate how many cols/rows the live session pane can hold, so a
+// resumed / newly-launched PTY can spawn at roughly the right size
+// instead of node-pty's 120×30 default. Why it matters: an alt-screen
+// TUI like claude lays its entire UI out the instant it starts, using
+// whatever size the PTY had then. xterm only sends the real size once
+// its WebSocket opens — a beat later — and claude, having already
+// painted at 30 rows, doesn't re-expand to fill a tall window until
+// something forces a redraw (e.g. the user resizing it). On a big
+// display that strands the terminal at ~1/4 height. Seeding the spawn
+// with the pane's real dimensions sidesteps the race; xterm's own fit
+// still corrects any few-row estimate error when it attaches.
+// Returns null when nothing measurable is mounted, so the caller omits
+// the hint and the backend keeps its default.
+export function estimateTermSize() {
+  let w, h;
+  const pane = document.querySelector('.terminal-host')
+            || document.querySelector('.session-pane-body');
+  if (pane) {
+    const r = pane.getBoundingClientRect();
+    w = r.width; h = r.height;
+  } else {
+    // Launching from the Launch page — no pane yet. Approximate from the
+    // window minus the sidebar column and the ~70px of top chrome.
+    const sb = document.querySelector('.sidebar');
+    w = window.innerWidth - (sb ? sb.getBoundingClientRect().width : 232) - 32;
+    h = window.innerHeight - 70;
+  }
+  if (!(w > 40) || !(h > 40)) return null;
+  // Mirror TerminalView's font sizing (13px desktop / 11px mobile,
+  // lineHeight 1.2); cell advance ≈ 0.6em for the mono stack.
+  const isMobile = window.matchMedia('(max-width: 640px)').matches;
+  const fontSize = isMobile ? 11 : 13;
+  return {
+    cols: Math.max(20, Math.min(400, Math.floor(w / (fontSize * 0.6)))),
+    rows: Math.max(8, Math.min(200, Math.floor(h / (fontSize * 1.2)))),
+  };
+}
+
 // Per-device 4-digit human-verification code. Sent alongside the
 // device id so the operator approving on the host can match what
 // they see in the Remote page against what the requesting user

package/public/js/components/TerminalView.js

@@ -229,6 +229,20 @@ export function TerminalView({ terminalId, cliType }) {
     scheduleFit();
     termRef.current = term;
 
+    // Web fonts settle AFTER the first fit. The terminal's mono stack
+    // (`Geist Mono` / `JetBrains Mono`) loads async from Google Fonts with
+    // display:swap, so on a machine without a local `Cascadia Mono` the very
+    // first term.open()+fit() measures cell metrics against the fallback font.
+    // When the real font swaps in its cell height changes, making the row
+    // count fit computed wrong — and because the host's box size never changed,
+    // the ResizeObserver never fires to correct it. The terminal ends up a row
+    // or two short of (or past) the host, "sometimes" — depending purely on
+    // whether the font was already cached. Re-fit once fonts settle; it's a
+    // no-op when the metrics didn't actually change (e.g. local font hit).
+    try {
+      document.fonts?.ready?.then(() => { if (termRef.current === term) scheduleFit(); });
+    } catch {}
+
     // Browser WS API can't set Authorization headers — token + device
     // ride as query string when we have them (Remote-mode access).
     // Server's upgrade handler reads both when Host is non-loopback.
@@ -380,7 +394,11 @@ export function TerminalView({ terminalId, cliType }) {
     };
     const doPaste = (text) => {
       if (!text) return;
-      if (ws.readyState !== 1) return;
+      // Read the live socket — `ws` is scoped to connect() and reassigned on
+      // every reconnect, so referencing it here would be a ReferenceError
+      // (which silently killed Ctrl+V via onKey's .catch).
+      const ws = wsRef.current;
+      if (!ws || ws.readyState !== 1) return;
       // Normalize line endings to \r (CR / Enter). This mirrors VSCode's
       // terminal sendText path (terminalInstance.ts ~L1385):
       //   text = text.replace(/\r?\n/g, '\r');
@@ -468,7 +486,8 @@ export function TerminalView({ terminalId, cliType }) {
       ev.preventDefault();
       ev.stopPropagation();
       ev.stopImmediatePropagation();
-      if (ws.readyState === 1) {
+      const ws = wsRef.current;
+      if (ws && ws.readyState === 1) {
         ws.send(JSON.stringify({ type: 'input', data }));
       }
     };

package/public/js/streaming.js

@@ -2,7 +2,7 @@
 // Items live in a signal keyed by repo so progress rows are reactive.
 
 import { signal } from '@preact/signals';
-import { httpBase } from './backend.js';
+import { httpBase, estimateTermSize } from './backend.js';
 
 // progressByContext[rootId] = { repoName: { phase, percent, detail, state, indeterminate, name } }
 export const progressByContext = signal({});
@@ -63,10 +63,13 @@ export async function streamNewSession(body, { progressRootId = 'newSessionProgr
   // Pass the resolved terminal theme so the backend can hand CLIs a matching
   // COLORFGBG (light/dark detection). dataset.theme is set by applyTheme().
   const theme = document.documentElement.dataset.theme;
+  // Seed the PTY at the pane's real size (estimated from the window here,
+  // since the terminal isn't mounted yet) so alt-screen CLIs don't start
+  // at node-pty's 30-row default and get stranded short of a tall window.
   const res = await fetch(httpBase() + '/api/sessions/new', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ ...body, theme }),
+    body: JSON.stringify({ ...body, theme, ...(estimateTermSize() || {}) }),
   });
   if (!res.ok && res.headers.get('content-type')?.startsWith('application/json')) {
     const j = await res.json();

package/server.js

@@ -281,7 +281,7 @@ function quoteForCmd(s) {
   return s;
 }
 
-function spawnCliSession({ cli, cwd, sessionId, meta, extraArgs = [], theme }) {
+function spawnCliSession({ cli, cwd, sessionId, meta, extraArgs = [], theme, cols, rows }) {
   if (!webTerminal.available) {
     const e = new Error('node-pty unavailable · cannot spawn web terminal');
     e.code = 'PTY_UNAVAILABLE';
@@ -331,12 +331,22 @@ function spawnCliSession({ cli, cwd, sessionId, meta, extraArgs = [], theme }) {
   if (theme === 'light' || theme === 'dark') {
     env.COLORFGBG = theme === 'light' ? '0;15' : '15;0';
   }
+  // Spawn the PTY at the size the frontend measured for its terminal pane
+  // (clamped against junk), so alt-screen CLIs lay out at the right height
+  // from the first frame instead of node-pty's 120×30 default. Omitted ⇒
+  // webTerminal.spawn keeps its default; xterm's first resize corrects any
+  // small estimate error on attach regardless.
+  const sized = (Number(cols) > 0 && Number(rows) > 0)
+    ? { cols: Math.min(400, Math.max(20, Math.floor(Number(cols)))),
+        rows: Math.min(200, Math.max(8, Math.floor(Number(rows)))) }
+    : {};
   const trySpawn = (executable) => webTerminal.spawn({
     id: sessionId,
     command: executable,
     args,
     cwd,
     env,
+    ...sized,
     meta: { ...meta, cliId: cli.id, cliName: cli.name },
     onData: () => {
       persistedSessions.touch(sessionId).catch(() => {});
@@ -867,6 +877,8 @@ app.post('/api/sessions/new', async (req, res) => {
           meta: { title: workspace.name, workspace: workspace.name, cwd: workspace.path },
           extraArgs: [...themeArgs, ...newSessionArgs],
           theme: req.body && req.body.theme,
+          cols: req.body && req.body.cols,
+          rows: req.body && req.body.rows,
         });
         await persistedSessions.markRunning(record.id, entry.meta.pid);
         launched = { id: record.id, pid: entry.meta.pid, cliId: cli.id };
@@ -1004,6 +1016,8 @@ app.post('/api/sessions/:id/resume', asyncH(async (req, res) => {
       meta: { title: record.title || record.workspace, workspace: record.workspace, cwd: record.cwd },
       extraArgs: [...themeArgs, ...extraArgs],
       theme: req.body && req.body.theme,
+      cols: req.body && req.body.cols,
+      rows: req.body && req.body.rows,
     });
     await persistedSessions.markRunning(record.id, entry.meta.pid);
     res.json({ launched: { id: record.id, pid: entry.meta.pid, cliId: cli.id } });