@agentproto/runtime 0.3.0 → 0.4.0

package/dist/index.d.ts

@@ -8,6 +8,7 @@ import { AdapterHandle, AdapterLister } from '@agentproto/adapter-kit';
 import { WorkspaceFs } from './workspace-fs.js';
 export { createWorkspaceFs } from './workspace-fs.js';
 export { ConversationMeta, ConversationStore, ConversationTurn, fileConversationStore } from './conversations.js';
+import { StepCache } from '@agentproto/workflow-runtime';
 export { PROVIDER_ENV_VARS, ProviderEntry, ProvidersFile, injectProviderKeysIntoEnv, loadProviders, providerEnvVar, providersPath, removeProviderKey, setProviderKey } from './providers-store.js';
 
 /**
@@ -15,23 +16,48 @@ export { PROVIDER_ENV_VARS, ProviderEntry, ProvidersFile, injectProviderKeysInto
  * RuntimeEvents (global daemon bus) — session events are scoped to
  * individual sessions and fire at turn-level granularity.
  *
- * Consumers: EventRing (poll_events cursor), WebhookNotifier
+ * Consumers: EventRing (session_events_poll cursor), WebhookNotifier
  * (fire-and-forget HTTP), RoutineRunner (state machine fan-in),
- * and wait_for_any MCP tool (long-poll multiplexed).
+ * and session_monitor MCP tool (long-poll multiplexed).
  */
