claude-code-kanban 5.4.0 → 6.1.0

package/public/index.html

@@ -52,7 +52,7 @@
       </div>
       <h2>Server Not Running</h2>
       <p>The dashboard needs the Claude Code Kanban server to stream live task data. Start it with:</p>
-      <code>npx claude-code-kanban</code>
+      <code>claude-code-kanban</code>
       <button class="btn btn-primary" onclick="location.reload()">Retry Connection</button>
       <div class="offline-status" id="offline-status" aria-live="polite"></div>
     </div>
@@ -691,8 +691,18 @@
   </div>
   <div id="scratchpad-modal" class="modal-overlay" onclick="closeScratchpad()">
     <div class="modal scratchpad-modal" onclick="event.stopPropagation()">
-      <div class="modal-header">
-        <h3 class="modal-title">Scratchpad</h3>
+      <div class="modal-header scratchpad-header">
+        <div class="scratchpad-title-row">
+          <button id="scratchpad-emoji-btn" class="scratchpad-emoji-btn" type="button" onclick="toggleScratchpadEmojiPicker()"></button>
+          <h3 class="modal-title">Scratchpad</h3>
+        </div>
+        <div id="scratchpad-emoji-picker" class="scratchpad-emoji-picker" tabindex="-1">
+          <div id="scratchpad-emoji-grid" class="scratchpad-emoji-grid"></div>
+          <div class="scratchpad-emoji-row">
+            <input id="scratchpad-emoji-input" class="form-input" maxlength="16" placeholder="Paste" aria-label="Custom emoji">
+            <button type="button" class="btn btn-secondary" onclick="setScratchpadEmoji('')">Clear</button>
+          </div>
+        </div>
         <button class="modal-close" aria-label="Close dialog" onclick="closeScratchpad()">
           <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
             <path d="M18 6L6 18M6 6l12 12"/>
@@ -808,6 +818,7 @@
         <div id="ns-error" class="ns-error" hidden></div>
       </div>
       <div class="modal-footer ns-footer">
+        <label class="ns-check ns-stay" title="Start in the background and keep the current view"><input type="checkbox" id="ns-stay"> Stay here</label>
         <button type="button" class="btn btn-secondary" onclick="closeNewSession()">Cancel</button>
         <button type="button" id="ns-start" class="btn btn-primary" onclick="startNewSession()" disabled>Start</button>
       </div>

package/public/project-match.js

@@ -23,7 +23,12 @@ const projectMatch = (() => {
       return p === q || (!!repo && normalizeProjectPath(repo) === q);
     };
   }
-  return { normalizeProjectPath, isExactProjectPath, isExactProjectFilter, projectMatcher };
+  // The project a session is listed under. A worktree transcript is filed under the worktree
+  // path, so `session.project` alone would show each worktree as a project of its own.
+  function sessionProjectKey(session) {
+    return session?.worktree?.repo || session?.project || null;
+  }
+  return { normalizeProjectPath, isExactProjectPath, isExactProjectFilter, projectMatcher, sessionProjectKey };
 })();
 
 if (typeof module === 'object' && module.exports) module.exports = projectMatch;

package/public/style.css

