@agentproto/runtime 0.4.0 → 0.5.0

package/dist/index.d.ts

@@ -3,14 +3,131 @@ import { B as BuildHeartbeatAgent } from './heartbeat-COGpMrJS.js';
 export { H as HeartbeatAgent, a as HeartbeatRunner, R as RuntimeEvent, b as RuntimeEvents, p as parseDuration } from './heartbeat-COGpMrJS.js';
 import { AcpMcpServer } from '@agentproto/acp';
 import { ChildProcess } from 'node:child_process';
+import { D as DeclaredAdapterOption } from './spawn-defaults-d5gAhNkV.js';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { AdapterHandle, AdapterLister } from '@agentproto/adapter-kit';
+import { AdapterHandle, SetupField, AdapterResolver, AdapterLister, AdapterEntry } from '@agentproto/provider-kit';
+import { SandboxProvider } from '@agentproto/sandbox';
 import { WorkspaceFs } from './workspace-fs.js';
 export { createWorkspaceFs } from './workspace-fs.js';
 export { ConversationMeta, ConversationStore, ConversationTurn, fileConversationStore } from './conversations.js';
+import { ProviderPreset } from '@agentproto/provider-presets';
 import { StepCache } from '@agentproto/workflow-runtime';
 export { PROVIDER_ENV_VARS, ProviderEntry, ProvidersFile, injectProviderKeysIntoEnv, loadProviders, providerEnvVar, providersPath, removeProviderKey, setProviderKey } from './providers-store.js';
 
