clideck 1.31.11 → 1.31.12

package/README.md

@@ -57,14 +57,24 @@ clideck --port 4001
   <img src="assets/autopilot.gif" width="720" alt="Autopilot routing work between agents">
 </p>
 
-**Ask another session** - from inside any CliDeck session, an agent can consult another session in the same project and get the answer back as command output:
+**Ask another session** - from inside any CliDeck session, an agent can consult another session and get the answer back as command output:
 
 ```bash
+clideck agents
 clideck ask --session "Reviewer" --message "Review this output and return findings." --timeout 10m
 ```
 
 CliDeck injects the message into the real target terminal, submits it, waits for the target session to finish, then returns the latest response to the caller.
 
+By default, target lookup is limited to the caller's project. For cross-project asks, discover the full address first:
+
+```bash
+clideck agents --all
+clideck ask "@website/Docs Writer" "Check if the docs mention the new CLI flags." --timeout 15m
+```
+
+If project or session names contain spaces, quote the whole target. The target is another LLM agent, not a fast CLI command, so callers should set both `clideck ask --timeout` and their own shell/tool timeout high enough. If the target session is busy, CliDeck does not queue the message; the caller gets a clear busy response and can retry later or ask another idle session.
+
 **Mobile remote** - the agents keep running on the local machine. status, prompts, history, and replies stay available from a phone while away. E2E encrypted, no account needed.
 
 **Native terminals** - each session opens into its real terminal. keys go straight to the agent, nothing sits in the middle.

package/bin/clideck.js