@@ -6861,6 +6861,17 @@ select.form-input option:checked {
 
 .ns-footer {
   align-items: center;
+  margin-top: 16px;
+  border-top: 1px solid var(--border);
+}
+
+.ns-stay {
+  margin-right: auto;
+  color: var(--text-tertiary);
+}
+
+.new-session-modal.ns-resume .ns-stay {
+  visibility: hidden;
 }
 
 .ns-footer .btn-primary:disabled {
@@ -7075,6 +7086,105 @@ select.form-input option:checked {
   color: var(--text-muted);
   align-self: center;
 }
+
+.scratchpad-header {
+  position: relative;
+}
+
+.scratchpad-title-row {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.scratchpad-emoji-btn {
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18px;
+  line-height: 1;
+  color: var(--text-muted);
+  background: var(--bg-elevated);
+  border: 1px dashed var(--border);
+  border-radius: 8px;
+  cursor: pointer;
+}
+
+.scratchpad-emoji-btn.set {
+  border-style: solid;
+  border-color: var(--accent);
+}
+
+.scratchpad-emoji-btn:hover {
+  border-color: var(--accent);
+}
+
+.scratchpad-emoji-btn[hidden] {
+  display: none;
+}
+
+.scratchpad-emoji-picker {
+  display: none;
+  position: absolute;
+  top: 40px;
+  left: 0;
+  z-index: 5;
+  width: 300px;
+  padding: 10px;
+  background: var(--bg-elevated);
+  border: 1px solid var(--border);
+  border-radius: 10px;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.35);
+  outline: none;
+}
+
+.scratchpad-emoji-picker.open {
+  display: block;
+}
+
+.scratchpad-emoji-grid {
+  display: grid;
+  gap: 2px;
+}
+
+.scratchpad-emoji-grid button {
+  padding: 4px 0;
+  font-size: 18px;
+  background: none;
+  border: 0;
+  border-radius: 6px;
+  cursor: pointer;
+}
+
+.scratchpad-emoji-grid button:hover,
+.scratchpad-emoji-grid button.kb {
+  background: var(--bg-hover);
+}
+
+.scratchpad-emoji-grid button.cur {
+  background: var(--accent-dim);
+}
+
+.scratchpad-emoji-row {
+  display: flex;
+  gap: 6px;
+  margin-top: 8px;
+}
+
+.scratchpad-emoji-row .form-input {
+  flex: 1;
+  min-width: 0;
+  padding: 5px 8px;
+  font-size: 13px;
+}
+
+.scratchpad-badge.has-emoji {
+  font-size: 13px;
+  line-height: 18px;
+  padding: 0 5px;
+}
 /* #endregion */
 
 /* #region STORAGE_MANAGER */

package/server.js

@@ -41,13 +41,15 @@ const {
 const { inlineHtmlAssets, MIME_BY_EXT } = require('./lib/inline-assets');
 const { buildDecision, decisionFileName, isDecisionFile, approvalsFrom, boardRefusal } = require('./lib/approvals');
 const { getClaudeDir, getArgValue, storageNamespace, isDefaultClaudeDir, encodeProjectDirName } = require('./lib/claude-dir');
-const { createTerminalService, readTerminalConfig } = require('./lib/terminal');
+const { readTerminalConfig } = require('./lib/terminal');
+const { createTerminalClient } = require('./lib/terminal-client');
+const { readLiveSessions, isPidAlive, isSessionLive } = require('./lib/live-sessions');
 const { createProcStats } = require('./lib/proc-stats');
-const { createDispatchRegistry, formatPreamble, formatDispatchLine, isPeerName, DISPATCH_OUTCOME } = require('./lib/dispatch');
+const { createDispatchRegistry } = require('./lib/dispatch');
 const { createGroupStore, isGroupName, suggestGroupName } = require('./lib/dispatch-groups');
 const { createDispatchedStore, scanTranscripts, pruneSessionDirs, retentionMs } = require('./lib/retention');
 const { createWorktreeStore } = require('./lib/worktrees');
-const { readGitBranch } = require('./lib/git-branch');
+const { readGitBranch, sessionGitBranch } = require('./lib/git-branch');
 const { createLinkedDocStore, linkUrl } = require('./lib/linked-docs');
 const { pickFolder } = require('./lib/folder-dialog');
 const { loadSessionCache, saveSessionCache } = require('./lib/session-cache');
@@ -301,7 +303,11 @@ function getContextStatus(sessionId, meta) {
 
 function getContextFields(sessionId, meta) {
   const contextStatus = getContextStatus(sessionId, meta);
-  return { contextStatus, autoCompact: contextStatus ? getAutoCompact(CLAUDE_DIR, meta?.project) : null };
+  return {
+    contextStatus,
+    autoCompact: contextStatus ? getAutoCompact(CLAUDE_DIR, meta?.project) : null,
+    cacheTtl: meta?.cacheTtl || null,
+  };
 }
 
 function isAgentFresh(agent) {
@@ -343,15 +349,6 @@ const worktrees = createWorktreeStore({
   save: (data) => writeJsonAtomic(WORKTREES_FILE, data),
 });
 
-// Only look up the branch when cwd has diverged from the launch project — that's
-// the only case the JSONL value is wrong.
-function resolveSessionGitBranch(meta) {
-  if (meta.cwd && meta.project && meta.cwd !== meta.project) {
-    return getGitBranch(meta.cwd) || meta.gitBranch || null;
-  }
-  return meta.gitBranch || null;
-}
-
 function getSessionLogStat(meta) {
   if (!meta.jsonlPath) return { mtime: null, hasMessages: false };
   try {
@@ -476,25 +473,12 @@ let liveSessionsCache = null;
 let lastLiveSessionsScan = 0;
 const LIVE_SESSIONS_TTL = 5000;
 
-function loadLiveSessions(fresh = false) {
+function loadLiveSessions() {
   const now = Date.now();
-  if (!fresh && liveSessionsCache && now - lastLiveSessionsScan < LIVE_SESSIONS_TTL) return liveSessionsCache;
-  const sessions = [];
-  if (existsSync(SESSIONS_DIR)) {
-    try {
-      for (const file of readdirSync(SESSIONS_DIR).filter(f => f.endsWith('.json'))) {
-        try {
-          const s = JSON.parse(readFileSync(path.join(SESSIONS_DIR, file), 'utf8'));
-          if (s?.sessionId && s.kind === 'interactive') {
-            sessions.push({ sessionId: s.sessionId, pid: s.pid || null, cwd: s.cwd || null, startedAt: s.startedAt || 0, status: s.status || null, name: s.name || null });
-          }
-        } catch (_) { /* skip invalid */ }
-      }
-    } catch (_) { /* ignore */ }
-  }
-  liveSessionsCache = sessions;
+  if (liveSessionsCache && now - lastLiveSessionsScan < LIVE_SESSIONS_TTL) return liveSessionsCache;
+  liveSessionsCache = readLiveSessions(SESSIONS_DIR);
   lastLiveSessionsScan = now;
-  return sessions;
+  return liveSessionsCache;
 }
 
 // An open-but-idle interactive session keeps touching its JSONL (metadata-line
@@ -513,19 +497,6 @@ function getPeerName(sessionId) {
   return live?.name ?? null;
 }
 
-// A registry file outlives a crashed claude, so the pid is probed rather than trusted.
-function isSessionProcessAlive(sessionId, exceptPid = null) {
-  return loadLiveSessions().some((s) => {
-    if (s.sessionId !== sessionId || !s.pid || s.pid === exceptPid) return false;
-    return isPidAlive(s.pid);
-  });
-}
-
-// EPERM means the process exists but belongs to someone else.
-function isPidAlive(pid) {
-  try { process.kill(pid, 0); return true; } catch (e) { return e.code === 'EPERM'; }
-}
-
 function hasRecentLogActivity(sessionId, logAge) {
   return logAge <= SESSION_STALE_MS && !isRegistryIdle(sessionId);
 }
@@ -856,6 +827,7 @@ function refreshSessionMetadataPath(jsonlPath) {
   if (info.logicalParentUuid) existing.logicalParentUuid = info.logicalParentUuid;
   if (info.compactBoundaryUuid) existing.compactBoundaryUuid = info.compactBoundaryUuid;
   existing.permissionMode = info.permissionMode;
+  existing.cacheTtl = info.cacheTtl;
   return true;
 }
 
@@ -943,7 +915,8 @@ function loadSessionMetadata() {
           jsonlPath: jsonlPath,
           logicalParentUuid: sessionInfo.logicalParentUuid || null,
           compactBoundaryUuid: sessionInfo.compactBoundaryUuid || null,
-          permissionMode: sessionInfo.permissionMode
+          permissionMode: sessionInfo.permissionMode,
+          cacheTtl: sessionInfo.cacheTtl || null
         };
         sessionIds.push(sessionId);
       }
@@ -1168,6 +1141,7 @@ function buildSessionObject(id, meta, overrides = {}) {
   const logStat = overrides._logStat || getSessionLogStat(meta);
   const logMtime = logStat.mtime;
   const logAge = logMtime ? Date.now() - logMtime : Infinity;
+  const worktree = worktrees.resolve(meta.project);
   return {
     id,
     name: getSessionDisplayName(id, meta),
@@ -1176,8 +1150,8 @@ function buildSessionObject(id, meta, overrides = {}) {
     project: meta.project || null,
     cwd: meta.cwd || null,
     description: meta.description || null,
-    gitBranch: resolveSessionGitBranch(meta),
-    worktree: worktrees.resolve(meta.project),
+    gitBranch: sessionGitBranch(meta, !!worktree, getGitBranch),
+    worktree,
     customTitle: meta.customTitle || null,
     taskCount: 0,
     completed: 0,
@@ -1227,7 +1201,7 @@ app.get('/api/sessions', async (req, res) => {
     const pinnedIds = pinnedParam ? new Set(pinnedParam.split(',').filter(Boolean)) : new Set();
     for (const id of includeIds) pinnedIds.add(id);
     const activeFilter = req.query.filter === 'active';
-    const terminalIds = activeFilter ? new Set(terminal.list().map((t) => t.id)) : new Set();
+    const terminalIds = activeFilter ? new Set(terminal.ids()) : new Set();
 
     const metadata = loadSessionMetadata();
     const sessionsMap = new Map();
@@ -1631,6 +1605,30 @@ app.get('/api/sessions/search', (req, res) => {
   res.json(hits.slice(0, SESSION_SEARCH_MAX).map((h) => h.id));
 });
 
+app.get('/api/sessions/known', (_req, res) => {
+  res.setHeader('Cache-Control', 'no-store');
+  try {
+    const known = new Map();
+    for (const [id, meta] of Object.entries(loadSessionMetadata())) {
+      known.set(id, { id, project: meta.project || null, name: getSessionDisplayName(id, meta) });
+    }
+    const add = (id, project = null) => {
+      if (!known.has(id)) known.set(id, { id, project, name: null });
+    };
+    for (const dir of [TASKS_DIR, AGENT_ACTIVITY_DIR]) {
+      if (!existsSync(dir)) continue;
+      for (const d of readdirSync(dir, { withFileTypes: true })) if (d.isDirectory()) add(d.name);
+    }
+    for (const map of Object.values(loadAllTaskMaps().listToSessions)) {
+      for (const [id, info] of Object.entries(map)) add(id, info.project || null);
+    }
+    res.json([...known.values()]);
+  } catch (error) {
+    console.error('Error listing known sessions:', error);
+    res.status(500).json({ error: 'Failed to list known sessions' });
+  }
+});
+
 function isTempPath(p) {
   const rel = path.relative(TEMP_ROOT, p);
   return !!rel && !rel.startsWith('..') && !path.isAbsolute(rel);
@@ -3256,29 +3254,34 @@ function resolveSessionFolder(id) {
   return meta ? meta.project || meta.cwd || null : null;
 }
 
-let listenPort = null;
-const terminal = createTerminalService({
+const terminal = createTerminalClient({
   config: readTerminalConfig({ getArgValue }),
-  serverUrl: () => (listenPort ? `http://127.0.0.1:${listenPort}` : null),
   net,
   claudeDir: CLAUDE_DIR,
   isDefaultDir: isDefaultClaudeDir(CLAUDE_DIR),
+  sessionsDir: SESSIONS_DIR,
   token: process.env.CCK_TERMINAL_TOKEN,
   load: () => {
     try { return JSON.parse(readFileSync(TERMINALS_FILE, 'utf8')); } catch { return null; }
   },
   save: (data) => writeJsonAtomic(TERMINALS_FILE, data),
-  which: whichSync,
-  isLiveElsewhere: isSessionProcessAlive,
   // The project, not the last cwd: `claude --resume` finds a session under the
   // project dir it started in, and cwd drifts into subdirectories.
   resolveCwd: resolveSessionFolder,
   isAllowedFolder,
-  liveSessions: () => loadLiveSessions(true),
-  onChange: () => broadcast({ type: 'terminals-update', ids: terminal.list().map((t) => t.id) }),
-  onExit: (id) => dispatches.sessionExited(id),
+  onChange: () => broadcast({ type: 'terminals-update', ids: terminal.ids() }),
+  onExit: (id) => {
+    if (dispatches.remove(id)) broadcast({ type: 'dispatch-update' });
+  },
 });
 
+// A call to the terminal host fails with 503 while the host restarts.
+function terminalRoute(fn) {
+  return (req, res) => fn(req, res).catch((e) => {
+    if (!res.headersSent) res.status(e.status || 500).json({ error: e.message });
+  });
+}
+
 let folderDialogOpen = false;
 app.post('/api/terminal/pick-folder', async (req, res) => {
   const reason = terminal.unavailableReason();
@@ -3297,28 +3300,37 @@ app.post('/api/terminal/pick-folder', async (req, res) => {
   }
 });
 
+// The New session dialog's "Stay here": the PTY starts headless and the board keeps its view.
+app.post('/api/terminal/start', terminalRoute(async (req, res) => {
+  if (!terminal.authorized(req.get('x-terminal-token'))) return res.status(401).json({ error: 'invalid terminal token' });
+  const { id, cwd, name, model, worktree, prompt } = req.body || {};
+  const started = await terminal.startNew({ id, cwd, name, model, worktree, prompt });
+  if (started.error) return res.status(started.status).json({ error: started.error });
+  res.status(201).json({ session: started.id, cwd: started.cwd });
+}));
+
 // The hub's eviction check reads this to keep a pool with live PTYs alive.
-app.get('/api/terminals', (_req, res) => {
+app.get('/api/terminals', terminalRoute(async (_req, res) => {
   res.setHeader('Cache-Control', 'no-store');
-  res.json({ sessions: terminal.list() });
-});
+  res.json({ sessions: await terminal.sessions() });
+}));
 
 const terminalProcStats = createProcStats();
-app.get('/api/terminals/stats', async (_req, res) => {
+app.get('/api/terminals/stats', terminalRoute(async (_req, res) => {
   res.setHeader('Cache-Control', 'no-store');
-  const pids = terminal.claudePids();
-  const byPid = await terminalProcStats([process.pid, ...Object.values(pids)]);
+  const { hostPid, claudePids } = await terminal.stats();
+  const byPid = await terminalProcStats([process.pid, hostPid, ...Object.values(claudePids)].filter(Boolean));
   const terminals = {};
-  for (const [id, pid] of Object.entries(pids)) if (byPid[pid]) terminals[id] = byPid[pid];
-  res.json({ cck: byPid[process.pid] || null, terminals });
-});
+  for (const [id, pid] of Object.entries(claudePids)) if (byPid[pid]) terminals[id] = byPid[pid];
+  res.json({ cck: byPid[process.pid] || null, host: byPid[hostPid] || null, terminals });
+}));
 
-app.delete('/api/terminals/:id', (req, res) => {
-  const err = terminal.end(req.params.id, req.get('x-terminal-token'));
+app.delete('/api/terminals/:id', terminalRoute(async (req, res) => {
+  const err = await terminal.end(req.params.id, req.get('x-terminal-token'));
   if (err === 'auth') return res.status(401).json({ error: 'invalid terminal token' });
   if (err === 'not-found') return res.status(404).json({ error: 'no such terminal' });
   res.status(204).end();
-});
+}));
 
 // Served from node_modules, never a CDN: any script on this page can use the token.
 const XTERM_FILES = {
@@ -3346,20 +3358,14 @@ const dispatched = createDispatchedStore({
   save: (data) => writeJsonAtomic(DISPATCHED_FILE, data),
 });
 
-const dispatches = createDispatchRegistry({
-  onSettle: (r) => {
-    if (r.parent && r.report) enqueueSessionEvent(topicKey('dispatch', r.parent), formatDispatchLine(r));
-    if (r.session) dispatched.settle(r.session, r.status);
-    broadcast({ type: 'dispatch-update' });
-  },
-});
+const dispatches = createDispatchRegistry();
 
 const dispatchGroups = createGroupStore({
   load: () => {
     try { return JSON.parse(readFileSync(DISPATCH_GROUPS_FILE, 'utf8')); } catch { return null; }
   },
   save: (data) => writeJsonAtomic(DISPATCH_GROUPS_FILE, data),
-  isAlive: (id) => terminal.isRunning(id) || isSessionProcessAlive(id),
+  isAlive: (id) => terminal.isRunning(id) || isSessionLive(loadLiveSessions(), id),
   pinnedIds: () => new Set(Object.keys(readPins())),
 });
 
@@ -3371,8 +3377,6 @@ const linkedDocs = createLinkedDocStore({
 });
 
 // The board places a session from these alone, so it never has to move it later.
-// `startedBy` lets it follow a starter the user put in a named group, which only the
-// browser knows; it goes once the dispatch settles. `dispatched` stays for the card's marker.
 function withDispatchPlacement(sessions) {
   const groups = dispatchGroups.snapshot();
   return sessions.map((s) => {
@@ -3382,56 +3386,35 @@ function withDispatchPlacement(sessions) {
     return {
       ...s,
       dispatchGroup,
-      startedBy: marker?.status === 'running' ? marker.parent || undefined : undefined,
-      dispatched: marker ? { parent: marker.parent, outcome: DISPATCH_OUTCOME[marker.status] } : undefined,
+      dispatched: marker ? { parent: marker.parent } : undefined,
     };
   });
 }
 
 // Starting a session needs the terminal token, as the browser does; the CLI reads it from
-// TERMINAL_TOKEN_FILE. The child gets only its dispatch capability through the preamble.
-app.post('/api/dispatch', (req, res) => {
+// TERMINAL_TOKEN_FILE. The started session never holds it.
+app.post('/api/dispatch', terminalRoute(async (req, res) => {
   if (!terminal.authorized(req.get('x-terminal-token'))) return res.status(401).json({ error: 'invalid terminal token' });
-  const { cwd, spec, name, model, worktree, parent, group, report, peer } = req.body || {};
+  const { cwd, spec, name, model, worktree, parent, group, claudeArgs } = req.body || {};
   if (typeof spec !== 'string' || !spec.trim()) return res.status(400).json({ error: 'spec is required' });
-  if (peer != null && !isPeerName(peer)) return res.status(400).json({ error: 'peer must be a peer name as ListAgents prints it' });
   if (parent != null && !(typeof parent === 'string' && isUUID(parent))) return res.status(400).json({ error: 'invalid parent' });
   if (group != null && !isGroupName(group)) {
     return res.status(400).json({ error: `group must be kebab-case, e.g. ${suggestGroupName(group) || 'my-group'}` });
   }
-  const target = group || (parent && dispatchGroups.groupOf(parent)) || null;
-  const r = dispatches.create({ parent, name, spec: spec.trim(), report: report === true, peer, group: target, worktree });
-  const env = { CCK_DISPATCH_ID: r.id, ...(parent && { PARENT_SESSION_ID: parent }) };
-  const started = terminal.startNew({ cwd, name, model, worktree, prompt: formatPreamble(r) }, env);
-  if (started.error) {
-    dispatches.discard(r.id);
-    return res.status(started.status).json({ error: started.error });
-  }
-  dispatches.attach(r.id, { session: started.id, cwd: started.cwd });
+  const started = await terminal.startNew({ cwd, name, model, worktree, prompt: spec.trim(), extraArgs: claudeArgs });
+  if (started.error) return res.status(started.status).json({ error: started.error });
+  dispatches.add({ session: started.id, parent, cwd: started.cwd, name, group: group || null, worktree });
   dispatched.record(started.id, parent);
   // The starter stays where it is: moving it would jump it under the user.
-  if (target) dispatchGroups.join(target, [started.id], parent);
+  if (group) dispatchGroups.join(group, [started.id]);
   broadcast({ type: 'dispatch-update' });
-  res.status(201).json({ dispatch: r.id, session: started.id, cwd: started.cwd, group: target });
-});
-
-app.post('/api/dispatch/:id/done', (req, res) => {
-  const { cap, outcome, summary } = req.body || {};
-  const err = dispatches.settle(req.params.id, cap, outcome, summary);
-  if (err) return res.status(err.status).json({ error: err.error });
-  res.status(204).end();
-});
+  res.status(201).json({ session: started.id, cwd: started.cwd, group: group || null });
+}));
 
-app.get('/api/dispatch', async (req, res) => {
+app.get('/api/dispatch', (req, res) => {
   res.setHeader('Cache-Control', 'no-store');
-  const ids = typeof req.query.ids === 'string' && req.query.ids ? req.query.ids.split(',') : null;
   const parent = typeof req.query.parent === 'string' && req.query.parent ? req.query.parent : null;
-  // res, not req: a GET's request stream can close before the response is sent.
-  const out = await dispatches.wait({ ids, parent }, req.query.wait, (stop) => {
-    res.on('close', stop);
-    return () => res.off('close', stop);
-  });
-  if (!res.writableEnded) res.json(out);
+  res.json({ running: dispatches.list({ parent }) });
 });
 // #endregion
 
@@ -3496,7 +3479,6 @@ const {
   formatTaskMoved,
   handleSessionEvents,
   hasSessionListener,
-  topicKey,
 } = require('./lib/session-events');
 app.get('/api/sessions/:sessionId/events', handleSessionEvents);
 
@@ -4036,7 +4018,7 @@ app.post('/api/sessions/:sessionId/review', async (req, res) => {
       terminal.isRunning(sessionId) &&
       !isWaitingOnUser(sessionId)
     ) {
-      if (terminal.paste(sessionId, `Address my review comments on ${src.label}: ${file}`)) delivered = 'terminal';
+      if (await terminal.paste(sessionId, `Address my review comments on ${src.label}: ${file}`)) delivered = 'terminal';
     }
     res.json({ delivered, file, markdown });
   } catch (error) {
@@ -4405,7 +4387,7 @@ async function prewarmCaches() {
 }
 
   const onReady = (actualPort) => {
-    listenPort = actualPort;
+    terminal.setServerUrl(`http://127.0.0.1:${actualPort}`);
     // The port is configurable and falls back to a random one when taken, so the postman
     // monitor cannot assume it -- publish the live one where it can read it.
     writeServerInfo(actualPort);
@@ -4415,12 +4397,13 @@ async function prewarmCaches() {
     migrateLegacyApprovalsConfig();
     const warning = net.exposureWarning();
     if (warning) console.log(warning);
-    const terminalReason = terminal.unavailableReason();
-    if (terminalReason && terminalReason !== 'disabled') console.log(`Terminal unavailable: ${terminalReason}`);
-    // Under the hub the hub owns the token and hands it to the iframe itself.
-    if (!terminalReason && !process.env.CLAUDE_HUB) {
-      console.log(`Terminal enabled - open http://localhost:${actualPort}/#t=${terminal.token}`);
-    }
+    terminal.started.then((terminalReason) => {
+      if (terminalReason && terminalReason !== 'disabled') console.log(`Terminal unavailable: ${terminalReason}`);
+      // Under the hub the hub owns the token and hands it to the iframe itself.
+      if (!terminalReason && !process.env.CLAUDE_HUB) {
+        console.log(`Terminal enabled - open http://localhost:${actualPort}/#t=${terminal.token}`);
+      }
+    });
 
     if (process.argv.includes('--open')) {
       import('open').then(open => open.default(`http://localhost:${actualPort}`));