+/**
+ * Per-session JSONL record of a completed `command_execute` invocation
+ * (and cron's `kind: "command"` action jobs, which share the same
+ * allowlist + `runCommand` path — see cron-scheduler.ts's "one
+ * enforcement path, not two" comment).
+ *
+ * Each call gets its OWN `kind: "command"` session, minted via
+ * `SessionsRegistry.recordCommand` — same as an agent-cli or PTY session,
+ * so it shows up in `session_list` / `command_list` for free instead of
+ * needing a bespoke query surface. Its result is stored at the exact
+ * per-id path an agent-cli session's structured transcript already uses:
+ * `~/.agentproto/sessions/<id>/events.jsonl` (see transcript-writer.ts).
+ * A command session's file holds exactly one line — there's no seq/turn
+ * machinery to reconstruct because the call is already finished by the
+ * time this is written.
+ *
+ * This module only knows how to read/write that one line; minting the
+ * session itself (and deciding the file's base directory) is
+ * `sessions.ts`'s job via `recordCommand`.
+ */
+interface CommandLogEntry {
+    ts: string;
+    command: string;
+    args: string[];
+    cwd: string;
+    exitCode: number;
+    signal: string | null;
+    durationMs: number;
+    stdout: string;
+    stderr: string;
+    truncated?: boolean;
+}
+
+/**
+ * Per-session usage snapshot — the single place that decides a session's
+ * `costUsd` and where that number came from.
+ *
+ * Two cost sources feed a session:
+ *   - an adapter's own usage reader (`readUsage`, e.g. hermes reads its
+ *     state.db) or an ACP `usage_update` that carries a `cost` block — these
+ *     are authoritative, tagged `source: "adapter"`.
+ *   - raw input/output token counts with NO adapter cost (ACP adapters like
+ *     claude-code / mastracode that report tokens but not dollars) — here we
+ *     price them ourselves against agentproto's in-repo LLM pricing catalog,
+ *     tagged `source: "computed"`.
+ *
+ * When tokens exist but the model is absent from the catalog we NEVER
+ * fabricate a price: `costUsd` is left undefined and the snapshot is tagged
+ * `source: "no-pricing"`. A session with neither cost nor tokens is
+ * `source: "none"`.
+ *
+ * This module is pure (the catalog lookup is injected) so the decision tree is
+ * unit-testable without building the whole model catalog.
+ */
+/** Where a session's `costUsd` came from — see the module doc. */
+type UsageSource = "adapter" | "computed" | "no-pricing" | "none";
+/** Per-token USD prices for a model (per 1M tokens), the subset of the
+ *  catalog's `LLMPricing` this module needs. */
+interface TokenPricing {
+    inputPer1M: number;
+    outputPer1M: number;
+}
+/** Pluggable pricing accessor — defaults to the in-repo catalog's
+ *  `resolvePricing`, overridable in tests. Returns undefined for an
+ *  unknown model (the caller then tags `no-pricing`). */
+type PricingResolver = (model: string) => TokenPricing | undefined;
+/** Raw signals gathered over a turn, handed to `deriveSessionUsage`. */
+interface UsageComputeInput {
+    /** Requested model id — needed to look up per-token prices. */
+    model?: string;
+    /** Cost the adapter reported directly (readUsage or usage_update.cost).
+     *  Present → authoritative, wins over token-based computation. */
+    adapterCostUsd?: number;
+    tokensIn?: number;
+    tokensOut?: number;
+    contextSize?: number;
+    contextUsed?: number;
+}
+/** The resolved usage snapshot — the shape `session_usage` returns and the
+ *  durable `usage_snapshot` transcript record carries. Cost/token fields are
+ *  omitted when absent so a missing value never reads as a measured zero. */
+interface SessionUsage {
+    model?: string;
+    costUsd?: number;
+    tokensIn?: number;
+    tokensOut?: number;
+    contextSize?: number;
+    contextUsed?: number;
+    source: UsageSource;
+}
+/**
+ * Decide a session's usage snapshot + cost source from the raw signals.
+ *
+ * Priority: an adapter-reported cost wins; else price the tokens against the
+ * catalog; else `none`. Never fabricates a price for an unpriced model.
+ */
+declare function deriveSessionUsage(input: UsageComputeInput, resolve?: PricingResolver): SessionUsage;
+/** Descriptor-shaped fields `projectSessionUsage` reads. */
+interface UsageDescriptorFields {
+    model?: string;
+    costUsd?: number;
+    tokensIn?: number;
+    tokensOut?: number;
+    contextSize?: number;
+    contextUsed?: number;
+    usageSource?: UsageSource;
+}
+/**
+ * Project a session descriptor's persisted usage fields into the
+ * `session_usage` response shape. Omits absent fields; defaults an
+ * unstamped `usageSource` to `"none"`.
+ */
+declare function projectSessionUsage(desc: UsageDescriptorFields): SessionUsage;
+
 /**
  * In-process pub/sub bus for session lifecycle events. Separate from
  * RuntimeEvents (global daemon bus) — session events are scoped to
@@ -152,26 +269,40 @@ interface SessionEventBus {
 }
 
 /**
- * Sessions registry — tracks long-lived child processes spawned by
- * the agentproto daemon (terminals, agent CLIs, custom commands).
+ * A per-session observer — the pluggable seam behind the runtime's transcript
+ * tap. `sessions.ts` drives one observer per turn (prompt in, each stream event,
+ * the turn-boundary usage snapshot, close). The transcript writer is the first
+ * and, today, only member; additional observers (e.g. a Langfuse session tracer)
+ * attach without touching the turn loop.
  *
- * The registry lives in-memory for the daemon's lifetime; a recent
- * snapshot also persists to `~/.agentproto/sessions.json` so a fresh
- * daemon restart can show "you had these running before" instead of
- * losing all visibility on a crash.
- *
- * Each session owns:
- *   - identity: id, kind, workspace slug, command + args, started time
- *   - lifecycle: status (starting/running/exited/killed/error)
- *   - output:    last N lines (ring buffer) for instant attach + a
- *                Node EventEmitter for live streaming consumers
+ * The method set is exactly the subset of `TranscriptWriter` the session loop
+ * calls, so `TranscriptWriter` IS a `SessionObserver` (see transcript-writer.ts).
+ */
+
+interface SessionObserver {
+    /** Record the outgoing message that opens a new turn. */
+    recordPrompt(sessionId: string, message: unknown): void;
+    /** Record one structured stream event (text-delta, tool-call, usage_update, …). */
+    recordEvent(sessionId: string, evt: AgentStreamEvent): void;
+    /** Record the durable turn-boundary / exit usage snapshot. */
+    recordUsageSnapshot(sessionId: string, usage: SessionUsage): void;
+    /** Flush and close this session's stream. Idempotent, fire-and-forget. */
+    close(sessionId: string): Promise<void>;
+    /** Close every open session stream (synchronous shutdown path). */
+    closeAll(): Promise<void>;
+}
+/**
+ * Fan a `SessionObserver` out over many. Each `record*` call is forwarded to
+ * every member in order; `close`/`closeAll` await all members.
  *
- * Consumers:
- *   - HTTP routes (GET /sessions, /sessions/:id, /sessions/:id/stream,
- *     POST /sessions/:id/kill)
- *   - CLI `agentproto sessions` (TUI navigation + attach)
- *   - guilde-web Active tab (session cards + terminal viewer)
+ * Every individual member call is isolated in try/catch so one throwing observer
+ * can neither break its siblings nor propagate into the turn loop — the
+ * transcript writer is effectively infallible today, but a future network-backed
+ * observer (a Langfuse sink) must never be able to throw a turn. Failures are
+ * swallowed here (no logging dependency at this layer); observers that need
+ * visibility into their own failures own that internally.
  */
+declare function composeSessionObservers(observers: readonly SessionObserver[]): SessionObserver;
 
 /**
  * Minimal shape we need from a driver-agent-cli session — kept as a
@@ -260,6 +391,11 @@ interface AgentStreamEvent {
         amount: number;
         currency: string;
     };
+    /** "usage_update" cumulative input/output token counts, when the adapter
+     *  reports them (lets the daemon price a session whose adapter gives tokens
+     *  but no `cost`). */
+    tokensIn?: number;
+    tokensOut?: number;
 }
 type SessionKind = "terminal" | "agent-cli" | "command" | "browser";
 type SessionStatus = "starting" | "running" | "exited" | "killed" | "error";