-type SessionEventType = "session:turn-end" | "session:awaiting-input" | "session:exited" | "session:command-done" | "policy:passed" | "policy:failed" | "policy:commit-ready" | "policy:committed";
+type SessionEventType = "session:turn-end" | "session:awaiting-input" | "session:exited" | "session:command-done" | "policy:passed" | "policy:failed" | "policy:commit-ready" | "policy:committed" | "cron:fired" | "cron:succeeded" | "cron:failed";
+/**
+ * Structured detail on why a session is awaiting input, when derivable.
+ * `source: "structured"` — a driver-reported ACP-style prompt (e.g. a tool
+ * permission request with real options). `source: "heuristic"` — a
+ * best-effort guess from the tail of the transcript (trailing "?" plus
+ * an optional enumerated option list) for drivers that don't report
+ * structured prompts. Absent entirely when neither could be determined —
+ * callers still have the plain `awaitingInput` boolean in that case.
+ */
+interface SessionAwaitingQuestion {
+    text: string;
+    options?: string[];
+    source: "structured" | "heuristic";
+}
 interface SessionTurnEndEvent {
     type: "session:turn-end";
     sessionId: string;
     awaitingInput: boolean;
     label?: string;
     ts: string;
+    question?: SessionAwaitingQuestion;
+    /**
+     * The adapter's stream `turn-end` reason, when the driver reports one
+     * (e.g. `"completed"`, `"cancelled"`, `"max_turns"`, or
+     * `"watchdog-timeout"` when the ACP client's turn-idle watchdog fired
+     * because the adapter went silent — see
+     * `@agentproto/acp/client`'s `AcpClientOptions.turnIdleTimeoutMs`).
+     * Absent for drivers that don't report a reason.
+     */
+    reason?: string;
 }
 interface SessionAwaitingInputEvent {
     type: "session:awaiting-input";
     sessionId: string;
     label?: string;
     ts: string;
+    question?: SessionAwaitingQuestion;
 }
 interface SessionExitedEvent {
     type: "session:exited";
@@ -41,8 +67,8 @@ interface SessionExitedEvent {
     label?: string;
     ts: string;
 }
-/** Emitted when execute_command finishes. commandId matches the id
- *  returned by the execute_command MCP tool. */
+/** Emitted when command_execute finishes. commandId matches the id
+ *  returned by the command_execute MCP tool. */
 interface SessionCommandDoneEvent {
     type: "session:command-done";
     sessionId: string;
@@ -68,7 +94,7 @@ interface PolicyFailedEvent {
 /**
  * Emitted by the supervisor (WP5) when a `then:"commit"` policy's gate passes
  * but `requireHumanAck` is set: the commit is staged-and-ready but NOT yet
- * executed. Carries the exact paths + message that `ack_policy(approve:true)`
+ * executed. Carries the exact paths + message that `policy_ack(approve:true)`
  * will commit. The policy sits in `awaiting-ack` until acked.
  */
 interface PolicyCommitReadyEvent {
@@ -81,7 +107,7 @@ interface PolicyCommitReadyEvent {
 }
 /** Emitted by the supervisor (WP5) when a `then:"commit"` policy has actually
  *  committed — either directly (requireHumanAck:false) or after an approving
- *  `ack_policy`. Carries the resulting commit sha. */
+ *  `policy_ack`. Carries the resulting commit sha. */
 interface PolicyCommittedEvent {
     type: "policy:committed";
     policyId: string;
@@ -91,7 +117,30 @@ interface PolicyCommittedEvent {
     message: string;
     ts: string;
 }
-type SessionEvent = SessionTurnEndEvent | SessionAwaitingInputEvent | SessionExitedEvent | SessionCommandDoneEvent | PolicyPassedEvent | PolicyFailedEvent | PolicyCommitReadyEvent | PolicyCommittedEvent;
+/** Emitted by CronScheduler when a job fires (before the action runs). */
+interface CronFiredEvent {
+    type: "cron:fired";
+    jobId: string;
+    label?: string;
+    ts: string;
+}
+/** Emitted by CronScheduler when a job action completes successfully. */
+interface CronSucceededEvent {
+    type: "cron:succeeded";
+    jobId: string;
+    label?: string;
+    summary: string;
+    ts: string;
+}
+/** Emitted by CronScheduler when a job action fails. */
+interface CronFailedEvent {
+    type: "cron:failed";
+    jobId: string;
+    label?: string;
+    error: string;
+    ts: string;
+}
+type SessionEvent = SessionTurnEndEvent | SessionAwaitingInputEvent | SessionExitedEvent | SessionCommandDoneEvent | PolicyPassedEvent | PolicyFailedEvent | PolicyCommitReadyEvent | PolicyCommittedEvent | CronFiredEvent | CronSucceededEvent | CronFailedEvent;
 interface SessionEventBus {
     emit(ev: SessionEvent): void;
     /** Subscribe to a specific event type. Returns an unsubscribe fn. */
@@ -132,6 +181,12 @@ interface SessionEventBus {
  */
 interface AgentSessionLike {
     sessionId: string;
+    /** OS-level process id of the spawned child, when the driver owns a
+     *  real subprocess. Mirrored onto `SessionDescriptor.pid` at
+     *  `spawnAgent` time so `processAlive` can be computed without
+     *  adapter-specific forensics. Undefined for drivers that don't
+     *  expose a process (e.g. a future non-subprocess transport). */
+    pid?: number;
     send(message: unknown): AsyncIterable<AgentStreamEvent>;
     cancel(): Promise<void>;
     close(): Promise<void>;
@@ -165,7 +220,15 @@ type PtyFactory = (opts: PtyFactoryOptions) => PtyProcess;
 interface AgentStreamEvent {
     kind: string;
     text?: string;
+    /** Correlates a "tool-call" with its later "tool-result" (and an
+     *  "agent-prompt" with the permission it's asking about) — see
+     *  @agentproto/acp's `StreamEvent`. */
+    toolCallId?: string;
     toolName?: string;
+    /** Tool-call input, e.g. an ACP `tool_call`'s `arguments` — see @agentproto/acp's `StreamEvent`. */
+    arguments?: unknown;
+    /** Tool-call output, e.g. an ACP `tool_call_update`'s `result` — see @agentproto/acp's `StreamEvent`. */
+    result?: unknown;
     isError?: boolean;
     reason?: string;
     error?: {
@@ -173,6 +236,30 @@ interface AgentStreamEvent {
         code?: number;
         data?: unknown;
     };
+    /** Structured options offered by an "agent-prompt" event (e.g. an ACP
+     *  `requestPermission` callback surfaced as a clarifying question rather
+     *  than auto-answered). Typed `unknown` — like `@agentproto/acp`'s own
+     *  `StreamEvent["options"]` — so this structural type stays assignable
+     *  from any driver's runtime session without a hard dependency on its
+     *  exact option shape (`{optionId,name,kind}` for ACP, or whatever a
+     *  future driver reports); `normalizeAgentPromptOptions` narrows it
+     *  defensively at the one place it's consumed. */
+    options?: unknown;
+    /** "plan" event entries — see @agentproto/acp's `StreamEvent`'s `plan` kind. */
+    entries?: Array<{
+        content: string;
+        priority: string;
+        status: string;
+    }>;
+    /** "usage_update" context-window size (tokens). */
+    size?: number;
+    /** "usage_update" tokens currently in context. */
+    used?: number;
+    /** "usage_update" cumulative session cost, when the adapter reports one. */
+    cost?: {
+        amount: number;
+        currency: string;
+    };
 }
 type SessionKind = "terminal" | "agent-cli" | "command" | "browser";
 type SessionStatus = "starting" | "running" | "exited" | "killed" | "error";
@@ -191,6 +278,19 @@ interface SessionDescriptor {
     /** Last time anything was written to stdout/stderr. Lets the UI
      *  spot stuck sessions ("running for 2h, last output 12min ago"). */
     lastOutputAt?: string;
+    /** Last time ANY adapter-process activity was observed — ACP
+     *  JSON-RPC traffic, protocol-level events, not just ring-buffer
+     *  output lines. Stays current during long tool-call chains where
+     *  `lastOutputAt` goes stale. Updated on incoming session/update
+     *  notifications AND on outbound RPC calls. ISO 8601. */
+    lastActivityAt?: string;
+    /** Whether the underlying OS process is still alive. Computed via
+     *  `process.kill(pid, 0)` at read time (list()/get()) — cheap,
+     *  zero-overhead, standard POSIX check. Absent when `pid` is null
+     *  (no process to check). Never persisted — recomputed fresh on
+     *  every read since it's a live OS query, stale the instant it's
+     *  written to disk. */
+    processAlive?: boolean;
     /** Free-text label the spawner can attach (e.g. conversation id,
      *  operator name) so the UI can group/filter. */
     label?: string;
@@ -249,17 +349,28 @@ interface SessionDescriptor {
     resumeMetadata?: Record<string, string>;
     /** Set by the orchestration layer when the agent emits an
      *  "awaiting-input" turn-end. Cleared on the next turn start.
-     *  Used by `wait_for_any` to fast-return without subscribing. */
+     *  Used by `session_monitor` to fast-return without subscribing. */
     awaitingInput?: boolean;
+    /**
+     * Structured detail on WHY the session is awaiting input, when it can be
+     * determined — lets an orchestrator distinguish "blocked on a real
+     * question" from "just finished a turn" without re-reading raw output.
+     * `source: "structured"` comes from a driver-reported ACP-style prompt
+     * (`AgentStreamEvent.options`, e.g. a tool permission request);
+     * `source: "heuristic"` is a best-effort guess from the tail of the
+     * transcript (trailing "?" + an optional enumerated option list) for
+     * drivers that don't report structured prompts. Cleared alongside
+     * `awaitingInput` on the next turn start. */
+    awaitingQuestion?: SessionAwaitingQuestion;
     /** Count of turns that have fully completed (turn-end emitted) on this
-     *  session. Lets `wait_for_any` fast-return for a session that already
+     *  session. Lets `session_monitor` fast-return for a session that already
      *  finished its turn before the wait subscribed — a fast turn that ends
      *  in "completed" (not "awaiting-input") leaves no other persisted
      *  signal (status stays "running", busy clears). 0 = never ran a turn,
      *  so a freshly-spawned idle session is NOT mistaken for done. */
     turnsCompleted?: number;
     /** True while a turn is actively running (mirror of the internal
-     *  runtime `busy` flag). Lets `wait_for_any` distinguish "idle after a
+     *  runtime `busy` flag). Lets `session_monitor` distinguish "idle after a
      *  finished turn" from "mid-turn" so it doesn't fast-return a stale
      *  turn-end while the NEXT turn is still generating. */
     busy?: boolean;
@@ -312,19 +423,29 @@ interface SessionsRegistry {
      *  `kill()` best-effort. */
     registerBrowser(input: RegisterBrowserInput): SessionDescriptor;
     /** Send a follow-up turn to a live agent session. Throws when the
-     *  session is missing, not an agent-cli kind, or busy. The events
-     *  stream into the existing ring buffer + line emitter so /stream
-     *  consumers see them as they arrive. */
+     *  session is missing, not an agent-cli kind, dead (exited/killed/
+     *  error and unresumable — `SessionNotAliveError`), or busy
+     *  (mid-turn). The events stream into the existing ring buffer +
+     *  line emitter so /stream consumers see them as they arrive. */
     sendPrompt(id: string, message: unknown): Promise<void>;
-    /** Fire-and-forget variant of `sendPrompt`. Validates the same
-     *  preconditions synchronously — throws on missing session / wrong
-     *  kind / busy — but returns immediately after the turn is started,
-     *  letting the caller stream output via the SSE endpoint instead of
-     *  blocking on the full turn. Async errors during the turn are
-     *  pushed into the ring buffer as `[error]` lines so `/stream`
-     *  subscribers see them. Used by the web UI's chat input where a
-     *  long turn would otherwise freeze the textbox. */
-    enqueuePrompt(id: string, message: unknown): void;
+    /** Fire-and-forget variant of `sendPrompt` for the TURN ITSELF only.
+     *  Admission (resume attempt + the missing/wrong-kind/dead/busy
+     *  checks `sendPrompt` throws) is AWAITED before this resolves, so a
+     *  dead or busy session rejects instead of silently reporting
+     *  success — only resolves once the turn has actually started.
+     *  Errors during the turn's own execution (network drop, child died
+     *  mid-turn) are pushed into the ring buffer as `[error]` lines so
+     *  `/stream` subscribers see them. Used by the web UI's chat input
+     *  and MCP `agent_prompt`, where a long turn would otherwise freeze
+     *  the caller. */
+    enqueuePrompt(id: string, message: unknown): Promise<void>;
+    /** Stamp `lastActivityAt` on a live agent-cli session's descriptor
+     *  and schedule a debounced persist. Called from the `onActivity`
+     *  callback threaded down through the driver → ACP client, which
+     *  fires on ANY adapter-process traffic (not just ring-buffer
+     *  output) — see `SessionDescriptor.lastActivityAt`. No-op when the
+     *  id is unknown (session already forgotten). */
+    pulseActivity(id: string): void;
     list(): SessionDescriptor[];
     get(id: string): SessionDescriptor | undefined;
     /** Subscribe to a session's output. Returns an unsubscribe fn.
@@ -499,7 +620,7 @@ interface SpawnPtyInput {
  * for fs/exec/agent-cli.
  *
  * Five tools:
- *   list_adapter_browsers   discover available browser adapter ids + metadata
+ *   browser_adapter_list   discover available browser adapter ids + metadata
  *   start_browser           ensure a browser adapter is up, register as a session
  *   stop_browser            kill a running browser session
  *   list_browsers           browse alive/recent browser sessions
@@ -575,7 +696,7 @@ type BrowserAdapterLister = () => {
     config?: unknown[];
 }[];
 /**
- * Family-specific descriptor surfaced in the kit-path `list_adapter_browsers`
+ * Family-specific descriptor surfaced in the kit-path `browser_adapter_list`
  * response. Fields match the legacy lister shape so the tool output is
  * unchanged regardless of which path is active.
  */
@@ -782,9 +903,30 @@ declare class TunnelRegistry {
     private loadFromDisk;
 }
 
+/**
+ * Fire-and-forget webhook notifier for session lifecycle events.
+ *
+ * Each session can register its own `notifyUrl` (via `agent_start`).
+ * A global URL can be set via `AGENTPROTO_NOTIFY_URL` env var or
+ * `~/.agentproto/notify.json` (env wins). Both are POSTed when an event
+ * fires — the union of per-session + global URLs, deduplicated.
+ *
+ * Retry policy: one retry after 2 s on network error. No retry on 4xx/5xx.
+ * Timeout: 10 s per attempt. All errors are swallowed — the notifier never
+ * throws into the session's hot path.
+ */
+
+interface WebhookNotifier {
+    /** Register a per-session URL (called from agent_start). */
+    register(sessionId: string, url: string): void;
+    unregister(sessionId: string): void;
+    /** Handler to wire into SessionEventBus.onAny. Fire-and-forget. */
+    onSessionEvent(ev: SessionEvent): void;
+}
+
 /**
  * Cursor-based ring buffer for session events. Bridges the in-process
- * SessionEventBus (push) to the poll_events MCP tool (pull).
+ * SessionEventBus (push) to the session_events_poll MCP tool (pull).
  *
  * Capacity default: 1 000 events. Oldest entry dropped on overflow —
  * callers that lag beyond the cap see a gap in their cursor but never
@@ -845,9 +987,9 @@ interface EventRing {
  *
  * Trigger: session:turn-end on the watched session(s).
  * Gate: optional shell command via the same allowlist + cwd-anchor as
- *       execute_command. exit 0 = pass.
+ *       command_execute. exit 0 = pass.
  * Action (then:"emit"): emits policy:passed / policy:failed on the bus
- *       (readable via poll_events).
+ *       (readable via session_events_poll).
  *
  * WP5 (then:"commit"): on a GREEN gate, prepare a host-side git commit in the
  * watched session's cwd — `git add -- <explicit paths>` then `git commit -m
@@ -859,7 +1001,7 @@ interface EventRing {
  * "nothing to commit" is treated as SUCCESS (idempotent re-commit after a
  * restart). `requireHumanAck` defaults to TRUE: the gate-green transition goes
  * to `awaiting-ack` and emits `policy:commit-ready` (paths + message) instead of
- * committing; the commit runs only on `ack_policy(approve:true)` →
+ * committing; the commit runs only on `policy_ack(approve:true)` →
  * `policy:committed` (+ sha) → done; `approve:false` → cancelled. With
  * `requireHumanAck:false` the commit runs directly at the green gate.
  * onFail (WP2): when gate fails, re-prompts the session(s) (sendPrompt) up to
@@ -913,7 +1055,10 @@ interface ShellGateSpec {
     command: string;
     args?: string[];
     /** Working directory for the gate command. Defaults to the watched
-     *  session's cwd, anchored to the workspace. */
+     *  session's own cwd (trusted as-is — it was already an explicit,
+     *  vetted choice made at `agent_start` time). When given explicitly,
+     *  anchored to that session's cwd (not the daemon's boot workspace)
+     *  so a stray/injected value can't escape it. */
     cwd?: string;
     timeoutMs?: number;
 }
@@ -970,7 +1115,7 @@ interface CommitSpec {
     /**
      * Human-in-the-loop gate before the commit actually runs. Default TRUE:
      * the green gate transitions to `awaiting-ack` + emits `policy:commit-ready`
-     * and waits for `ack_policy`. Set false to commit directly at the green gate.
+     * and waits for `policy_ack`. Set false to commit directly at the green gate.
      */
     requireHumanAck?: boolean;
 }
@@ -1073,6 +1218,15 @@ interface CompletionPolicySupervisor {
      */
     ack(policyId: string, approve: boolean): Promise<PolicyRunState | undefined>;
     list(): PolicyRunState[];
+    /**
+     * Subscribe to policy settlements — fired whenever a policy transitions
+     * into a terminal state (done / blocked / cancelled) OR into awaiting-ack.
+     * Used by the `/policies/:id/wait` long-poll to block until a policy
+     * resolves without reimplementing the state machine's event surface.
+     * Returns an unsubscribe fn. The callback receives the policyId; read
+     * the full state via `getStatus(policyId)`.
+     */
+    onSettle(cb: (policyId: string) => void): () => void;
     /**
      * Sync flush of the policy snapshot to disk. Call from the daemon
      * stop() path — mirrors sessions.shutdown().
@@ -1080,34 +1234,13 @@ interface CompletionPolicySupervisor {
     shutdown(): void;
 }
 
-/**
- * Fire-and-forget webhook notifier for session lifecycle events.
- *
- * Each session can register its own `notifyUrl` (via `start_agent_session`).
- * A global URL can be set via `AGENTPROTO_NOTIFY_URL` env var or
- * `~/.agentproto/notify.json` (env wins). Both are POSTed when an event
- * fires — the union of per-session + global URLs, deduplicated.
- *
- * Retry policy: one retry after 2 s on network error. No retry on 4xx/5xx.
- * Timeout: 10 s per attempt. All errors are swallowed — the notifier never
- * throws into the session's hot path.
- */
-
-interface WebhookNotifier {
-    /** Register a per-session URL (called from start_agent_session). */
-    register(sessionId: string, url: string): void;
-    unregister(sessionId: string): void;
-    /** Handler to wire into SessionEventBus.onAny. Fire-and-forget. */
-    onSessionEvent(ev: SessionEvent): void;
-}
-
 /**
  * Orchestrator sub-gateway (ADR §4.2 / WP2) — the security primitive
  * that lets a spawned agent become a *scoped* orchestrator without
  * handing it the daemon's full toolset.
  *
- * The plain `/mcp` endpoint registers EVERY tool (execute_command,
- * fs_*, remote_*, import_mcp, terminals, driver CRUD) and bypasses auth
+ * The plain `/mcp` endpoint registers EVERY tool (command_execute,
+ * fs_*, remote_*, mcp_import, terminals, driver CRUD) and bypasses auth
  * on loopback — pointing a child at it would be a privilege handout.
  * This module builds a second, scoped MCP server that registers ONLY a
  * curated orchestration allowlist, gated by an unguessable per-child
@@ -1126,21 +1259,20 @@ interface WebhookNotifier {
  * The curated set of tools a scoped child orchestrator may call.
  *
  * INCLUDED — the orchestration primitives:
- *   start_agent_session, prompt_agent_session, get_agent_session_output,
- *   wait_for_any, poll_events  (spawn + drive + fan-in)
- *   list_sessions, list_agent_sessions, kill_agent_session  (observe +
- *     halt). NB: list/kill are NOT yet scoped to the child's own
- *     subtree — that subtree filter is WP4 (parentSessionId/depth). For
- *     WP2 they are exposed daemon-wide; documented debt.
+ *   agent_start, agent_prompt, agent_output, agent_kill,
+ *   session_monitor, session_events_poll  (spawn + drive + fan-in)
+ *   session_list, session_tree  (observe). NB: list is NOT yet scoped
+ *     to the child's own subtree — that subtree filter is WP4
+ *     (parentSessionId/depth). For WP2 it is exposed daemon-wide;
+ *     documented debt.
  *
  * EXCLUDED — the danger surface (each a separate trust boundary):
- *   execute_command, terminal/PTY tools (raw shell), fs tools
- *   (read/write/delete file, create_directory, …), remote_* (publish
- *   the daemon to the internet), import_mcp / mcp_imported_* /
- *   list_discovered_mcps / remove_imported_mcp (widen the daemon's own
- *   MCP surface), and driver CRUD (create_/delete_/update_driver — these
- *   never register here because the scoped server is built with no
- *   doctype specs).
+ *   command_execute, terminal/PTY tools (raw shell), file_* /
+ *   directory_* tools, remote_* (publish the daemon to the internet),
+ *   mcp_import / mcp_discovered_* / mcp_imported_* (widen the daemon's
+ *   own MCP surface), and driver CRUD (create_/delete_/update_driver —
+ *   these never register here because the scoped server is built with
+ *   no doctype specs).
  */
 declare const DEFAULT_ORCHESTRATOR_TOOLS: readonly string[];
 interface OrchestratorScope {
@@ -1228,16 +1360,21 @@ interface OrchestratorGatewayDeps {
     listAgentAdapters?: AgentAdapterLister;
     /** Orchestrator injector (WP3/WP4). When wired, a child orchestrator
      *  driving the scoped server can itself spawn sub-orchestrators
-     *  (`orchestrator: true` on its `start_agent_session`) — the new
+     *  (`orchestrator: true` on its `agent_start`) — the new
      *  token inherits depth+1 and is bounded by the caller's tools
      *  (non-re-grant). Omitted → recursion injection is unavailable on
      *  the scoped surface (a child can still spawn plain sub-agents). */
     orchestratorInjector?: OrchestratorInjector;
     /** Optional webhook notifier — same singleton as the root /mcp server.
-     *  When provided, per-session notifyUrl values from start_agent_session
+     *  When provided, per-session notifyUrl values from agent_start
      *  are registered on spawn and unregistered on exit, so child
      *  orchestrators spawning through this scoped gateway also fire webhooks. */
     webhookNotifier?: WebhookNotifier;
+    /** Forwarded to `registerSessionTools` — the daemon's own plain `/mcp`
+     *  gateway URL, defaulted onto `hermes` `agent_start` spawns issued
+     *  through this scoped sub-gateway that pass no `mcpServers`. See
+     *  `RegisterAgentToolsOptions.daemonMcpUrl`. */
+    daemonMcpUrl?: string;
 }
 type OrchestratorMcpServerFactory = (scope: OrchestratorScope) => Promise<McpServer>;
 /**
@@ -1314,33 +1451,11 @@ type OrchestratorInjector = (opts?: {
 /**
  * Build the orchestrator injector. Closed over the gateway's
  * scope-token registry + session-event bus + HTTP port. Returns a
- * function that the `start_agent_session` handler calls when its
+ * function that the `agent_start` handler calls when its
  * `orchestrator` field is set.
  */
 declare function createOrchestratorInjector(deps: OrchestratorInjectorDeps): OrchestratorInjector;
 
-/**
- * Tiny node:http server that fronts the runtime gateway.
- *
- * Routes:
- *   GET  /health              — { status, workspace, registered, uptime }
- *   GET  /events              — SSE stream of RuntimeEvent
- *   POST /mcp                 — MCP Streamable HTTP transport (POST)
- *   GET  /mcp                 — MCP SSE response stream (GET)
- *   DELETE /mcp               — close MCP session
- *   GET  /conversations       — JSON list of conversation summaries
- *   GET  /conversations/<id>  — markdown body of one conversation
- *   POST /heartbeat/tick      — force-fire one heartbeat tick
- *
- * No auth in `mode: "none"` (loopback default). `mode: "bearer"`
- * checks `Authorization: Bearer <token>` against the configured
- * token. Health is always public so external monitors can probe.
- *
- * MCP transport: stateless mode for v1 — each request is independent.
- * Stateful session pinning can come later when long-running streaming
- * tool calls become a real use case.
- */
-
 /**
  * Pluggable adapter resolver — keeps the runtime package free of any
  * @agentproto/cli dep. The host (cli `serve`, playground, embedding
@@ -1361,12 +1476,25 @@ type AgentAdapterResolver = (slug: string) => Promise<{
     startSession(opts: {
         cwd: string;
         resumeSessionId?: string;
-        /** Model identifier forwarded from `start_agent_session`. For ACP
+        /**
+         * Manifest-declared mode id forwarded from `agent_start` (AIP-45
+         * `AgentCliHandle.modes` — e.g. claude-code's `plan` /
+         * `accept-edits` / `bypass-permissions`, codex's `read-only`,
+         * mastracode/opencode's `plan`). Applied at spawn time via
+         * `composeSpawn`'s mode patch (`bin_args_append` / `env`) — BEFORE
+         * the child process is exec'd, unlike `model`/`effort` below.
+         * Adapters with no declared `modes` (e.g. hermes) ignore it; an
+         * unknown id for an adapter that DOES declare modes throws
+         * `RuntimeConfigError` (composeSpawn validates against the
+         * manifest, so a typo fails the spawn rather than silently no-op).
+         */
+        mode?: string;
+        /** Model identifier forwarded from `agent_start`. For ACP
          *  adapters this is applied via session/set_config_option after
          *  newSession (the ACP wrapper does not forward CLI args to claude).
          *  Adapters that don't support model selection ignore it. */
         model?: string;
-        /** Effort level forwarded from `start_agent_session`. Effort is
+        /** Effort level forwarded from `agent_start`. Effort is
          *  model-dependent — same label ≠ same budget across models; defaults
          *  differ by model. Omit to keep the model's own default. Applied
          *  via session/set_config_option on ACP adapters; others ignore it. */
@@ -1377,6 +1505,12 @@ type AgentAdapterResolver = (slug: string) => Promise<{
          *  a host-chosen scoped toolset (e.g. the daemon's own orchestration
          *  gateway). Adapters that don't model MCP mounting ignore it. */
         mcpServers?: AcpMcpServer[];
+        /** Called on any adapter-process activity (ACP JSON-RPC traffic in
+         *  either direction) — forwarded to the driver's
+         *  `runtime.start({ onActivity })`. The caller (agent_start's MCP
+         *  handler, POST /sessions/agent) wires this to pulse
+         *  `SessionDescriptor.lastActivityAt` via `registry.pulseActivity(id)`. */
+        onActivity?: () => void;
     }): Promise<AgentSessionLike>;
     /** Display label for the descriptor's `command` field. */
     commandPreview?: string;
@@ -1530,6 +1664,28 @@ declare function makeBrowserAdapterLister(opts: {
     resolveBrowserAdapter?: BrowserAdapterResolver;
 }): AdapterLister<BrowserAdapterInfo>;
 
+/**
+ * Turns a raw tool-call name + args (and its eventual result) into a short,
+ * human-readable line for ring-buffer / CLI / transcript rendering. Without
+ * this, every tool call renders as a bare `[tool] view` with no args and no
+ * outcome — this module is the one place that knows how to summarize both.
+ */
+/** A one-line human summary of a tool call, e.g. `read src/foo.ts` or `⏰ wake in 30s — checking CI`. */
+declare function formatToolCall(toolName: string, args: unknown): string;
+/**
+ * A short outcome line for a completed tool call, or `null` when there's
+ * nothing useful to show (e.g. an empty/void result). `toolName` is
+ * accepted for parity with `formatToolCall` and future bespoke result
+ * formatting, but generic text extraction covers today's cases.
+ */
+declare function formatToolResult(toolName: string | undefined, result: unknown, isError: boolean): string | null;
+
+/** A journal-file StepCache scoped to one cacheKey. Best-effort: read/parse
+ *  failures degrade to "no cache" (a miss), never throw into the run. */
+declare function createFileStepCache(cacheKey: string, opts?: {
+    dir?: string;
+}): StepCache;
+
 /**
  * `.agentproto/` config dir — runtime-managed state at the root of
  * every workspace. Mirrors the `.git/` model: user-content stays at
@@ -1648,6 +1804,90 @@ declare function readRuntimeMeta(workspace: string): Promise<{
  */
 declare function sweepStaleRuntimeMetas(workspaces: readonly string[], currentWorkspace: string): Promise<string[]>;
 
+/**
+ * MCP tools for event-driven orchestration:
+ *   - session_events_poll — cheap cursor-based snapshot of session events
+ *   - session_monitor     — multiplexed long-poll (1 call for N sessions)
+ *
+ * These complement the existing per-session waitForTurnEnd inside
+ * agent_output. The new tools handle multi-session fan-in
+ * and external-client retrigger without burning polling tokens.
+ */
+
+/**
+ * Event kind a session wait can target. Mirrors the `session_monitor`
+ * `event` parameter. `turn-end` also matches `awaiting-input` (both
+ * signal end-of-turn), matching the MCP tool's semantics.
+ */
+type SessionWaitEvent = "turn-end" | "awaiting-input" | "exited" | "any";
+/**
+ * Result of a single-session wait. On a hit, carries the session id, the
+ * matched event (ring-bus form, without the `session:` prefix), the
+ * session's current status, and whether it's awaiting input. On a
+ * timeout, `timedOut: true` and the watched id list.
+ */
+interface SessionWaitResult {
+    timedOut?: boolean;
+    sessionId?: string;
+    event?: string;
+    source?: "ring" | "state" | "bus";
+    awaitingInput?: boolean;
+    status?: string;
+    turnsCompleted?: number;
+    sessionIds?: string[];
+    since?: number;
+    /** Structured awaiting-input question (harness-parity). Surface on
+     *  turn-end / awaiting-input matches so callers (MCP session_monitor +
+     *  REST /sessions/:id/wait) can read the question without a separate
+     *  transcript fetch. Mirrors desc.awaitingQuestion / ev.question. */
+    question?: SessionAwaitingQuestion;
+}
+/**
+ * Block until one of the listed sessions fires a matching lifecycle event
+ * (turn-end / awaiting-input / exited / any), or until `timeoutMs` elapses.
+ *
+ * This is the single-session-capable core that the MCP `session_monitor`
+ * tool and the REST `GET /sessions/:id/wait` route both call. The MCP tool
+ * passes N ids (multiplexed fan-in); the REST route passes exactly one.
+ * The semantics are identical: race-free cursor replay → synchronous
+ * already-in-target-state check → bus long-poll → timeout.
+ *
+ * `since` is an EventRing cursor: when provided, already-emitted matching
+ * events for the watched sessions that occurred after that cursor are
+ * returned immediately (race-free replay) before subscribing to the bus.
+ */
+declare function monitorSessionWait(opts: {
+    registry: SessionsRegistry;
+    sessionEvents: SessionEventBus;
+    eventRing: EventRing;
+    sessionIds: string[];
+    event?: SessionWaitEvent;
+    timeoutMs?: number;
+    since?: number;
+}): Promise<SessionWaitResult>;
+/**
+ * Block until the named policy's status transitions out of the active
+ * `watching` / `queued` / `gating` / `nudging` states — i.e. reaches
+ * `done`, `blocked`, `awaiting-ack`, or `cancelled` — then return the
+ * full PolicyRunState. Returns `{ timedOut: true }` on timeout.
+ *
+ * Hooks into the supervisor's `onSettle` callback (the single reliable
+ * signal — some terminal transitions like `cancel()` / `ack(false)` /
+ * single-session-exit emit no SessionEventBus event). The MCP
+ * `policy_status` tool and the REST `GET /policies/:id/wait` route both
+ * delegate here, so the wait semantics are shared across transports.
+ */
+declare function monitorPolicyWait(opts: {
+    supervisor: CompletionPolicySupervisor;
+    policyId: string;
+    timeoutMs?: number;
+}): Promise<{
+    timedOut: true;
+} | {
+    timedOut: false;
+    state: PolicyRunState;
+}>;
+
 /**
  * @agentproto/runtime — long-running gateway around an agentproto
  * workspace dir.
@@ -1703,18 +1943,18 @@ interface CreateGatewayOptions {
      *  Without this, /sessions still works for raw `argv` spawns. */
     resolveAgentAdapter?: AgentAdapterResolver;
     /** Optional adapter lister — when provided, enables
-     *  `GET /adapters` HTTP route + `list_adapters` MCP tool so UIs
+     *  `GET /adapters` HTTP route + `adapter_list` MCP tool so UIs
      *  can discover what's installed on the host. */
     listAgentAdapters?: AgentAdapterLister;
     /** Optional browser adapter resolver — when provided, enables the
      *  `start_browser` MCP tool (launches Camofox / Bureau / Chromium). */
     resolveBrowserAdapter?: BrowserAdapterResolver;
     /** Optional browser adapter lister — when provided, enables the
-     *  `list_adapter_browsers` MCP tool. */
+     *  `browser_adapter_list` MCP tool. */
     listBrowserAdapters?: BrowserAdapterLister;
     /** Optional PTY factory (node-pty wrapper, typically from the cli
      *  layer's `loadNodePtyFactory()`). When provided, enables
-     *  `POST /sessions/terminal`, the `start_terminal_session` MCP
+     *  `POST /sessions/terminal`, the `terminal_start` MCP
      *  tool family, and the `/sessions/:id/pty` WebSocket. Without it,
      *  those routes return 501 / the MCP tools aren't registered. */
     spawnPty?: PtyFactory;
@@ -1731,6 +1971,19 @@ interface CreateGatewayOptions {
     /** When true, drop the localhost-wildcard defaults — only the
      *  explicit `allowedOrigins` list is honoured. */
     strictOrigins?: boolean;
+    /**
+     * Opt-in deferred/lazy MCP tool loading (harness-parity item 3, see
+     * `deferred-tools.ts`). When set, every root-gateway tool outside
+     * `alwaysOn` registers but starts disabled — excluded from the first
+     * `tools/list` — until the always-on `tool_search` meta-tool pulls it
+     * in by keyword. Omitted (default) → every tool is eagerly enabled,
+     * identical to pre-existing behaviour. Does not affect the scoped
+     * `/mcp/orchestrator` sub-gateway, which already exposes a small
+     * curated allowlist (`DEFAULT_ORCHESTRATOR_TOOLS`).
+     */
+    deferredTools?: {
+        alwaysOn?: readonly string[];
+    };
 }
 interface GatewayHandle {
     url: string;
@@ -1774,4 +2027,4 @@ interface GatewayHandle {
  */
 declare function createGateway(opts: CreateGatewayOptions): Promise<GatewayHandle>;
 
-export { type AdapterListEntry, type AgentAdapterLister, type AgentAdapterResolver, type AgentSessionLike, type AgentStreamEvent, type BrowserAdapterHandle, type BrowserAdapterInfo, type BrowserAdapterLister, type BrowserAdapterResolver, BuildHeartbeatAgent, type CreateGatewayOptions, DEFAULT_ORCHESTRATOR_TOOLS, type GatewayHandle, type InboundWatcher, type OrchestratorGatewayDeps, type OrchestratorInjection, type OrchestratorInjector, type OrchestratorInjectorDeps, type OrchestratorMcpServerFactory, type OrchestratorScope, type RegisterBrowserInput, type RegisterSessionInput, type RuntimeMeta, type ScopeTokenRegistry, type SessionDescriptor, type SessionKind, type SessionStatus, type SessionsRegistry, type SpawnAgentInput, type SpawnSessionInput, type TunnelDescriptor, type TunnelProvider, type TunnelStatus, type WatcherDescriptor, type WatcherStartInput, WorkspaceFs, createGateway, createOrchestratorInjector, createOrchestratorMcpServerFactory, createScopeTokenRegistry, daemonRegistryDir, makeBrowserAdapterLister, narrowOrchestratorTools, readDaemonRegistry, readRuntimeMeta, sweepStaleDaemonRegistry, sweepStaleRuntimeMetas, unlinkDaemonRegistryEntry, unlinkRuntimeMeta, writeDaemonRegistryEntry };
+export { type AdapterListEntry, type AgentAdapterLister, type AgentAdapterResolver, type AgentSessionLike, type AgentStreamEvent, type AttachPolicyInput, type BrowserAdapterHandle, type BrowserAdapterInfo, type BrowserAdapterLister, type BrowserAdapterResolver, BuildHeartbeatAgent, type CommitSpec, type CompletionPolicySupervisor, type CreateGatewayOptions, DEFAULT_ORCHESTRATOR_TOOLS, type GateSpec, type GatewayHandle, type InboundWatcher, type JudgeGateSpec, type OnFailSpec, type OrchestratorGatewayDeps, type OrchestratorInjection, type OrchestratorInjector, type OrchestratorInjectorDeps, type OrchestratorMcpServerFactory, type OrchestratorScope, type PolicyRunState, type PolicyRunStatus, type RegisterBrowserInput, type RegisterSessionInput, type RuntimeMeta, type ScopeTokenRegistry, type SessionDescriptor, type SessionKind, type SessionStatus, type SessionWaitEvent, type SessionWaitResult, type SessionsRegistry, type ShellGateSpec, type SpawnAgentInput, type SpawnSessionInput, type TunnelDescriptor, type TunnelProvider, type TunnelStatus, type WatcherDescriptor, type WatcherStartInput, WorkspaceFs, createFileStepCache, createGateway, createOrchestratorInjector, createOrchestratorMcpServerFactory, createScopeTokenRegistry, daemonRegistryDir, formatToolCall, formatToolResult, makeBrowserAdapterLister, monitorPolicyWait, monitorSessionWait, narrowOrchestratorTools, readDaemonRegistry, readRuntimeMeta, sweepStaleDaemonRegistry, sweepStaleRuntimeMetas, unlinkDaemonRegistryEntry, unlinkRuntimeMeta, writeDaemonRegistryEntry };