@@ -8,7 +8,7 @@ function usage() {
     '',
     'Usage:',
     '  clideck [--host <host>] [--port <port>]',
-    '  clideck agents [--json]',
+    '  clideck agents [--json] [--all]',
     '  clideck ask --session <name-or-id> --message <text> [--timeout 10m]',
     '',
     'Options:',
@@ -21,24 +21,32 @@ function usage() {
     '  clideck agents',
     '    Lists active sessions in the same project as the caller session.',
     '    Use this first when an agent needs to discover who it can ask.',
+    '    Add --all to list cross-project targets with @project/session ask addresses.',
     '',
     '  clideck ask',
     '    Use from inside a CliDeck session when one agent needs an answer from another session.',
     '',
     'Ask behavior:',
-    '  Target lookup is limited to the same project as the caller session.',
+    '  Unscoped target lookup is limited to the same project as the caller session.',
+    '  Cross-project asks must use an explicit @project/session target.',
     '  CliDeck sends the message into the real target terminal, presses Enter, waits for the',
     '  target to finish, then prints the target agent response to stdout.',
+    '  The target is another LLM agent. It may need minutes to think, read files, and use tools.',
+    '  Set both `--timeout` and your shell/tool-call timeout high enough, or your caller may exit',
+    '  before the target agent finishes.',
     '',
     'Examples:',
     '  clideck agents',
     '  clideck agents --json',
+    '  clideck agents --all',
     '  clideck ask --session "Reviewer" --message "Review my changes and return only findings."',
     '  clideck ask "research manager" "Check this plan and tell me what is missing." --timeout 15m',
+    '  clideck ask "@website/Docs Writer" "Check if the docs mention the new CLI flags." --timeout 15m',
     '  cat notes.md | clideck ask --session "Docs Writer" --timeout 10m',
     '',
     'Notes for agents:',
     '  Run `clideck agents` to discover available same-project sessions.',
+    '  Run `clideck agents --all` before a cross-project ask.',
     '  Run `clideck ask --help` for the exact ask command contract.',
     '  If the target name has spaces, quote it.',
     '  If several sessions have the same name in the same project, use the session id.',

package/clideck-agents-cli.js

@@ -4,13 +4,15 @@ const https = require('https');
 function usage() {
   return [
     'Usage:',
-    '  clideck agents [--json]',
+    '  clideck agents [--json] [--all]',
     '',
     'Lists active CliDeck sessions in the same project as the caller session.',
     'Use this from inside a CliDeck session before `clideck ask` to discover target names.',
+    'Use --all to discover cross-project targets and their @project/session ask addresses.',
     '',
     'Options:',
     '  --json       Print machine-readable JSON.',
+    '  --all        List sessions across all projects.',
     '  --url <url>  CliDeck server URL. Default: CLIDECK_URL or http://127.0.0.1:<port>.',
     '  -h, --help   Show this help.',
   ].join('\n');
@@ -18,10 +20,11 @@ function usage() {
 
 function parseArgs(args) {
   const port = process.env.CLIDECK_PORT || process.env.PORT || '4000';
-  const out = { json: false, url: process.env.CLIDECK_URL || `http://127.0.0.1:${port}` };
+  const out = { json: false, all: false, url: process.env.CLIDECK_URL || `http://127.0.0.1:${port}` };
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
     if (arg === '--json') out.json = true;
+    else if (arg === '--all') out.all = true;
     else if (arg === '--url') out.url = args[++i];
     else if (arg === '--help' || arg === '-h') out.help = true;
     else throw new Error(`Unknown argument: ${arg}`);
@@ -29,10 +32,11 @@ function parseArgs(args) {
   return out;
 }
 
-function getJson(url, callerSessionId) {
+function getJson(url, callerSessionId, all = false) {
   return new Promise((resolve, reject) => {
     const target = new URL('/api/session/agents', url);
     target.searchParams.set('callerSessionId', callerSessionId);
+    if (all) target.searchParams.set('all', '1');
     const client = target.protocol === 'https:' ? https : http;
     const req = client.get(target, (res) => {
       let data = '';
@@ -53,13 +57,15 @@ function getJson(url, callerSessionId) {
   });
 }
 
-function formatAgents(agents) {
-  if (!agents.length) return 'No active sessions found in this project.';
+function formatAgents(agents, opts = {}) {
+  if (!agents.length) return opts.all ? 'No active sessions found.' : 'No active sessions found in this project.';
   return agents.map(a => {
     const marker = a.caller ? 'self' : 'peer';
     const status = a.working ? 'working' : 'idle';
     const preview = a.lastPreview ? ` - ${a.lastPreview}` : '';
-    return `${a.name} (${marker}, ${a.preset}, ${status}) id=${a.id}${preview}`;
+    const address = a.address && a.address !== a.name ? ` ask=${a.address}` : '';
+    const project = opts.all && a.project ? ` project="${a.project}"` : '';
+    return `${a.name} (${marker}, ${a.preset}, ${status}) id=${a.id}${address}${project}${preview}`;
   }).join('\n');
 }
 
@@ -73,9 +79,9 @@ async function run(args) {
     const callerSessionId = process.env.CLIDECK_SESSION_ID || '';
     if (!callerSessionId) throw new Error('CLIDECK_SESSION_ID is missing. Run this from inside a CliDeck session.');
 
-    const res = await getJson(opts.url, callerSessionId);
+    const res = await getJson(opts.url, callerSessionId, opts.all);
     if (opts.json) process.stdout.write(JSON.stringify(res.agents || [], null, 2) + '\n');
-    else process.stdout.write(formatAgents(res.agents || []) + '\n');
+    else process.stdout.write(formatAgents(res.agents || [], opts) + '\n');
   } catch (e) {
     process.stderr.write(`${e.message}\n`);
     process.exitCode = 1;

package/clideck-ask-cli.js

@@ -6,11 +6,19 @@ function usage() {
     'Usage:',
     '  clideck ask --session <name-or-id> --message <text> [--timeout 10m]',
     '  clideck ask <name-or-id> <message> [--timeout 10m]',
+    '  clideck ask "@project-name/session-name" <message> [--timeout 10m]',
     '  cat file.txt | clideck ask --session <name-or-id> [--timeout 10m]',
     '',
     'Use from inside a CliDeck session when this agent needs an answer from another active session.',
-    'Target lookup is limited to the same project as the caller session.',
-    'Run `clideck agents` first to discover available target sessions.',
+    'Unscoped target lookup is limited to the same project as the caller session.',
+    'Use @project/session only when you intentionally need to ask across projects.',
+    'Run `clideck agents` or `clideck agents --all` first to discover available target sessions.',
+    '',
+    'Important for agents:',
+    '  The target is another LLM agent, not a fast CLI command. It may need minutes to read files,',
+    '  think, use tools, and answer. Set BOTH the `clideck ask --timeout` value and your own',
+    '  shell/tool-call timeout high enough. If your shell tool kills this process first, the target',
+    '  agent may keep working but you will lose the response.',
     '',
     'Options:',
     '  -s, --session <name-or-id>  Target session name or id.',
@@ -109,10 +117,12 @@ function findAgent(agents, target) {
   if (!text) return null;
   const byId = agents.filter(a => a.id === text);
   if (byId.length === 1) return byId[0];
+  const byAddress = agents.filter(a => a.address === text);
+  if (byAddress.length === 1) return byAddress[0];
   const exact = agents.filter(a => a.name === text);
   if (exact.length === 1) return exact[0];
   const lower = text.toLowerCase();
-  const insensitive = agents.filter(a => String(a.name || '').toLowerCase() === lower);
+  const insensitive = agents.filter(a => String(a.name || '').toLowerCase() === lower || String(a.address || '').toLowerCase() === lower);
   return insensitive.length === 1 ? insensitive[0] : null;
 }
 
@@ -133,7 +143,8 @@ function startProgressHints(opts, callerSessionId) {
   const tick = async () => {
     if (stopped) return;
     try {
-      const path = `/api/session/agents?callerSessionId=${encodeURIComponent(callerSessionId)}`;
+      const all = String(opts.session || '').trim().startsWith('@') ? '&all=1' : '';
+      const path = `/api/session/agents?callerSessionId=${encodeURIComponent(callerSessionId)}${all}`;
       const res = await getJson(opts.url, path, 4000);
       const agent = findAgent(res.agents || [], opts.session);
       const elapsed = formatDuration(Date.now() - started);

package/handlers.js

@@ -167,7 +167,13 @@ function hasExistingHook(arr, hookFile, route) {
   return !!arr?.some(h => h.hooks?.some(x => {
     if (!x.command?.includes(hookFile) || !x.command?.includes(` ${route}`)) return false;
     const hookPath = extractQuotedPath(x.command, hookFile);
-    return !!hookPath && existsSync(hookPath);
+    if (!hookPath || !existsSync(hookPath)) return false;
+    const command = String(x.command).replace(/\\/g, '/');
+    const normalizedPath = hookPath.replace(/\\/g, '/');
+    const quotedIdx = command.indexOf(`"${normalizedPath}"`);
+    if (quotedIdx < 0) return false;
+    const suffix = command.slice(quotedIdx + normalizedPath.length + 2).trim().split(/\s+/);
+    return suffix[0] === String(PORT) && suffix[1] === route;
   }));
 }
 
@@ -196,6 +202,19 @@ function codexConfigLooksHealthy(content, port, codexHome) {
   return !!helperPath && existsSync(helperPath);
 }
 
+function opencodeBridgeLooksHealthy() {
+  const bridgePath = join(opencodePluginDir, 'clideck-bridge.js');
+  if (!existsSync(bridgePath)) return false;
+  try {
+    const content = readFileSync(bridgePath, 'utf8');
+    return content.includes('/opencode-events')
+      && content.includes('CLIDECK_URL')
+      && content.includes('CLIDECK_PORT');
+  } catch {
+    return false;
+  }
+}
+
 function detectTelemetryConfig(c) {
   const port = String(PORT);
   let changed = false;
@@ -237,7 +256,7 @@ function detectTelemetryConfig(c) {
           if (!detected) reason = 'Needs re-patch';
         } catch {}
       } else if (preset.presetId === 'opencode') {
-        detected = existsSync(join(opencodePluginDir, 'clideck-bridge.js')) || existsSync(join(opencodePluginDir, 'termix-bridge.js'));
+        detected = opencodeBridgeLooksHealthy();
         if (!detected) reason = 'Needs re-patch';
       } else { continue; }
       if (preset.available && preset.minVersion && !preset.versionOk) {
@@ -307,27 +326,16 @@ function onConnection(ws) {
         const transcript = require('./transcript');
         const sess = sessions.getSessions().get(msg.id);
         if (sess) {
-          transcript.updateAgentCandidate(msg.id, sess.presetId, msg.lines);
-          if (!sess.working && sess._finalizeOnIdle) {
-            sess._finalizeOnIdle = false;
-            // if (sess.presetId === 'claude-code') {
-            //   console.log(`[claude] terminal.buffer finalize session=${msg.id.slice(0,8)} lines=${msg.lines?.length || 0}`);
-            // }
-            transcript.commitAgentCandidate(msg.id, sess.presetId);
-          }
-          let choices = require('./transcript').detectMenu(msg.lines, sess.presetId);
+          const rawChoices = transcript.detectMenu(msg.lines, sess.presetId);
+          let choices = rawChoices;
           // Codex: only trust menu detection if last OTEL event was response.completed
           if (choices && sess.presetId === 'codex') {
             const last = require('./telemetry-receiver').getLastEvent(msg.id);
             if (!last.startsWith('codex.sse_event:response.completed')) {
-              // console.log(`[codex] menu rejected — lastEvent=${last} session=${msg.id.slice(0,8)}`);
               choices = null;
-            } else {
-              // console.log(`[codex] menu accepted session=${msg.id.slice(0,8)}`);
             }
           }
           if (choices && sess.presetId === 'claude-code' && msg.menuVersion && (sess._menuConsumedVersion || 0) >= msg.menuVersion) {
-            // console.log(`[claude] menu ignored stale version=${msg.menuVersion} consumed=${sess._menuConsumedVersion || 0} session=${msg.id.slice(0,8)}`);
             choices = null;
           }
           let key = choices ? JSON.stringify(choices) : '';
@@ -335,22 +343,27 @@ function onConnection(ws) {
           // Once that exact menu was approved, ignore repeated detections of the
           // same signature until the next real turn starts.
           if (choices && sess.presetId === 'claude-code' && key === (sess._resolvedMenuKey || '')) {
-            // console.log(`[claude] menu ignored resolved key session=${msg.id.slice(0,8)}`);
             choices = null;
             key = '';
           }
+          const candidateLines = (choices || (rawChoices && sess.presetId === 'claude-code'))
+            ? transcript.stripMenu(msg.lines, sess.presetId)
+            : msg.lines;
+          transcript.updateAgentCandidate(msg.id, sess.presetId, candidateLines);
+          if (!sess.working && sess._finalizeOnIdle) {
+            sess._finalizeOnIdle = false;
+            transcript.commitAgentCandidate(msg.id, sess.presetId);
+          }
           // Auto-approve: send Enter immediately when menu detected
           if (choices && plugins.shouldAutoApproveMenu(msg.id)) {
             setTimeout(() => sessions.input({ id: msg.id, data: '\r' }), 500);
           }
+          if (choices) transcript.commitAgentCandidate(msg.id, sess.presetId);
           if (key !== (sess._menuKey || '')) {
             sess._menuKey = key;
             sessions.broadcast({ type: 'session.menu', id: msg.id, choices: choices || [] });
             if (choices) {
               if (sess.presetId === 'claude-code' && msg.menuVersion) sess._menuActiveVersion = msg.menuVersion;
-              // if (sess.presetId === 'claude-code') {
-              //   console.log(`[claude] menu detected session=${msg.id.slice(0,8)} choices=${choices.length} version=${msg.menuVersion || 0}`);
-              // }
               plugins.notifyMenu(msg.id, choices);
               if (sess.presetId === 'codex') require('./telemetry-receiver').cancelCodexMenuPoll(msg.id);
               sessions.broadcast({ type: 'session.status', id: msg.id, working: false, source: 'menu' });

package/opencode-plugin/clideck-bridge.js

@@ -2,7 +2,9 @@
 // Forwards session events to CliDeck server via HTTP POST.
 // Install: copy to ~/.config/opencode/plugins/clideck-bridge.js
 
-const CLIDECK_URL = "http://localhost:4000/opencode-events";
+const env = globalThis.process?.env || {};
+const baseUrl = env.CLIDECK_URL || `http://localhost:${env.CLIDECK_PORT || "4000"}`;
+const CLIDECK_URL = `${baseUrl.replace(/\/$/, "")}/opencode-events`;
 
 function post(payload) {
   fetch(CLIDECK_URL, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clideck",
-  "version": "1.31.11",
+  "version": "1.31.12",
   "description": "One screen for all your AI coding agents — run, monitor, and manage multiple CLI agents from a single browser tab",
   "main": "server.js",
   "bin": {

package/server.js

@@ -128,7 +128,6 @@ const server = http.createServer((req, res) => {
         const route = req.url.slice('/hook/codex/'.length);
         const clideckId = payload.clideck_id;
         const threadId = payload['thread-id'] || payload.session_id;
-        // console.log(`[codex] notify clideck=${clideckId ? clideckId.slice(0,8) : 'none'} thread=${threadId ? threadId.slice(0,8) : 'none'}`);
         const allSessions = sessions.getSessions();
         let matchedId = null;
         if (clideckId && allSessions.has(clideckId)) {
@@ -148,7 +147,6 @@ const server = http.createServer((req, res) => {
           if (route === 'start') telemetry.markCodexStart(matchedId, 'hook');
           else if (route === 'stop') telemetry.armCodexStop(matchedId);
         }
-        // if (!matchedId) console.log(`[codex] hook ${route} no match clideck=${clideckId ? clideckId.slice(0,8) : 'none'} thread=${threadId ? threadId.slice(0,8) : 'none'}`);
       } catch {}
       res.writeHead(200).end('{}');
     });
@@ -170,31 +168,23 @@ const server = http.createServer((req, res) => {
           : sessionId
             ? [...allSessions].find(([, s]) => s.sessionToken === sessionId)?.[0]
             : null;
-        // console.log(`[claude] hook ${route} clideck=${payload.clideck_id?.slice(0,8) || 'none'} session=${sessionId?.slice(0,8) || 'none'} match=${clideckId?.slice(0,8) || 'none'}`);
         if (clideckId) {
           const sess = allSessions.get(clideckId);
           if (route === 'start') {
-            // console.log(`[claude] status working=true source=hook session=${clideckId.slice(0,8)}`);
             sessions.broadcast({ type: 'session.status', id: clideckId, working: true, source: 'hook' });
           } else if (route === 'stop' || route === 'idle') {
-            // console.log(`[claude] status working=false source=hook session=${clideckId.slice(0,8)}`);
             sessions.broadcast({ type: 'session.status', id: clideckId, working: false, source: 'hook' });
-            // After an approval menu, Claude can already be idle before the real
-            // stop hook arrives. In that case there is no new working→idle edge
-            // on the client, so force one final capture from the true stop signal.
-            if (route === 'stop' && sess && !sess.working) {
-              // console.log(`[claude] stop capture session=${clideckId.slice(0,8)} source=claude-stop`);
+            // Stop and idle both mean Claude is settled enough to snapshot the
+            // visible transcript. Some Claude flows emit only the idle signal.
+            if ((route === 'stop' || route === 'idle') && sess && !sess.working) {
               setTimeout(() => sessions.broadcast({ type: 'terminal.capture', id: clideckId }), 500);
             }
           } else if (route === 'menu') {
             // PreToolUse: trigger terminal capture — detectMenu will set idle if a choice menu is visible
             const menuVersion = sess ? ((sess._menuVersion || 0) + 1) : 1;
             if (sess) sess._menuVersion = menuVersion;
-            // console.log(`[claude] menu capture session=${clideckId.slice(0,8)} source=claude-menu version=${menuVersion}`);
             setTimeout(() => sessions.broadcast({ type: 'terminal.capture', id: clideckId, menuVersion }), 500);
           }
-        } else {
-          // console.log(`[claude] hook ${route} no-match`);
         }
       } catch {}
       res.writeHead(200).end('{}');
@@ -242,13 +232,13 @@ const server = http.createServer((req, res) => {
 
   // Session-to-session ask bridge used by the `clideck ask` CLI command.
   if (req.method === 'POST' && req.url === '/api/session/ask') {
-    require('./session-ask').handleHttp(req, res, sessions);
+    require('./session-ask').handleHttp(req, res, sessions, () => config.load());
     return;
   }
 
   // Agent discovery bridge used by the `clideck agents` CLI command.
   if (req.method === 'GET' && req.url.startsWith('/api/session/agents')) {
-    require('./session-agents').handleHttp(req, res, sessions);
+    require('./session-agents').handleHttp(req, res, sessions, () => config.load());
     return;
   }
 

package/session-agents.js

@@ -12,7 +12,28 @@ function sameProject(a, b) {
   return (a.projectId || null) === (b.projectId || null);
 }
 
-function listProjectAgents(callerSessionId, sessionsApi) {
+function projectName(projects, projectId) {
+  if (!projectId) return 'No project';
+  return projects.find(p => p.id === projectId)?.name || projectId;
+}
+
+function agentRow(id, s, callerId, projects) {
+  const project = projectName(projects, s.projectId);
+  return {
+    id,
+    name: s.name || id.slice(0, 8),
+    preset: s.presetId || 'shell',
+    projectId: s.projectId || null,
+    project,
+    address: s.projectId ? `@${project}/${s.name || id.slice(0, 8)}` : s.name || id.slice(0, 8),
+    working: !!s.working,
+    lastPreview: s.lastPreview || '',
+    lastActivityAt: s.lastActivityAt || null,
+    caller: id === callerId,
+  };
+}
+
+function listProjectAgents(callerSessionId, sessionsApi, cfg = {}, all = false) {
   const sessions = sessionsApi.getSessions();
   const callerId = String(callerSessionId || '').trim();
   const caller = sessions.get(callerId);
@@ -22,20 +43,13 @@ function listProjectAgents(callerSessionId, sessionsApi) {
     throw err;
   }
 
+  const projects = Array.isArray(cfg.projects) ? cfg.projects : [];
   return [...sessions]
-    .filter(([, s]) => sameProject(caller, s))
-    .map(([id, s]) => ({
-      id,
-      name: s.name || id.slice(0, 8),
-      preset: s.presetId || 'shell',
-      working: !!s.working,
-      lastPreview: s.lastPreview || '',
-      lastActivityAt: s.lastActivityAt || null,
-      caller: id === callerId,
-    }));
+    .filter(([, s]) => all || sameProject(caller, s))
+    .map(([id, s]) => agentRow(id, s, callerId, projects));
 }
 
-async function handleHttp(req, res, sessionsApi) {
+async function handleHttp(req, res, sessionsApi, getConfig = () => ({})) {
   try {
     if (!isLoopback(req)) {
       const err = new Error('CliDeck agents only accepts local requests');
@@ -43,7 +57,8 @@ async function handleHttp(req, res, sessionsApi) {
       throw err;
     }
     const url = new URL(req.url, 'http://127.0.0.1');
-    const agents = listProjectAgents(url.searchParams.get('callerSessionId'), sessionsApi);
+    const all = url.searchParams.get('all') === '1' || url.searchParams.get('all') === 'true';
+    const agents = listProjectAgents(url.searchParams.get('callerSessionId'), sessionsApi, getConfig() || {}, all);
     sendJson(res, 200, { agents });
   } catch (e) {
     sendJson(res, e.status || 500, { error: e.message || 'CliDeck agents failed' });

package/session-ask.js

@@ -50,9 +50,62 @@ function sameProject(a, b) {
   return (a.projectId || null) === (b.projectId || null);
 }
 
-function findTarget(sessions, callerId, caller, target) {
+function projectName(projects, projectId) {
+  if (!projectId) return 'No project';
+  return projects.find(p => p.id === projectId)?.name || projectId;
+}
+
+function parseScopedTarget(target) {
+  const text = String(target || '').trim();
+  if (!text.startsWith('@')) return null;
+  const slash = text.indexOf('/');
+  if (slash <= 1 || slash === text.length - 1) {
+    throw jsonError('Cross-project target must use @project/session');
+  }
+  return { project: text.slice(1, slash).trim(), session: text.slice(slash + 1).trim() };
+}
+
+function resolveProject(projects, nameOrId) {
+  const text = String(nameOrId || '').trim();
+  const byId = projects.filter(p => p.id === text);
+  if (byId.length === 1) return byId[0];
+  const exact = projects.filter(p => p.name === text);
+  if (exact.length === 1) return exact[0];
+  if (exact.length > 1) throw jsonError(`Multiple projects named "${text}". Use the project id.`, 409);
+  const lower = text.toLowerCase();
+  const insensitive = projects.filter(p => String(p.name || '').toLowerCase() === lower);
+  if (insensitive.length === 1) return insensitive[0];
+  if (insensitive.length > 1) throw jsonError(`Multiple projects named "${text}". Use the project id.`, 409);
+  throw jsonError(`No project named "${text}"`, 404);
+}
+
+function findInProject(candidates, target, projectLabel) {
+  const byId = candidates.filter(([id]) => id === target);
+  if (byId.length === 1) return byId[0];
+
+  const exact = candidates.filter(([, s]) => s.name === target);
+  if (exact.length === 1) return exact[0];
+  if (exact.length > 1) throw jsonError(`Multiple sessions named "${target}" in ${projectLabel}. Use the session id.`);
+
+  const lower = target.toLowerCase();
+  const insensitive = candidates.filter(([, s]) => String(s.name || '').toLowerCase() === lower);
+  if (insensitive.length === 1) return insensitive[0];
+  if (insensitive.length > 1) throw jsonError(`Multiple sessions named "${target}" in ${projectLabel}. Use the session id.`);
+  throw jsonError(`No session named "${target}" in ${projectLabel}`, 404);
+}
+
+function findTarget(sessions, callerId, caller, target, cfg = {}) {
   const trimmed = String(target || '').trim();
   if (!trimmed) throw jsonError('Target session is required');
+  const projects = Array.isArray(cfg.projects) ? cfg.projects : [];
+  const scoped = parseScopedTarget(trimmed);
+
+  if (scoped) {
+    const project = resolveProject(projects, scoped.project);
+    const projectSessions = [...sessions]
+      .filter(([id, s]) => id !== callerId && (s.projectId || null) === project.id);
+    return findInProject(projectSessions, scoped.session, `project "${project.name || project.id}"`);
+  }
 
   const byId = sessions.get(trimmed);
   if (byId) {
@@ -63,15 +116,7 @@ function findTarget(sessions, callerId, caller, target) {
 
   const sameProjectSessions = [...sessions]
     .filter(([id, s]) => id !== callerId && sameProject(caller, s));
-  const exact = sameProjectSessions.filter(([, s]) => s.name === trimmed);
-  if (exact.length === 1) return exact[0];
-  if (exact.length > 1) throw jsonError(`Multiple sessions named "${trimmed}" in this project. Use the session id.`);
-
-  const lower = trimmed.toLowerCase();
-  const insensitive = sameProjectSessions.filter(([, s]) => String(s.name || '').toLowerCase() === lower);
-  if (insensitive.length === 1) return insensitive[0];
-  if (insensitive.length > 1) throw jsonError(`Multiple sessions named "${trimmed}" in this project. Use the session id.`);
-  throw jsonError(`No session named "${trimmed}" in this project`, 404);
+  return findInProject(sameProjectSessions, trimmed, `project "${projectName(projects, caller.projectId)}"`);
 }
 
 function latestAgentTextSince(sessionId, sinceTs) {
@@ -167,13 +212,13 @@ function waitForAnswer({ sessionsApi, targetId, sinceTs, timeoutMs }) {
   });
 }
 
-async function askSession(payload, sessionsApi) {
+async function askSession(payload, sessionsApi, cfg = {}) {
   const sessions = sessionsApi.getSessions();
   const callerId = String(payload.callerSessionId || '').trim();
   const caller = sessions.get(callerId);
   if (!caller) throw jsonError('Caller session is not active', 404);
 
-  const [targetId, target] = findTarget(sessions, callerId, caller, payload.target);
+  const [targetId, target] = findTarget(sessions, callerId, caller, payload.target, cfg);
   if (target.working) {
     throw jsonError(`Target session "${target.name}" is busy. CliDeck ask only sends to idle sessions. Try again later, choose another idle session, or ask the user how to proceed.`, 409);
   }
@@ -193,11 +238,11 @@ async function askSession(payload, sessionsApi) {
   return { targetSessionId: targetId, targetName: target.name, response };
 }
 
-async function handleHttp(req, res, sessionsApi) {
+async function handleHttp(req, res, sessionsApi, getConfig = () => ({})) {
   try {
     if (!isLoopback(req)) throw jsonError('CliDeck ask only accepts local requests', 403);
     const payload = await readJson(req);
-    const result = await askSession(payload, sessionsApi);
+    const result = await askSession(payload, sessionsApi, getConfig() || {});
     sendJson(res, 200, result);
   } catch (e) {
     sendJson(res, e.status || 500, { error: e.message || 'CliDeck ask failed' });

package/transcript.js

@@ -262,26 +262,67 @@ function clear(id) {
 // Finds the footer line, then walks upward collecting only the contiguous menu block.
 const MENU_MARKERS = { 'claude-code': /[❯›]/, codex: /[›❯]/, 'gemini-cli': /●/ };
 const MENU_CHOICE_RE = /^\s*(?:[│❯›●•]\s+)*(\d+)\.\s+(.+)$/;
-function detectMenu(lines, presetId) {
+const MENU_TOP_RE = /^\s*[╭┌┏╔].*[╮┐┓╗]\s*$/;
+const MENU_BOTTOM_RE = /^\s*[╰└┗╚].*[╯┘┛╝]\s*$/;
+const MENU_RULE_RE = /^\s*[─━═-]{5,}\s*$/;
+const TURN_MARKERS = {
+  'claude-code': /^(?:[│ ]\s*)?[⏺•●❯›]\s/,
+  codex: /^(?:│\s*)?[•›]\s/,
+  'gemini-cli': /^(?:✦| > )/,
+};
+
+function cleanMenuLabel(text) {
+  return String(text || '').replace(/[│┃║]\s*$/u, '').trim();
+}
+
+function detectMenuBlock(lines, presetId) {
   const marker = MENU_MARKERS[presetId];
   if (!marker) return null;
   // Only scan the bottom 40 lines — menus are always near the visible area
   const scanStart = Math.max(0, lines.length - 40);
-  let footerIdx = -1;
+  let footerLineIdx = -1;
   for (let i = lines.length - 1; i >= scanStart; i--) {
-    if (/\besc\b|\(esc\)/i.test(lines[i])) { footerIdx = MENU_CHOICE_RE.test(lines[i]) ? i + 1 : i; break; }
+    if (/\besc\b|\(esc\)/i.test(lines[i])) { footerLineIdx = i; break; }
   }
-  if (footerIdx < 0) return null;
+  if (footerLineIdx < 0) return null;
   const choices = [];
-  for (let i = footerIdx - 1; i >= scanStart; i--) {
+  let firstChoiceIdx = -1;
+  const searchFrom = MENU_CHOICE_RE.test(lines[footerLineIdx]) ? footerLineIdx : footerLineIdx - 1;
+  for (let i = searchFrom; i >= scanStart; i--) {
     if (!lines[i].trim() || /^[│\s]+$/.test(lines[i])) continue;
+    if (MENU_RULE_RE.test(lines[i]) || MENU_BOTTOM_RE.test(lines[i])) continue;
     const m = lines[i].match(MENU_CHOICE_RE);
-    if (!m) { if (/^\s{2,}\S/.test(lines[i])) continue; break; }
+    if (!m) { if (choices.length && /^\s{2,}\S/.test(lines[i])) continue; break; }
     if (choices.length && +m[1] >= +choices[0].value) break;
-    choices.unshift({ value: m[1], label: m[2].trim(), selected: marker.test(lines[i]) });
+    choices.unshift({ value: m[1], label: cleanMenuLabel(m[2]), selected: marker.test(lines[i]) });
+    firstChoiceIdx = i;
   }
   if (!choices.some(c => c.selected)) return null;
-  return choices.length ? choices : null;
+  if (!choices.length) return null;
+  let startIdx = firstChoiceIdx;
+  const turnMarker = TURN_MARKERS[presetId];
+  for (let i = startIdx - 1; i >= scanStart; i--) {
+    if (turnMarker?.test(lines[i])) break;
+    if (lines[i].trim()) startIdx = i;
+    if (MENU_TOP_RE.test(lines[i])) { startIdx = i; break; }
+  }
+  let endIdx = footerLineIdx;
+  if (MENU_CHOICE_RE.test(lines[footerLineIdx])) {
+    for (let i = footerLineIdx + 1; i < Math.min(lines.length, footerLineIdx + 6); i++) {
+      if (MENU_BOTTOM_RE.test(lines[i])) { endIdx = i; break; }
+    }
+  }
+  return { choices, startIdx, endIdx };
+}
+
+function detectMenu(lines, presetId) {
+  return detectMenuBlock(lines, presetId)?.choices || null;
+}
+
+function stripMenu(lines, presetId) {
+  const block = detectMenuBlock(lines, presetId);
+  if (!block) return lines;
+  return lines.filter((_, i) => i < block.startIdx || i > block.endIdx);
 }
 
-module.exports = { init, trackInput, recordInjectedInput, trackOutput, updateAgentCandidate, commitAgentCandidate, clearAgentCandidate, parseTurnsFromLines, getTurns, getEntriesSince, getCache, getReplayText, clear, setPrefix, setFinalizeOnIdle, detectMenu };
+module.exports = { init, trackInput, recordInjectedInput, trackOutput, updateAgentCandidate, commitAgentCandidate, clearAgentCandidate, parseTurnsFromLines, getTurns, getEntriesSince, getCache, getReplayText, clear, setPrefix, setFinalizeOnIdle, detectMenu, stripMenu };