@zgeoff/atc 2.10.3 → 2.11.0

package/README.md

@@ -137,9 +137,9 @@ installs in detail.
   list or revoke grants with `atc grants`. [Remote MCP](./docs/architecture/remote-mcp.md) covers
   it.
 - A Claude session takes messages from other tools. `atc_session_message` queues one, and the
-  session reads it in a new turn, or inside the turn it is running. `atc_message_get` returns the
-  reply once that turn ends. The [protocol](./docs/architecture/protocol.md#messages) covers the
-  details.
+  session reads it in a new turn, or inside the turn it is running. `atc_message_get` returns that
+  turn's final output once the turn ends, and waits for the next status change when given `waitMs`.
+  The [protocol](./docs/architecture/protocol.md#messages) covers the details.
 - `atc events` prints every fleet event as one NDJSON line. The same stream is on a unix socket, and
   `config.json` hooks run your own commands on events. The [events guide](./docs/guides/events.md)
   covers all three.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgeoff/atc",
-  "version": "2.10.3",
+  "version": "2.11.0",
   "description": "Terminal control tower for coding-agent sessions",
   "homepage": "https://github.com/zgeoff/atc#readme",
   "bugs": "https://github.com/zgeoff/atc/issues",

package/src/agents/agent-adapter.ts

@@ -117,6 +117,24 @@ export type HeadlessRunner = (
   hooks: HeadlessRunEvents,
 ) => { readonly stop: () => void };
 
+/**
+ * How `agents.list` describes an agent. It holds no secret: never an
+ * environment value, a credential, a helper command, or a base URL.
+ */
+export interface AgentProfile {
+  readonly label: string;
+
+  // The family the agent belongs to, chosen by its adapter; agents.list
+  // reports it as given, and any string is a valid kind.
+  readonly kind: string;
+
+  // The binary a spawn runs: a name looked up on PATH, or a path.
+  readonly bin: string;
+
+  // Model names the config sets explicitly, keyed by role; null when it sets none.
+  readonly models: Readonly<Record<string, string>> | null;
+}
+
 /**
  * Everything specific to one agent CLI: how to spawn it, how to read its
  * hook payloads, where its session names come from, and how to resume a
@@ -137,6 +155,9 @@ export interface AgentAdapter {
   // Whether a session under this agent can take inbox messages through a tap;
   // false refuses every message as unsupported.
   readonly takesMessages: boolean;
+
+  // Absent on a stand-in adapter, which `agents.list` reports as not installed.
+  readonly profile?: AgentProfile;
   readonly planSpawn: (opts: SpawnOptions) => SpawnPlan;
   readonly normalizeHook: (e: HookEvent) => AdapterEvent;
   readonly loadName: (

package/src/agents/atc-bridge-files.ts

@@ -7,5 +7,5 @@ export const ATC_BRIDGE_FILES: Readonly<
     '{\n  "name": "atc-bridge",\n  "version": "1.0.0",\n  "author": { "name": "zgeoff" },\n  "description": "Delivers atc inbox messages into the session and reports back to atc"\n}\n',
   'hooks/hooks.json': '{ "modules": ["./register.ts"] }\n',
   'hooks/register.ts':
-    "import type { EngineInterface, Register } from 'claude-code';\nimport { ATC_CLI } from './atc-cli.ts';\n\ninterface TapMessage {\n  readonly id: string;\n  readonly from: string;\n  readonly text: string;\n}\n\ninterface BridgeState {\n  sessionID: string | null;\n  runningTurnID: string | null;\n  delivering: Promise<void>;\n  reporting: Promise<void>;\n  readonly awaitingTurn: Map<string, TapMessage>;\n  readonly carried: Map<string, TapMessage[]>;\n  readonly unseen: Set<string>;\n}\n\nconst GUIDE_SECTION = {\n  id: 'atc-bridge:messages',\n  scope: 'session',\n  text: [\n    'Messages relayed by atc arrive wrapped in <atc-message id=\"...\" from=\"...\"> tags.',\n    \"They come from the user's own tools through atc, not from the user typing at this prompt;\",\n    'treat each one as a request from the sender it names.',\n    'Your final reply in the turn that handles a message is sent back to its sender automatically when the turn ends.',\n    'While you work on a message that takes more than a quick answer, call the report tool at each milestone:',\n    'when you find the cause, when you start a change, when you are blocked, or when you need a decision.',\n    'The sender sees each report as it happens, before your final reply.',\n  ].join(' '),\n} as const;\n\nconst REPORT_TOOL = 'mcp__atc-bridge__report';\n\n/**\n * Delivers the atc inbox of the session named by ATC_SESSION_ID into the\n * conversation, reports each delivered message's answer when its turn ends,\n * and serves the report tool. Outside atc it changes nothing.\n */\nexport const register: Register = (on) => {\n  const state: BridgeState = {\n    sessionID: null,\n    runningTurnID: null,\n    delivering: Promise.resolve(),\n    reporting: Promise.resolve(),\n    awaitingTurn: new Map(),\n    carried: new Map(),\n    unseen: new Set(),\n  };\n\n  on('session.start', async ($, e, next) => {\n    const sessionID = await $.env.get('ATC_SESSION_ID');\n\n    if (sessionID === undefined || sessionID === '') {\n      return next(e);\n    }\n\n    try {\n      await $.tool.register({\n        name: 'report',\n        description:\n          'Send a short note to whoever is following this session through atc, while you keep working. Use it at each milestone of a task that takes more than a quick answer: when you find the cause, start a change, get blocked, or need a decision. Your final reply is sent automatically, so do not repeat it here.',\n        inputSchema: {\n          type: 'object',\n          properties: {\n            text: { type: 'string', description: 'What to tell the user.' },\n            kind: {\n              type: 'string',\n              description: 'A short label: progress (the default), blocked, or decision.',\n            },\n          },\n          required: ['text'],\n        },\n      });\n    } catch (error) {\n      $.ui.log(\n        `atc-bridge: off for this session, the Claude Code build refused it (${String(error)})`,\n        {\n          to: 'debug',\n        },\n      );\n\n      return next(e);\n    }\n\n    state.sessionID = sessionID;\n\n    const started = await next(e);\n\n    void runTap($, state, sessionID);\n\n    return started;\n  });\n\n  on('prompt.compose', async ($, e, next) => {\n    const composed = await next(e);\n\n    return state.sessionID === null\n      ? composed\n      : { sections: [...composed.sections, GUIDE_SECTION] };\n  });\n\n  on('turn.start', async ($, e, next) => {\n    const started = await next(e);\n\n    if (state.sessionID !== null) {\n      updateTurnStarted(state, e.turnId, e.text);\n    }\n\n    return started;\n  });\n\n  on('turn.step', async function* updateSeenMessages($, e, next) {\n    if (e.agentId === undefined && e.turnId === state.runningTurnID) {\n      for (const msg of state.carried.get(e.turnId) ?? []) {\n        state.unseen.delete(msg.id);\n      }\n    }\n\n    return yield* next(e);\n  });\n\n  on('turn.complete', async ($, e, next) => {\n    const completed = await next(e);\n\n    if (state.sessionID !== null && e.agentId === undefined) {\n      updateTurnCompleted($, state, e.turnId, e.answer, e.reason === 'answer');\n    }\n\n    return completed;\n  });\n\n  on('tool.call', { tool: REPORT_TOOL }, async ($, e) => {\n    const text = typeof e['text'] === 'string' ? e['text'].trim() : '';\n    const label = typeof e['kind'] === 'string' ? e['kind'].trim().slice(0, 64) : '';\n\n    if (text === '') {\n      return { deny: 'report needs non-empty text' };\n    }\n\n    try {\n      await $.process.run(\n        [...ATC_CLI, 'report', 'note', '--label', label === '' ? 'progress' : label],\n        {\n          stdin: text,\n          timeoutMs: 5000,\n        },\n      );\n    } catch (error) {\n      return { deny: `atc did not take the report: ${String(error)}` };\n    }\n\n    return { result: 'Sent to the user through atc.' };\n  });\n};\n\nasync function runTap($: EngineInterface, state: BridgeState, sessionID: string): Promise<void> {\n  const tap = $.process.spawn({ argv: [...ATC_CLI, 'tap', '--session', sessionID] });\n  let pending = '';\n\n  try {\n    for await (const chunk of tap) {\n      if (chunk.stream !== 'stdout') {\n        continue;\n      }\n\n      const lines = `${pending}${chunk.text}`.split('\\n');\n\n      pending = lines.pop() ?? '';\n\n      for (const line of lines) {\n        const msg = parseTapLine(line);\n\n        if (msg !== null) {\n          scheduleDelivery($, state, msg);\n        }\n      }\n    }\n\n    $.ui.log('atc-bridge: atc tap ended; this session takes no more atc messages', { to: 'debug' });\n  } catch (error) {\n    $.ui.log(`atc-bridge: atc tap failed (${String(error)}); this session takes no atc messages`, {\n      to: 'debug',\n    });\n  }\n}\n\nfunction parseTapLine(line: string): TapMessage | null {\n  let parsed: unknown;\n\n  try {\n    parsed = JSON.parse(line);\n  } catch {\n    return null;\n  }\n\n  if (\n    typeof parsed !== 'object' ||\n    parsed === null ||\n    !('id' in parsed) ||\n    !('from' in parsed) ||\n    !('text' in parsed)\n  ) {\n    return null;\n  }\n\n  return typeof parsed.id === 'string' &&\n    typeof parsed.from === 'string' &&\n    typeof parsed.text === 'string'\n    ? { id: parsed.id, from: parsed.from, text: parsed.text }\n    : null;\n}\n\nfunction scheduleDelivery($: EngineInterface, state: BridgeState, msg: TapMessage): void {\n  state.delivering = state.delivering\n    .then(() => sendMessage($, state, msg))\n    .catch((error: unknown) => {\n      $.ui.log(`atc-bridge: delivering ${msg.id} failed (${String(error)})`, { to: 'debug' });\n    });\n}\n\nasync function sendMessage($: EngineInterface, state: BridgeState, msg: TapMessage): Promise<void> {\n  const turnID = state.runningTurnID;\n\n  if (turnID !== null && (await tryUpdateConversation($, msg))) {\n    const carried = state.carried.get(turnID);\n\n    // The append can resolve after the turn completed; the turn then no\n    // longer reports or redelivers anything, so the message goes out as a\n    // fresh submit instead.\n    if (carried !== undefined && state.runningTurnID === turnID) {\n      carried.push(msg);\n      state.unseen.add(msg.id);\n\n      return;\n    }\n  }\n\n  state.awaitingTurn.set(msg.id, msg);\n\n  const submitted = await $.prompt.submit({ text: renderEnvelope(msg) });\n\n  if ('drop' in submitted && submitted.drop !== undefined) {\n    state.awaitingTurn.delete(msg.id);\n    $.ui.log(`atc-bridge: a hook dropped ${msg.id} (${submitted.drop})`, { to: 'debug' });\n  }\n}\n\nasync function tryUpdateConversation($: EngineInterface, msg: TapMessage): Promise<boolean> {\n  try {\n    const appended = await $.session.append({\n      message: { type: 'user', content: [{ type: 'text', text: renderEnvelope(msg) }] },\n    });\n\n    return appended.deny === undefined;\n  } catch (error) {\n    $.ui.log(`atc-bridge: appending ${msg.id} failed (${String(error)}); submitting it instead`, {\n      to: 'debug',\n    });\n\n    return false;\n  }\n}\n\nfunction renderEnvelope(msg: TapMessage): string {\n  const body = msg.text.replaceAll('</atc-message>', '&lt;/atc-message&gt;');\n\n  return `<atc-message id=\"${encodeAttribute(msg.id)}\" from=\"${encodeAttribute(msg.from)}\">\\n${body}\\n</atc-message>`;\n}\n\nfunction encodeAttribute(value: string): string {\n  return value\n    .replaceAll('&', '&amp;')\n    .replaceAll('\"', '&quot;')\n    .replaceAll('<', '&lt;')\n    .replaceAll('>', '&gt;');\n}\n\nconst ENVELOPE_ID = /<atc-message id=\"(?<id>[^\"]+)\"/gu;\n\nfunction updateTurnStarted(state: BridgeState, turnID: string, text: string): void {\n  const carried: TapMessage[] = [];\n\n  state.runningTurnID = turnID;\n\n  state.carried.set(turnID, carried);\n\n  for (const match of text.matchAll(ENVELOPE_ID)) {\n    const msg = state.awaitingTurn.get(match.groups?.['id'] ?? '');\n\n    if (msg !== undefined) {\n      state.awaitingTurn.delete(msg.id);\n      carried.push(msg);\n    }\n  }\n}\n\nfunction updateTurnCompleted(\n  $: EngineInterface,\n  state: BridgeState,\n  turnID: string,\n  answer: string,\n  isAnswered: boolean,\n): void {\n  const carried = state.carried.get(turnID) ?? [];\n\n  state.carried.delete(turnID);\n\n  if (state.runningTurnID === turnID) {\n    state.runningTurnID = null;\n  }\n\n  for (const msg of carried) {\n    if (state.unseen.delete(msg.id)) {\n      scheduleDelivery($, state, msg);\n    } else if (isAnswered) {\n      scheduleAnsweredReport($, state, msg.id, answer);\n    }\n  }\n}\n\nfunction scheduleAnsweredReport(\n  $: EngineInterface,\n  state: BridgeState,\n  messageID: string,\n  answer: string,\n): void {\n  state.reporting = state.reporting\n    .then(async () => {\n      await $.process.run([...ATC_CLI, 'report', 'answered', '--message', messageID], {\n        stdin: answer,\n        timeoutMs: 5000,\n      });\n    })\n    .catch((error: unknown) => {\n      $.ui.log(`atc-bridge: reporting ${messageID} failed (${String(error)})`, { to: 'debug' });\n    });\n}\n",
+    "import type { EngineInterface, Register } from 'claude-code';\nimport { ATC_CLI } from './atc-cli.ts';\n\ninterface TapMessage {\n  readonly id: string;\n  readonly from: string;\n  readonly text: string;\n}\n\ninterface BridgeState {\n  sessionID: string | null;\n  runningTurnID: string | null;\n  delivering: Promise<void>;\n  reporting: Promise<void>;\n  readonly awaitingTurn: Map<string, TapMessage>;\n  readonly carried: Map<string, TapMessage[]>;\n  readonly unseen: Set<string>;\n}\n\nconst GUIDE_SECTION = {\n  id: 'atc-bridge:messages',\n  scope: 'session',\n  text: [\n    'Messages relayed by atc arrive wrapped in <atc-message id=\"...\" from=\"...\"> tags.',\n    \"They come from the user's own tools through atc, not from the user typing at this prompt;\",\n    'treat each one as a request from the sender it names.',\n    'Your final reply in the turn that handles a message is sent back to its sender automatically when the turn ends.',\n    'While you work on a message that takes more than a quick answer, call the report tool at each milestone:',\n    'when you find the cause, when you start a change, when you are blocked, or when you need a decision.',\n    'The sender sees each report as it happens, before your final reply.',\n  ].join(' '),\n} as const;\n\nconst REPORT_TOOL = 'mcp__atc-bridge__report';\n\n/**\n * Delivers the atc inbox of the session named by ATC_SESSION_ID into the\n * conversation and serves the report tool. When a turn ends, it reports the\n * turn's final reply, with the turn's id, as the answer to every message the\n * turn carried. Outside atc it changes nothing.\n */\nexport const register: Register = (on) => {\n  const state: BridgeState = {\n    sessionID: null,\n    runningTurnID: null,\n    delivering: Promise.resolve(),\n    reporting: Promise.resolve(),\n    awaitingTurn: new Map(),\n    carried: new Map(),\n    unseen: new Set(),\n  };\n\n  on('session.start', async ($, e, next) => {\n    const sessionID = await $.env.get('ATC_SESSION_ID');\n\n    if (sessionID === undefined || sessionID === '') {\n      return next(e);\n    }\n\n    try {\n      await $.tool.register({\n        name: 'report',\n        description:\n          'Send a short note to whoever is following this session through atc, while you keep working. Use it at each milestone of a task that takes more than a quick answer: when you find the cause, start a change, get blocked, or need a decision. Your final reply is sent automatically, so do not repeat it here.',\n        inputSchema: {\n          type: 'object',\n          properties: {\n            text: { type: 'string', description: 'What to tell the user.' },\n            kind: {\n              type: 'string',\n              description: 'A short label: progress (the default), blocked, or decision.',\n            },\n          },\n          required: ['text'],\n        },\n      });\n    } catch (error) {\n      $.ui.log(\n        `atc-bridge: off for this session, the Claude Code build refused it (${String(error)})`,\n        {\n          to: 'debug',\n        },\n      );\n\n      return next(e);\n    }\n\n    state.sessionID = sessionID;\n\n    const started = await next(e);\n\n    void runTap($, state, sessionID);\n\n    return started;\n  });\n\n  on('prompt.compose', async ($, e, next) => {\n    const composed = await next(e);\n\n    return state.sessionID === null\n      ? composed\n      : { sections: [...composed.sections, GUIDE_SECTION] };\n  });\n\n  on('turn.start', async ($, e, next) => {\n    const started = await next(e);\n\n    if (state.sessionID !== null) {\n      updateTurnStarted(state, e.turnId, e.text);\n    }\n\n    return started;\n  });\n\n  on('turn.step', async function* updateSeenMessages($, e, next) {\n    if (e.agentId === undefined && e.turnId === state.runningTurnID) {\n      for (const msg of state.carried.get(e.turnId) ?? []) {\n        state.unseen.delete(msg.id);\n      }\n    }\n\n    return yield* next(e);\n  });\n\n  on('turn.complete', async ($, e, next) => {\n    const completed = await next(e);\n\n    if (state.sessionID !== null && e.agentId === undefined) {\n      updateTurnCompleted($, state, e.turnId, e.answer, e.reason === 'answer');\n    }\n\n    return completed;\n  });\n\n  on('tool.call', { tool: REPORT_TOOL }, async ($, e) => {\n    const text = typeof e['text'] === 'string' ? e['text'].trim() : '';\n    const label = typeof e['kind'] === 'string' ? e['kind'].trim().slice(0, 64) : '';\n\n    if (text === '') {\n      return { deny: 'report needs non-empty text' };\n    }\n\n    try {\n      await $.process.run(\n        [...ATC_CLI, 'report', 'note', '--label', label === '' ? 'progress' : label],\n        {\n          stdin: text,\n          timeoutMs: 5000,\n        },\n      );\n    } catch (error) {\n      return { deny: `atc did not take the report: ${String(error)}` };\n    }\n\n    return { result: 'Sent to the user through atc.' };\n  });\n};\n\nasync function runTap($: EngineInterface, state: BridgeState, sessionID: string): Promise<void> {\n  const tap = $.process.spawn({ argv: [...ATC_CLI, 'tap', '--session', sessionID] });\n  let pending = '';\n\n  try {\n    for await (const chunk of tap) {\n      if (chunk.stream !== 'stdout') {\n        continue;\n      }\n\n      const lines = `${pending}${chunk.text}`.split('\\n');\n\n      pending = lines.pop() ?? '';\n\n      for (const line of lines) {\n        const msg = parseTapLine(line);\n\n        if (msg !== null) {\n          scheduleDelivery($, state, msg);\n        }\n      }\n    }\n\n    $.ui.log('atc-bridge: atc tap ended; this session takes no more atc messages', { to: 'debug' });\n  } catch (error) {\n    $.ui.log(`atc-bridge: atc tap failed (${String(error)}); this session takes no atc messages`, {\n      to: 'debug',\n    });\n  }\n}\n\nfunction parseTapLine(line: string): TapMessage | null {\n  let parsed: unknown;\n\n  try {\n    parsed = JSON.parse(line);\n  } catch {\n    return null;\n  }\n\n  if (\n    typeof parsed !== 'object' ||\n    parsed === null ||\n    !('id' in parsed) ||\n    !('from' in parsed) ||\n    !('text' in parsed)\n  ) {\n    return null;\n  }\n\n  return typeof parsed.id === 'string' &&\n    typeof parsed.from === 'string' &&\n    typeof parsed.text === 'string'\n    ? { id: parsed.id, from: parsed.from, text: parsed.text }\n    : null;\n}\n\nfunction scheduleDelivery($: EngineInterface, state: BridgeState, msg: TapMessage): void {\n  state.delivering = state.delivering\n    .then(() => sendMessage($, state, msg))\n    .catch((error: unknown) => {\n      $.ui.log(`atc-bridge: delivering ${msg.id} failed (${String(error)})`, { to: 'debug' });\n    });\n}\n\nasync function sendMessage($: EngineInterface, state: BridgeState, msg: TapMessage): Promise<void> {\n  const turnID = state.runningTurnID;\n\n  if (turnID !== null && (await tryUpdateConversation($, msg))) {\n    const carried = state.carried.get(turnID);\n\n    // The append can resolve after the turn completed; the turn then no\n    // longer reports or redelivers anything, so the message goes out as a\n    // fresh submit instead.\n    if (carried !== undefined && state.runningTurnID === turnID) {\n      carried.push(msg);\n      state.unseen.add(msg.id);\n\n      return;\n    }\n  }\n\n  state.awaitingTurn.set(msg.id, msg);\n\n  const submitted = await $.prompt.submit({ text: renderEnvelope(msg) });\n\n  if ('drop' in submitted && submitted.drop !== undefined) {\n    state.awaitingTurn.delete(msg.id);\n    $.ui.log(`atc-bridge: a hook dropped ${msg.id} (${submitted.drop})`, { to: 'debug' });\n  }\n}\n\nasync function tryUpdateConversation($: EngineInterface, msg: TapMessage): Promise<boolean> {\n  try {\n    const appended = await $.session.append({\n      message: { type: 'user', content: [{ type: 'text', text: renderEnvelope(msg) }] },\n    });\n\n    return appended.deny === undefined;\n  } catch (error) {\n    $.ui.log(`atc-bridge: appending ${msg.id} failed (${String(error)}); submitting it instead`, {\n      to: 'debug',\n    });\n\n    return false;\n  }\n}\n\nfunction renderEnvelope(msg: TapMessage): string {\n  const body = msg.text.replaceAll('</atc-message>', '&lt;/atc-message&gt;');\n\n  return `<atc-message id=\"${encodeAttribute(msg.id)}\" from=\"${encodeAttribute(msg.from)}\">\\n${body}\\n</atc-message>`;\n}\n\nfunction encodeAttribute(value: string): string {\n  return value\n    .replaceAll('&', '&amp;')\n    .replaceAll('\"', '&quot;')\n    .replaceAll('<', '&lt;')\n    .replaceAll('>', '&gt;');\n}\n\nconst ENVELOPE_ID = /<atc-message id=\"(?<id>[^\"]+)\"/gu;\n\nfunction updateTurnStarted(state: BridgeState, turnID: string, text: string): void {\n  const carried: TapMessage[] = [];\n\n  state.runningTurnID = turnID;\n\n  state.carried.set(turnID, carried);\n\n  for (const match of text.matchAll(ENVELOPE_ID)) {\n    const msg = state.awaitingTurn.get(match.groups?.['id'] ?? '');\n\n    if (msg !== undefined) {\n      state.awaitingTurn.delete(msg.id);\n      carried.push(msg);\n    }\n  }\n}\n\nfunction updateTurnCompleted(\n  $: EngineInterface,\n  state: BridgeState,\n  turnID: string,\n  answer: string,\n  isAnswered: boolean,\n): void {\n  const carried = state.carried.get(turnID) ?? [];\n\n  state.carried.delete(turnID);\n\n  if (state.runningTurnID === turnID) {\n    state.runningTurnID = null;\n  }\n\n  const answered: string[] = [];\n\n  for (const msg of carried) {\n    if (state.unseen.delete(msg.id)) {\n      scheduleDelivery($, state, msg);\n    } else if (isAnswered) {\n      answered.push(msg.id);\n    }\n  }\n\n  // One report carries every message the turn answered, so atc records the\n  // whole group at once and no member reads as answered before the rest.\n  if (answered.length > 0) {\n    scheduleAnsweredReport($, state, answered, turnID, answer);\n  }\n}\n\nfunction scheduleAnsweredReport(\n  $: EngineInterface,\n  state: BridgeState,\n  messageIDs: readonly string[],\n  turnID: string,\n  answer: string,\n): void {\n  state.reporting = state.reporting\n    .then(async () => {\n      await $.process.run(\n        [...ATC_CLI, 'report', 'answered', '--messages', messageIDs.join(','), '--turn', turnID],\n        {\n          stdin: answer,\n          timeoutMs: 5000,\n        },\n      );\n    })\n    .catch((error: unknown) => {\n      $.ui.log(`atc-bridge: reporting ${messageIDs.join(', ')} failed (${String(error)})`, {\n        to: 'debug',\n      });\n    });\n}\n",
 };

package/src/agents/claude-adapter.ts

@@ -10,6 +10,7 @@ import { toShellArg } from '../shared/to-shell-arg';
 import type {
   AdapterEvent,
   AgentAdapter,
+  AgentProfile,
   HeadlessRunner,
   NameUpdate,
   ResumeCheck,
@@ -48,6 +49,8 @@ export class ClaudeAdapter implements AgentAdapter {
 
   readonly parseTranscriptLine = parseClaudeTranscriptLine;
 
+  readonly profile: AgentProfile;
+
   readonly takesMessages = true;
 
   private readonly config: Config;
@@ -63,6 +66,7 @@ export class ClaudeAdapter implements AgentAdapter {
   constructor(config: Config, headlessRunner: HeadlessRunner | null = null, bridgeTarget?: string) {
     this.bridgeTarget = bridgeTarget;
     this.config = config;
+    this.profile = { label: 'Claude', kind: 'claude', bin: config.claudeBin, models: null };
 
     this.headlessRunner =
       headlessRunner === null

package/src/agents/codex-adapter.ts

@@ -11,6 +11,7 @@ import { toShellArg } from '../shared/to-shell-arg';
 import type {
   AdapterEvent,
   AgentAdapter,
+  AgentProfile,
   NameUpdate,
   ResumeCheck,
   SpawnOptions,
@@ -47,12 +48,15 @@ export class CodexAdapter implements AgentAdapter {
   // Codex's hooks are authoritative; no screen heuristics needed.
   readonly screenDetector = null;
 
+  readonly profile: AgentProfile;
+
   readonly takesMessages = false;
 
   private readonly config: Config;
 
   constructor(config: Config) {
     this.config = config;
+    this.profile = { label: 'Codex', kind: 'codex', bin: config.codexBin, models: null };
   }
 
   planSpawn(opts: SpawnOptions): SpawnPlan {

package/src/agents/gateway-adapter.ts

@@ -7,6 +7,7 @@ import type {
   AdapterEvent,
   AgentAdapter,
   AgentID,
+  AgentProfile,
   HeadlessRunner,
   NameUpdate,
   ResumeCheck,
@@ -40,6 +41,8 @@ export class GatewayAdapter implements AgentAdapter {
 
   readonly takesMessages = true;
 
+  readonly profile: AgentProfile;
+
   private readonly gateway: GatewayConfig;
 
   private readonly claude: ClaudeAdapter;
@@ -62,6 +65,13 @@ export class GatewayAdapter implements AgentAdapter {
     this.gateway = gateway;
     this.id = gateway.id;
 
+    this.profile = {
+      label: gateway.label,
+      kind: 'gateway',
+      bin: gateway.bin,
+      models: pickModels(gateway.env),
+    };
+
     this.claude = new ClaudeAdapter(config);
 
     this.headlessRunner =
@@ -131,3 +141,24 @@ export class GatewayAdapter implements AgentAdapter {
     return this.bridgeDir;
   }
 }
+
+// The model names a gateway's env sets explicitly, keyed by role:
+// `ANTHROPIC_MODEL` is `default`, and `ANTHROPIC_DEFAULT_<TIER>_MODEL` is the
+// tier in lower case. No other env value leaves the adapter.
+const MODEL_KEY = /^ANTHROPIC_(?:DEFAULT_(?<tier>[A-Z0-9]+)_)?MODEL$/u;
+
+function pickModels(
+  env: Readonly<Record<string, string>>,
+): Readonly<Record<string, string>> | null {
+  const models: Record<string, string> = {};
+
+  for (const [key, value] of Object.entries(env)) {
+    const matched = MODEL_KEY.exec(key);
+
+    if (matched !== null && value !== '') {
+      models[matched.groups?.['tier']?.toLowerCase() ?? 'default'] = value;
+    }
+  }
+
+  return Object.keys(models).length === 0 ? null : models;
+}

package/src/agents/grok-adapter.ts

@@ -12,6 +12,7 @@ import { toShellArg } from '../shared/to-shell-arg';
 import type {
   AdapterEvent,
   AgentAdapter,
+  AgentProfile,
   NameUpdate,
   ResumeCheck,
   SpawnOptions,
@@ -60,6 +61,8 @@ export class GrokAdapter implements AgentAdapter {
   // Grok's hooks are authoritative; no screen heuristics needed.
   readonly screenDetector = null;
 
+  readonly profile: AgentProfile;
+
   readonly takesMessages = false;
 
   private readonly config: Config;
@@ -68,6 +71,7 @@ export class GrokAdapter implements AgentAdapter {
 
   constructor(config: Config) {
     this.config = config;
+    this.profile = { label: 'Grok', kind: 'grok', bin: config.grokBin, models: null };
   }
 
   planSpawn(opts: SpawnOptions): SpawnPlan {

package/src/cli.ts

@@ -317,13 +317,17 @@ const main = defineCommand({
           kind: { type: 'positional', required: false, default: '' },
           message: { type: 'string', default: '' },
           label: { type: 'string', default: '' },
+          messages: { type: 'string', default: '' },
+          turn: { type: 'string', default: '' },
         },
         async run(ctx) {
           const reporter = await import('./report');
 
           await reporter.runReport(ctx.args.kind, {
             message: ctx.args.message,
+            messages: ctx.args.messages,
             label: ctx.args.label,
+            turn: ctx.args.turn,
           });
         },
       }),

package/src/client/boot-daemon.ts

@@ -4,6 +4,8 @@ import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { toAgentID } from '../agents/agent-adapter';
 import type { AgentID } from '../agents/agent-adapter';
+import type { DaemonFeature } from '../protocol/daemon-features';
+import { parseDaemonFeatures } from '../protocol/parse-daemon-features';
 import { daemonPidFile, daemonRecordFile, daemonSocketPath } from '../shared/config';
 import { findDaemonRecord } from '../shared/find-daemon-record';
 import { getBuild } from '../shared/get-build';
@@ -18,6 +20,9 @@ export interface DaemonBoot {
   readonly stale: boolean;
   readonly lastUsedAgent: AgentID;
 
+  // What the daemon announced it serves; an older daemon announces less.
+  readonly features: ReadonlySet<DaemonFeature>;
+
   // The socket the client reached, which differs from the computed one when
   // the daemon was found through its record in the state directory.
   readonly socketPath: string;
@@ -49,6 +54,7 @@ export async function bootDaemonClient(): Promise<DaemonBoot> {
         client,
         stale: hello['daemon'] !== build,
         lastUsedAgent: toAgentID(hello['lastUsedAgent']),
+        features: parseDaemonFeatures(hello),
         socketPath: opened.socketPath,
       };
     } catch (error) {

package/src/daemon/build-agent-list.ts

@@ -0,0 +1,58 @@
+import type { AgentAdapter } from '../agents/agent-adapter';
+
+interface AgentCapabilities {
+  // Only an installed agent can start a session.
+  readonly spawn: boolean;
+  readonly readTranscript: boolean;
+
+  // Whether a session takes inbox messages through a tap.
+  readonly message: boolean;
+  readonly attach: boolean;
+  readonly screen: boolean;
+  readonly input: boolean;
+}
+
+export interface AgentEntry {
+  readonly id: string;
+  readonly label: string;
+  readonly kind: string;
+
+  // Whether the agent's binary resolves, on PATH or at its configured path.
+  readonly installed: boolean;
+  readonly capabilities: AgentCapabilities;
+  readonly models: Readonly<Record<string, string>> | null;
+}
+
+/**
+ * One `agents.list` entry per registered adapter, in registration order. An
+ * entry carries only the adapter's profile and what its interface offers,
+ * so no environment value, credential, helper command, or base URL reaches
+ * it. Every session runs in a PTY, so each agent can be attached, read as a
+ * screen, and typed into. A stand-in adapter without a profile is listed
+ * under its id as both label and kind.
+ */
+export function buildAgentList(
+  adapters: readonly AgentAdapter[],
+  isInstalled: (bin: string) => boolean,
+): AgentEntry[] {
+  return adapters.map((adapter) => {
+    const profile = adapter.profile;
+    const installed = profile === undefined ? false : isInstalled(profile.bin);
+
+    return {
+      id: adapter.id,
+      label: profile?.label ?? adapter.id,
+      kind: profile?.kind ?? adapter.id,
+      installed,
+      capabilities: {
+        spawn: installed,
+        readTranscript: adapter.parseTranscriptLine !== undefined,
+        message: adapter.takesMessages,
+        attach: true,
+        screen: true,
+        input: true,
+      },
+      models: profile?.models ?? null,
+    };
+  });
+}

package/src/daemon/daemon-connection.ts

@@ -1,5 +1,6 @@
 import { basename } from 'node:path';
 import type { AgentAdapter, AgentID, SpawnOptions } from '../agents/agent-adapter';
+import { DAEMON_FEATURES } from '../protocol/daemon-features';
 import { decodeCursor } from '../protocol/decode-cursor';
 import { encodeCursor } from '../protocol/encode-cursor';
 import { OutboundQueue } from '../protocol/outbound-queue';
@@ -18,6 +19,7 @@ import type { SessionID } from '../shared/session-id';
 import type { FleetEntry } from '../store/fleet-entry';
 import type { MessageRecord } from '../store/message-record';
 import type { Dims } from './attach-registry';
+import type { AgentEntry } from './build-agent-list';
 import type { FleetEvent } from './build-fleet-events';
 import type { TranscriptPage, TranscriptPosition } from './load-transcript-page';
 import type { AnswerResult } from './permission-registry';
@@ -55,6 +57,7 @@ export interface DaemonContext {
   readonly build: string;
   readonly collectSessions: () => SessionDescriptor[];
   readonly collectSpawnDirs: () => Promise<string[]>;
+  readonly collectAgents: () => AgentList;
   readonly collectFleet: () => Promise<FleetEntry[]>;
   readonly loadLastUsedAgent: () => Promise<AgentID>;
   readonly findAdapter: (id: AgentID) => AgentAdapter | null;
@@ -101,13 +104,14 @@ export interface DaemonContext {
     afterID: number | null,
     limit: number,
     waitMs: number,
-  ) => Promise<FleetEvent[]>;
+    sessionID: SessionID | null,
+  ) => Promise<EventsPage>;
   readonly writeSessionMessage: (
     sessionID: SessionID,
     from: string,
     text: string,
   ) => Promise<MessageRecord | 'missing' | 'dead' | 'unsupported' | 'no_tap'>;
-  readonly readMessage: (messageID: MessageID) => Promise<MessageView | null>;
+  readonly readMessage: (messageID: MessageID, waitMs: number) => Promise<MessageView | null>;
   readonly attachTap: (client: TapClient, sessionID: SessionID) => 'ok' | 'missing' | 'unsupported';
   readonly ackMessage: (
     client: TapClient,
@@ -122,11 +126,29 @@ export interface OutputClient {
   readonly sendOutput: (sessionID: SessionID, event: EventMsg, byteLength: number) => void;
 }
 
-// One message as `message.get` reports it: the session it belongs to now and
-// every field of the record.
+// The `agents.list` answer: the host the daemon runs on, and each agent.
+interface AgentList {
+  readonly daemon: {
+    readonly hostname: string;
+    readonly platform: string;
+    readonly arch: string;
+    readonly build: string;
+  };
+  readonly agents: readonly AgentEntry[];
+}
+
+// One `events.read` answer: the events, and whether more follow them.
+interface EventsPage {
+  readonly events: readonly FleetEvent[];
+  readonly more: boolean;
+}
+
+// One message as `message.get` reports it: the session it belongs to now,
+// every field of the record, and the other messages its turn answered.
 interface MessageView {
   readonly session: SessionID;
   readonly record: MessageRecord;
+  readonly answeredWith: readonly MessageID[];
 }
 
 // The slice of a connection a tap subscription needs.
@@ -309,6 +331,11 @@ export class DaemonConnection {
 
         return;
       }
+      case 'agents.list': {
+        this.sendOk(req.id, { ...this.ctx.collectAgents() });
+
+        return;
+      }
       case 'dirs.list': {
         this.sendOk(req.id, { dirs: await this.ctx.collectSpawnDirs() });
 
@@ -826,14 +853,20 @@ export class DaemonConnection {
       afterID = decoded.id;
     }
 
-    const events = await this.ctx.readEvents(afterID, parsed.data.limit, parsed.data.waitMs);
+    const page = await this.ctx.readEvents(
+      afterID,
+      parsed.data.limit,
+      parsed.data.waitMs,
+      parsed.data.session ?? null,
+    );
 
-    const last = events.at(-1);
+    const last = page.events.at(-1);
 
     // A cursor always comes back so a client can long-poll from an empty trail.
     this.sendOk(req.id, {
-      events,
+      events: page.events,
       cursor: last === undefined ? encodeCursor({ kind: 'events', id: afterID ?? 0 }) : last.cursor,
+      more: page.more,
     });
   }
 
@@ -923,7 +956,7 @@ export class DaemonConnection {
 
     const messageID = parsed.data.message;
 
-    const view = await this.ctx.readMessage(messageID);
+    const view = await this.ctx.readMessage(messageID, parsed.data.waitMs);
 
     if (view === null) {
       this.sendErr(req.id, 'bad_args', `no message '${messageID}'`);
@@ -943,6 +976,8 @@ export class DaemonConnection {
       ...(record.deliveredAt === undefined ? {} : { deliveredAt: record.deliveredAt }),
       ...(record.answeredAt === undefined ? {} : { answeredAt: record.answeredAt }),
       ...(record.answer === undefined ? {} : { answer: record.answer }),
+      turn: record.turn ?? null,
+      answeredWith: view.answeredWith,
     });
   }
 
@@ -1025,6 +1060,7 @@ export class DaemonConnection {
     this.sendOk(id, {
       daemon: this.ctx.build,
       limits: { maxLine: MAX_LINE, maxChunk: MAX_CHUNK },
+      features: DAEMON_FEATURES,
       lastUsedAgent: await this.ctx.loadLastUsedAgent(),
     });
   }

package/src/daemon/daemon.ts

@@ -1,18 +1,22 @@
 import { unlinkSync, writeFileSync } from 'node:fs';
+import { hostname } from 'node:os';
 import { dirname, join } from 'node:path';
 import type { AdapterEvent, AgentAdapter } from '../agents/agent-adapter';
 import { MAX_CHUNK, PROTOCOL_V } from '../protocol/protocol';
 import type { EventMsg } from '../protocol/protocol';
 import type { HooksConfig } from '../shared/collect-hooks';
 import { findDaemonRecord } from '../shared/find-daemon-record';
+import type { MessageID } from '../shared/message-id';
 import type { SessionID } from '../shared/session-id';
 import { truncateToBytes } from '../shared/truncate-to-bytes';
 import type { MessageOwner } from '../store/message-owner';
-import type { MessageRecord } from '../store/message-record';
+import type { MessageRecord, MessageStatus } from '../store/message-record';
 import { StateStore } from '../store/state-store';
+import type { EventScope } from '../store/state-store';
 import type { TrailEntry } from '../store/trail-entry';
 import { ANSWER_BYTE_CAP } from './answer-byte-cap';
 import { AttachRegistry } from './attach-registry';
+import { buildAgentList } from './build-agent-list';
 import { buildFleetEvents } from './build-fleet-events';
 import { buildMessageTrailEntry } from './build-message-trail-entry';
 import { buildReportTrailEntry } from './build-report-trail-entry';
@@ -202,6 +206,35 @@ export async function startDaemon(opts: DaemonOptions): Promise<DaemonHandle> {
     emitEvent(buildSessionMessageEvent(sessionID, record), findHookScope(sessionID));
   };
 
+  // A live session's scope also matches the rows it wrote under an earlier
+  // atc id, through the agent session id a restore carries on.
+  const buildEventScope = (sessionID: SessionID): EventScope => ({
+    atcID: sessionID,
+    agentSessionID: mgr.sessions.find((x) => x.id === sessionID)?.agentSessionID,
+  });
+
+  // A message belongs to the live session holding its atc id or its agent
+  // session id, else to the atc id it was sent to.
+  const readMessageView = async (messageID: MessageID) => {
+    const record = await store.findMessageByID(messageID);
+
+    if (record === null) {
+      return null;
+    }
+
+    const owner = mgr.sessions.find(
+      (x) =>
+        x.id === record.atcID ||
+        (record.agentSessionID !== undefined && x.agentSessionID === record.agentSessionID),
+    );
+
+    return {
+      session: owner?.id ?? record.atcID,
+      record,
+      answeredWith: await store.collectTurnSiblings(record),
+    };
+  };
+
   registry.onRequested = (req) => {
     emitEvent(
       {
@@ -309,15 +342,18 @@ export async function startDaemon(opts: DaemonOptions): Promise<DaemonHandle> {
     const owner = s === undefined ? { atcID: e.atcId } : buildMessageOwner(s);
 
     try {
-      const answered = await store.updateMessageAnswered(
-        report.message,
+      // One statement answers the whole turn, so a reader that sees any
+      // member answered already finds every sibling answered beside it.
+      const answered = await store.updateMessagesAnswered(
+        report.messages,
         owner,
         truncateToBytes(report.answer, ANSWER_BYTE_CAP),
         Date.now(),
+        report.turn,
       );
 
-      if (answered !== null) {
-        await recordMessageStatus(e.atcId, answered);
+      for (const record of answered) {
+        await recordMessageStatus(e.atcId, record);
       }
     } catch {}
   };
@@ -620,6 +656,15 @@ export async function startDaemon(opts: DaemonOptions): Promise<DaemonHandle> {
     build: opts.build,
     collectSessions: () => mgr.collectDescriptors(),
     collectSpawnDirs: () => store.collectSpawnDirs(),
+    collectAgents: () => ({
+      daemon: {
+        hostname: hostname(),
+        platform: process.platform,
+        arch: process.arch,
+        build: opts.build,
+      },
+      agents: buildAgentList(mgr.collectAdapters(), (bin) => Bun.which(bin) !== null),
+    }),
     collectFleet: () => store.loadFleet(),
     loadLastUsedAgent: () => store.loadLastUsedAgent(),
     findAdapter: (kind) => mgr.findAdapter(kind),
@@ -905,23 +950,30 @@ export async function startDaemon(opts: DaemonOptions): Promise<DaemonHandle> {
 
       return { path, page };
     },
-    readEvents: async (afterID, limit, waitMs) => {
+    readEvents: async (afterID, limit, waitMs, sessionID) => {
       const deadline = Date.now() + waitMs;
+      const scope = sessionID === null ? null : buildEventScope(sessionID);
 
-      // A wake for an event the read leaves out (a heartbeat) loops back to
-      // wait out the rest of the window.
+      // A wake for an event the read leaves out (a heartbeat, or another
+      // session's event under a session filter) loops back to wait out the
+      // rest of the window.
       for (;;) {
         const generation = eventSignal.generation;
 
+        // A read from a cursor takes one row past the limit to learn whether
+        // more follow; the latest events have nothing after them.
         const rows =
           afterID === null
-            ? await store.collectLatestEvents(limit)
-            : await store.collectEventsAfter(afterID, limit);
+            ? await store.collectLatestEvents(limit, scope)
+            : await store.collectEventsAfter(afterID, limit + 1, scope);
 
         const remaining = deadline - Date.now();
 
         if (rows.length > 0 || remaining <= 0 || eventSignal.disposed) {
-          return buildFleetEvents(rows, mgr.collectDescriptors());
+          return {
+            events: buildFleetEvents(rows.slice(0, limit), mgr.collectDescriptors()),
+            more: rows.length > limit,
+          };
         }
 
         await eventSignal.waitForNext(generation, remaining);
@@ -1005,20 +1057,38 @@ export async function startDaemon(opts: DaemonOptions): Promise<DaemonHandle> {
 
       return 'ok';
     },
-    readMessage: async (messageID) => {
-      const record = await store.findMessageByID(messageID);
+    readMessage: async (messageID, waitMs) => {
+      const deadline = Date.now() + waitMs;
+      let initialStatus: MessageStatus | null = null;
 
-      if (record === null) {
-        return null;
-      }
+      // Every message status change writes a trail entry and wakes the
+      // signal, so a wake re-reads the message and returns once its status
+      // moved from the status at call time. An answered message has no
+      // further status to wait for.
+      for (;;) {
+        const generation = eventSignal.generation;
 
-      const owner = mgr.sessions.find(
-        (x) =>
-          x.id === record.atcID ||
-          (record.agentSessionID !== undefined && x.agentSessionID === record.agentSessionID),
-      );
+        const view = await readMessageView(messageID);
+
+        if (view === null) {
+          return null;
+        }
+
+        initialStatus ??= view.record.status;
 
-      return { session: owner?.id ?? record.atcID, record };
+        const remaining = deadline - Date.now();
+
+        if (
+          view.record.status !== initialStatus ||
+          view.record.status === 'answered' ||
+          remaining <= 0 ||
+          eventSignal.disposed
+        ) {
+          return view;
+        }
+
+        await eventSignal.waitForNext(generation, remaining);
+      }
     },
     ackMessage: async (client, sessionID, messageID) => {
       const s = mgr.sessions.find((x) => x.id === sessionID);