@@ -322,6 +458,16 @@ interface SessionDescriptor {
     /** Cumulative input / output token counts (same source + cadence as costUsd). */
     tokensIn?: number;
     tokensOut?: number;
+    /** Context-window size + tokens-in-context from the latest `usage_update`
+     *  event (ACP adapters that report a context window). Refreshed live as
+     *  usage_update events arrive, not just at turn-end. */
+    contextSize?: number;
+    contextUsed?: number;
+    /** Where `costUsd` came from — `"adapter"` (adapter's own reader or a
+     *  usage_update cost block), `"computed"` (tokens × in-repo catalog price),
+     *  `"no-pricing"` (tokens present but the model isn't in the catalog — cost
+     *  deliberately left undefined), or `"none"`. Stamped at each turn-end. */
+    usageSource?: UsageSource;
     /** ACP-level session id (the adapter's own handle — claude-code's
      *  conversation id, hermes' chat id, …). Set at spawnAgent time
      *  from `agentSession.sessionId`. Survives across daemon restarts
@@ -374,6 +520,17 @@ interface SessionDescriptor {
      *  finished turn" from "mid-turn" so it doesn't fast-return a stale
      *  turn-end while the NEXT turn is still generating. */
     busy?: boolean;
+    /** What the in-flight turn is currently blocked on, when classifiable
+     *  from the pending tool call: a spawned sub-agent (`agent_start`) or a
+     *  shell/terminal command. Deliberately NO "user" variant — waiting on
+     *  the user is already covered by `awaitingInput`/`awaitingQuestion`.
+     *  Set on tool-call, cleared on the MATCHING tool-result (guarded by
+     *  `pendingToolCallId`), at turn start, and in the turn's finally. */
+    blockedOn?: "subagent" | "command";
+    /** toolCallId of the tool-call that set `blockedOn`. A tool-result only
+     *  clears `blockedOn` when its toolCallId matches — so a nested or
+     *  interleaved tool finishing first can't clear the flag early. */
+    pendingToolCallId?: string;
     /** Session id of the orchestrator that spawned this session, set when
      *  the spawn arrived via the scoped orchestrator sub-gateway (the
      *  token carried the spawner's identity). Absent for direct `/mcp`
@@ -387,6 +544,17 @@ interface SessionDescriptor {
      *  Treated as 0 when absent (legacy rows / direct spawns that predate
      *  WP4). */
     depth?: number;
+    /** Id of the most recently-completed `kind: "command"` session spawned
+     *  with the same `cwd`, found at spawn time — see `recordCommand` and
+     *  `findPriorCommandSessionId`. Deliberately a REFERENCE, not copied
+     *  content: a new session's own ring buffer / structured transcript
+     *  never gets a prior command_execute's stdout/stderr spliced in, it
+     *  just gets told where to look (`command_log_tail({sessionId})` or
+     *  `agent_export`/`command_list` resolve the id into the full record).
+     *  Set on `spawnAgent`/`spawnPty` when the registry already has a
+     *  matching command session; absent otherwise (including for legacy
+     *  rows persisted before this field existed). */
+    priorCommandSessionId?: string;
     /** Adapter id that drives this session (e.g. "camofox", "bureau"). */
     browserAdapterId?: string;
     /** Port the browser service listens on. */
@@ -395,6 +563,16 @@ interface SessionDescriptor {
     browserBaseUrl?: string;
     /** Execution location — "local" (default) or "cloud". */
     browserLocation?: "local" | "cloud";
+    /** True when this agent-cli session is running inside a sandbox (`agent_start.sandbox`)
+     *  rather than as a local subprocess — there's no local PID to check, so
+     *  `processAlive` never applies (it's already absent whenever `pid` is null). */
+    remote?: boolean;
+    /** Provider-assigned sandbox id (`BootedSandbox.sandboxId`), when `remote` is true. */
+    sandboxId?: string;
+    /** What session close does to the box (PR3 lifecycle) — `"kill"` (the
+     *  default, ephemeral) or `"pause"` (keeps `sandboxId` reconnectable via
+     *  `agent_start.sandbox.reuse`). Only set when `remote` is true. */
+    sandboxTeardown?: "kill" | "pause";
 }
 interface SessionsRegistry {
     spawn(input: SpawnSessionInput): SessionDescriptor;
@@ -417,6 +595,27 @@ interface SessionsRegistry {
      *  `attachPty(id, ...)`. Throws when the registry was constructed
      *  without a `spawnPty` factory (node-pty optional dep missing). */
     spawnPty(input: SpawnPtyInput): SessionDescriptor;
+    /** Register a COMPLETED `command_execute` (or cron `kind:"command"`
+     *  action) invocation as its own `kind: "command"` session. Unlike
+     *  `spawn`/`spawnAgent`/`spawnPty`, there's no live process to track —
+     *  the command already ran to completion via `runCommand` before this
+     *  is called — so the descriptor is minted already "finished"
+     *  (status exited/error, startedAt backdated by `durationMs`,
+     *  endedAt now) and its full result is written to that session's own
+     *  `events.jsonl` (see command-log.ts), the same per-id path an
+     *  agent-cli session's structured transcript uses. Synchronous: the
+     *  descriptor (and its id) is available immediately, the JSONL write
+     *  itself is fire-and-forget internally. */
+    recordCommand(input: RecordCommandInput): SessionDescriptor;
+    /** Read back a `kind:"command"` session's full logged result (the
+     *  `CommandLogEntry` `recordCommand` wrote). Resolves to null when the
+     *  session isn't a command session or has no recorded entry. Routed
+     *  through the registry (rather than callers importing
+     *  `readCommandLogEntry` directly) so the read always targets the same
+     *  base directory `recordCommand` wrote to — that dir is test-overridable
+     *  (`transcriptDir`) and callers outside sessions.ts have no other way
+     *  to know it. */
+    readCommandLog(sessionId: string): Promise<CommandLogEntry | null>;
     /** Register an already-running browser service adapter as a tracked
      *  session (kind="browser"). Idempotent by identity — each call
      *  mints a fresh session id. The `stop` callback is invoked by
@@ -437,8 +636,18 @@ interface SessionsRegistry {
      *  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>;
+     *  the caller.
+     *
+     *  `opts.interrupt` lets a caller redirect a mid-turn session instead
+     *  of hitting the busy rejection: the in-flight turn is cancelled
+     *  (`agentSession.cancel()`), admission waits for that turn to
+     *  actually settle (busy flips false — no fixed sleep), then the new
+     *  prompt is admitted + fired on the SAME live session. Ignored
+     *  (identical to the default) when the session is idle. Omitted or
+     *  `false` reproduces today's mid-turn rejection byte-for-byte. */
+    enqueuePrompt(id: string, message: unknown, opts?: {
+        interrupt?: boolean;
+    }): 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
@@ -569,6 +778,18 @@ interface SpawnAgentInput {
         tokensIn?: number;
         tokensOut?: number;
     } | null>;
+    /** Opt this session into Langfuse tracing (prompt/completion + tool spans +
+     *  tokens/cost). Effective opt-in is `trace ?? opts.langfuseTracingDefault ?? false`. */
+    trace?: boolean;
+    /** True when `agentSession` is a `SandboxAgentSessionProxy` (`agent_start.sandbox`)
+     *  rather than a local subprocess-backed session — stamped onto the descriptor
+     *  as `remote` since there's no local PID to report. */
+    remote?: boolean;
+    /** Provider-assigned sandbox id, when `remote` is true. */
+    sandboxId?: string;
+    /** What session close does to the box, when `remote` is true — see
+     *  `SessionDescriptor.sandboxTeardown`. */
+    sandboxTeardown?: "kill" | "pause";
 }
 interface SpawnSessionInput {
     kind: SessionKind;
@@ -612,6 +833,24 @@ interface SpawnPtyInput {
     name?: string;
     label?: string;
 }
+interface RecordCommandInput {
+    workspaceSlug: string;
+    /** Working directory the command actually ran in (post cwd-anchoring).
+     *  Matched against a fresh session's cwd by `findPriorCommandSessionId`. */
+    cwd: string;
+    command: string;
+    args: string[];
+    /** Fields mirror `command-tools.ts`'s `ExecuteResult` — kept inline here
+     *  (rather than importing that type) so sessions.ts has no dependency
+     *  on command-tools.ts. */
+    exitCode: number;
+    signal: string | null;
+    durationMs: number;
+    stdout: string;
+    stderr: string;
+    truncated?: boolean;
+    label?: string;
+}
 
 /**
  * MCP tools that expose browser service adapters (Camofox, Bureau, …) to
@@ -714,7 +953,7 @@ interface BrowserAdapterInfo {
  * `TunnelRegistry` (multi-tunnel general surface) can share the same
  * provider contract without creating a circular dep.
  *
- * The tunnel family is the FIRST consumer of `@agentproto/adapter-kit`:
+ * The tunnel family is the FIRST consumer of `@agentproto/provider-kit`:
  * {@link TunnelProviderHandle} extends the kit's generic `AdapterHandle`
  * (slug/name/version/description/requiresSetup/check) with the
  * tunnel-specific `capabilities` + the existing `start`/`stop` lifecycle.
@@ -896,7 +1135,7 @@ declare class TunnelRegistry {
      * third-party secrets) merged with descriptor-carried config (named's
      * hostname/tunnelId/credentialsFile), descriptor taking precedence.
      */
-    private credsForDescriptor;
+    protected credsForDescriptor(desc: TunnelDescriptor): Promise<TunnelCreds>;
     private findEntryByIdOrName;
     private schedulePersist;
     private persistNow;
@@ -1301,6 +1540,18 @@ interface OrchestratorScope {
     /** Max concurrently-alive children the owning orchestrator may spawn
      *  before further spawns are rejected. */
     maxChildren: number;
+    /**
+     * Name of the resolved role that owns this scope (spawn-role-
+     * profiles / privilege lattice). This is the "parent role" the
+     * `canSpawn` gate checks against when this scope is used to spawn a
+     * further child (`session-spawn.ts`). Defaults to `"supervisor"` at
+     * mint time when the caller doesn't say — every role that can reach
+     * `orchestrator: true` today resolves to supervisor (executor's
+     * `toolPolicy.delegation: "deny"` already excludes it from ever
+     * minting a scope), so this preserves #214 behaviour exactly until a
+     * custom role is actually granted delegation.
+     */
+    role: string;
 }
 /**
  * Narrow a caller-requested tool list to ⊆ a ceiling subset.
@@ -1329,6 +1580,9 @@ interface MintScopeOptions {
     maxDepth?: number;
     /** Per-orchestrator alive-child quota (default DEFAULT_MAX_CHILDREN). */
     maxChildren?: number;
+    /** Name of the resolved role that owns this scope. Default
+     *  `"supervisor"` — see `OrchestratorScope.role`. */
+    role?: string;
 }
 interface ScopeTokenRegistry {
     /** Mint a fresh scope-token. See `MintScopeOptions`. */
@@ -1447,6 +1701,11 @@ type OrchestratorInjector = (opts?: {
     /** Override the per-orchestrator child quota for the minted scope
      *  (clamped to the caller's). Root-only knob. */
     maxChildren?: number;
+    /** Name of the resolved role for the session THIS scope is being
+     *  minted for (i.e. the session becoming an orchestrator) — becomes
+     *  `OrchestratorScope.role`, the "parent role" a future spawn
+     *  through this scope is gated against. Default `"supervisor"`. */
+    role?: string;
 }) => OrchestratorInjection;
 /**
  * Build the orchestrator injector. Closed over the gateway's
@@ -1456,6 +1715,95 @@ type OrchestratorInjector = (opts?: {
  */
 declare function createOrchestratorInjector(deps: OrchestratorInjectorDeps): OrchestratorInjector;
 
+/**
+ * Shared types for pluggable sandbox providers.
+ *
+ * The sandbox family is a `@agentproto/provider-kit` consumer, same shape as
+ * the tunnel family (`remote-providers/types.ts`): {@link SandboxProviderHandle}
+ * extends the kit's generic `AdapterHandle` (slug/name/version/description/
+ * requiresSetup/check) with the AIP-36 capability namespace and the concrete
+ * `@agentproto/sandbox` `SandboxProvider` (`boot()`) the handle wraps.
+ */
+
+/**
+ * Declared capabilities of a sandbox provider — pure metadata, surfaced in
+ * `list_sandbox_providers`. Never carries secrets. Namespace mirrors AIP-36
+ * SANDBOX.md (`network.egress`, `mounts`, `lifecycle.pause_after_idle`,
+ * `read_only`, `limits.timeout_ms`).
+ */
+interface SandboxProviderCapabilities {
+    /** Sandbox can be given a network egress allowlist (AIP-36 `network.egress`). */
+    networkEgress: boolean;
+    /** Sandbox supports mounting external filesystems (AIP-36 `mounts`). */
+    mounts: boolean;
+    /** Sandbox can be paused (not just killed) between turns (AIP-36 `lifecycle.pause_after_idle`). */
+    lifecyclePause: boolean;
+    /** Sandbox can be started read-only (AIP-36 `read_only`). */
+    readOnly: boolean;
+    /** Hard cap on `limits.timeout_ms`, when the provider enforces one. */
+    maxTimeoutMs?: number;
+}
+/**
+ * A sandbox provider as an adapter-kit handle. Rides on the kit's generic
+ * {@link AdapterHandle} and adds the sandbox-specific `capabilities` plus
+ * the `@agentproto/sandbox` `SandboxProvider` the handle wraps — the thing
+ * `createSandboxAgentSessionHost` actually boots.
+ */
+interface SandboxProviderHandle extends AdapterHandle {
+    readonly provider: SandboxProvider;
+    readonly capabilities: SandboxProviderCapabilities;
+    /**
+     * Credential fields this provider accepts via `setup_sandbox_provider`
+     * (e.g. e2b's `apiKey`). Omit (or empty) when the provider needs no
+     * credentials (e.g. `local`).
+     */
+    readonly setupFields?: readonly SetupField[];
+}
+
+/**
+ * Sandbox family on top of `@agentproto/provider-kit` — mirrors
+ * `tunnel-adapters.ts`. This module is the entire bridge between the
+ * generic kit and `@agentproto/sandbox`'s `SandboxProvider` concept: it
+ * contributes nothing the kit already owns (catalog/status/creds/ledger/
+ * list/MCP-tool plumbing); it only supplies the sandbox-family `TInfo`
+ * (`SandboxAdapterInfo`), the static `SANDBOX_CATALOG`, and the resolver
+ * that maps a catalog slug to a concrete {@link SandboxProviderHandle}
+ * (`./sandbox-providers/registry.js`).
+ *
+ * Kit primitives used:
+ *   - `makeCredsStore`      → per-slug 0600 creds under `~/.agentproto/sandbox-creds/`
+ *   - `makeSetupLedger`     → `~/.agentproto/setup/<slug>.json`
+ *   - `makeAdapterResolver` → wraps the throwing `load` into null-on-miss
+ *   - `makeAdapterLister`   → catalog → status-classified `AdapterEntry[]`
+ *   - `makeListTool`        → registers `list_sandbox_providers`
+ *   - `makeSetupTool`       → registers `setup_sandbox_provider` (multi-field
+ *                             form: e2b's `apiKey`, sensitive)
+ *
+ * This is pure additive plumbing (introspection + setup) — it does NOT wire
+ * a `sandbox` field into `agent_start`. That lands in a follow-up PR; the
+ * `resolveSandboxProvider`/`listSandboxProviders` overrides below exist now
+ * so that later wiring can inject the same resolver/lister this module
+ * builds by default, mirroring `resolveAgentAdapter`/`listAgentAdapters`.
+ *
+ * Security: `toSandboxInfo` exposes only `capabilities` — never a cred
+ * value (Appendix B). The setup tool's fields are marked SENSITIVE and the
+ * result NEVER echoes any field value back.
+ */
+
+/**
+ * Family descriptor (`TInfo`). Pure metadata surfaced in
+ * `list_sandbox_providers`. The kit's `AdapterEntry` already carries
+ * slug/name/description/status/version, so the only sandbox-specific field
+ * is the declared capability set. NEVER carries a cred value.
+ */
+interface SandboxAdapterInfo {
+    capabilities: SandboxProviderCapabilities;
+}
+/** Resolve a sandbox provider slug to a handle, or null when unavailable. */
+type SandboxProviderResolver = AdapterResolver<SandboxProviderHandle>;
+/** List every sandbox provider with its live status + capabilities. */
+type SandboxProviderLister = AdapterLister<SandboxAdapterInfo>;
+
 /**
  * Pluggable adapter resolver — keeps the runtime package free of any
  * @agentproto/cli dep. The host (cli `serve`, playground, embedding
@@ -1489,6 +1837,17 @@ type AgentAdapterResolver = (slug: string) => Promise<{
          * manifest, so a typo fails the spawn rather than silently no-op).
          */
         mode?: string;
+        /**
+         * Manifest-declared option id → value map forwarded from
+         * `agent_start` (AIP-45 `AgentCliHandle.options` — e.g. hermes'
+         * `skills`). Applied at spawn time via `composeSpawn`'s option
+         * patches (`bin_args_prepend` / `bin_args_template` /
+         * `bin_args_append_when_true` / `env`), validated against each
+         * option's declared `type`/`enum`/`min`/`max`. An id the adapter
+         * doesn't declare throws `RuntimeConfigError` (composeSpawn
+         * validates against the manifest, same as an unknown `mode`).
+         */
+        options?: Record<string, boolean | number | 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).
@@ -1520,7 +1879,30 @@ type AgentAdapterResolver = (slug: string) => Promise<{
         tokensIn?: number;
         tokensOut?: number;
     } | null>;
+    /** AIP-45 `options[]` this adapter's manifest declares (id + type only —
+     *  no spawn internals). Lets `session-spawn.ts` fold a config-level
+     *  `defaults.skills` list into `options.skills` using the shape the
+     *  manifest actually declared (e.g. hermes' comma-joined string),
+     *  instead of guessing. Omitted/empty ⇒ the skills normalization is a
+     *  documented no-op for that adapter (e.g. claude-code, which
+     *  auto-discovers skills and declares no such option). */
+    declaredOptions?: readonly DeclaredAdapterOption[];
 } | null>;
+/**
+ * UI-safe projection of an AIP-45 `modes[]` entry as surfaced by
+ * `adapter_list`. Mirrors `@agentproto/cli`'s `AdapterMode` without
+ * importing it (the runtime deliberately carries no cli dep — see the
+ * `AgentAdapterLister` note above). Spawn internals (`bin_args_*`, `env`)
+ * are intentionally omitted; `status` is normalised to `"active"` by the
+ * lister when the manifest omits it, so a declared mode is never
+ * silently statusless.
+ */
+interface AdapterListMode {
+    id: string;
+    description?: string;
+    status: "active" | "noop" | "planned";
+    status_note?: string;
+}
 /**
  * Compact adapter metadata for the discovery endpoints. Independent
  * of the resolver function above — hosts that can list installed
@@ -1535,6 +1917,10 @@ interface AdapterListEntry {
     protocol: string;
     streaming: boolean;
     packageName: string;
+    /** Declared operation modes with their honest support status, so a
+     *  client can see e.g. hermes' `lean` mode is a measured no-op instead
+     *  of being silently accepted. Empty when the adapter declares none. */
+    modes: AdapterListMode[];
 }
 type AgentAdapterLister = () => Promise<AdapterListEntry[]>;
 interface AuthOptions {
@@ -1621,7 +2007,7 @@ interface InboundWatcher {
 }
 
 /**
- * Browser family on top of `@agentproto/adapter-kit` — Phase 3 (lightest
+ * Browser family on top of `@agentproto/provider-kit` — Phase 3 (lightest
  * adoption: no creds, no wizard, no catalog file).
  *
  * Provides the kit-compatible types (`BrowserAdapterHandle`) and the
@@ -1680,6 +2066,116 @@ declare function formatToolCall(toolName: string, args: unknown): string;
  */
 declare function formatToolResult(toolName: string | undefined, result: unknown, isError: boolean): string | null;
 
+/**
+ * Dependency-injection surface for MCP credential resolution.
+ *
+ * `packages/runtime` intentionally does NOT depend on `@agentproto/auth`;
+ * the daemon bootstrap (e.g. `packages/cli`) can set a broker-backed
+ * resolver here, and `session-spawn.ts` will call it when an `mcpServers`
+ * entry carries `credentialRef`. Errors from the hook are treated as
+ * non-fatal by the caller.
+ */
+interface McpCredentialDeps {
+    /** Resolve brokered headers for an `mcpServers` entry that names a
+     *  `credentialRef`. The returned headers are merged ON TOP of the
+     *  entry's static `headers` so brokered auth wins on collision. */
+    resolveMcpCredentialHeaders?: (o: {
+        credentialRef: string;
+        signal?: AbortSignal;
+    }) => Promise<Record<string, string> | undefined>;
+    /** Resolve a single named secret (an env-var-shaped slug — e.g. a sandbox
+     *  spec's `env.passthrough` / `env.auth.state.env` entries) to its raw
+     *  value. Distinct from `resolveMcpCredentialHeaders` above (which
+     *  resolves an MCP `credentialRef` PATH into Authorization-style
+     *  headers): this is the `SecretResolver` shape `agent_start`'s sandbox
+     *  branch (`session-spawn.ts`) passes to `@agentproto/sandbox`'s
+     *  `SandboxSecretsConfig.resolver` — so a booted sandbox's env is filled
+     *  from the same host-injected broker as every other secret, never a
+     *  bare `process.env` read at the call site. Returns null when the slug
+     *  can't be resolved (missing/unconfigured). */
+    resolveSandboxSecret?: (slug: string) => Promise<string | null>;
+}
+declare function setMcpCredentialDeps(d: McpCredentialDeps): void;
+declare function getMcpCredentialDeps(): McpCredentialDeps;
+
+/**
+ * Provider-preset family on top of `@agentproto/provider-kit` — the *thin,
+ * honest* lister (Option B). Unlike tunnels/sandboxes/eval-reporters, presets
+ * are bundled static data with no binary to install, no package to resolve, and
+ * no setup ledger: their only "setup" is an ambient API-key env var. So this
+ * module does NOT use `makeAdapterResolver` / `makeAdapterLister` / the wizard
+ * (all install-oriented, a forced fit). It reuses only `makeListTool` — the one
+ * kit primitive that's genuinely about "JSON a lister's output as an MCP tool."
+ *
+ * Status is derived honestly from the daemon's own environment (the env agents
+ * spawn into), not the CLI caller's:
+ *   "ready"     — `process.env[preset.keyEnv]` is set (key available to spawn)
+ *   "available" — key absent (preset known, usable once the env var is provided)
+ *
+ * There is no "supported" state: presets ship in-repo, so they're always at
+ * least "available." `version` is the literal "built-in".
+ *
+ * Security (Appendix B): `PresetInfo` carries only `keyEnv` (the env-var NAME),
+ * never a key value. The list tool never returns creds — there are none to
+ * return; keys live in the operator's environment, not a creds store.
+ */
+
+/**
+ * Manifest-declared AIP-45 preset, the minimum the catalog needs to merge
+ * an adapter-contributed preset into the listing. Mirrors
+ * `AgentCliPresetDeclaration`'s fields without importing
+ * `@agentproto/driver-agent-cli` into the runtime package (same structural-
+ * type pattern as `DeclaredAdapterOption` in spawn-defaults.ts).
+ */
+interface DeclaredAdapterPreset {
+    id: string;
+    label: string;
+    description?: string;
+    schemaFlavor: ProviderPreset["schemaFlavor"];
+    baseUrl: string;
+    keyEnv: string;
+    scrubEnv?: string[];
+    defaultModel?: string;
+    homepage?: string;
+}
+/**
+ * Family descriptor surfaced as `AdapterEntry.info`. User-facing preset facts
+ * only — no cred values (there are none in the registry), no adapter projection
+ * detail (`scrubEnv` stays internal to adapter manifests).
+ */
+interface PresetInfo {
+    /** API schema flavor — which adapter family can consume this preset. */
+    schemaFlavor: ProviderPreset["schemaFlavor"];
+    /** Base URL the client hits. */
+    baseUrl: string;
+    /** Env-var NAME holding the API key (never the value). */
+    keyEnv: string;
+    /** Conventional default model id, if any. */
+    defaultModel?: string;
+    /** Homepage/docs URL. */
+    homepage?: string;
+}
+/**
+ * Normalize a manifest-declared preset into the canonical `ProviderPreset`
+ * shape the catalog lists. `scrubEnv` defaults to empty (an adapter that
+ * scrubs in code may omit it); `description` defaults to empty. Pure.
+ */
+declare function declaredPresetToProviderPreset(decl: DeclaredAdapterPreset): ProviderPreset;
+/**
+ * Map the static preset registry → status-classified catalog entries, reading
+ * the daemon's environment for key presence. Pure (no I/O) save the `process`
+ * .env read; safe to call on every list invocation.
+ *
+ * `adapterPresets` — manifest-declared presets contributed by loaded adapters
+ * (Stage 3 AIP-45 `presets` field). Merged AFTER the built-in registry and
+ * deduped by id: an adapter-declared id that collides with a built-in is
+ * ignored (the registry is the source of truth for canonical providers), so
+ * an adapter can't silently override moonshot/openrouter facts. The live
+ * wiring that reads each adapter's `.presets` and passes them here is Stage 4;
+ * today this is the tested seam.
+ */
+declare function listPresets(env?: Record<string, string | undefined>, adapterPresets?: readonly DeclaredAdapterPreset[]): AdapterEntry<PresetInfo>[];
+
 /** 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?: {
@@ -1984,6 +2480,17 @@ interface CreateGatewayOptions {
     deferredTools?: {
         alwaysOn?: readonly string[];
     };
+    /**
+     * Optional sandbox provider resolver — overrides the sandbox family's
+     * default resolver (built-ins + `@agentproto/sandbox-<slug>` dynamic
+     * import) used by `list_sandbox_providers` / `setup_sandbox_provider`
+     * AND `agent_start.sandbox`. Mirrors `resolveAgentAdapter`'s injection
+     * shape.
+     */
+    resolveSandboxProvider?: SandboxProviderResolver;
+    /** Optional sandbox provider lister — mirrors `listAgentAdapters`.
+     *  Overrides the default catalog-driven lister behind `list_sandbox_providers`. */
+    listSandboxProviders?: SandboxProviderLister;
 }
 interface GatewayHandle {
     url: string;
@@ -2027,4 +2534,4 @@ interface GatewayHandle {
  */
 declare function createGateway(opts: CreateGatewayOptions): Promise<GatewayHandle>;
 
-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 };
+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 DeclaredAdapterPreset, type GateSpec, type GatewayHandle, type InboundWatcher, type JudgeGateSpec, type McpCredentialDeps, type OnFailSpec, type OrchestratorGatewayDeps, type OrchestratorInjection, type OrchestratorInjector, type OrchestratorInjectorDeps, type OrchestratorMcpServerFactory, type OrchestratorScope, type PolicyRunState, type PolicyRunStatus, type PresetInfo, type PricingResolver, type RegisterBrowserInput, type RegisterSessionInput, type RuntimeMeta, type SandboxAdapterInfo, type SandboxProviderCapabilities, type SandboxProviderHandle, type SandboxProviderLister, type SandboxProviderResolver, type ScopeTokenRegistry, type SessionDescriptor, type SessionKind, type SessionObserver, type SessionStatus, type SessionUsage, type SessionWaitEvent, type SessionWaitResult, type SessionsRegistry, type ShellGateSpec, type SpawnAgentInput, type SpawnSessionInput, type TokenPricing, type TunnelDescriptor, type TunnelProvider, type TunnelStatus, type UsageComputeInput, type UsageSource, type WatcherDescriptor, type WatcherStartInput, WorkspaceFs, composeSessionObservers, createFileStepCache, createGateway, createOrchestratorInjector, createOrchestratorMcpServerFactory, createScopeTokenRegistry, daemonRegistryDir, declaredPresetToProviderPreset, deriveSessionUsage, formatToolCall, formatToolResult, getMcpCredentialDeps, listPresets, makeBrowserAdapterLister, monitorPolicyWait, monitorSessionWait, narrowOrchestratorTools, projectSessionUsage, readDaemonRegistry, readRuntimeMeta, setMcpCredentialDeps, sweepStaleDaemonRegistry, sweepStaleRuntimeMetas, unlinkDaemonRegistryEntry, unlinkRuntimeMeta, writeDaemonRegistryEntry };