claude-code-kanban 7.2.0 → 7.4.0

package/hub-app.json

@@ -5,6 +5,7 @@
   "icon": "columns",
   "run": { "entry": "server.js", "defaultPort": 3541 },
   "publishes": ["session.changed"],
+  "keys": { "keeps": ["ctrl+alt+n", "ctrl+alt+r", "ctrl+alt+s"] },
   "provides": {
     "projects": { "path": "/api/projects" },
     "terminal": { "liveWork": "/api/terminals" }

package/lib/terminal.js

@@ -12,6 +12,7 @@
 // gates and hands the upgraded socket over, so no keystroke or output byte waits on
 // cck's main thread.
 
+const { spawnSync } = require('node:child_process');
 const crypto = require('node:crypto');
 const fs = require('node:fs');
 const os = require('node:os');
@@ -22,7 +23,7 @@ const priority = require('./priority');
 
 const WS_PATH = '/api/terminal/ws';
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-const MODES = new Set(['auto', 'resume', 'fork', 'shell', 'new', 'pick']);
+const MODES = new Set(['auto', 'resume', 'shell', 'new', 'pick']);
 const PICK_POLL_MS = 1000;
 // How long before the PTY a registry entry may claim to have started (clock skew between the two).
 const PICK_START_SLACK_MS = 2000;
@@ -58,7 +59,6 @@ const RESTORE_GAP_MS = 2000;
 // The hub stops cck with `taskkill /f /t`, which can deliver the PTY exits to cck a moment
 // before cck itself dies. The delay keeps that teardown out of the saved list.
 const SAVE_DELAY_MS = 1000;
-// A fork runs under its parent's id until claude names the new one, so it has no id to resume.
 const RESTORABLE_MODES = new Set(['resume', 'new']);
 // Quitting claude drops the PTY to its shell, so the PTY's exit cannot tell cck that claude is gone.
 const CLAUDE_EXIT_POLL_MS = 5000;
@@ -147,10 +147,25 @@ function quoteArg(arg, family) {
   return family === 'cmd' ? `"${arg}"` : `'${arg}'`;
 }
 
+// Free text, unlike quoteArg's input. Inside single quotes pwsh only reads a quote mark (it
+// counts the typographic ones too) and POSIX shells read nothing, so doubling or closing
+// around the quote is enough. cmd has no quoting that holds % and ", so start() refuses it.
+function quotePrompt(text, family) {
+  if (family === 'pwsh') return `'${text.replace(/['‘’‚‛]/g, '$&$&')}'`;
+  return `'${text.replace(/'/g, "'\\''")}'`;
+}
+
+// The prompt goes first: -w takes an optional value, so a prompt after it would become the worktree name.
+function claudeCommand(shell, claudeArgs, prompt) {
+  const family = shellFamily(shell);
+  const args = claudeArgs.map((a) => quoteArg(a, family));
+  return ['claude', ...(prompt ? [quotePrompt(prompt, family)] : []), ...args].join(' ');
+}
+
 function shellArgs(shell, claudeArgs) {
   const family = shellFamily(shell);
   if (!claudeArgs) return family === 'pwsh' ? ['-NoLogo'] : family === 'gitbash' ? ['--login', '-i'] : [];
-  const cmd = ['claude', ...claudeArgs].map((a) => quoteArg(a, family)).join(' ');
+  const cmd = claudeCommand(shell, claudeArgs);
   if (family === 'pwsh') return ['-NoLogo', '-NoExit', '-Command', cmd];
   if (family === 'cmd') return ['/k', cmd];
   if (family === 'gitbash') return ['--login', '-i', '-c', `${cmd}; exec bash --login -i`];
@@ -161,10 +176,11 @@ function shellArgs(shell, claudeArgs) {
 
 function claudeArgsFor(mode, id, spec) {
   if (mode === 'shell') return null;
-  if (mode === 'fork') return ['--resume', id, '--fork-session'];
   if (mode === 'pick') return ['--resume'];
   if (mode === 'new') {
-    const args = ['--session-id', id, ...(spec.extraArgs || [])];
+    // claude takes --session-id with --resume only together with --fork-session.
+    const fork = spec.forkOf ? ['--resume', spec.forkOf, '--fork-session'] : [];
+    const args = [...fork, '--session-id', id, ...(spec.extraArgs || [])];
     if (spec.name) args.push('--name', spec.name);
     if (spec.model) args.push('--model', spec.model);
     // Last, because its value is optional and a following flag must not be taken for it.
@@ -187,7 +203,9 @@ function extraArgsError(args) {
 
 // Returns the new-session options from a hello, or a string naming the bad field.
 function parseNewSpec(msg) {
-  if (typeof msg.cwd !== 'string' || !msg.cwd) return 'folder';
+  const forkOf = msg.forkOf ?? null;
+  if (forkOf !== null && (typeof forkOf !== 'string' || !UUID_RE.test(forkOf))) return 'session to fork';
+  if (!forkOf && (typeof msg.cwd !== 'string' || !msg.cwd)) return 'folder';
   const name = typeof msg.name === 'string' ? msg.name.trim() : '';
   if (name && !NAME_RE.test(name)) return 'name';
   const worktree = msg.worktree ?? false;
@@ -196,13 +214,18 @@ function parseNewSpec(msg) {
   if (model && !MODELS.has(model)) return 'model';
   const taskList = msg.taskList || null;
   if (taskList && !(typeof taskList === 'string' && TASK_LIST_RE.test(taskList))) return 'task list id';
-  // biome-ignore lint/suspicious/noControlCharactersInRegex: strips ESC so a prompt cannot carry terminal sequences
-  const prompt = typeof msg.prompt === 'string' ? msg.prompt.replace(/\x1b/g, '').trim() : '';
+  const edit = msg.edit === true;
+  // ESC so a prompt cannot carry terminal sequences; on a shell line (edit) every control
+  // character but tab and line breaks, since it could act as a key (Ctrl+C, Ctrl+U) instead of text.
+  // biome-ignore lint/suspicious/noControlCharactersInRegex: strips control characters on purpose
+  const strip = edit ? /[\x00-\x08\x0b-\x1f\x7f]/g : /\x1b/g;
+  const prompt = typeof msg.prompt === 'string' ? msg.prompt.replace(strip, '').trim() : '';
   if (prompt.length > MAX_PROMPT) return 'prompt';
   const extraArgs = msg.extraArgs ?? [];
   const bad = extraArgsError(extraArgs);
   if (bad) return bad;
-  return { cwd: msg.cwd, name: name || null, worktree, model, taskList, prompt: prompt || null, extraArgs };
+  if (forkOf && worktree) return 'worktree: a fork runs in its parent session folder';
+  return { cwd: forkOf ? null : msg.cwd, forkOf, name: name || null, worktree, model, taskList, prompt: prompt || null, extraArgs, edit };
 }
 
 function samePath(a, b) {
@@ -442,19 +465,23 @@ function createTerminalService(o) {
     return /\btrust\b/i.test(screenText(s.term));
   }
 
-  function queuePrompt(s, prompt) {
-    let armed = false;
+  // `submit` is claude's prompt: wait for its input box, then press Enter. Without it the text
+  // is the claude command typed at the shell prompt once the shell's startup output settles,
+  // and Enter is left to the user; bracketed paste keeps a prompt's line breaks from running
+  // the command early (checked in Git Bash and pwsh).
+  function queueText(s, raw, submit) {
+    let armed = !submit;
     let timer = null;
-    const text = bracketed(prompt);
+    const text = bracketed(raw);
     s.onOutput = (data) => {
       if (!armed && data.includes('\x1b[?2004h')) armed = true;
       if (!armed) return;
       clearTimeout(timer);
       timer = setTimeout(() => {
-        if (s.exited || onTrustScreen(s)) return;
+        if (s.exited || (submit && onTrustScreen(s))) return;
         s.onOutput = null;
         s.pty.write(text);
-        setTimeout(() => { if (!s.exited) s.pty.write('\r'); }, 100);
+        if (submit) setTimeout(() => { if (!s.exited) s.pty.write('\r'); }, 100);
       }, PROMPT_QUIET_MS);
     };
   }
@@ -465,13 +492,7 @@ function createTerminalService(o) {
     if (s.claudeExitedAt) return null;
     if (s.claudePid || s.mode === 'pick') return s.claudePid;
     const live = registry || o.liveSessions();
-    const own = ownEntry(live, s, s.startedAt);
-    if (own || s.mode !== 'fork') {
-      s.claudePid = own?.pid;
-      return s.claudePid;
-    }
-    const claimed = new Set([...sessions.values()].map((x) => x.claudePid).filter(Boolean));
-    s.claudePid = findPickProcess(live, s, claimed);
+    s.claudePid = ownEntry(live, s, s.startedAt)?.pid;
     return s.claudePid;
   }
 
@@ -492,7 +513,10 @@ function createTerminalService(o) {
         moved = true;
         continue;
       }
+      const had = s.claudePid;
       const pid = inputPid(s, live);
+      // An edit terminal starts claude whenever the user presses Enter, after syncBoost stopped looking.
+      if (pid && pid !== had) syncBoost(s);
       if (!pid || (live.some((l) => l.pid === pid) && pidAlive(pid))) continue;
       s.claudeExitedAt = Date.now();
       s.claudePid = null;
@@ -537,7 +561,8 @@ function createTerminalService(o) {
     if (taskList) env.CLAUDE_CODE_TASK_LIST_ID = taskList;
     // Git Bash's login profile cds to $HOME unless this is set.
     if (shellFamily(shell) === 'gitbash') env.CHERE_INVOKING = '1';
-    const proc = pty.spawn(shell, shellArgs(shell, claudeArgsFor(mode, id, spec)), {
+    const claudeArgs = claudeArgsFor(mode, id, spec);
+    const proc = pty.spawn(shell, shellArgs(shell, spec?.edit ? null : claudeArgs), {
       name: 'xterm-256color',
       cols,
       rows,
@@ -549,9 +574,11 @@ function createTerminalService(o) {
     term.loadAddon(serializer);
     const s = {
       id, mode, cwd, pty: proc, term, serializer, sockets: new Set(), exited: false, ended: false, paused: false, startedAt: Date.now(),
-      name: spec?.name || null, worktree: spec?.worktree || false, taskList, onOutput: null,
+      name: spec?.name || null, worktree: spec?.worktree || false, taskList, onOutput: null, edit: !!spec?.edit,
+      forkOf: spec?.forkOf || null,
     };
-    if (spec?.prompt) queuePrompt(s, spec.prompt);
+    if (s.edit) queueText(s, claudeCommand(shell, claudeArgs, spec.prompt), false);
+    else if (spec?.prompt) queueText(s, spec.prompt, true);
     if (mode === 'pick') watchPick(s);
 
     proc.onData((data) => {
@@ -697,15 +724,20 @@ function createTerminalService(o) {
     if (mode === 'new') {
       spec = parseNewSpec(msg);
       if (typeof spec === 'string') return { code: 4002, status: 400, error: `invalid ${spec}` };
+      if (spec.edit && spec.prompt && shellFamily(shell) === 'cmd') {
+        return { code: 4002, status: 400, error: 'cmd cannot take a typed prompt; clear the prompt or set the terminal shell to pwsh or gitbash' };
+      }
     }
-    const known = await o.resolveCwd(id);
+    // `claude --resume` finds a fork's parent only from the parent's own project folder.
+    const [known, forkCwd] = await Promise.all([o.resolveCwd(id), spec?.forkOf ? o.resolveCwd(spec.forkOf) : null]);
     let cwd = known;
     if (mode === 'new' || mode === 'pick') {
       if (known !== null) return { code: 4006, status: 409, error: 'session id already in use' };
-      if (typeof msg.cwd !== 'string' || !(await o.isAllowedFolder(msg.cwd))) {
+      cwd = spec?.forkOf ? forkCwd : msg.cwd;
+      if (spec?.forkOf && cwd === null) return { code: 4004, status: 404, error: 'unknown session to fork' };
+      if (!spec?.forkOf && (typeof cwd !== 'string' || !(await o.isAllowedFolder(cwd)))) {
         return { code: 4004, status: 403, error: 'folder is not a known project or a folder picked in this run' };
       }
-      cwd = msg.cwd;
     } else if (mode !== 'shell' && known === null) {
       return { code: 4004, status: 404, error: 'unknown session' };
     }
@@ -751,7 +783,7 @@ function createTerminalService(o) {
   function list() {
     return [...sessions.values()].filter((s) => !s.ended).map((s) => ({
       id: s.id, mode: s.mode, cwd: s.cwd, pid: s.pty.pid, clients: s.sockets.size, startedAt: s.startedAt,
-      name: s.name, worktree: s.worktree,
+      name: s.name, worktree: s.worktree, edit: s.edit, forkOf: s.forkOf,
     }));
   }
 
@@ -795,13 +827,14 @@ function createTerminalService(o) {
   }
 
   // Pastes into claude's input box and stops there: Enter would also submit whatever the
-  // user had half-typed, and over a permission dialog it would answer it. A fork runs under
-  // a new session id, so its terminal id does not name the session the text is for. A
-  // pending queued prompt owns the input box until it is sent.
+  // user had half-typed, and over a permission dialog it would answer it. A pending queued
+  // prompt owns the input box until it is sent.
   function paste(id, text) {
     const s = sessions.get(id);
-    if (!s || s.ended || s.exited || s.claudeExitedAt || s.onOutput || s.mode === 'shell' || s.mode === 'fork') return false;
+    if (!s || s.ended || s.exited || s.claudeExitedAt || s.onOutput || s.mode === 'shell') return false;
     if (onTrustScreen(s)) return false;
+    // Until the user runs the typed command, the input box is the shell's command line.
+    if (s.edit && !s.claudePid) return false;
     s.pty.write(bracketed(text));
     return true;
   }
@@ -810,6 +843,12 @@ function createTerminalService(o) {
     shuttingDown = true;
     clearTimeout(saveTimer);
     clearInterval(exitTimer);
+    // On Windows pty.kill() returns before the tree is gone, and the host exits right after
+    // shutdown, so claude outlived it. One synchronous tree kill ends every session first.
+    const pids = [...sessions.values()].map((s) => s.pty.pid).filter(Boolean);
+    if (process.platform === 'win32' && pids.length) {
+      spawnSync('taskkill', ['/f', '/t', ...pids.flatMap((pid) => ['/pid', String(pid)])], { windowsHide: true, stdio: 'ignore' });
+    }
     for (const s of sessions.values()) {
       try { s.pty.kill(); } catch { /* already gone */ }
     }
@@ -819,4 +858,4 @@ function createTerminalService(o) {
   return { token, handleUpgrade, clientConfig, list, claudePids, isRunning, end, authorized, startNew, paste, restore, shutdown, unavailableReason };
 }
 
-module.exports = { createTerminalService, readTerminalConfig, localUnavailableReason, refuseUpgrade, clientConfigFor, ptyEnv, shellArgs, resolveShell, claudeArgsFor, parseNewSpec, findPickProcess, tokenMatches };
+module.exports = { createTerminalService, readTerminalConfig, localUnavailableReason, refuseUpgrade, clientConfigFor, ptyEnv, shellArgs, claudeCommand, resolveShell, claudeArgsFor, parseNewSpec, findPickProcess, tokenMatches };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-kanban",
-  "version": "7.2.0",
+  "version": "7.4.0",
   "description": "A web-based Kanban board for viewing Claude Code tasks with agent teams support",
   "main": "server.js",
   "type": "commonjs",