diff --git a/.changeset/725-audiobook-curator-cli-projections.md b/.changeset/725-audiobook-curator-cli-projections.md
new file mode 100644
index 000000000..c81d856b6
--- /dev/null
+++ b/.changeset/725-audiobook-curator-cli-projections.md
@@ -0,0 +1,5 @@
+---
+"agent-bundle": patch
+---
+
+Judge a projected command's `z.enum` choices with the canonical schema after `mapInput` runs when the `<tool>.cli.ts` projection exports `mapInput`, so a mapper can split a comma-separated enum list (`--regions us,uk`); a value outside the enum still exits 2 as `Invalid value for --<option>[<index>]`. The `audiobook-curator` example now ships its sixteen commands as `<tool>.cli.ts` projections of its sixteen curator tools instead of a parallel `src/cli/` tree and the bulk `routes.mcpCommands` group. (#734)
diff --git a/examples/audiobook-curator/README.md b/examples/audiobook-curator/README.md
index 218ed032d..9dbf472c1 100644
--- a/examples/audiobook-curator/README.md
+++ b/examples/audiobook-curator/README.md
@@ -52,8 +52,8 @@ and `@agent-bundle/runtime` exports with `workspace:*` dependencies.
 
 ### The route tree is the application
 
-`agent-bundle.config.ts` declares the plugin identity, Node runtime, Claude and
-Codex targets, and MCP-to-CLI projection. File conventions discover the rest.
+`agent-bundle.config.ts` declares the plugin identity, Node runtime, and Claude
+and Codex targets. File conventions discover the rest.
 The MCP tree under `src/mcp/curator/` contains 16 tool routes, one catalog
 resource, and one curation prompt. Each executable route exports static
 `config`, `inputSchema`, and `resultSchema` values plus an async default Server
@@ -62,17 +62,23 @@ Flight worker, and MCP registrations; there is no `src/application.ts`,
 operation-array registry, handwritten `src/mcp/curator.ts`, or per-operation
 server selector.
 
-The routed CLI under `src/cli/` contains 16 authored commands. The
-`routes.mcpCommands` setting projects all 16 MCP tools as
-`audiobook-curator curator <tool>`, giving the compiled graph 32 CLI commands.
-Projected tools accept one optional `--input '<JSON object>'`; tools annotated
-read-only run directly, while mutation-capable tools require `--yes`.
+The CLI is the same 16 tools. Each tool has a colocated `<tool>.cli.ts`
+projection module (#725) that declares its command name, option spellings,
+positionals, and confirmation policy — `search_audible.cli.ts` spells the tool
+as `audible-search` with `--duration` and a comma-separated or repeatable
+`--regions`, `prepare_audiobook.cli.ts` spells `outputRoot` as `--output`, and
+`inspect_sources.cli.ts` takes `<root>` as a positional — so the compiled graph
+carries exactly 16 CLI commands, each with the tool's identity
+(`tool:curator/<tool>`). There is no `src/cli/` directory, no second input
+schema or render body per command, and no `audiobook-curator curator <tool>`
+twin: one operation is one command. Every projection declares `confirm: false`;
+the plan-first commands gate their mutation on `--apply`, never on `--yes`.
 
 ### `src/layout.tsx` is the shared document shell
 
 The conventional layout module wraps every rendered route once — the 16 MCP
-tools, the catalog resource, the curate prompt, the rendered CLI commands, and
-the projected `curator <tool>` commands — so no route imports a wrapper to get
+tools (on both surfaces), the catalog resource, and the curate prompt — so no
+route imports a wrapper to get
 the server's standard document structure. The layout renders a container
 `Agent.Result` and the runtime merges each route's own
 `<Agent.Result value={receipt}>` into it: the structured receipt, the MCP
@@ -95,21 +101,22 @@ export default async function Route({ input, signal }: ToolRouteProps<typeof inp
 
 ### `src/components/` is the shared presentation library
 
-The route modules perform domain work and compose these report components
-instead of maintaining separate MCP and CLI presenters:
-
-| Component | MCP composition | Rendered authored CLI composition |
-| --- | --- | --- |
-| `DataList`, `Field`, `Callout`, and `FileList` | Provide atomic report fields, prose callouts, and file-list blocks throughout the component library and directly in the catalog resource, curate prompt, cache route, and library audit | Provide the same primitives through the shared components and directly in `library-audit` |
-| `FileCard` and `EditionCard`, fed by `view-models` | Render file and edition models in `audit_library`, shelf, and ranking views | Reached through the receipt-specific shelves and ranking components |
-| `InspectionShelf`, `InventoryShelf`, and `SelectionShelf` | Compose receipt-specific inspection, inventory, and selection reports, each used directly by its MCP route; `audit_library` composes `AuditSummary` and `AuditFileCards` alongside the asynchronous `LibraryAnalysis` instead of a shelf | `InventoryShelf` and `SelectionShelf` compose `inventory` and `select` |
-| `SearchRanking`, `IdentifyRanking`, and `SelectionRanking` | Render the statically typed ranking for `search_audible`, `identify_audible_sample`, and `select_audible_edition` | `SearchRanking` composes `audible-search` |
-| `AcousticTrail`, `IdentifyTrail`, and `WhisperTrail` | Render the statically typed evidence for acoustic verification, acoustic identification, and Whisper verification | No authored rendered counterpart; those compatibility commands remain plain `.ts` routes |
-| `MetadataMutation`, `ChapterMutation`, `ConversionMutation`, and `PrepareMutation` | Render each statically typed metadata, chapter, conversion, or preparation mutation | `ConversionMutation` composes `convert` |
-| `ChapterOutline` with normalized `chapters` props | Composes integrity audit, conversion, and chapter application tools through receipt-specific mappers | Composes `audit` and `convert` |
-| `IntegrityAuditReport`, `MetadataIntegrityReport`, `ChapterIntegrityReport`, and `ConversionIntegrityReport` | Render each statically typed integrity report | `IntegrityAuditReport` and `ConversionIntegrityReport` compose `audit` and `convert` |
-| `CurationShelf` | Composes shelf review, Audible edition selection, and metadata/chapter application | Composes `shelf` |
-| `LibraryAnalysis` and `CandidateGroupCallout` | Resolve asynchronous duplicate and multipart analysis in `audit_library` with shared atomic candidate prose and file lists | Resolve the same analysis and candidate-group presentation in `library-audit` |
+The tool modules perform domain work and compose these report components once;
+the same rendered document serves the MCP client as text content and the
+command line as piped Markdown, so there is no second presenter to drift:
+
+| Component | Composition |
+| --- | --- |
+| `DataList`, `Field`, `Callout`, and `FileList` | Atomic report fields, prose callouts, and file-list blocks throughout the component library and directly in the catalog resource, curate prompt, and cache route |
+| `FileCard` and `EditionCard`, fed by `view-models` | File and edition models in `audit_library`, shelf, and ranking views |
+| `InspectionShelf`, `InventoryShelf`, and `SelectionShelf` | Receipt-specific inspection, inventory, and selection reports for `inspect_sources`, `inventory_sources`, and `select_sources`; `audit_library` composes `AuditSummary` and `AuditFileCards` alongside the asynchronous `LibraryAnalysis` instead of a shelf |
+| `SearchRanking`, `IdentifyRanking`, and `SelectionRanking` | The statically typed ranking for `search_audible`, `identify_audible_sample`, and `select_audible_edition` |
+| `AcousticTrail`, `IdentifyTrail`, and `WhisperTrail` | The statically typed evidence for `verify_audible_sample`, `identify_audible_sample`, and `verify_with_whisper` |
+| `MetadataMutation`, `ChapterMutation`, `ConversionMutation`, and `PrepareMutation` | Each statically typed metadata, chapter, conversion, or preparation mutation |
+| `ChapterOutline` with normalized `chapters` props | Integrity audit, conversion, and chapter application through receipt-specific mappers |
+| `IntegrityAuditReport`, `MetadataIntegrityReport`, `ChapterIntegrityReport`, and `ConversionIntegrityReport` | Each statically typed integrity report |
+| `CurationShelf` | Shelf review, Audible edition selection, and metadata/chapter application |
+| `LibraryAnalysis` and `CandidateGroupCallout` | Asynchronous duplicate and multipart analysis in `audit_library` with shared atomic candidate prose and file lists |
 
 The catalog resource at `src/mcp/curator/resources/catalog.tsx` and the prompt at
 `src/mcp/curator/prompts/curate.tsx` are compositions too: both return their
@@ -133,9 +140,9 @@ The conventional state module defines the workspace-durable
 `mutationApplied`, and `shelfCleared`. `select_audible_edition` dispatches the
 selection event; `apply_audiobook_metadata` and `apply_audiobook_chapters`
 dispatch mutation records and render the updated shelf. The read-only
-`review_curation_shelf` MCP tool and rendered `shelf` CLI command expose the
-same mounted state. If state is not mounted, both surfaces return an empty
-structured shelf and render an explicit unavailable notice.
+`review_curation_shelf` tool — `shelf` on the command line — exposes the
+mounted state. If state is not mounted, it returns an empty structured shelf
+and renders an explicit unavailable notice on both surfaces.
 
 ### Suspense becomes MCP progress
 
@@ -146,27 +153,25 @@ node — and that node is the whole progress story: the generated MCP projector
 turns the streamed fallback into `notifications/progress` for a client that
 sent a progress token, then replaces it with the completed analysis without
 changing the final structured `LibraryAuditReceipt`. No `progress.report()`
-call repeats the fallback's message. The rendered `library-audit` CLI route
-composes the same analysis and fallback.
-
-### CLI routes have rendered and plain modes
-
-Seven authored `.tsx` commands render Agent Documents:
-`inventory`, `select`, `audible-search`, `convert`, `audit`, `library-audit`,
-and `shelf`. Interactive terminals can update reported progress in place;
-piped output is one final Markdown document. Nine compatibility commands remain
-plain `.ts` routes: `acoustic-identify`, `acoustic-verify`, `apply-chapters`,
-`apply-metadata`, `audible-cache`, `audible-select`, `inspect`, `prepare`, and
-`whisper-verify`.
-
-The 16 projected MCP commands render the same tool components as their MCP
-counterparts. Across plain and rendered commands, `--json` selects machine
-output and emits one result-schema-validated JSON value followed by a newline.
-For rendered commands that value is the canonical final `Agent.Result` value,
-not the Markdown presentation or an intermediate Suspense fallback, so existing
-receipt consumers do not change when a command becomes rendered.
-
-`src/operations/` owns shared operation handlers and schemas;
+call repeats the fallback's message. On an interactive terminal the
+`library-audit` command draws the same fallback in place.
+
+### Every command renders its tool's document
+
+Each command runs its tool's component: piped output is one final Markdown
+document — the same headline and report the MCP client receives as text
+content — and an interactive terminal draws the streamed `Agent.Progress`
+fallback in place. `--json` selects machine output and emits one
+result-schema-validated JSON value followed by a newline: the canonical final
+`Agent.Result` value, never the Markdown presentation or an intermediate
+Suspense fallback, and byte for byte the `structuredContent` of the tool call.
+`--report` and `--receipt` are optional on the command line exactly as they are
+on the tool; a command that gets one still writes the receipt file.
+
+Each tool module declares its `inputSchema` as an inline zod literal, because
+the argv projection is compiled statically from that literal; it is the only
+input schema. `src/operations/` keeps each operation's handler and result
+schema;
 `src/cli-command.ts` names the `{ signal }` context every handler receives. Domain logic
 remains in `src/` over `foundation.ts` and `media-process.ts`, while
 `src/index.ts` remains the package library entry.
@@ -229,7 +234,8 @@ The completion contract and real-volume checklist are in
 
 This example is the reference consumer of the framework-owned package build:
 one `agent-bundle.config.ts` declares the structure, conventional
-`src/skills/**`, `src/mcp/**`, `src/cli/**`, `src/providers/**`, and
-`src/state.ts` modules supply the application surfaces, and agent-bundle owns
+`src/skills/**`, `src/mcp/**` (tool routes and their `<tool>.cli.ts`
+projections), `src/providers/**`, and `src/state.ts` modules supply the
+application surfaces, and agent-bundle owns
 the generated package and host artifacts. See
 [`docs/entry-conventions.md`](../../docs/entry-conventions.md) for the contract.
diff --git a/examples/audiobook-curator/agent-bundle.config.ts b/examples/audiobook-curator/agent-bundle.config.ts
index a3e2ffae5..a02b2ee81 100644
--- a/examples/audiobook-curator/agent-bundle.config.ts
+++ b/examples/audiobook-curator/agent-bundle.config.ts
@@ -14,11 +14,10 @@ export default defineConfig({
     // status, and the `agent-bundle/meta` constant this plugin imports.
   },
   runtime: { node: '22.19.0' },
-  // #102 stage 4 adopts the in-house G7 projection for every curator tool.
-  routes: { mcpCommands: true },
-  // No `scripts` or `bin` fields needed: the routed `src/cli/` commands
-  // compile into the shared artifact/package executable (bin/audiobook-curator.mjs) by
-  // convention (#102 stages 2-3).
+  // No `routes`, `scripts`, or `bin` fields needed: every curator tool's
+  // colocated `<tool>.cli.ts` projection compiles into the shared
+  // artifact/package executable (bin/audiobook-curator.mjs) by convention,
+  // so one operation is one command (#725).
   // No `skills` field needed: `src/skills/curate-audiobooks/SKILL.md` is
   // discovered by convention.
   targets: ['claude', 'codex'],
diff --git a/examples/audiobook-curator/src/cli-command.ts b/examples/audiobook-curator/src/cli-command.ts
index 488515437..433ceffb7 100644
--- a/examples/audiobook-curator/src/cli-command.ts
+++ b/examples/audiobook-curator/src/cli-command.ts
@@ -1,9 +1,7 @@
 /**
- * The context every `src/operations/*.ts` handler receives from the generated
- * MCP routes and the routed `src/cli/` commands. The manual CLI projection
- * (`cli.parse`/`usage`/`exitCode`) and its `runCliCommands` dispatcher were
- * retired by the #102 stage-3 migration — the framework compiles `src/cli/**`
- * routes into the executable instead.
+ * The context every `src/operations/*.ts` handler receives from the curator
+ * tool routes, whichever surface — MCP or the tools' `<tool>.cli.ts`
+ * projections — invoked them.
  */
 
 export interface CliCommandContext {
diff --git a/examples/audiobook-curator/src/cli/acoustic-identify.ts b/examples/audiobook-curator/src/cli/acoustic-identify.ts
deleted file mode 100644
index fd6a6e74f..000000000
--- a/examples/audiobook-curator/src/cli/acoustic-identify.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { evidenceOperations } from '../operations/evidence.js';
-
-const operation = evidenceOperations.acousticIdentify;
-
-export const config = {
-  description: 'Try score-ranked, deduplicated Audible candidates and retain per-candidate evidence.',
-  exitCode: 'result',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  all: z.boolean().optional(),
-  attempts: z.number().int().min(1).max(10).optional(),
-  candidates: z.string().min(1).max(4096),
-  chunkSeconds: z.number().int().min(1).max(86_400).optional(),
-  file: z.string().min(1).max(4096),
-  receipt: z.string().min(1).max(4096),
-  top: z.number().int().min(1).max(10).optional(),
-  verbose: z.boolean().optional(),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function acousticIdentify({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler(input, { signal });
-}
diff --git a/examples/audiobook-curator/src/cli/acoustic-verify.ts b/examples/audiobook-curator/src/cli/acoustic-verify.ts
deleted file mode 100644
index 49ec94abb..000000000
--- a/examples/audiobook-curator/src/cli/acoustic-verify.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { evidenceOperations } from '../operations/evidence.js';
-
-const operation = evidenceOperations.acousticVerify;
-
-export const config = {
-  description: 'Compare one bounded Audible sample with local audio through optional Audiolocate.',
-  exitCode: 'result',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  asin: z.string().min(1).max(64),
-  attempts: z.number().int().min(1).max(10).optional(),
-  audiolocatePython: z.string().min(1).max(4096).optional(),
-  chunkSeconds: z.number().int().min(1).max(86_400).optional(),
-  file: z.string().min(1).max(4096),
-  receipt: z.string().min(1).max(4096),
-  region: z.enum(['au', 'ca', 'de', 'es', 'fr', 'in', 'it', 'jp', 'uk', 'us']).optional(),
-  sampleUrl: z.url().optional(),
-  verbose: z.boolean().optional(),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function acousticVerify({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler(input, { signal });
-}
diff --git a/examples/audiobook-curator/src/cli/apply-chapters.ts b/examples/audiobook-curator/src/cli/apply-chapters.ts
deleted file mode 100644
index 9cd796e67..000000000
--- a/examples/audiobook-curator/src/cli/apply-chapters.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { mediaMutationOperations } from '../operations/media-mutation.js';
-
-const operation = mediaMutationOperations.applyChapters;
-
-export const config = {
-  description: 'Plan or apply verified generic or Audible chapter rows without changing encoded audio.',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  apply: z.boolean().optional(),
-  chapters: z.string().min(1).max(4096),
-  file: z.string().min(1).max(4096),
-  receipt: z.string().min(1).max(4096),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function applyChapters({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler(input, { signal });
-}
diff --git a/examples/audiobook-curator/src/cli/apply-metadata.ts b/examples/audiobook-curator/src/cli/apply-metadata.ts
deleted file mode 100644
index caf85b9bb..000000000
--- a/examples/audiobook-curator/src/cli/apply-metadata.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { mediaMutationOperations } from '../operations/media-mutation.js';
-
-const operation = mediaMutationOperations.applyMetadata;
-
-export const config = {
-  description: 'Plan or apply verified Audible metadata and artwork without changing encoded audio.',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  apply: z.boolean().optional(),
-  artwork: z.string().min(1).max(4096).optional(),
-  author: z.string().max(512).optional(),
-  file: z.string().min(1).max(4096),
-  language: z.string().min(1).max(64).optional(),
-  narrator: z.string().max(512).optional(),
-  product: z.string().min(1).max(4096),
-  receipt: z.string().min(1).max(4096),
-  title: z.string().max(1024).optional(),
-  year: z.string().max(64).optional(),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function applyMetadata({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler(input, { signal });
-}
diff --git a/examples/audiobook-curator/src/cli/audible-cache.ts b/examples/audiobook-curator/src/cli/audible-cache.ts
deleted file mode 100644
index d201fa526..000000000
--- a/examples/audiobook-curator/src/cli/audible-cache.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { audibleOperations } from '../operations/audible.js';
-
-const operation = audibleOperations.audibleCache;
-
-export const config = {
-  description: 'Cache one reviewed Audible product, chapters, artwork, and source URLs.',
-} satisfies CliRouteConfig;
-
-// Schema keys are the CLI surface (`--cache-dir`); the handler maps the key
-// onto the operation input's `cacheDirectory`.
-export const inputSchema = z.object({
-  asin: z.string().min(1).max(64),
-  attempts: z.number().int().min(1).max(10).optional(),
-  cacheDir: z.string().min(1).max(4096),
-  receipt: z.string().min(1).max(4096),
-  region: z.enum(['au', 'ca', 'de', 'es', 'fr', 'in', 'it', 'jp', 'uk', 'us']).optional(),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function audibleCache({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler({
-    asin: input.asin,
-    ...(input.attempts === undefined ? {} : { attempts: input.attempts }),
-    cacheDirectory: input.cacheDir,
-    receipt: input.receipt,
-    ...(input.region === undefined ? {} : { region: input.region }),
-  }, { signal });
-}
diff --git a/examples/audiobook-curator/src/cli/audible-search.tsx b/examples/audiobook-curator/src/cli/audible-search.tsx
deleted file mode 100644
index 02a20f319..000000000
--- a/examples/audiobook-curator/src/cli/audible-search.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Agent } from '@agent-bundle/runtime';
-import React from 'react';
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import type { AudibleSearchReceipt } from '../audible.js';
-import { SearchRanking } from '../components/candidate-ranking.js';
-import { audibleSearchHeadline } from '../components/headlines.js';
-import { audibleOperations, audibleRegionList } from '../operations/audible.js';
-
-const operation = audibleOperations.audibleSearch;
-
-export const config = {
-  description: 'Search and rank Audible identity candidates across reviewed regions.',
-  exitCode: 'result',
-} satisfies CliRouteConfig;
-
-// Schema keys are the CLI surface (`--duration`, `--regions LIST`); the
-// handler maps them onto the operation input's `durationSeconds` and parsed
-// region array, preserving the pre-migration option names byte for byte.
-export const inputSchema = z.object({
-  attempts: z.number().int().min(1).max(10).optional(),
-  author: z.string().min(1).max(512).optional(),
-  duration: z.number().positive().optional(),
-  limit: z.number().int().min(1).max(50).optional(),
-  narrator: z.string().min(1).max(512).optional(),
-  regions: z.string().min(1).max(64).optional(),
-  report: z.string().min(1).max(4096),
-  title: z.string().min(1).max(1024),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function audibleSearch({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  const receipt = await operation.handler({
-    ...(input.attempts === undefined ? {} : { attempts: input.attempts }),
-    ...(input.author === undefined ? {} : { author: input.author }),
-    ...(input.duration === undefined ? {} : { durationSeconds: input.duration }),
-    ...(input.limit === undefined ? {} : { limit: input.limit }),
-    ...(input.narrator === undefined ? {} : { narrator: input.narrator }),
-    ...(input.regions === undefined ? {} : { regions: audibleRegionList(input.regions) }),
-    report: input.report,
-    title: input.title,
-  }, { signal }) as AudibleSearchReceipt;
-  return (
-    <Agent.Result value={receipt}>
-      <Agent.Text>{audibleSearchHeadline(receipt)}</Agent.Text>
-      <SearchRanking receipt={receipt} />
-    </Agent.Result>
-  );
-}
diff --git a/examples/audiobook-curator/src/cli/audible-select.ts b/examples/audiobook-curator/src/cli/audible-select.ts
deleted file mode 100644
index da8aa024d..000000000
--- a/examples/audiobook-curator/src/cli/audible-select.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { audibleOperations } from '../operations/audible.js';
-
-const operation = audibleOperations.audibleSelect;
-
-export const config = {
-  description: 'Record one explicit human-reviewed Audible edition choice.',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  candidate: z.number().int().min(1).max(500),
-  candidates: z.string().min(1).max(4096),
-  note: z.string().max(4096).optional(),
-  receipt: z.string().min(1).max(4096),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function audibleSelect({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler(input, { signal });
-}
diff --git a/examples/audiobook-curator/src/cli/audit.tsx b/examples/audiobook-curator/src/cli/audit.tsx
deleted file mode 100644
index 3fc2934ab..000000000
--- a/examples/audiobook-curator/src/cli/audit.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Agent } from '@agent-bundle/runtime';
-import React from 'react';
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { ChapterOutline, chaptersFromAuditReceipt } from '../components/chapter-outline.js';
-import { integrityAuditHeadline } from '../components/headlines.js';
-import { IntegrityAuditReport } from '../components/integrity-report.js';
-import type { IntegrityAuditReceipt } from '../integrity-audit.js';
-import { outputOperations } from '../operations/output.js';
-
-const operation = outputOperations.audit;
-
-export const config = {
-  description: 'Validate metadata, chapters, source mapping, hashes, and optional complete decode.',
-  exitCode: 'result',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  conversionReceipt: z.string().min(1).max(4096).optional(),
-  file: z.string().min(1).max(4096),
-  fullDecode: z.boolean().optional(),
-  receipt: z.string().min(1).max(4096),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function audit({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  const receipt = await operation.handler(input, { signal }) as IntegrityAuditReceipt;
-  return (
-    <Agent.Result value={receipt}>
-      <Agent.Text>{integrityAuditHeadline(receipt)}</Agent.Text>
-      <IntegrityAuditReport receipt={receipt} />
-      <ChapterOutline chapters={chaptersFromAuditReceipt(receipt)} />
-    </Agent.Result>
-  );
-}
diff --git a/examples/audiobook-curator/src/cli/convert.tsx b/examples/audiobook-curator/src/cli/convert.tsx
deleted file mode 100644
index 1620ad9bf..000000000
--- a/examples/audiobook-curator/src/cli/convert.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Agent } from '@agent-bundle/runtime';
-import React from 'react';
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { ChapterOutline, chaptersFromConvertReceipt } from '../components/chapter-outline.js';
-import { convertHeadline } from '../components/headlines.js';
-import { ConversionIntegrityReport } from '../components/integrity-report.js';
-import { ConversionMutation } from '../components/mutation-receipt.js';
-import type { ConvertReceipt } from '../conversion.js';
-import { outputOperations } from '../operations/output.js';
-
-const operation = outputOperations.convert;
-
-export const config = {
-  description: 'Plan or apply a verified conversion to one chaptered M4B.',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  apply: z.boolean().optional(),
-  artwork: z.string().min(1).max(4096).optional(),
-  audioBitrate: z.string().min(2).max(32).optional(),
-  audioCodec: z.enum(['aac', 'alac']).optional(),
-  author: z.string().min(1).max(512),
-  engine: z.enum(['audiobook-forge', 'ffmpeg']).optional(),
-  forgeAacEncoder: z.string().min(1).max(128).optional(),
-  forgeCli: z.string().min(1).max(4096).optional(),
-  jobs: z.number().int().min(0).max(256).optional(),
-  language: z.string().min(1).max(64).optional(),
-  narrator: z.string().min(1).max(512).optional(),
-  output: z.string().min(1).max(4096),
-  overwrite: z.boolean().optional(),
-  receipt: z.string().min(1).max(4096),
-  selection: z.string().min(1).max(4096),
-  title: z.string().min(1).max(1024),
-  year: z.string().min(1).max(64).optional(),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function convert({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  const receipt = await operation.handler(input, { signal }) as ConvertReceipt;
-  return (
-    <Agent.Result value={receipt}>
-      <Agent.Text>{convertHeadline(receipt)}</Agent.Text>
-      <ConversionMutation receipt={receipt} />
-      <ChapterOutline chapters={chaptersFromConvertReceipt(receipt)} />
-      <ConversionIntegrityReport receipt={receipt} />
-    </Agent.Result>
-  );
-}
diff --git a/examples/audiobook-curator/src/cli/inspect.ts b/examples/audiobook-curator/src/cli/inspect.ts
deleted file mode 100644
index 4f5d3f04e..000000000
--- a/examples/audiobook-curator/src/cli/inspect.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { discoveryOperations } from '../operations/discovery.js';
-
-const operation = discoveryOperations.inspect;
-
-export const config = {
-  description: 'Inspect a bounded audiobook source tree without changing it.',
-  positionals: ['root'],
-} satisfies CliRouteConfig;
-
-// The argv projection is compiled statically, so the schema is inline
-// literal zod; the bounds match the operation registry's own input schema.
-export const inputSchema = z.object({
-  maxFiles: z.number().int().min(1).max(256).optional(),
-  root: z.string().min(1).max(4096),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function inspect({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler(input, { signal });
-}
diff --git a/examples/audiobook-curator/src/cli/inventory.tsx b/examples/audiobook-curator/src/cli/inventory.tsx
deleted file mode 100644
index a3b41de4e..000000000
--- a/examples/audiobook-curator/src/cli/inventory.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Agent } from '@agent-bundle/runtime';
-import React from 'react';
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { inventoryHeadline } from '../components/headlines.js';
-import { InventoryShelf } from '../components/library-shelf.js';
-import type { InventoryReceipt } from '../library.js';
-import { discoveryOperations } from '../operations/discovery.js';
-
-const operation = discoveryOperations.inventory;
-
-export const config = {
-  description: 'Probe source audio without changing it.',
-  exitCode: 'result',
-  positionals: ['source'],
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  report: z.string().min(1).max(4096),
-  source: z.string().min(1).max(4096),
-  strict: z.boolean().optional(),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function inventory({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  const receipt = await operation.handler(input, { signal }) as InventoryReceipt;
-  return (
-    <Agent.Result value={receipt}>
-      <Agent.Text>{inventoryHeadline(receipt)}</Agent.Text>
-      <InventoryShelf receipt={receipt} />
-    </Agent.Result>
-  );
-}
diff --git a/examples/audiobook-curator/src/cli/library-audit.tsx b/examples/audiobook-curator/src/cli/library-audit.tsx
deleted file mode 100644
index 950f11225..000000000
--- a/examples/audiobook-curator/src/cli/library-audit.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { Suspense } from 'react';
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { Agent, agent } from '@agent-bundle/runtime';
-import { z } from 'zod';
-
-import { libraryAuditCliHeadline } from '../components/headlines.js';
-import { LibraryAnalysis } from '../components/library-analysis.js';
-import { DataList } from '../components/primitives.js';
-import type { LibraryAuditReceipt } from '../library.js';
-import { discoveryOperations } from '../operations/discovery.js';
-
-const operation = discoveryOperations.libraryAudit;
-
-/**
- * The rendered command of this CLI (#102 stage 3): the audit is the
- * long-running surface, so an interactive terminal gets in-place progress
- * and a piped run gets one Markdown summary document. `--json` keeps the
- * canonical receipt (the same value the plain command printed), and the
- * receipt's own `exitCode` stays authoritative through the result policy.
- */
-export const config = {
-  description: 'Audit metadata, artwork, chapters, duplicate candidates, and multipart groups.',
-  exitCode: 'result',
-  positionals: ['sources'],
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  concurrency: z.number().int().min(1).max(8).optional(),
-  report: z.string().min(1).max(4096),
-  sources: z.array(z.string().min(1).max(4096)).min(1).max(64),
-  strict: z.boolean().optional(),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function LibraryAudit({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  const context = await agent();
-  const total = input.sources.length;
-  await context.progress.report({ completed: 0, message: 'Auditing sources', total });
-  const receipt = await operation.handler(input, { signal }) as LibraryAuditReceipt;
-  await context.progress.report({ completed: total, message: 'Audit complete', total });
-  const { summary } = receipt;
-  const issues =
-    summary.missingAlbum + summary.missingArtwork + summary.missingAuthor +
-    summary.missingChapters + summary.missingTitle + summary.probeFailures;
-  return (
-    <Agent.Result value={receipt}>
-      <Agent.Text>{libraryAuditCliHeadline(receipt, total)}</Agent.Text>
-      <Agent.Markdown>## Library audit</Agent.Markdown>
-      <DataList fields={[
-        { label: 'Files', value: summary.files },
-        { label: 'Total bytes', value: summary.bytes },
-        { label: 'Sources', value: total },
-        { label: 'Metadata issues', value: issues },
-        { label: 'Duplicate candidates', value: receipt.duplicateCandidates.length },
-        { label: 'Multipart candidates', value: receipt.multipartCandidates.length },
-      ]} />
-      <Suspense fallback={<Agent.Progress completed={0} message="Analyzing duplicate and multipart groups" />}>
-        <LibraryAnalysis receipt={receipt} signal={signal} />
-      </Suspense>
-    </Agent.Result>
-  );
-}
diff --git a/examples/audiobook-curator/src/cli/prepare.ts b/examples/audiobook-curator/src/cli/prepare.ts
deleted file mode 100644
index 92562c0f8..000000000
--- a/examples/audiobook-curator/src/cli/prepare.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { outputOperations } from '../operations/output.js';
-
-const operation = outputOperations.prepare;
-
-export const config = {
-  description: 'Plan an M4B output or apply the plan when explicitly requested.',
-  positionals: ['source'],
-} satisfies CliRouteConfig;
-
-// Schema keys are the CLI surface (`--output`, `--name`); the handler maps
-// them onto the operation input's `outputRoot`/`outputName`, preserving the
-// pre-migration option names byte for byte.
-export const inputSchema = z.object({
-  apply: z.boolean().optional(),
-  name: z.string().min(5).max(204).optional(),
-  output: z.string().min(1).max(4096),
-  source: z.string().min(1).max(4096),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function prepare({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler({
-    ...(input.apply === undefined ? {} : { apply: input.apply }),
-    ...(input.name === undefined ? {} : { outputName: input.name }),
-    outputRoot: input.output,
-    source: input.source,
-  }, { signal });
-}
diff --git a/examples/audiobook-curator/src/cli/select.tsx b/examples/audiobook-curator/src/cli/select.tsx
deleted file mode 100644
index 7f07f9483..000000000
--- a/examples/audiobook-curator/src/cli/select.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Agent } from '@agent-bundle/runtime';
-import React from 'react';
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { selectionHeadline } from '../components/headlines.js';
-import { SelectionShelf } from '../components/library-shelf.js';
-import type { SelectionReceipt } from '../library.js';
-import { discoveryOperations } from '../operations/discovery.js';
-
-const operation = discoveryOperations.select;
-
-export const config = {
-  description: 'Choose the strongest source among normalized collisions.',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  inventory: z.string().min(1).max(4096),
-  report: z.string().min(1).max(4096),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function select({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  const receipt = await operation.handler(input, { signal }) as SelectionReceipt;
-  return (
-    <Agent.Result value={receipt}>
-      <Agent.Text>{selectionHeadline(receipt)}</Agent.Text>
-      <SelectionShelf receipt={receipt} />
-    </Agent.Result>
-  );
-}
diff --git a/examples/audiobook-curator/src/cli/shelf.tsx b/examples/audiobook-curator/src/cli/shelf.tsx
deleted file mode 100644
index eff40d663..000000000
--- a/examples/audiobook-curator/src/cli/shelf.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Agent, agent } from '@agent-bundle/runtime';
-import type { CliRouteConfig } from 'agent-bundle';
-import React from 'react';
-import { z } from 'zod';
-
-import { CurationShelf, ShelfUnavailable } from '../components/curation-shelf.js';
-import {
-  CurationShelfStateSchema,
-  type CurationShelfState,
-} from '../state.js';
-
-const emptyShelf: CurationShelfState = {
-  mutations: [],
-  selections: [],
-};
-
-export const config = {
-  description: 'Show the persisted curation shelf.',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({}).strict();
-export const resultSchema = CurationShelfStateSchema;
-
-export default async function Shelf() {
-  const state = (await agent()).state;
-  if (state === undefined) {
-    return (
-      <Agent.Result value={emptyShelf}>
-        <Agent.Text>Persisted curation shelf unavailable.</Agent.Text>
-        <ShelfUnavailable />
-      </Agent.Result>
-    );
-  }
-  const shelf = CurationShelfStateSchema.parse((await state.read()).state);
-  return (
-    <Agent.Result value={shelf}>
-      <Agent.Text>Persisted curation shelf ready.</Agent.Text>
-      <CurationShelf state={shelf} />
-    </Agent.Result>
-  );
-}
diff --git a/examples/audiobook-curator/src/cli/whisper-verify.ts b/examples/audiobook-curator/src/cli/whisper-verify.ts
deleted file mode 100644
index 66a75c03f..000000000
--- a/examples/audiobook-curator/src/cli/whisper-verify.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import type { CliRouteConfig, CliRouteProps } from 'agent-bundle';
-import { z } from 'zod';
-
-import { evidenceOperations } from '../operations/evidence.js';
-
-const operation = evidenceOperations.whisperVerify;
-
-export const config = {
-  description: 'Transcribe distributed audiobook windows for human language and identity review.',
-  exitCode: 'result',
-} satisfies CliRouteConfig;
-
-export const inputSchema = z.object({
-  author: z.string().max(512).optional(),
-  file: z.string().min(1).max(4096),
-  language: z.string().min(1).max(64).optional(),
-  maxWindows: z.number().int().min(5).max(11).optional(),
-  minimumChars: z.number().int().min(1).max(16_384).optional(),
-  model: z.string().min(1).max(4096),
-  receipt: z.string().min(1).max(4096),
-  threads: z.number().int().min(1).max(256).optional(),
-  title: z.string().max(1024).optional(),
-  whisperCli: z.string().min(1).max(4096).optional(),
-  windowSeconds: z.number().int().min(1).max(3600).optional(),
-}).strict();
-
-export const resultSchema = operation.resultSchema;
-
-export default async function whisperVerify({ input, signal }: CliRouteProps<typeof inputSchema>) {
-  return operation.handler(input, { signal });
-}
diff --git a/examples/audiobook-curator/src/components/headlines.ts b/examples/audiobook-curator/src/components/headlines.ts
index 84ecb466b..d4754fecb 100644
--- a/examples/audiobook-curator/src/components/headlines.ts
+++ b/examples/audiobook-curator/src/components/headlines.ts
@@ -9,9 +9,6 @@ export const inventoryHeadline = (receipt: InventoryReceipt): string =>
 export const libraryAuditHeadline = (receipt: LibraryAuditReceipt): string =>
   `Audited ${receipt.summary.files} library media files and found ${receipt.duplicateCandidates.length} duplicate candidate groups.`;
 
-export const libraryAuditCliHeadline = (receipt: LibraryAuditReceipt, sourceCount: number): string =>
-  `Audited ${String(receipt.summary.files)} files (${String(receipt.summary.bytes)} bytes) across ${String(sourceCount)} sources.`;
-
 export const selectionHeadline = (receipt: SelectionReceipt): string => {
   const reviewCount = receipt.selections.filter((selection) => selection.reviewRequired).length;
   return `Selected ${receipt.selections.length} source groups; ${reviewCount} require review.`;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_chapters.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_chapters.cli.ts
new file mode 100644
index 000000000..04971bab7
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_chapters.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './apply_audiobook_chapters.js';
+
+export const config = {
+  command: ['apply-chapters'],
+  confirm: false,
+  description: 'Plan or apply verified generic or Audible chapter rows without changing encoded audio.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_chapters.tsx b/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_chapters.tsx
index 86a0339a5..804630ce5 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_chapters.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_chapters.tsx
@@ -1,6 +1,7 @@
 import { Agent, agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { ChapterOutline, chaptersFromApplyReceipt } from '../../../components/chapter-outline.js';
 import { CurationShelf, ShelfUnavailable } from '../../../components/curation-shelf.js';
@@ -16,7 +17,12 @@ export const config = {
   annotations: { destructiveHint: true, readOnlyHint: false },
   description: 'Plan or explicitly apply verified chapter rows while preserving all non-chapter media state.',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  apply: z.boolean().optional(),
+  chapters: z.string().min(1).max(4096),
+  file: z.string().min(1).max(4096),
+  receipt: z.string().min(1).max(4096).optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_metadata.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_metadata.cli.ts
new file mode 100644
index 000000000..b05769a83
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_metadata.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './apply_audiobook_metadata.js';
+
+export const config = {
+  command: ['apply-metadata'],
+  confirm: false,
+  description: 'Plan or apply verified Audible metadata and artwork without changing encoded audio.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_metadata.tsx b/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_metadata.tsx
index 645065af7..a57086ea6 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_metadata.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/apply_audiobook_metadata.tsx
@@ -1,6 +1,7 @@
 import { Agent, agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { CurationShelf, ShelfUnavailable } from '../../../components/curation-shelf.js';
 import { MetadataIntegrityReport } from '../../../components/integrity-report.js';
@@ -15,7 +16,18 @@ export const config = {
   annotations: { destructiveHint: true, readOnlyHint: false },
   description: 'Plan or explicitly apply verified catalog metadata and artwork while preserving every audio stream.',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  apply: z.boolean().optional(),
+  artwork: z.string().min(1).max(4096).optional(),
+  author: z.string().max(512).optional(),
+  file: z.string().min(1).max(4096),
+  language: z.string().min(1).max(64).optional(),
+  narrator: z.string().max(512).optional(),
+  product: z.string().min(1).max(4096),
+  receipt: z.string().min(1).max(4096).optional(),
+  title: z.string().max(1024).optional(),
+  year: z.string().max(64).optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/audit_audiobook.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/audit_audiobook.cli.ts
new file mode 100644
index 000000000..2e0ae1f11
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/audit_audiobook.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './audit_audiobook.js';
+
+export const config = {
+  command: ['audit'],
+  confirm: false,
+  description: 'Validate metadata, chapters, source mapping, hashes, and optional complete decode.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/audit_audiobook.tsx b/examples/audiobook-curator/src/mcp/curator/tools/audit_audiobook.tsx
index 00a34f226..8b4346e71 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/audit_audiobook.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/audit_audiobook.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { ChapterOutline, chaptersFromAuditReceipt } from '../../../components/chapter-outline.js';
 import { integrityAuditHeadline } from '../../../components/headlines.js';
@@ -15,7 +16,12 @@ export const config = {
   description: 'Validate chapter structure, optional conversion mapping, file/audio hashes, probe facts, and optional full decode.',
   exitCode: 'result',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  conversionReceipt: z.string().min(1).max(4096).optional(),
+  file: z.string().min(1).max(4096),
+  fullDecode: z.boolean().optional(),
+  receipt: z.string().min(1).max(4096).optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/audit_library.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/audit_library.cli.ts
new file mode 100644
index 000000000..77d4c6a88
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/audit_library.cli.ts
@@ -0,0 +1,10 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './audit_library.js';
+
+export const config = {
+  command: ['library-audit'],
+  confirm: false,
+  description: 'Audit metadata, artwork, chapters, duplicate candidates, and multipart groups.',
+  positionals: ['sources'],
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/audit_library.tsx b/examples/audiobook-curator/src/mcp/curator/tools/audit_library.tsx
index 40db3181d..8e231a6b6 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/audit_library.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/audit_library.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React, { Suspense } from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { libraryAuditHeadline } from '../../../components/headlines.js';
 import { LibraryAnalysis } from '../../../components/library-analysis.js';
@@ -15,7 +16,12 @@ export const config = {
   description: 'Audit audiobook library metadata, duplicates, and multipart evidence without deletion advice.',
   exitCode: 'result',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  concurrency: z.number().int().min(1).max(8).optional(),
+  report: z.string().min(1).max(4096).optional(),
+  sources: z.array(z.string().min(1).max(4096)).min(1).max(64),
+  strict: z.boolean().optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/cache_audible_edition.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/cache_audible_edition.cli.ts
new file mode 100644
index 000000000..69796c915
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/cache_audible_edition.cli.ts
@@ -0,0 +1,10 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './cache_audible_edition.js';
+
+export const config = {
+  command: ['audible-cache'],
+  confirm: false,
+  description: 'Cache one reviewed Audible product, chapters, artwork, and source URLs.',
+  flags: { cacheDirectory: { name: 'cache-dir' } },
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/cache_audible_edition.tsx b/examples/audiobook-curator/src/mcp/curator/tools/cache_audible_edition.tsx
index 9bbd91357..c7041d485 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/cache_audible_edition.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/cache_audible_edition.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import type { AudibleCacheReceipt } from '../../../audible.js';
 import { Callout, DataList } from '../../../components/primitives.js';
@@ -12,7 +13,13 @@ export const config = {
   annotations: { openWorldHint: true, readOnlyHint: false },
   description: 'Cache a reviewed Audible edition and retained source evidence.',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  asin: z.string().min(1).max(64),
+  attempts: z.number().int().min(1).max(10).optional(),
+  cacheDirectory: z.string().min(1).max(4096),
+  receipt: z.string().min(1).max(4096).optional(),
+  region: z.enum(['au', 'ca', 'de', 'es', 'fr', 'in', 'it', 'jp', 'uk', 'us']).optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/convert_audiobook.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/convert_audiobook.cli.ts
new file mode 100644
index 000000000..b16ce368e
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/convert_audiobook.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './convert_audiobook.js';
+
+export const config = {
+  command: ['convert'],
+  confirm: false,
+  description: 'Plan or apply a verified conversion to one chaptered M4B.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/convert_audiobook.tsx b/examples/audiobook-curator/src/mcp/curator/tools/convert_audiobook.tsx
index 3c4fbc7fd..175d240d1 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/convert_audiobook.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/convert_audiobook.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { ChapterOutline, chaptersFromConvertReceipt } from '../../../components/chapter-outline.js';
 import { convertHeadline } from '../../../components/headlines.js';
@@ -15,7 +16,25 @@ export const config = {
   annotations: { destructiveHint: true, readOnlyHint: false },
   description: 'Plan or explicitly apply a verified FFmpeg or Audiobook Forge conversion while preserving sources.',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  apply: z.boolean().optional(),
+  artwork: z.string().min(1).max(4096).optional(),
+  audioBitrate: z.string().min(2).max(32).optional(),
+  audioCodec: z.enum(['aac', 'alac']).optional(),
+  author: z.string().min(1).max(512),
+  engine: z.enum(['audiobook-forge', 'ffmpeg']).optional(),
+  forgeAacEncoder: z.string().min(1).max(128).optional(),
+  forgeCli: z.string().min(1).max(4096).optional(),
+  jobs: z.number().int().min(0).max(256).optional(),
+  language: z.string().min(1).max(64).optional(),
+  narrator: z.string().min(1).max(512).optional(),
+  output: z.string().min(1).max(4096),
+  overwrite: z.boolean().optional(),
+  receipt: z.string().min(1).max(4096).optional(),
+  selection: z.string().min(1).max(4096),
+  title: z.string().min(1).max(1024),
+  year: z.string().min(1).max(64).optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/identify_audible_sample.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/identify_audible_sample.cli.ts
new file mode 100644
index 000000000..6a589d6ff
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/identify_audible_sample.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './identify_audible_sample.js';
+
+export const config = {
+  command: ['acoustic-identify'],
+  confirm: false,
+  description: 'Try score-ranked, deduplicated Audible candidates and retain per-candidate evidence.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/identify_audible_sample.tsx b/examples/audiobook-curator/src/mcp/curator/tools/identify_audible_sample.tsx
index bffd650bf..45dc1b321 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/identify_audible_sample.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/identify_audible_sample.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { IdentifyRanking } from '../../../components/candidate-ranking.js';
 import { IdentifyTrail } from '../../../components/evidence-trail.js';
@@ -14,7 +15,16 @@ export const config = {
   description: 'Try ranked Audible candidates, retaining skips/errors and stopping at the first acoustic match by default.',
   exitCode: 'result',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  all: z.boolean().optional(),
+  attempts: z.number().int().min(1).max(10).optional(),
+  candidates: z.string().min(1).max(4096),
+  chunkSeconds: z.number().int().min(1).max(86_400).optional(),
+  file: z.string().min(1).max(4096),
+  receipt: z.string().min(1).max(4096).optional(),
+  top: z.number().int().min(1).max(10).optional(),
+  verbose: z.boolean().optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/inspect_sources.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/inspect_sources.cli.ts
new file mode 100644
index 000000000..92ae745c6
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/inspect_sources.cli.ts
@@ -0,0 +1,10 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './inspect_sources.js';
+
+export const config = {
+  command: ['inspect'],
+  confirm: false,
+  description: 'Inspect a bounded audiobook source tree without changing it.',
+  positionals: ['root'],
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/inspect_sources.tsx b/examples/audiobook-curator/src/mcp/curator/tools/inspect_sources.tsx
index f4e044b6a..ed92b5f0d 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/inspect_sources.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/inspect_sources.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { InspectionShelf } from '../../../components/library-shelf.js';
 import type { InspectionReceipt } from '../../../curator-core.js';
@@ -12,7 +13,10 @@ export const config = {
   annotations: { readOnlyHint: true },
   description: 'Inspect a bounded directory tree and report supported audiobook media without changing it.',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  maxFiles: z.number().int().min(1).max(256).optional(),
+  root: z.string().min(1).max(4096),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/inventory_sources.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/inventory_sources.cli.ts
new file mode 100644
index 000000000..c10205935
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/inventory_sources.cli.ts
@@ -0,0 +1,10 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './inventory_sources.js';
+
+export const config = {
+  command: ['inventory'],
+  confirm: false,
+  description: 'Probe source audio without changing it.',
+  positionals: ['source'],
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/prepare_audiobook.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/prepare_audiobook.cli.ts
new file mode 100644
index 000000000..c4581ef38
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/prepare_audiobook.cli.ts
@@ -0,0 +1,14 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './prepare_audiobook.js';
+
+export const config = {
+  command: ['prepare'],
+  confirm: false,
+  description: 'Plan an M4B output or apply the plan when explicitly requested.',
+  flags: {
+    outputName: { name: 'name' },
+    outputRoot: { name: 'output' },
+  },
+  positionals: ['source'],
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/prepare_audiobook.tsx b/examples/audiobook-curator/src/mcp/curator/tools/prepare_audiobook.tsx
index d627c2334..e348ebdf9 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/prepare_audiobook.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/prepare_audiobook.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { PrepareMutation } from '../../../components/mutation-receipt.js';
 import type { PrepareReceipt } from '../../../curator-core.js';
@@ -12,7 +13,12 @@ export const config = {
   annotations: { destructiveHint: true, readOnlyHint: false },
   description: 'Plan an M4B output, or apply the plan only when apply is explicitly true.',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  apply: z.boolean().optional(),
+  outputName: z.string().min(5).max(204).optional(),
+  outputRoot: z.string().min(1).max(4096),
+  source: z.string().min(1).max(4096),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/review_curation_shelf.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/review_curation_shelf.cli.ts
new file mode 100644
index 000000000..a98acfead
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/review_curation_shelf.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './review_curation_shelf.js';
+
+export const config = {
+  command: ['shelf'],
+  confirm: false,
+  description: 'Show the persisted curation shelf.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/search_audible.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/search_audible.cli.ts
new file mode 100644
index 000000000..cb8d25684
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/search_audible.cli.ts
@@ -0,0 +1,27 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+import type { z } from 'zod';
+
+import type { inputSchema } from './search_audible.js';
+
+export const config = {
+  command: ['audible-search'],
+  confirm: false,
+  description: 'Search and rank Audible identity candidates across reviewed regions.',
+  flags: {
+    durationSeconds: { name: 'duration' },
+    regions: { description: 'Audible regions to search (repeatable, or comma-separated)' },
+  },
+} satisfies CliProjectionConfig<typeof inputSchema>;
+
+type CliInput = Omit<z.input<typeof inputSchema>, 'regions'> & { readonly regions?: readonly string[] };
+
+/**
+ * `--regions us,uk` and `--regions us --regions uk` both reach the canonical
+ * region array; the tool's `z.enum` judges each entry after the split.
+ */
+export const mapInput = (input: CliInput): z.input<typeof inputSchema> => {
+  const { regions, ...rest } = input;
+  if (regions === undefined) return rest;
+  const split = regions.flatMap((value) => value.split(',').map((region) => region.trim().toLowerCase()));
+  return { ...rest, regions: split as z.input<typeof inputSchema>['regions'] };
+};
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/search_audible.tsx b/examples/audiobook-curator/src/mcp/curator/tools/search_audible.tsx
index 7c5b6e19d..9d45b99aa 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/search_audible.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/search_audible.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import type { AudibleSearchReceipt } from '../../../audible.js';
 import { SearchRanking } from '../../../components/candidate-ranking.js';
@@ -14,7 +15,16 @@ export const config = {
   description: 'Search Audible regions and return ranked identity evidence requiring human review.',
   exitCode: 'result',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  attempts: z.number().int().min(1).max(10).optional(),
+  author: z.string().min(1).max(512).optional(),
+  durationSeconds: z.number().positive().optional(),
+  limit: z.number().int().min(1).max(50).optional(),
+  narrator: z.string().min(1).max(512).optional(),
+  regions: z.array(z.enum(['au', 'ca', 'de', 'es', 'fr', 'in', 'it', 'jp', 'uk', 'us'])).min(1).max(10).optional(),
+  report: z.string().min(1).max(4096).optional(),
+  title: z.string().min(1).max(1024),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/select_audible_edition.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/select_audible_edition.cli.ts
new file mode 100644
index 000000000..cc53d218e
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/select_audible_edition.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './select_audible_edition.js';
+
+export const config = {
+  command: ['audible-select'],
+  confirm: false,
+  description: 'Record one explicit human-reviewed Audible edition choice.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/select_audible_edition.tsx b/examples/audiobook-curator/src/mcp/curator/tools/select_audible_edition.tsx
index fab72f5fd..0a27aaa34 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/select_audible_edition.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/select_audible_edition.tsx
@@ -1,6 +1,7 @@
 import { Agent, agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import type { AudibleSelectionReceipt } from '../../../audible.js';
 import { SelectionRanking } from '../../../components/candidate-ranking.js';
@@ -14,7 +15,12 @@ export const config = {
   annotations: { readOnlyHint: false },
   description: 'Record an explicit human-reviewed Audible edition choice from a candidate report.',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  candidate: z.number().int().min(1).max(500),
+  candidates: z.string().min(1).max(4096),
+  note: z.string().max(4096).optional(),
+  receipt: z.string().min(1).max(4096).optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/select_sources.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/select_sources.cli.ts
new file mode 100644
index 000000000..03aad89bf
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/select_sources.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './select_sources.js';
+
+export const config = {
+  command: ['select'],
+  confirm: false,
+  description: 'Choose the strongest source among normalized collisions.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/select_sources.tsx b/examples/audiobook-curator/src/mcp/curator/tools/select_sources.tsx
index 0457d1f75..58abcc4c9 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/select_sources.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/select_sources.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { selectionHeadline } from '../../../components/headlines.js';
 import { SelectionShelf } from '../../../components/library-shelf.js';
@@ -13,7 +14,10 @@ export const config = {
   annotations: { readOnlyHint: false },
   description: 'Select strongest source encodings while retaining alternates and duration review evidence.',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  inventory: z.string().min(1).max(4096),
+  report: z.string().min(1).max(4096).optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/verify_audible_sample.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/verify_audible_sample.cli.ts
new file mode 100644
index 000000000..f3e005edd
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/verify_audible_sample.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './verify_audible_sample.js';
+
+export const config = {
+  command: ['acoustic-verify'],
+  confirm: false,
+  description: 'Compare one bounded Audible sample with local audio through optional Audiolocate.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/verify_audible_sample.tsx b/examples/audiobook-curator/src/mcp/curator/tools/verify_audible_sample.tsx
index 597de4c31..5dd65e76d 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/verify_audible_sample.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/verify_audible_sample.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { AcousticTrail } from '../../../components/evidence-trail.js';
 import type { AcousticReceipt } from '../../../evidence.js';
@@ -13,7 +14,17 @@ export const config = {
   description: 'Compare a bounded Audible sample with local audio through an optional Audiolocate Python capability.',
   exitCode: 'result',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  asin: z.string().min(1).max(64),
+  attempts: z.number().int().min(1).max(10).optional(),
+  audiolocatePython: z.string().min(1).max(4096).optional(),
+  chunkSeconds: z.number().int().min(1).max(86_400).optional(),
+  file: z.string().min(1).max(4096),
+  receipt: z.string().min(1).max(4096).optional(),
+  region: z.enum(['au', 'ca', 'de', 'es', 'fr', 'in', 'it', 'jp', 'uk', 'us']).optional(),
+  sampleUrl: z.url().optional(),
+  verbose: z.boolean().optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/verify_with_whisper.cli.ts b/examples/audiobook-curator/src/mcp/curator/tools/verify_with_whisper.cli.ts
new file mode 100644
index 000000000..5b3ccd669
--- /dev/null
+++ b/examples/audiobook-curator/src/mcp/curator/tools/verify_with_whisper.cli.ts
@@ -0,0 +1,9 @@
+import type { CliProjectionConfig } from 'agent-bundle/routes';
+
+import type { inputSchema } from './verify_with_whisper.js';
+
+export const config = {
+  command: ['whisper-verify'],
+  confirm: false,
+  description: 'Transcribe distributed audiobook windows for human language and identity review.',
+} satisfies CliProjectionConfig<typeof inputSchema>;
diff --git a/examples/audiobook-curator/src/mcp/curator/tools/verify_with_whisper.tsx b/examples/audiobook-curator/src/mcp/curator/tools/verify_with_whisper.tsx
index a71e00b80..5991a5266 100644
--- a/examples/audiobook-curator/src/mcp/curator/tools/verify_with_whisper.tsx
+++ b/examples/audiobook-curator/src/mcp/curator/tools/verify_with_whisper.tsx
@@ -1,6 +1,7 @@
 import { Agent } from '@agent-bundle/runtime';
 import React from 'react';
 import type { ToolRouteProps } from 'agent-bundle';
+import { z } from 'zod';
 
 import { WhisperTrail } from '../../../components/evidence-trail.js';
 import type { WhisperReceipt } from '../../../evidence.js';
@@ -13,7 +14,19 @@ export const config = {
   description: 'Extract and transcribe distributed PCM windows for human language, story, and narrator review.',
   exitCode: 'result',
 };
-export const inputSchema = operation.inputSchema;
+export const inputSchema = z.object({
+  author: z.string().max(512).optional(),
+  file: z.string().min(1).max(4096),
+  language: z.string().min(1).max(64).optional(),
+  maxWindows: z.number().int().min(5).max(11).optional(),
+  minimumChars: z.number().int().min(1).max(16_384).optional(),
+  model: z.string().min(1).max(4096),
+  receipt: z.string().min(1).max(4096).optional(),
+  threads: z.number().int().min(1).max(256).optional(),
+  title: z.string().max(1024).optional(),
+  whisperCli: z.string().min(1).max(4096).optional(),
+  windowSeconds: z.number().int().min(1).max(3600).optional(),
+}).strict();
 export const resultSchema = operation.resultSchema;
 
 export default async function Route({ input, signal }: ToolRouteProps<typeof inputSchema>) {
diff --git a/examples/audiobook-curator/src/operations/audible.ts b/examples/audiobook-curator/src/operations/audible.ts
index d7f35e6fe..0b782895d 100644
--- a/examples/audiobook-curator/src/operations/audible.ts
+++ b/examples/audiobook-curator/src/operations/audible.ts
@@ -10,13 +10,12 @@ import {
   searchAudible,
   selectAudibleEdition,
   type AudibleCacheReceipt,
-  type AudibleRegion,
   type AudibleSearchReceipt,
   type AudibleSelectionReceipt,
 } from '../audible.ts';
 import type { CliCommandContext } from '../cli-command.js';
 import { readJson, writeReceipt } from '../foundation.ts';
-import { audibleRegions, audibleRegionSchema, parityReceiptSchema, pathSchema } from './schemas.ts';
+import { audibleRegionSchema, parityReceiptSchema } from './schemas.ts';
 
 const audibleEvidenceSchema = z.object({
   authorMatch: z.boolean(), durationDifferencePercent: z.number().nonnegative().optional(), language: z.string().optional(),
@@ -35,23 +34,10 @@ export const audibleSearchResultSchema: z.ZodType<AudibleSearchReceipt> = z.obje
 const audibleSelectResultSchema = parityReceiptSchema<AudibleSelectionReceipt>('audible-select');
 const audibleCacheResultSchema = parityReceiptSchema<AudibleCacheReceipt>('audible-cache');
 
-/** Parses the CLI's comma-separated `--regions` list; shared with the routed `audible-search` command. */
-export const audibleRegionList = (value: string): readonly AudibleRegion[] => value.split(',').map((region) => {
-  const candidate = region.trim().toLowerCase();
-  if (!audibleRegions.includes(candidate as AudibleRegion)) throw new Error(`Unsupported Audible region: ${candidate}.`);
-  return candidate as AudibleRegion;
-});
-
 export const audibleOperations = Object.freeze({
   audibleSearch: {
     handler: searchAudible,
     id: 'audible-search',
-    inputSchema: z.object({
-      attempts: z.number().int().min(1).max(10).optional(), author: z.string().min(1).max(512).optional(),
-      durationSeconds: z.number().positive().optional(), limit: z.number().int().min(1).max(50).optional(),
-      narrator: z.string().min(1).max(512).optional(), regions: z.array(audibleRegionSchema).min(1).max(10).optional(),
-      report: pathSchema.optional(), title: z.string().min(1).max(1024),
-    }).strict(),
     resultSchema: audibleSearchResultSchema,
   },
   audibleSelect: {
@@ -69,16 +55,11 @@ export const audibleOperations = Object.freeze({
       return receipt;
     },
     id: 'audible-select',
-    inputSchema: z.object({ candidate: z.number().int().min(1).max(500), candidates: pathSchema, note: z.string().max(4096).optional(), receipt: pathSchema.optional() }).strict(),
     resultSchema: audibleSelectResultSchema,
   },
   audibleCache: {
     handler: cacheAudibleEdition,
     id: 'audible-cache',
-    inputSchema: z.object({
-      asin: z.string().min(1).max(64), attempts: z.number().int().min(1).max(10).optional(), cacheDirectory: pathSchema,
-      receipt: pathSchema.optional(), region: audibleRegionSchema.optional(),
-    }).strict(),
     resultSchema: audibleCacheResultSchema,
   },
 });
diff --git a/examples/audiobook-curator/src/operations/discovery.ts b/examples/audiobook-curator/src/operations/discovery.ts
index daa91c4cc..fda71c034 100644
--- a/examples/audiobook-curator/src/operations/discovery.ts
+++ b/examples/audiobook-curator/src/operations/discovery.ts
@@ -27,10 +27,6 @@ const inspectedFileSchema = z.object({
   bytes: z.number().int().nonnegative(),
   path: pathSchema,
 }).strict();
-const inspectInputSchema = z.object({
-  maxFiles: z.number().int().min(1).max(256).optional(),
-  root: pathSchema,
-}).strict();
 const inspectResultSchema = z.object({
   files: z.array(inspectedFileSchema).max(256),
   operation: z.literal('inspect'),
@@ -42,7 +38,6 @@ export const discoveryOperations = Object.freeze({
   inspect: {
     handler: inspectSources,
     id: 'inspect',
-    inputSchema: inspectInputSchema,
     resultSchema: inspectResultSchema,
   },
   inventory: {
@@ -55,7 +50,6 @@ export const discoveryOperations = Object.freeze({
       return receipt;
     },
     id: 'inventory',
-    inputSchema: z.object({ report: pathSchema.optional(), source: pathSchema, strict: z.boolean().optional() }).strict(),
     resultSchema: inventoryResultSchema,
   },
   libraryAudit: {
@@ -68,12 +62,6 @@ export const discoveryOperations = Object.freeze({
       return receipt;
     },
     id: 'library-audit',
-    inputSchema: z.object({
-      concurrency: z.number().int().min(1).max(8).optional(),
-      report: pathSchema.optional(),
-      sources: z.array(pathSchema).min(1).max(64),
-      strict: z.boolean().optional(),
-    }).strict(),
     resultSchema: libraryResultSchema,
   },
   select: {
@@ -87,7 +75,6 @@ export const discoveryOperations = Object.freeze({
       return receipt;
     },
     id: 'select',
-    inputSchema: z.object({ inventory: pathSchema, report: pathSchema.optional() }).strict(),
     resultSchema: selectionResultSchema,
   },
 });
diff --git a/examples/audiobook-curator/src/operations/evidence.ts b/examples/audiobook-curator/src/operations/evidence.ts
index d7c38478b..fb956acd4 100644
--- a/examples/audiobook-curator/src/operations/evidence.ts
+++ b/examples/audiobook-curator/src/operations/evidence.ts
@@ -16,7 +16,7 @@ import {
   type WhisperReceipt,
 } from '../evidence.ts';
 import { readJson } from '../foundation.ts';
-import { audibleRegionSchema, parityReceiptSchema, pathSchema } from './schemas.ts';
+import { parityReceiptSchema } from './schemas.ts';
 
 const acousticResultSchema = parityReceiptSchema<AcousticReceipt>('audiolocate');
 const acousticIdentifyResultSchema = parityReceiptSchema<AcousticIdentifyReceipt>('acoustic-identify');
@@ -26,11 +26,6 @@ export const evidenceOperations = Object.freeze({
   acousticVerify: {
     handler: verifyAudibleSample,
     id: 'acoustic-verify',
-    inputSchema: z.object({
-      asin: z.string().min(1).max(64), attempts: z.number().int().min(1).max(10).optional(), audiolocatePython: pathSchema.optional(),
-      chunkSeconds: z.number().int().min(1).max(86_400).optional(), file: pathSchema, receipt: pathSchema.optional(),
-      region: audibleRegionSchema.optional(), sampleUrl: z.url().optional(), verbose: z.boolean().optional(),
-    }).strict(),
     resultSchema: acousticResultSchema,
   },
   acousticIdentify: {
@@ -48,22 +43,11 @@ export const evidenceOperations = Object.freeze({
       }, options);
     },
     id: 'acoustic-identify',
-    inputSchema: z.object({
-      all: z.boolean().optional(), attempts: z.number().int().min(1).max(10).optional(), candidates: pathSchema,
-      chunkSeconds: z.number().int().min(1).max(86_400).optional(), file: pathSchema, receipt: pathSchema.optional(),
-      top: z.number().int().min(1).max(10).optional(), verbose: z.boolean().optional(),
-    }).strict(),
     resultSchema: acousticIdentifyResultSchema,
   },
   whisperVerify: {
     handler: verifyWithWhisper,
     id: 'whisper-verify',
-    inputSchema: z.object({
-      author: z.string().max(512).optional(), file: pathSchema, language: z.string().min(1).max(64).optional(),
-      maxWindows: z.number().int().min(5).max(11).optional(), minimumChars: z.number().int().min(1).max(16_384).optional(),
-      model: pathSchema, receipt: pathSchema.optional(), threads: z.number().int().min(1).max(256).optional(), title: z.string().max(1024).optional(),
-      whisperCli: pathSchema.optional(), windowSeconds: z.number().int().min(1).max(3600).optional(),
-    }).strict(),
     resultSchema: whisperResultSchema,
   },
 });
diff --git a/examples/audiobook-curator/src/operations/media-mutation.ts b/examples/audiobook-curator/src/operations/media-mutation.ts
index 887febe7a..706b5252a 100644
--- a/examples/audiobook-curator/src/operations/media-mutation.ts
+++ b/examples/audiobook-curator/src/operations/media-mutation.ts
@@ -2,15 +2,13 @@
  * Plan-first derived-media repair operations: `apply-metadata` and
  * `apply-chapters`, backed by `../media-mutation.ts`.
  */
-import { z } from 'zod';
-
 import {
   applyAudiobookChapters,
   applyAudiobookMetadata,
   type ChapterReceipt,
   type MetadataReceipt,
 } from '../media-mutation.ts';
-import { parityReceiptSchema, pathSchema } from './schemas.ts';
+import { parityReceiptSchema } from './schemas.ts';
 
 const metadataResultSchema = parityReceiptSchema<MetadataReceipt>('apply-metadata');
 const chaptersResultSchema = parityReceiptSchema<ChapterReceipt>('apply-chapters');
@@ -19,17 +17,11 @@ export const mediaMutationOperations = Object.freeze({
   applyMetadata: {
     handler: applyAudiobookMetadata,
     id: 'apply-metadata',
-    inputSchema: z.object({
-      apply: z.boolean().optional(), artwork: pathSchema.optional(), author: z.string().max(512).optional(), file: pathSchema,
-      language: z.string().min(1).max(64).optional(), narrator: z.string().max(512).optional(), product: pathSchema,
-      receipt: pathSchema.optional(), title: z.string().max(1024).optional(), year: z.string().max(64).optional(),
-    }).strict(),
     resultSchema: metadataResultSchema,
   },
   applyChapters: {
     handler: applyAudiobookChapters,
     id: 'apply-chapters',
-    inputSchema: z.object({ apply: z.boolean().optional(), chapters: pathSchema, file: pathSchema, receipt: pathSchema.optional() }).strict(),
     resultSchema: chaptersResultSchema,
   },
 });
diff --git a/examples/audiobook-curator/src/operations/output.ts b/examples/audiobook-curator/src/operations/output.ts
index da86db32c..3a49fed35 100644
--- a/examples/audiobook-curator/src/operations/output.ts
+++ b/examples/audiobook-curator/src/operations/output.ts
@@ -13,12 +13,6 @@ import { parityReceiptSchema, pathSchema, probeSchema } from './schemas.ts';
 
 const convertResultSchema = parityReceiptSchema<ConvertReceipt>('convert');
 const auditResultSchema = parityReceiptSchema<IntegrityAuditReceipt>('audit');
-const prepareInputSchema = z.object({
-  apply: z.boolean().optional(),
-  outputName: z.string().min(5).max(204).optional(),
-  outputRoot: pathSchema,
-  source: pathSchema,
-}).strict();
 const prepareResultSchema = z.object({
   applied: z.boolean(),
   operation: z.literal('prepare'),
@@ -31,26 +25,16 @@ export const outputOperations = Object.freeze({
   convert: {
     handler: convertAudiobook,
     id: 'convert',
-    inputSchema: z.object({
-      apply: z.boolean().optional(), artwork: pathSchema.optional(), audioBitrate: z.string().min(2).max(32).optional(),
-      audioCodec: z.enum(['aac', 'alac']).optional(), author: z.string().min(1).max(512),
-      engine: z.enum(['audiobook-forge', 'ffmpeg']).optional(), forgeAacEncoder: z.string().min(1).max(128).optional(),
-      forgeCli: pathSchema.optional(), jobs: z.number().int().min(0).max(256).optional(), language: z.string().min(1).max(64).optional(),
-      narrator: z.string().min(1).max(512).optional(), output: pathSchema, overwrite: z.boolean().optional(), receipt: pathSchema.optional(),
-      selection: pathSchema, title: z.string().min(1).max(1024), year: z.string().min(1).max(64).optional(),
-    }).strict(),
     resultSchema: convertResultSchema,
   },
   prepare: {
     handler: prepareAudiobook,
     id: 'prepare',
-    inputSchema: prepareInputSchema,
     resultSchema: prepareResultSchema,
   },
   audit: {
     handler: auditAudiobookIntegrity,
     id: 'audit',
-    inputSchema: z.object({ conversionReceipt: pathSchema.optional(), file: pathSchema, fullDecode: z.boolean().optional(), receipt: pathSchema.optional() }).strict(),
     resultSchema: auditResultSchema,
   },
 });
diff --git a/examples/audiobook-curator/tests/application.test.ts b/examples/audiobook-curator/tests/application.test.ts
index fb1d95453..8328c2510 100644
--- a/examples/audiobook-curator/tests/application.test.ts
+++ b/examples/audiobook-curator/tests/application.test.ts
@@ -31,8 +31,8 @@ describe('audiobook curator filesystem application', () => {
     expect(config.targets).toEqual(['claude', 'codex']);
     expect(config.mcp).toBeUndefined();
     // The manual CLI dispatcher and its explicit `scripts` shipping are
-    // retired (#102 stage 3); the routed src/cli/ commands feed the package
-    // executable instead.
+    // retired (#102 stage 3); the tools' `<tool>.cli.ts` projections feed
+    // the package executable instead (#725).
     expect(config.scripts).toBeUndefined();
     expect(config.skills).toBeUndefined();
 
@@ -45,18 +45,12 @@ describe('audiobook curator filesystem application', () => {
     expect(graph.servers[0]!.routes.filter((route) => route.kind === 'prompt').map((route) => route.id)).toEqual(['prompt:curator/curate']);
   });
 
-  it('derives the complete routed CLI and projected MCP toolset', async () => {
+  it('derives one projected CLI command per tool and nothing else', async () => {
     const graph = await compileRouteGraph(root, config);
     expect(graph.cli).toMatchObject({ mode: 'generated' });
-    expect(graph.cli!.commands).toHaveLength(32);
-    const customCommands = graph.cli!.commands!.filter((command) => command.mcp === undefined);
-    const projectedCommands = graph.cli!.commands!.filter((command) => command.mcp !== undefined);
-    expect(customCommands).toHaveLength(16);
-    expect(projectedCommands.map((command) => command.path.join(' '))).toEqual(
-      toolNames.map((tool) => `curator ${tool}`),
-    );
-    expect(customCommands.filter((command) => command.rendered).map((command) => command.path.join(' ')))
-      .toEqual(['audible-search', 'audit', 'convert', 'inventory', 'library-audit', 'select', 'shelf']);
-    expect(projectedCommands.every((command) => command.rendered)).toBe(true);
+    const commands = graph.cli!.commands!;
+    expect(commands).toHaveLength(16);
+    expect(commands.map((command) => command.routeId).sort()).toEqual(toolNames.map((tool) => `tool:curator/${tool}`));
+    expect(commands.every((command) => command.projection !== undefined && command.rendered)).toBe(true);
   });
 });
diff --git a/examples/audiobook-curator/tests/cli.test.ts b/examples/audiobook-curator/tests/cli.test.ts
index e92ae2159..e6fe9f924 100644
--- a/examples/audiobook-curator/tests/cli.test.ts
+++ b/examples/audiobook-curator/tests/cli.test.ts
@@ -1,39 +1,26 @@
-import { mkdtemp, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-import { afterEach, describe, expect, it } from '@rstest/core';
+import { describe, expect, it } from '@rstest/core';
 
 import maybeFactoryConfig from '../agent-bundle.config.ts';
 import { compileRouteGraph } from 'agent-bundle/api';
-import inspectRoute, { inputSchema as inspectInput, resultSchema as inspectResult } from '../src/cli/inspect.ts';
 
 if (typeof maybeFactoryConfig === 'function') throw new Error('expected a static config object');
 const config = maybeFactoryConfig;
 const root = new URL('..', import.meta.url).pathname;
 
-const directories: string[] = [];
-
-afterEach(async () => {
-  await Promise.all(directories.splice(0).map((directory) => rm(directory, { force: true, recursive: true })));
-});
-
 /**
- * The routed-CLI migration pins (#102 stages 2-3): the compiled command
- * graph carries exactly the pre-migration argv surface — the same command
- * names, option spellings, positionals, and exit-code policies the manual
- * `runCli` dispatcher served — and plain routes still emit the identical
- * one-line JSON receipts.
+ * The CLI is sixteen `<tool>.cli.ts` projections of the sixteen curator tools
+ * (#725): one operation compiles to one command whose identity stays the
+ * tool's, and the projection metadata carries the pre-#725 argv surface — the
+ * same command names, option spellings, positionals, and exit-code policies
+ * the deleted `src/cli/**` routes served.
  */
-describe('audiobook-curator routed CLI', () => {
-  it('compiles the migrated commands and projected MCP toolset in one graph', async () => {
+describe('audiobook-curator projected CLI', () => {
+  it('compiles every curator tool to exactly one projected command', async () => {
     const graph = await compileRouteGraph(root, config);
     expect(graph.diagnostics).toEqual([]);
     expect(graph.cli?.mode).toBe('generated');
     const commands = graph.cli!.commands!;
-    const customCommands = commands.filter((command) => command.mcp === undefined);
-    const projectedCommands = commands.filter((command) => command.mcp !== undefined);
-    const byName = new Map(customCommands.map((command) => [command.path.join(' '), command]));
+    const byName = new Map(commands.map((command) => [command.path.join(' '), command]));
 
     expect([...byName.keys()].sort()).toEqual([
       'acoustic-identify',
@@ -53,42 +40,44 @@ describe('audiobook-curator routed CLI', () => {
       'shelf',
       'whisper-verify',
     ]);
-    expect(projectedCommands).toHaveLength(16);
-    expect(projectedCommands.every((command) =>
-      command.path[0] === 'curator' && command.rendered)).toBe(true);
-    expect(projectedCommands
-      .filter((command) => command.exitCode === 'result')
-      .map((command) => command.path.join(' '))
-      .sort()).toEqual([
-        'curator audit_audiobook',
-        'curator audit_library',
-        'curator identify_audible_sample',
-        'curator inventory_sources',
-        'curator search_audible',
-        'curator verify_audible_sample',
-        'curator verify_with_whisper',
-      ]);
+    // Every command is a projection of a curator tool; no `src/cli` route and
+    // no bulk `curator <tool>` command remains.
+    expect(commands.every((command) => command.projection !== undefined && command.mcp?.server === 'curator' && command.rendered)).toBe(true);
+    expect(commands.map((command) => command.routeId).sort()).toEqual(
+      [...new Set(commands.map((command) => `tool:curator/${command.mcp!.tool}`))].sort(),
+    );
+    // The authored CLI never confirmed: plan-first commands gate mutation on
+    // `--apply`, so no projection asks for `--yes`.
+    expect(commands.every((command) => command.mcp!.confirm === false)).toBe(true);
+    // The result exit-code policy rides exactly the commands that declared it.
+    expect(commands.filter((command) => command.exitCode === 'result').map((command) => command.path.join(' ')).sort()).toEqual([
+      'acoustic-identify', 'acoustic-verify', 'audible-search', 'audit', 'inventory', 'library-audit', 'whisper-verify',
+    ]);
+    // Only the region list needs reshaping; every other projection is renames.
+    expect(commands.filter((command) => command.projection!.mapInput).map((command) => command.path.join(' '))).toEqual(['audible-search']);
 
     // inspect [--max-files N] <root>
     const inspect = byName.get('inspect')!;
-    expect(inspect).toMatchObject({ exitCode: 'zero', rendered: false });
+    expect(inspect).toMatchObject({ exitCode: 'zero', routeId: 'tool:curator/inspect_sources' });
     expect(inspect.options).toEqual([
       { key: 'maxFiles', kind: 'number', option: 'max-files', repeated: false, required: false },
       { key: 'root', kind: 'string', option: 'root', positional: 0, repeated: false, required: true },
     ]);
 
-    // inventory <source> --report FILE [--strict]
+    // inventory <source> [--report FILE] [--strict]. The retired route demanded
+    // --report; a projection can only relax a canonical key (`required?: false`),
+    // so the command now takes the tool's optional report.
     const inventory = byName.get('inventory')!;
-    expect(inventory).toMatchObject({ exitCode: 'result', rendered: true });
+    expect(inventory).toMatchObject({ exitCode: 'result', routeId: 'tool:curator/inventory_sources' });
     expect(inventory.options.map((option) => [option.option, option.required, option.positional ?? null])).toEqual([
-      ['report', true, null],
+      ['report', false, null],
       ['source', true, 0],
       ['strict', false, null],
     ]);
 
-    // library-audit <sources...> --report FILE [--concurrency N] [--strict] — the rendered command.
+    // library-audit <sources...> [--report FILE] [--concurrency N] [--strict]
     const libraryAudit = byName.get('library-audit')!;
-    expect(libraryAudit).toMatchObject({ exitCode: 'result', rendered: true });
+    expect(libraryAudit).toMatchObject({ exitCode: 'result', routeId: 'tool:curator/audit_library' });
     expect(libraryAudit.options.map((option) => [option.option, option.repeated, option.positional ?? null])).toEqual([
       ['concurrency', false, null],
       ['report', false, null],
@@ -99,24 +88,24 @@ describe('audiobook-curator routed CLI', () => {
     // convert keeps its full named-option surface, including kebab-case
     // projections of camelCase keys (--audio-bitrate, --forge-aac-encoder).
     const convert = byName.get('convert')!;
-    expect(convert).toMatchObject({ rendered: true });
     expect(convert.options.map((option) => option.option).sort()).toEqual([
       'apply', 'artwork', 'audio-bitrate', 'audio-codec', 'author', 'engine',
       'forge-aac-encoder', 'forge-cli', 'jobs', 'language', 'narrator',
       'output', 'overwrite', 'receipt', 'selection', 'title', 'year',
     ]);
+    // --receipt is optional like the tool's; the retired route required it.
     expect(convert.options.filter((option) => option.required).map((option) => option.option)).toEqual([
-      'author', 'output', 'receipt', 'selection', 'title',
+      'author', 'output', 'selection', 'title',
     ]);
 
-    // prepare [--apply] [--name FILE] --output DIR <source> — the handler
-    // maps --output/--name onto the operation's outputRoot/outputName.
+    // prepare [--apply] [--name FILE] --output DIR <source> — the projection
+    // spells the operation's outputRoot/outputName as --output/--name.
     const prepare = byName.get('prepare')!;
-    expect(prepare.options.map((option) => [option.option, option.required, option.positional ?? null])).toEqual([
-      ['apply', false, null],
-      ['name', false, null],
-      ['output', true, null],
-      ['source', true, 0],
+    expect(prepare.options.map((option) => [option.key, option.option, option.required, option.positional ?? null])).toEqual([
+      ['apply', 'apply', false, null],
+      ['outputName', 'name', false, null],
+      ['outputRoot', 'output', true, null],
+      ['source', 'source', true, 0],
     ]);
 
     // audible-search keeps --duration and the comma-separated --regions list.
@@ -124,31 +113,11 @@ describe('audiobook-curator routed CLI', () => {
     expect(audibleSearch.options.map((option) => option.option)).toEqual([
       'attempts', 'author', 'duration', 'limit', 'narrator', 'regions', 'report', 'title',
     ]);
-    expect(audibleSearch).toMatchObject({ exitCode: 'result', rendered: true });
-    expect(byName.get('audit')).toMatchObject({ exitCode: 'result', rendered: true });
-    expect(byName.get('select')).toMatchObject({ rendered: true });
+    expect(audibleSearch.options.find((option) => option.option === 'duration')).toMatchObject({ key: 'durationSeconds', kind: 'number' });
+    expect(audibleSearch.options.find((option) => option.option === 'regions')).toMatchObject({ key: 'regions', repeated: true });
+    expect(audibleSearch.projection).toEqual({ mapInput: true, module: 'src/mcp/curator/tools/search_audible.cli.ts' });
 
     // audible-cache keeps --cache-dir.
-    expect(byName.get('audible-cache')!.options.some((option) => option.option === 'cache-dir')).toBe(true);
-
-    // The result exit-code policy rides exactly the commands that declared it.
-    expect(customCommands.filter((command) => command.exitCode === 'result').map((command) => command.path.join(' ')).sort()).toEqual([
-      'acoustic-identify', 'acoustic-verify', 'audible-search', 'audit', 'inventory', 'library-audit', 'whisper-verify',
-    ]);
-  });
-
-  it('keeps the plain inspect receipt byte-identical to the pre-migration CLI output', async () => {
-    const directory = await mkdtemp(join(tmpdir(), 'curator-cli-inspect-'));
-    directories.push(directory);
-    const input = inspectInput.parse({ root: directory });
-    const result = inspectResult.parse(await inspectRoute({ input, signal: new AbortController().signal }));
-    // The generated shell prints exactly JSON.stringify(result) + '\n', the
-    // same line `runCliCommands` wrote before the migration.
-    expect(JSON.stringify(result)).toBe(JSON.stringify({
-      files: [],
-      operation: 'inspect',
-      root: directory,
-      totalBytes: 0,
-    }));
+    expect(byName.get('audible-cache')!.options.find((option) => option.key === 'cacheDirectory')).toMatchObject({ option: 'cache-dir', required: true });
   });
 });
diff --git a/examples/audiobook-curator/tests/route-unit/cli-rendered.test.ts b/examples/audiobook-curator/tests/route-unit/audit-rendered.test.ts
similarity index 66%
rename from examples/audiobook-curator/tests/route-unit/cli-rendered.test.ts
rename to examples/audiobook-curator/tests/route-unit/audit-rendered.test.ts
index dc648ecb6..4d313bd28 100644
--- a/examples/audiobook-curator/tests/route-unit/cli-rendered.test.ts
+++ b/examples/audiobook-curator/tests/route-unit/audit-rendered.test.ts
@@ -5,29 +5,7 @@ import { join } from 'node:path';
 import { expect, it } from '@rstest/core';
 import { expectDocument, renderRoute } from 'agent-bundle/test';
 
-it('renders the inventory CLI document with its canonical receipt', async () => {
-  const directory = await mkdtemp(join(tmpdir(), 'curator-cli-rendered-inventory-'));
-  try {
-    const source = join(directory, 'library');
-    const report = join(directory, 'inventory.json');
-    await mkdir(source);
-
-    const rendered = await renderRoute('cli:inventory', {
-      input: { report, source },
-    });
-    const canonicalReceipt = JSON.parse(await readFile(report, 'utf8')) as unknown;
-
-    expectDocument(rendered)
-      .toHaveStatus('success')
-      .toContainText('Inventoried 0 media files with 0 retained errors.')
-      .toContainMarkdown('**Files:** 0')
-      .toHaveValue(canonicalReceipt);
-  } finally {
-    await rm(directory, { force: true, recursive: true });
-  }
-});
-
-it('renders the audit CLI integrity report and chapter outline with its canonical receipt', async () => {
+it('renders the audit tool integrity report and chapter outline with its canonical receipt', async () => {
   const directory = await mkdtemp(join(tmpdir(), 'curator-cli-rendered-audit-'));
   const previousPath = process.env['PATH'];
   try {
@@ -52,7 +30,7 @@ process.stdout.write('SHA256=${'b'.repeat(64)}\\n');
     ]);
     process.env['PATH'] = `${bin}:${previousPath ?? ''}`;
 
-    const rendered = await renderRoute('cli:audit', {
+    const rendered = await renderRoute('tool:curator/audit_audiobook', {
       input: { file, receipt },
     });
     const canonicalReceipt = JSON.parse(await readFile(receipt, 'utf8')) as unknown;
diff --git a/examples/audiobook-curator/tests/route-unit/cli-dispatch.test.ts b/examples/audiobook-curator/tests/route-unit/cli-dispatch.test.ts
index 8b02ff5f3..24a9a267d 100644
--- a/examples/audiobook-curator/tests/route-unit/cli-dispatch.test.ts
+++ b/examples/audiobook-curator/tests/route-unit/cli-dispatch.test.ts
@@ -3,16 +3,14 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
 import { afterEach, describe, expect, it } from '@rstest/core';
-import { cliJson, cliNdjson, invokeCli } from 'agent-bundle/test';
-
-import inspectRoute, {
-  inputSchema as inspectInputSchema,
-  resultSchema as inspectResultSchema,
-} from '../../src/cli/inspect.ts';
-import { resultSchema as inventoryResultSchema } from '../../src/cli/inventory.tsx';
-import { resultSchema as libraryAuditResultSchema } from '../../src/cli/library-audit.tsx';
+import { cliJson, cliNdjson, invokeCli, invokeMcpTool } from 'agent-bundle/test';
+
+import { resultSchema as libraryAuditResultSchema } from '../../src/mcp/curator/tools/audit_library.tsx';
 import { inputSchema as convertAudiobookInputSchema } from '../../src/mcp/curator/tools/convert_audiobook.tsx';
-import { resultSchema as inspectSourcesResultSchema } from '../../src/mcp/curator/tools/inspect_sources.tsx';
+import { inputSchema as inspectInputSchema, resultSchema as inspectResultSchema } from '../../src/mcp/curator/tools/inspect_sources.tsx';
+import { resultSchema as inventoryResultSchema } from '../../src/mcp/curator/tools/inventory_sources.tsx';
+import { resultSchema as audibleSearchResultSchema } from '../../src/mcp/curator/tools/search_audible.tsx';
+import { discoveryOperations } from '../../src/operations/discovery.ts';
 
 const directories: string[] = [];
 
@@ -46,16 +44,16 @@ const invokeLibraryAudit = async (
 };
 
 const libraryAuditMarkdown = [
-  'Audited 0 files (0 bytes) across 1 sources.',
-  '',
-  '## Library audit',
+  'Audited 0 library media files and found 0 duplicate candidate groups.',
   '',
   '- **Files:** 0',
   '- **Total bytes:** 0',
-  '- **Sources:** 1',
-  '- **Metadata issues:** 0',
-  '- **Duplicate candidates:** 0',
-  '- **Multipart candidates:** 0',
+  '- **Missing album:** 0',
+  '- **Missing artwork:** 0',
+  '- **Missing author:** 0',
+  '- **Missing chapters:** 0',
+  '- **Missing title:** 0',
+  '- **Probe failures:** 0',
   '',
   'No duplicate or multipart candidate groups were found.',
   '',
@@ -63,18 +61,51 @@ const libraryAuditMarkdown = [
   '',
 ].join('\n');
 
+const audibleProduct = {
+  asin: 'B012345678',
+  authors: [{ name: 'Ursula K. Le Guin' }],
+  format_type: 'Unabridged',
+  language: 'English',
+  narrators: [{ name: 'Rob Inglis' }],
+  runtime_length_min: 600,
+  title: 'A Wizard of Earthsea',
+};
+
+/**
+ * A deterministic Audible: every catalog request answers with one product,
+ * and the requested hosts are recorded so a test can count domain calls. The
+ * projection contract must be provable while Audible itself is unreachable.
+ */
+const withAudible = async <T>(run: () => Promise<T>): Promise<{ readonly hosts: readonly string[]; readonly value: T }> => {
+  const hosts: string[] = [];
+  const realFetch = globalThis.fetch;
+  globalThis.fetch = async (input) => {
+    hosts.push(new URL(typeof input === 'string' ? input : input instanceof URL ? input.href : input.url).host);
+    return new Response(JSON.stringify({ products: [audibleProduct] }), { headers: { 'content-type': 'application/json' } });
+  };
+  try {
+    return { hosts, value: await run() };
+  } finally {
+    globalThis.fetch = realFetch;
+  }
+};
+
+const withoutGeneratedAt = (value: unknown): unknown => {
+  const { generatedAt: _generatedAt, ...rest } = value as { readonly generatedAt: string };
+  return rest;
+};
+
 afterEach(async () => {
   await Promise.all(directories.splice(0).map((directory) => rm(directory, { force: true, recursive: true })));
 });
 
 describe('audiobook-curator at the CLI dispatch proof level', () => {
-  describe('custom commands', () => {
-    it('emits the inspect receipt as one canonical JSON line with direct-operation byte parity', async () => {
+  describe('projected tool commands', () => {
+    it('emits the inspect receipt as one canonical JSON line with direct-operation parity', async () => {
       const { library } = await temporaryLibrary();
-      const run = await invokeCli(['inspect', library, '--max-files', '1']);
+      const run = await invokeCli(['inspect', library, '--max-files', '1', '--json']);
       const directInput = inspectInputSchema.parse({ maxFiles: 1, root: library });
-      const direct = inspectResultSchema.parse(await inspectRoute({
-        input: directInput,
+      const direct = inspectResultSchema.parse(await discoveryOperations.inspect.handler(directInput, {
         signal: new AbortController().signal,
       }));
       const receipt = inspectResultSchema.parse(cliJson(run));
@@ -82,11 +113,26 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
       expect(run.exitCode).toBe(0);
       expect(run.stderr).toBe('');
       expect(run.provenance.proofLevel).toBe('cli-dispatch');
+      expect(run.routeId).toBe('tool:curator/inspect_sources');
       expect(receipt).toEqual(direct);
       expect(run.value).toEqual(direct);
       expect(run.stdout).toBe(`${JSON.stringify(direct)}\n`);
     });
 
+    it('renders the tool document for the plain command and rejects the bulk curator group', async () => {
+      const { library } = await temporaryLibrary();
+      const run = await invokeCli(['inspect', library]);
+      expect(run.exitCode).toBe(0);
+      expect(run.stdout).toContain('Inspected 0 audio files (0 bytes).');
+      expect(run.stdout).toContain(`- **Root:** ${library}`);
+
+      // One operation compiles to one command: a projected tool has no
+      // `curator <tool> --input` twin.
+      const bulk = await invokeCli(['curator', 'inspect_sources', '--input', JSON.stringify({ root: library })]);
+      expect(bulk.exitCode).toBe(2);
+      expect(bulk.stderr).toContain('Unknown command: curator.');
+    });
+
     it('uses a successful inventory receipt exit code as the process exit code', async () => {
       const { library, report } = await temporaryLibrary();
       const run = await invokeCli(['inventory', library, '--report', report, '--strict', '--json']);
@@ -146,14 +192,13 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
       expect(run.stderr).toContain("Run 'audiobook-curator inspect --help' for usage.");
     });
 
-    it('reports a missing required option as a usage failure with the command help hint', async () => {
-      const { library } = await temporaryLibrary();
-      const run = await invokeCli(['inventory', library]);
+    it('reports a missing required option under its projected spelling with the command help hint', async () => {
+      const run = await invokeCli(['audible-cache', '--asin', 'B012345678']);
 
       expect(run.exitCode).toBe(2);
       expect(run.stdout).toBe('');
-      expect(run.stderr).toContain('Missing required option: --report.');
-      expect(run.stderr).toContain("Run 'audiobook-curator inventory --help' for usage.");
+      expect(run.stderr).toContain('Missing required option: --cache-dir.');
+      expect(run.stderr).toContain("Run 'audiobook-curator audible-cache --help' for usage.");
     });
 
     it('projects real option spellings into command help and all routes into root help', async () => {
@@ -166,8 +211,11 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
       expect(commandHelp.stderr).toBe('');
       expect(commandHelp.stdout).toContain('Usage: audiobook-curator inspect [options] <root>');
       expect(commandHelp.stdout).toContain('--max-files <number>');
+      expect(commandHelp.stdout).toContain('MCP tool: curator:inspect_sources');
+      expect(commandHelp.stdout).toContain('Projection: src/mcp/curator/tools/inspect_sources.cli.ts');
       expect(rootHelp.exitCode).toBe(0);
       expect(rootHelp.stderr).toBe('');
+      expect(rootHelp.stdout).not.toMatch(/^ {2}curator(?: |$)/mu);
       for (const command of [
         'acoustic-identify',
         'acoustic-verify',
@@ -183,6 +231,7 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
         'library-audit',
         'prepare',
         'select',
+        'shelf',
         'whisper-verify',
       ]) {
         expect(rootHelp.stdout).toMatch(new RegExp(`^  ${command}(?: |$)`, 'mu'));
@@ -206,31 +255,84 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
     });
   });
 
-  describe('projected MCP commands', () => {
-    it('runs read-only inspect_sources without --yes and emits its schema-validated JSON receipt', async () => {
-      const { library } = await temporaryLibrary();
-      const run = await invokeCli([
-        'curator',
-        'inspect_sources',
-        '--input',
-        JSON.stringify({ root: library }),
+  describe('the audible-search projection against the search_audible tool', () => {
+    const query = {
+      author: 'Ursula K. Le Guin',
+      durationSeconds: 36_000,
+      title: 'A Wizard of Earthsea',
+    };
+
+    it('reaches one domain invocation per region from either surface with an equal receipt', async () => {
+      const cli = await withAudible(() => invokeCli([
+        'audible-search',
+        '--title', query.title,
+        '--author', query.author,
+        '--duration', String(query.durationSeconds),
+        '--regions', 'us,uk',
         '--json',
-      ]);
-      const receipt = inspectSourcesResultSchema.parse(cliJson(run));
+      ]));
+      const tool = await withAudible(() => invokeMcpTool('search_audible', { input: { ...query, regions: ['us', 'uk'] } }));
+      const receipt = audibleSearchResultSchema.parse(cliJson(cli.value));
+
+      expect(cli.value.exitCode).toBe(0);
+      expect(cli.value.stderr).toBe('');
+      expect(cli.value.routeId).toBe('tool:curator/search_audible');
+      expect(cli.hosts).toEqual(['api.audible.com', 'api.audible.co.uk']);
+      expect(tool.hosts).toEqual(cli.hosts);
+      expect(tool.value.isError).toBe(false);
+      expect(receipt.query).toEqual(query);
+      expect(receipt.candidates.map((candidate) => candidate.region)).toEqual(['us', 'uk']);
+      expect(withoutGeneratedAt(tool.value.structuredContent)).toEqual(withoutGeneratedAt(receipt));
+      expect(cli.value.value).toEqual(receipt);
+    });
 
+    it('renders the same headline and ranking the tool renders', async () => {
+      const { value: run } = await withAudible(() => invokeCli(['audible-search', '--title', query.title]));
       expect(run.exitCode).toBe(0);
-      expect(run.stderr).toBe('');
-      expect(run.routeId).toBe('tool:curator/inspect_sources');
-      expect(receipt).toMatchObject({
-        files: [],
-        operation: 'inspect',
-        root: library,
-        totalBytes: 0,
-      });
-      expect(run.value).toEqual(receipt);
+      expect(run.stdout).toContain('Ranked 1 Audible candidates');
+      expect(run.stdout).toContain('A Wizard of Earthsea');
+    });
+
+    it('defaults an omitted --regions to the operation default of one us search', async () => {
+      const { hosts, value: run } = await withAudible(() => invokeCli(['audible-search', '--title', query.title, '--json']));
+      expect(run.exitCode).toBe(0);
+      expect(hosts).toEqual(['api.audible.com']);
+      expect(audibleSearchResultSchema.parse(cliJson(run)).query).toEqual({ title: query.title });
+    });
+
+    it('accepts a repeated --regions and rejects an unknown region as a usage failure', async () => {
+      const repeated = await withAudible(() => invokeCli(['audible-search', '--title', query.title, '--regions', 'de', '--regions', 'fr', '--json']));
+      expect(repeated.value.exitCode).toBe(0);
+      expect(repeated.hosts).toEqual(['api.audible.de', 'api.audible.fr']);
+
+      // The region list is split before the canonical schema validates, so a
+      // typo is a usage failure the tool's enum reports, never a request.
+      const rejected = await withAudible(() => invokeCli(['audible-search', '--title', query.title, '--regions', 'us,mars']));
+      expect(rejected.hosts).toEqual([]);
+      expect(rejected.value.exitCode).toBe(2);
+      expect(rejected.value.stdout).toBe('');
+      expect(rejected.value.stderr).toContain('Invalid value for --regions[1]');
+      expect(rejected.value.stderr).toContain('"mars"');
+      expect(rejected.value.value).toBeUndefined();
     });
 
-    it('fails convert_audiobook closed without --yes and reaches domain validation with it', async () => {
+    it('uses the receipt exit code when every region fails', async () => {
+      const realFetch = globalThis.fetch;
+      globalThis.fetch = async () => { throw new Error('offline'); };
+      try {
+        const run = await invokeCli(['audible-search', '--title', query.title, '--attempts', '1', '--json']);
+        const receipt = audibleSearchResultSchema.parse(cliJson(run));
+        expect(receipt.exitCode).toBe(1);
+        expect(receipt.errors.map((error) => error.region)).toEqual(['us']);
+        expect(run.exitCode).toBe(1);
+      } finally {
+        globalThis.fetch = realFetch;
+      }
+    });
+  });
+
+  describe('mutation commands keep the plan-first policy', () => {
+    it('runs convert without --yes, gates the mutation on --apply, and reaches domain validation', async () => {
       const { directory } = await temporaryLibrary();
       const selection = join(directory, 'selection.json');
       await writeFile(selection, JSON.stringify({ selections: [] }));
@@ -240,61 +342,31 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
         selection,
         title: 'Example Title',
       });
-      const argv = ['curator', 'convert_audiobook', '--input', JSON.stringify(input)];
-
-      const denied = await invokeCli(argv);
-      expect(denied.exitCode).toBe(2);
-      expect(denied.stdout).toBe('');
-      expect(denied.stderr).toContain('--yes');
-      expect(denied.value).toBeUndefined();
+      const argv = [
+        'convert',
+        '--author', input.author,
+        '--output', input.output,
+        '--selection', input.selection,
+        '--title', input.title,
+      ];
 
       // An empty selection reaches domain validation before any media probe or binary.
-      const allowed = await invokeCli([...argv, '--yes', '--json']);
-      expect(allowed.exitCode).toBe(1);
-      expect(allowed.stdout).toBe('');
-      expect(allowed.stderr).toContain('Selection contains no audio files.');
-      expect(allowed.stderr).not.toContain('requires --yes');
-      expect(allowed.value).toBeUndefined();
-    });
-
-    it('maps invalid JSON and tool inputSchema rejection to usage exit 2', async () => {
-      const invalidJson = await invokeCli(['curator', 'inspect_sources', '--input', '{']);
-      expect(invalidJson.exitCode).toBe(2);
-      expect(invalidJson.stdout).toBe('');
-      expect(invalidJson.stderr).toContain('valid JSON object');
-      expect(invalidJson.value).toBeUndefined();
-
-      const rejected = await invokeCli([
-        'curator',
-        'inspect_sources',
-        '--input',
-        '{"root":""}',
-      ]);
-      expect(rejected.exitCode).toBe(2);
-      expect(rejected.stdout).toBe('');
-      expect(rejected.stderr).toContain('root');
-      expect(rejected.stderr).toContain("Run 'audiobook-curator curator inspect_sources --help' for usage.");
-      expect(rejected.value).toBeUndefined();
-    });
-
-    it('merges the curator group with custom commands and explains projected provenance', async () => {
-      const [rootHelp, curatorHelp, mutationHelp] = await Promise.all([
-        invokeCli(['--help']),
-        invokeCli(['curator', '--help']),
-        invokeCli(['curator', 'convert_audiobook', '--help']),
-      ]);
-
-      expect(rootHelp.exitCode).toBe(0);
-      expect(rootHelp.stderr).toBe('');
-      expect(rootHelp.stdout).toMatch(/^ {2}curator <command>(?: |$)/mu);
-      expect(rootHelp.stdout).toMatch(/^ {2}inspect(?: |$)/mu);
-      expect(curatorHelp.exitCode).toBe(0);
-      expect(curatorHelp.stderr).toBe('');
-      expect(curatorHelp.stdout).toMatch(/^ {2}inspect_sources(?: |$)/mu);
-      expect(mutationHelp.exitCode).toBe(0);
-      expect(mutationHelp.stderr).toBe('');
-      expect(mutationHelp.stdout).toContain('MCP tool: curator:convert_audiobook');
-      expect(mutationHelp.stdout).toContain('Mutation-capable; requires --yes.');
+      const planned = await invokeCli([...argv, '--json']);
+      expect(planned.exitCode).toBe(1);
+      expect(planned.stdout).toBe('');
+      expect(planned.stderr).toContain('Selection contains no audio files.');
+      expect(planned.stderr).not.toContain('--yes');
+      expect(planned.value).toBeUndefined();
+
+      // The projection declares confirm: false, so --yes is not an option here.
+      const confirmed = await invokeCli([...argv, '--yes']);
+      expect(confirmed.exitCode).toBe(2);
+      expect(confirmed.stderr).toContain('Unknown option: --yes.');
+
+      const help = await invokeCli(['convert', '--help']);
+      expect(help.stdout).toContain('MCP tool: curator:convert_audiobook');
+      expect(help.stdout).toContain('--apply');
+      expect(help.stdout).not.toContain('requires --yes');
     });
   });
 
@@ -305,8 +377,7 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
       expect(run.exitCode).toBe(0);
       expect(run.stderr).toBe('');
       expect(run.stdout).toBe(libraryAuditMarkdown);
-      expect(run.stdout).not.toContain('Auditing sources');
-      expect(run.stdout).not.toContain('Audit complete');
+      expect(run.stdout).not.toContain('Analyzing duplicate and multipart groups');
       expect(libraryAuditResultSchema.parse(run.value)).toMatchObject({
         exitCode: 0,
         operation: 'library-audit',
@@ -315,13 +386,12 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
       expect(libraryAuditResultSchema.parse(JSON.parse(await readFile(report, 'utf8')))).toEqual(run.value);
     });
 
-    it('writes progress-in-place frames before the final Markdown for an explicit TTY', async () => {
+    it('writes the Suspense progress frame in place before the final Markdown for an explicit TTY', async () => {
       const { run } = await invokeLibraryAudit([], true);
 
       expect(run.exitCode).toBe(0);
       expect(run.stderr).toBe('');
-      expect(run.stdout).toContain('\r\u001B[2KAuditing sources (0/1)');
-      expect(run.stdout).toContain('\r\u001B[2KAudit complete (1/1)');
+      expect(run.stdout).toContain('\r\u001B[2KAnalyzing duplicate and multipart groups (0)');
       expect(run.stdout.indexOf('\r\u001B[2K')).toBeLessThan(run.stdout.indexOf(libraryAuditMarkdown));
       expect(run.stdout.endsWith(libraryAuditMarkdown)).toBe(true);
     });
@@ -349,7 +419,9 @@ describe('audiobook-curator at the CLI dispatch proof level', () => {
 
       expect(run.exitCode).toBe(0);
       expect(run.stderr).toBe('');
-      expect(events.some((event) => event.type === 'progress')).toBe(true);
+      // The Suspense fallback is a document event in the stream, not a
+      // `progress` event: the tool reports no request-scoped progress.
+      expect(events.some((event) => event.type === 'progress')).toBe(false);
       expect(sequences.every((sequence, index) => index === 0 || sequence > sequences[index - 1]!)).toBe(true);
       expect(terminal).toMatchObject({
         document: { status: 'success' },
diff --git a/examples/audiobook-curator/tests/route-unit/routes.test.ts b/examples/audiobook-curator/tests/route-unit/routes.test.ts
index 7f5be054f..a13089cfe 100644
--- a/examples/audiobook-curator/tests/route-unit/routes.test.ts
+++ b/examples/audiobook-curator/tests/route-unit/routes.test.ts
@@ -158,36 +158,3 @@ it('caps rendered inventory probe errors while retaining the complete receipt',
     await rm(directory, { force: true, recursive: true });
   }
 });
-
-it('renders the library-audit CLI route with in-flight progress and the canonical receipt (#102 stage 3)', async () => {
-  const directory = await mkdtemp(join(tmpdir(), 'curator-route-unit-audit-'));
-  try {
-    const sources = join(directory, 'library');
-    const report = join(directory, 'report.json');
-    await mkdir(sources, { recursive: true });
-    const rendered = await renderRoute('cli:library-audit', {
-      input: { concurrency: 1, report, sources: [sources] },
-    });
-
-    expectDocument(rendered).toHaveStatus('success').toContainMarkdown('Library audit');
-    const receipt = rendered.document.value as {
-      readonly exitCode: number;
-      readonly operation: string;
-      readonly summary: { readonly files: number };
-    };
-    expect(receipt.operation).toBe('library-audit');
-    expect(receipt.exitCode).toBe(0);
-    expect(receipt.summary.files).toBe(0);
-    // The same shell wraps rendered CLI commands; a CLI route has no owning server.
-    expect(rendered.document.root.kind === 'result' ? rendered.document.root.metadata : undefined).toEqual({
-      curator: { route: 'cli:library-audit', server: null, surface: 'cli' },
-    });
-    // The component reported request-scoped progress around the audit.
-    expect(rendered.progress.map((update) => update.completed)).toEqual([0, 1]);
-    // The receipt landed in the requested report file, exactly like the
-    // pre-migration plain command.
-    expect(JSON.parse(await readFile(report, 'utf8'))).toMatchObject({ operation: 'library-audit' });
-  } finally {
-    await rm(directory, { force: true, recursive: true });
-  }
-});
diff --git a/packages/agent-bundle/fixtures/route-harness/src/mcp/harness/tools/submit.cli.tsx b/packages/agent-bundle/fixtures/route-harness/src/mcp/harness/tools/submit.cli.tsx
index e546dcd09..7685815c4 100644
--- a/packages/agent-bundle/fixtures/route-harness/src/mcp/harness/tools/submit.cli.tsx
+++ b/packages/agent-bundle/fixtures/route-harness/src/mcp/harness/tools/submit.cli.tsx
@@ -10,23 +10,31 @@ export const config = {
   flags: {
     cwd: { description: 'Working directory of the command (default: the current directory).', required: false },
     laneKey: { name: 'lane' },
+    regions: { description: 'Region the work may run in (repeatable, or comma-separated).', name: 'region' },
     tags: { description: 'Tag attached to the request (repeatable; duplicates are dropped).', name: 'tag' },
   },
   positionals: ['argv'],
 } satisfies CliProjectionConfig<typeof inputSchema>;
 
-type CliInput = Omit<z.input<typeof inputSchema>, 'cwd'> & { readonly cwd?: string };
+type CliInput = Omit<z.input<typeof inputSchema>, 'cwd' | 'regions'> & {
+  readonly cwd?: string;
+  readonly regions?: readonly string[];
+};
 
-// Leading "!" tags exercise projection mapping failures.
+// Leading "!" tags exercise projection mapping failures; `--region eu,us`
+// exercises a comma-separated enum list the canonical schema judges after
+// mapInput has split it.
 export const mapInput = (input: CliInput): z.input<typeof inputSchema> => {
   const tags = input.tags === undefined ? undefined : dedupe(input.tags);
   const rejected = tags?.find((tag) => tag.startsWith('!'));
   if (rejected !== undefined) {
     throw new Error(`Tag ${JSON.stringify(rejected)} must not start with "!".`);
   }
+  const { regions, ...rest } = input;
   return {
-    ...input,
+    ...rest,
     cwd: input.cwd ?? process.cwd(),
+    ...(regions === undefined ? {} : { regions: regions.flatMap((value) => value.split(',')) as z.input<typeof inputSchema>['regions'] }),
     ...(tags === undefined ? {} : { tags: [...tags] }),
   };
 };
diff --git a/packages/agent-bundle/fixtures/route-harness/src/mcp/harness/tools/submit.tsx b/packages/agent-bundle/fixtures/route-harness/src/mcp/harness/tools/submit.tsx
index e2b4b1375..11d71f5ca 100644
--- a/packages/agent-bundle/fixtures/route-harness/src/mcp/harness/tools/submit.tsx
+++ b/packages/agent-bundle/fixtures/route-harness/src/mcp/harness/tools/submit.tsx
@@ -11,6 +11,7 @@ export const inputSchema = z.object({
   argv: z.array(z.string()).min(1).describe('The command line to run.'),
   cwd: z.string().min(1).describe('Working directory of the command.'),
   laneKey: z.string().min(1).optional().describe('Lane the work is queued under.'),
+  regions: z.array(z.enum(['eu', 'us'])).optional().describe('Regions the work may run in.'),
   tags: z.array(z.string()).optional().describe('Tags attached to the request.'),
 });
 
@@ -19,6 +20,7 @@ export const resultSchema = z.object({
   cwd: z.string().min(1),
   laneKey: z.string().optional(),
   operation: z.literal('submit'),
+  regions: z.array(z.string()).optional(),
   tags: z.array(z.string()).optional(),
 });
 
@@ -29,6 +31,7 @@ export default async function Submit({ input }: { readonly input: z.infer<typeof
     cwd: input.cwd,
     ...(input.laneKey === undefined ? {} : { laneKey: input.laneKey }),
     operation: 'submit' as const,
+    ...(input.regions === undefined ? {} : { regions: input.regions }),
     ...(input.tags === undefined ? {} : { tags: input.tags }),
   };
   const { invocation, providers } = context;
diff --git a/packages/agent-bundle/src/cli-entry.ts b/packages/agent-bundle/src/cli-entry.ts
index ada73a06b..fd9ca9e37 100644
--- a/packages/agent-bundle/src/cli-entry.ts
+++ b/packages/agent-bundle/src/cli-entry.ts
@@ -520,7 +520,13 @@ export interface ParsedGeneratedCliArgv {
   readonly ndjson: boolean;
 }
 
-const coerceValue = (option: CompiledCliOption, value: string): unknown => {
+/**
+ * `deferChoices` is true for a command whose projection exports `mapInput`:
+ * the mapper may still split or rename an enum value (`--regions us,uk`), so
+ * the canonical schema judges the choices after it runs, with the same
+ * `Invalid value for --<option>` report every other schema issue gets.
+ */
+const coerceValue = (option: CompiledCliOption, value: string, deferChoices: boolean): unknown => {
   switch (option.kind) {
     case 'boolean':
       throw new CliUsageError(`--${option.option} is a flag and takes no value.`);
@@ -532,7 +538,7 @@ const coerceValue = (option: CompiledCliOption, value: string): unknown => {
       return parsed;
     }
     case 'enum': {
-      if (!(option.choices ?? []).includes(value)) {
+      if (!deferChoices && !(option.choices ?? []).includes(value)) {
         throw new CliUsageError(`--${option.option} must be one of: ${(option.choices ?? []).join(', ')}.`);
       }
       return value;
@@ -546,7 +552,7 @@ const coerceValue = (option: CompiledCliOption, value: string): unknown => {
   }
 };
 
-const coercePositional = (option: CompiledCliOption, value: string): unknown => {
+const coercePositional = (option: CompiledCliOption, value: string, deferChoices: boolean): unknown => {
   switch (option.kind) {
     case 'number': {
       const parsed = Number(value);
@@ -556,7 +562,7 @@ const coercePositional = (option: CompiledCliOption, value: string): unknown =>
       return parsed;
     }
     case 'enum': {
-      if (!(option.choices ?? []).includes(value)) {
+      if (!deferChoices && !(option.choices ?? []).includes(value)) {
         throw new CliUsageError(`<${option.option}> must be one of: ${(option.choices ?? []).join(', ')}.`);
       }
       return value;
@@ -580,6 +586,7 @@ const parseCommandArgv = (command: CompiledCliCommand, argv: readonly string[]):
     for (const alias of option.aliases ?? []) options.set(alias, option);
   }
   const positionals = sortedPositionals(command);
+  const deferChoices = command.projection?.mapInput === true;
   const values = new Map<string, unknown>();
   const bare: string[] = [];
   let json = false;
@@ -612,7 +619,7 @@ const parseCommandArgv = (command: CompiledCliCommand, argv: readonly string[]):
       value = next;
       index += 1;
     }
-    const coerced = coerceValue(option, value);
+    const coerced = coerceValue(option, value, deferChoices);
     if (option.repeated) {
       const existing = values.get(option.key);
       values.set(option.key, Array.isArray(existing) ? [...existing, coerced] : [coerced]);
@@ -643,7 +650,7 @@ const parseCommandArgv = (command: CompiledCliCommand, argv: readonly string[]):
   let cursor = 0;
   for (const option of positionals) {
     if (option.repeated) {
-      const rest = bare.slice(cursor).map((value) => coercePositional(option, value));
+      const rest = bare.slice(cursor).map((value) => coercePositional(option, value, deferChoices));
       cursor = bare.length;
       if (rest.length === 0) {
         if (option.required) throw new CliUsageError(`Missing required argument: <${option.option}...>.`);
@@ -656,7 +663,7 @@ const parseCommandArgv = (command: CompiledCliCommand, argv: readonly string[]):
       if (option.required) throw new CliUsageError(`Missing required argument: <${option.option}>.`);
       continue;
     }
-    values.set(option.key, coercePositional(option, bare[cursor]!));
+    values.set(option.key, coercePositional(option, bare[cursor]!, deferChoices));
     cursor += 1;
   }
   if (cursor < bare.length) {
diff --git a/packages/agent-bundle/tests/examples-contract.test.ts b/packages/agent-bundle/tests/examples-contract.test.ts
index 58323f193..de3df9a29 100644
--- a/packages/agent-bundle/tests/examples-contract.test.ts
+++ b/packages/agent-bundle/tests/examples-contract.test.ts
@@ -304,7 +304,7 @@ it('derives the Audiobook Curator release identity from package.json as the one
 });
 
 
-it('serves the routed Audiobook Curator artifact through a real MCP client', { retry: 2, timeout: 60_000 }, async () => {
+it('serves the routed Audiobook Curator artifact through a real MCP client and its projected bin', { retry: 2, timeout: 60_000 }, async () => {
   const fixtureRoot = await mkdtemp(join(tmpdir(), 'audiobook-routed-artifact-'));
   const root = join(fixtureRoot, 'project');
   await cp(join(examplesRoot, 'audiobook-curator'), root, {
@@ -332,6 +332,18 @@ it('serves the routed Audiobook Curator artifact through a real MCP client', { r
       content: expect.arrayContaining([expect.objectContaining({ type: 'text' })]),
       structuredContent: { operation: 'inspect', root },
     });
+
+    // The same tool from the source-free artifact bin, through its `.cli.ts`
+    // projection (#725): `inspect <root>` is `tool:curator/inspect_sources`,
+    // and the receipt is the MCP structuredContent.
+    const bin = join(output, 'bin', 'audiobook-curator.mjs');
+    const projected = await execFile(process.execPath, [bin, 'inspect', root, '--json'], { cwd: fixtureRoot });
+    expect(JSON.parse(projected.stdout)).toEqual(inspectResult.structuredContent);
+    const usage = await execFile(process.execPath, [bin, 'inspect', '--help'], { cwd: fixtureRoot });
+    expect(usage.stdout).toContain('MCP tool: curator:inspect_sources');
+    expect(usage.stdout).toContain('--max-files <number>');
+    await expect(execFile(process.execPath, [bin, 'curator', 'inspect_sources'], { cwd: fixtureRoot }))
+      .rejects.toMatchObject({ code: 2, stderr: expect.stringContaining('Unknown command: curator.') });
     await expect(client.listResources()).resolves.toMatchObject({
       resources: expect.arrayContaining([
         expect.objectContaining({ uri: 'audiobook-curator://catalog' }),
diff --git a/packages/agent-bundle/tests/projection/cli-dispatch-projection.test.ts b/packages/agent-bundle/tests/projection/cli-dispatch-projection.test.ts
index 0cd516518..dabb03316 100644
--- a/packages/agent-bundle/tests/projection/cli-dispatch-projection.test.ts
+++ b/packages/agent-bundle/tests/projection/cli-dispatch-projection.test.ts
@@ -51,6 +51,7 @@ describe('the CLI surface projection of tool:harness/submit', () => {
         expect.objectContaining({ description: 'The command line to run.', key: 'argv', kind: 'string', option: 'argv', positional: 0, repeated: true, required: true }),
         expect.objectContaining({ description: 'Working directory of the command (default: the current directory).', key: 'cwd', kind: 'string', option: 'cwd', repeated: false, required: false }),
         expect.objectContaining({ description: 'Lane the work is queued under.', key: 'laneKey', kind: 'string', option: 'lane', repeated: false, required: false }),
+        expect.objectContaining({ choices: ['eu', 'us'], description: 'Region the work may run in (repeatable, or comma-separated).', key: 'regions', kind: 'enum', option: 'region', repeated: true, required: false }),
         expect.objectContaining({ description: 'Tag attached to the request (repeatable; duplicates are dropped).', key: 'tags', kind: 'string', option: 'tag', repeated: true, required: false }),
       ],
       path: ['submit'],
@@ -139,6 +140,27 @@ describe('the CLI surface projection of tool:harness/submit', () => {
     expect(cliJson(run)).toMatchObject({ tags: ['a', 'b'] });
   });
 
+  it('defers enum choices to the canonical schema so mapInput can split a comma-separated list', async () => {
+    const split = await invokeCli(['submit', '--region', 'eu,us', '--json', '--', 'cargo', 'check']);
+    expect(split.exitCode).toBe(0);
+    expect(cliJson(split)).toMatchObject({ regions: ['eu', 'us'] });
+
+    const repeated = await invokeCli(['submit', '--region', 'us', '--region', 'eu', '--json', '--', 'cargo', 'check']);
+    expect(repeated.exitCode).toBe(0);
+    expect(cliJson(repeated)).toMatchObject({ regions: ['us', 'eu'] });
+
+    // The choices are still enforced, by the schema after mapInput, under the CLI spelling.
+    const rejected = await invokeCli(['submit', '--region', 'mars', '--', 'cargo', 'check']);
+    expect(rejected.exitCode).toBe(2);
+    expect(rejected.stdout).toBe('');
+    expect(rejected.stderr).toBe([
+      'Invalid value for --region[0]: expected one of: "eu", "us"; received "mars".',
+      usage,
+      helpHint,
+      '',
+    ].join('\n'));
+  });
+
   it('reports a thrown mapInput as an input failure: exit 2, nothing written to stdout, no value', async () => {
     const run = await invokeCli(['submit', '--tag', '!boom', '--', 'cargo', 'check']);
     expect(run.exitCode).toBe(2);
diff --git a/packages/agent-bundle/tests/workbench-surface.test.ts b/packages/agent-bundle/tests/workbench-surface.test.ts
index eba6a050b..bba6b1843 100644
--- a/packages/agent-bundle/tests/workbench-surface.test.ts
+++ b/packages/agent-bundle/tests/workbench-surface.test.ts
@@ -115,51 +115,34 @@ describe('the Workbench surface of the audiobook curator', () => {
     expect(search === undefined ? undefined : workbenchLeafPath(search)).toBe('/routes/mcp/curator/tool/search_audible');
   });
 
-  it('lists the 16 authored commands beside one projected command per tool', async () => {
+  it('lists one projected command per tool and no authored command', async () => {
     const surface = await surfacePromise;
     const cli = groupNamed(surface, 'CLI commands');
     const routeIds = cli.entries.map((entry) => entry.route.id);
-    const authored = routeIds.filter((routeId) => routeId.startsWith('cli:'));
-    const projected = routeIds.filter((routeId) => routeId.startsWith('tool:'));
 
     expect(cli.mode).toBe('generated');
-    expect(authored).toEqual([
-      'cli:acoustic-identify',
-      'cli:acoustic-verify',
-      'cli:apply-chapters',
-      'cli:apply-metadata',
-      'cli:audible-cache',
-      'cli:audible-search',
-      'cli:audible-select',
-      'cli:audit',
-      'cli:convert',
-      'cli:inspect',
-      'cli:inventory',
-      'cli:library-audit',
-      'cli:prepare',
-      'cli:select',
-      'cli:shelf',
-      'cli:whisper-verify',
-    ]);
-    expect(projected).toEqual(groupNamed(surface, 'curator · Tools').entries.map((entry) => entry.route.id));
-    expect(new Set(routeIds).size).toBe(routeIds.length);
-    expect(routeIds).toHaveLength(authored.length + projected.length);
+    // Every command is a `<tool>.cli.ts` projection (#725): the CLI group
+    // carries the tools' identities, in the tools' order, and nothing else.
+    expect(routeIds.filter((routeId) => routeId.startsWith('cli:'))).toEqual([]);
+    expect(routeIds).toEqual(groupNamed(surface, 'curator · Tools').entries.map((entry) => entry.route.id));
+    expect(new Set(routeIds).size).toBe(16);
     const byId = new Map(cli.entries.map((entry) => [entry.route.id, entry]));
-    expect(byId.get('cli:library-audit')?.route.source).toBe('src/cli/library-audit.tsx');
-    expect(byId.get('cli:shelf')?.route.source).toBe('src/cli/shelf.tsx');
-    expect(byId.get('cli:library-audit')?.commandUsage)
-      .toBe('library-audit <sources...> [--concurrency <number>] --report <string> [--strict]');
-    expect(byId.get('cli:inspect')?.commandUsage).toBe('inspect <root> [--max-files <number>]');
-    // Projected commands carry their MCP provenance and the annotation-derived
-    // confirmation policy: read-only tools run without --yes, mutation-capable
-    // tools fail closed without it.
+    expect(byId.get('tool:curator/audit_library')?.route.source).toBe('src/mcp/curator/tools/audit_library.tsx');
+    expect(byId.get('tool:curator/audit_library')?.command?.projection)
+      .toEqual({ mapInput: false, module: 'src/mcp/curator/tools/audit_library.cli.ts' });
+    expect(byId.get('tool:curator/audit_library')?.commandUsage)
+      .toBe('library-audit <sources...> [--concurrency <number>] [--report <string>] [--strict]');
+    expect(byId.get('tool:curator/inspect_sources')?.commandUsage).toBe('inspect <root> [--max-files <number>]');
+    expect(byId.get('tool:curator/search_audible')?.commandUsage).toContain('[--duration <number>]');
+    // The projections keep the authored CLI's policy: plan-first commands
+    // gate mutation on --apply, so no command asks for --yes.
     expect(byId.get('tool:curator/inspect_sources')?.command?.mcp).toEqual({
       confirm: false,
       server: 'curator',
       tool: 'inspect_sources',
     });
     expect(byId.get('tool:curator/convert_audiobook')?.command?.mcp).toEqual({
-      confirm: true,
+      confirm: false,
       server: 'curator',
       tool: 'convert_audiobook',
     });
@@ -168,8 +151,8 @@ describe('the Workbench surface of the audiobook curator', () => {
   it('reports the route graph identity and invents nothing', async () => {
     const surface = await surfacePromise;
 
-    // 18 MCP routes plus 16 authored and 16 projected CLI routes.
-    expect(surface.catalog.routeCount).toBe(50);
+    // 18 MCP routes plus 16 projected CLI commands.
+    expect(surface.catalog.routeCount).toBe(34);
     expect(surface.catalog.groups.map((group) => group.kind)).not.toContain('event-route');
     expect(surface.catalog.groups.map((group) => group.kind)).not.toContain('script');
     expect(surface.catalog.providers).toEqual([{ id: 'provider:library', name: 'library', source: 'src/providers/library.ts' }]);
diff --git a/packages/workbench/tests/audiobook-curator.acceptance.e2e.test.ts b/packages/workbench/tests/audiobook-curator.acceptance.e2e.test.ts
index b92b3de58..aeba45a86 100644
--- a/packages/workbench/tests/audiobook-curator.acceptance.e2e.test.ts
+++ b/packages/workbench/tests/audiobook-curator.acceptance.e2e.test.ts
@@ -82,11 +82,11 @@ e2e('accepts the audiobook-curator Application workspace at 1440×900', { timeou
     }
     const inventoryLeaf = applicationLeafForRouteId(surface.application, 'tool:curator/inventory_sources');
     const auditLeaf = applicationLeafForRouteId(surface.application, 'tool:curator/audit_library');
-    const inventoryCliLeaf = applicationLeaves(surface.application).find((leaf) =>
-      leaf.routeId === 'cli:inventory' && leaf.ref.kind === 'cli');
-    if (auditLeaf?.ref.kind !== 'tool' || inventoryLeaf?.ref.kind !== 'tool' || inventoryCliLeaf?.ref.kind !== 'cli') {
-      throw new Error('inspectWorkbenchSurface did not project the audit, inventory, and CLI routes.');
+    if (auditLeaf?.ref.kind !== 'tool' || inventoryLeaf?.ref.kind !== 'tool') {
+      throw new Error('inspectWorkbenchSurface did not project the audit and inventory tools.');
     }
+    // The `inventory` command is the tool's `.cli.ts` projection (#725), not a `cli:*` leaf.
+    expect(inventoryLeaf.command?.path).toEqual(['inventory']);
     expect(searchLeaf.ref.server).toBe('curator');
     const searchPath = workbenchLeafPath(searchLeaf);
     expect(searchPath).toBe('/routes/mcp/curator/tool/search_audible');
@@ -153,30 +153,6 @@ e2e('accepts the audiobook-curator Application workspace at 1440×900', { timeou
     await expect(inventoryDocument).toHaveAttribute('aria-busy', 'false', { timeout: runTimeout });
     await expect(inventoryDocument.locator('.agent-document-error-node')).toBeVisible({ timeout: runTimeout });
 
-    await selectApplicationLeaf(page, server.url, inventoryCliLeaf);
-    await workbenchTestId(page, 'routeInputEditor').getByRole('button', { name: 'Raw JSON' }).click();
-    const cliArgs = workbenchTestId(page, 'routeInputEditor').locator('textarea');
-    await cliArgs.fill('[]');
-    await workbenchTestId(page, 'routeRun').click();
-    await expect(inventoryStatus).toHaveClass(/route-status--failed/u, { timeout: runTimeout });
-    await expect(page.getByText(/Loading/u)).toHaveCount(0, { timeout: browserTimeout });
-    await expect(page.locator('.route-diagnostic')).toContainText(/required|missing|usage/iu, { timeout: browserTimeout });
-    await workbenchTestId(page, 'inspectorToggle').click();
-    await page.getByRole('tab', { name: 'Providers' }).click();
-    const libraryProvider = page.getByRole('row').filter({ hasText: 'library' });
-    await expect(libraryProvider).toContainText('unobserved', { timeout: browserTimeout });
-    await expect(libraryProvider).toContainText('—');
-
-    await workbenchTestId(page, 'routeInputEditor').getByRole('button', { name: 'Form' }).click();
-    await fillRouteInput(page, {
-      report: join(project.root, 'inventory-report.json'),
-      source: acceptanceLibrary,
-    });
-    await workbenchTestId(page, 'routeInputEditor').getByLabel('Strict').selectOption('true');
-    await runSelectedRoute(page, runTimeout);
-    await expect(page.getByText(/Loading/u)).toHaveCount(0, { timeout: browserTimeout });
-    await expect(inventoryStatus).toContainText('Exit code 1', { timeout: runTimeout });
-
     await selectApplicationLeaf(page, server.url, searchLeaf);
     await fillRouteInput(page, { title: searchTitle });
     await runSelectedRoute(page, runTimeout);
diff --git a/packages/workbench/tests/examples-real.e2e.test.ts b/packages/workbench/tests/examples-real.e2e.test.ts
index e5accf916..39853ed7c 100644
--- a/packages/workbench/tests/examples-real.e2e.test.ts
+++ b/packages/workbench/tests/examples-real.e2e.test.ts
@@ -379,26 +379,14 @@ e2e('renders the flagship compiled Application tree by server and kind in real C
     await selectApplicationLeaf(page, server.url, searchLeaf);
     await expectApplicationTree(page, surface.application);
     expect(workbenchLeafPath(searchLeaf)).toBe('/routes/mcp/curator/tool/search_audible');
-    const cliLeaves = applicationLeaves(surface.application).filter((leaf) => leaf.ref.kind === 'cli');
-    expect(cliLeaves.map((leaf) => leaf.routeId).filter((id): id is string => id !== undefined).filter((id) => id.startsWith('cli:')).toSorted())
-      .toEqual([
-        'cli:acoustic-identify',
-        'cli:acoustic-verify',
-        'cli:apply-chapters',
-        'cli:apply-metadata',
-        'cli:audible-cache',
-        'cli:audible-search',
-        'cli:audible-select',
-        'cli:audit',
-        'cli:convert',
-        'cli:inspect',
-        'cli:inventory',
-        'cli:library-audit',
-        'cli:prepare',
-        'cli:select',
-        'cli:shelf',
-        'cli:whisper-verify',
-      ]);
+    // Every command is a `<tool>.cli.ts` projection of a curator tool (#725): the CLI
+    // group lists the sixteen tool leaves under their command spelling, and no `cli:*` leaf remains.
+    const cliGroup = surface.application.groups.find((group) => group.kind === 'cli');
+    if (cliGroup?.kind !== 'cli') throw new Error('audiobook-curator surface has no CLI group.');
+    expect(cliGroup.leaves).toHaveLength(16);
+    expect(cliGroup.leaves.every((leaf) => leaf.ref.kind === 'tool' && leaf.command?.projection !== undefined)).toBe(true);
+    expect(applicationLeaves(surface.application).filter((leaf) => leaf.routeId?.startsWith('cli:'))).toEqual([]);
+    expect(searchLeaf.command?.path).toEqual(['audible-search']);
     await captureExampleState(page, 'audiobook-curator', 'routes-catalog-by-server');
 
     await editWatchedSource(server, project.root, conversionSource, `${healthyConversion}\nconst = ;\n`, 'failed');
diff --git a/website/docs/en/examples/audiobook-curator.mdx b/website/docs/en/examples/audiobook-curator.mdx
index d660a2ec3..9ab4ac66f 100644
--- a/website/docs/en/examples/audiobook-curator.mdx
+++ b/website/docs/en/examples/audiobook-curator.mdx
@@ -25,18 +25,21 @@ those features, not the build. This example has no hooks.
 ## What it proves
 
 - **The route tree is the application.** `agent-bundle.config.ts` declares identity, the Node
-  runtime, the two targets, and the MCP-to-CLI projection. File conventions discover the rest:
-  16 tool routes, one catalog resource, and one curation prompt under `src/mcp/curator/`. There
-  is no operation registry, no handwritten `src/mcp/curator.ts`, and no per-operation server
-  selector.
-- **One authored surface, two protocols.** `routes.mcpCommands` projects all 16 MCP tools as
-  `audiobook-curator curator <tool>`, so the compiled graph carries 32 CLI commands: the 16
-  authored ones under `src/cli/` plus the 16 projections. Projected tools take one optional
-  `--input '<JSON object>'`; read-only tools run directly while mutation-capable tools require
-  `--yes`.
-- **Presentation is shared, not duplicated.** `src/components/` is one report library composed by
-  both the MCP routes and the rendered CLI routes, so an MCP tool and its CLI counterpart cannot
-  drift into two presenters.
+  runtime, and the two targets. File conventions discover the rest: 16 tool routes, one catalog
+  resource, and one curation prompt under `src/mcp/curator/`. There is no route registry, no
+  handwritten `src/mcp/curator.ts`, no per-operation server selector, and no `routes` setting.
+- **One operation, one command.** Every tool has a colocated
+  [`<tool>.cli.ts` projection](../guide/authoring/package-entries.mdx#project-one-tool-as-an-idiomatic-command)
+  — `search_audible.cli.ts` spells the tool as `audible-search`, `--duration`, and a
+  comma-separated or repeatable `--regions`; `prepare_audiobook.cli.ts` spells `outputRoot` as
+  `--output` — so the compiled graph carries exactly 16 CLI commands, each with the tool's own
+  identity (`tool:curator/<tool>`). There is no `src/cli/` directory and no
+  `audiobook-curator curator <tool> --input` twin: the projection is the command. Every
+  projection declares `confirm: false` because the plan-first commands gate their mutation on
+  `--apply`, never on `--yes`.
+- **Presentation is shared, not duplicated.** `src/components/` is one report library, and each
+  tool module renders once for both surfaces: the MCP text content and the piped CLI Markdown are
+  the same document, so a tool and its command cannot drift into two presenters.
 - **Markdown blocks are JSX.** The library's `DataList` and `FileList` primitives and the
   duplicate analysis's measured-files table author their Markdown through the runtime's
   [`MarkdownContent`](../guide/authoring/mcp.mdx#rich-markdown-blocks-as-jsx) component —
@@ -48,33 +51,32 @@ those features, not the build. This example has no hooks.
   with the probe time. The catalog resource reads it through `await agent()` and renders either
   the live context or an explicit unavailable state.
 - **Durable state has a mounted identity.** `src/state.ts` mounts the workspace-durable
-  `audiobook-curator/shelf` state with three events. If state is not mounted, the read-only MCP
-  tool and the rendered `shelf` CLI command both return an empty structured shelf and an explicit
-  unavailable notice instead of failing.
+  `audiobook-curator/shelf` state with three events. If state is not mounted, the read-only
+  `review_curation_shelf` tool — `shelf` on the command line — returns an empty structured shelf
+  and an explicit unavailable notice instead of failing.
 - **Suspense becomes MCP progress.** `audit_library` places its asynchronous analysis behind
   React `Suspense` with an `Agent.Progress` fallback, and that fallback alone is the progress
   surface: the generated projector sends it as `notifications/progress` to a client that passed a
   progress token, then replaces it with the completed analysis without changing the final
   structured receipt. No `progress.report()` call repeats the message.
-- **The framework owns the package build.** The config declares no `bin` or `scripts` field. The routed
-  `src/cli/` commands compile into `dist/bin/audiobook-curator.mjs` for `package.json` `bin`, and
+- **The framework owns the package build.** The config declares no `bin` or `scripts` field. The
+  projected commands compile into `dist/bin/audiobook-curator.mjs` for `package.json` `bin`, and
   `dist/index.js` plus declarations serve `exports`. See
   [CLI and library package entries](../guide/authoring/package-entries.mdx).
 - **`package.json` is the single version source.** The config declares no `plugin.version`; the
   resolved version flows into project context, artifact manifests, `inspect` output, dev status,
   and the `agent-bundle/meta` constant this plugin imports.
 
-## Rendered and plain CLI routes
+## Every command renders its tool's document
 
-Seven authored `.tsx` commands render Agent Documents — `inventory`, `select`, `audible-search`,
-`convert`, `audit`, `library-audit`, and `shelf`. An interactive terminal updates their reported
-progress in place; piped output is one final Markdown document. Nine compatibility commands
-remain plain `.ts` routes.
-
-Across both kinds, `--json` selects machine output and emits one result-schema-validated JSON
-value followed by a newline. For a rendered command that value is the canonical final
-`Agent.Result` value — never the Markdown presentation and never an intermediate Suspense
-fallback — so a receipt consumer does not change when a command becomes rendered.
+Each command runs its tool's component. An interactive terminal draws the streamed
+`Agent.Progress` fallback in place; piped output is one final Markdown document — the same
+headline and report the MCP client receives as text content. `--json` selects machine output and
+emits one result-schema-validated JSON value followed by a newline: the canonical final
+`Agent.Result` value, never the Markdown presentation and never an intermediate Suspense fallback,
+and byte for byte the `structuredContent` of the tool call. `--report` and `--receipt` are
+optional on the command line exactly as they are on the tool; a command that gets one still
+writes the receipt file.
 
 ## Working in the workspace
 
diff --git a/website/docs/en/guide/authoring/package-entries.mdx b/website/docs/en/guide/authoring/package-entries.mdx
index 6ac146af1..d58d98c9d 100644
--- a/website/docs/en/guide/authoring/package-entries.mdx
+++ b/website/docs/en/guide/authoring/package-entries.mdx
@@ -322,7 +322,12 @@ is recorded statically and loaded only by the CLI bin; the MCP worker never sees
 `mapInput` is a surface adapter, not domain logic: it only reshapes or defaults argv into the
 canonical input (renames, splitting lists, deriving a working directory). Domain validation and
 behaviour stay in the operation — its `inputSchema` refinements and its component. A mapper that
-recreates command logic is the duplication the projection exists to remove.
+recreates command logic is the duplication the projection exists to remove. Because the mapper
+may still split or rename a value, a command whose projection exports `mapInput` has its
+`z.enum` choices judged by the canonical schema after `mapInput` runs — so `--regions us,uk`
+reaches the mapper — and a value outside the enum is still exit 2, reported as
+`Invalid value for --<option>[<index>]: expected one of: …` under the CLI spelling. A projection
+without `mapInput` rejects an unknown enum value while parsing argv, as a `src/cli` route does.
 
 | Key | Meaning |
 | --- | --- |
diff --git a/website/docs/zh/examples/audiobook-curator.mdx b/website/docs/zh/examples/audiobook-curator.mdx
index e97369785..a9db9d63b 100644
--- a/website/docs/zh/examples/audiobook-curator.mdx
+++ b/website/docs/zh/examples/audiobook-curator.mdx
@@ -22,15 +22,19 @@ description: '有声书策展器示例：一个由路由模块、请求上下文
 
 ## 它证明什么
 
-- **路由树就是应用。** `agent-bundle.config.ts` 声明标识、Node 运行时、两个 target 与 MCP 到 CLI 的
-  投影。其余由文件约定发现：`src/mcp/curator/` 下的 16 个工具路由、1 个目录资源与 1 个策展提示词。
-  这里没有操作注册表，没有手写的 `src/mcp/curator.ts`，也没有逐操作的服务器选择器。
-- **一份编写好的表面，两种协议。** `routes.mcpCommands` 把全部 16 个 MCP 工具投影为
-  `audiobook-curator curator <tool>`，因此编译后的图共有 32 条 CLI 命令：`src/cli/` 下 16 条编写好的，
-  加上 16 条投影出来的。被投影的工具接受一个可选的 `--input '<JSON object>'`；只读工具直接运行，
-  而可能产生变更的工具需要 `--yes`。
-- **表现层是共享的，不是复制的。** `src/components/` 是一份报告组件库，MCP 路由与渲染式 CLI 路由都
-  组合它，因此一个 MCP 工具和它的 CLI 对应命令不可能漂移成两套表现层。
+- **路由树就是应用。** `agent-bundle.config.ts` 声明标识、Node 运行时与两个 target。其余由文件约定
+  发现：`src/mcp/curator/` 下的 16 个工具路由、1 个目录资源与 1 个策展提示词。这里没有路由注册表，
+  没有手写的 `src/mcp/curator.ts`，没有逐操作的服务器选择器，也没有 `routes` 设置。
+- **一个操作，一条命令。** 每个工具都有一个同目录的
+  [`<tool>.cli.ts` 投影模块](../guide/authoring/package-entries.mdx#将一个工具投影为惯用命令)——
+  `search_audible.cli.ts` 把工具拼写为 `audible-search`、`--duration`，以及可逗号分隔或重复的
+  `--regions`；`prepare_audiobook.cli.ts` 把 `outputRoot` 拼写为 `--output`——因此编译后的图恰好有
+  16 条 CLI 命令，每条都带着工具自己的身份（`tool:curator/<tool>`）。没有 `src/cli/` 目录，也没有
+  `audiobook-curator curator <tool> --input` 这样的孪生命令：投影就是命令。每个投影都声明
+  `confirm: false`，因为这些先计划再执行的命令用 `--apply` 而不是 `--yes` 把关变更。
+- **表现层是共享的，不是复制的。** `src/components/` 是一份报告组件库，每个工具模块只渲染一次并服务
+  两种表面：MCP 文本内容与管道输出的 CLI Markdown 是同一份文档，因此一个工具和它的命令不可能漂移成
+  两套表现层。
 - **Markdown 块就是 JSX。** 组件库中的 `DataList`、`FileList` 原语以及重复分析中的已测量文件表格，都通过
   运行时的 [`MarkdownContent`](../guide/authoring/mcp.mdx#用-jsx-编写富-markdown-块) 组件编写
   Markdown——`<ul>`/`<li>`、`<strong>` 和一个 GFM `<table>`——而不是手工拼接字符串，因此转义归渲染器
@@ -39,27 +43,25 @@ description: '有声书策展器示例：一个由路由模块、请求上下文
   `ffmpeg -version` 与 `ffprobe -version`，并连同探测时间一起发布工具可用性。目录资源通过
   `await agent()` 读取它，并渲染实时上下文或一个显式的不可用状态。
 - **持久状态有被挂载的身份。** `src/state.ts` 挂载工作区级持久状态 `audiobook-curator/shelf` 与三个
-  事件。如果状态未挂载，那个只读 MCP 工具与渲染式 `shelf` CLI 命令都会返回一个空的结构化书架和一条
-  显式的不可用提示，而不是失败。
+  事件。如果状态未挂载，只读的 `review_curation_shelf` 工具——命令行上是 `shelf`——会返回一个空的
+  结构化书架和一条显式的不可用提示，而不是失败。
 - **Suspense 变成 MCP 进度。** `audit_library` 把它的异步分析放到 React `Suspense` 之后，回退内容是一个
   `Agent.Progress` 节点，而这个回退本身就是全部的进度表面：生成的投影器会把它作为 `notifications/progress`
   发送给传入了 progress token 的客户端，再用完成后的分析替换它，而最终的结构化收据不变。没有任何
   `progress.report()` 调用重复这条消息。
-- **包构建归框架所有。** 配置没有声明 `bin`，也没有声明 `scripts`。`src/cli/` 下的路由命令编译为
+- **包构建归框架所有。** 配置没有声明 `bin`，也没有声明 `scripts`。投影出的命令编译为
   `dist/bin/audiobook-curator.mjs` 以服务 `package.json` 的 `bin`，而 `dist/index.js` 加声明文件服务
   `exports`。见 [CLI 与库包入口](../guide/authoring/package-entries.mdx)。
 - **`package.json` 是唯一的版本来源。** 配置没有声明 `plugin.version`；解析出的版本会流入项目上下文、
   产物清单、`inspect` 输出、dev 状态，以及这个插件导入的 `agent-bundle/meta` 常量。
 
-## 渲染式与普通 CLI 路由
+## 每条命令都渲染其工具的文档
 
-七条编写好的 `.tsx` 命令渲染 Agent Document——`inventory`、`select`、`audible-search`、`convert`、
-`audit`、`library-audit` 与 `shelf`。交互式终端会就地更新它们报告的进度；管道输出则是一份最终的
-Markdown 文档。另外九条兼容性命令仍是普通的 `.ts` 路由。
-
-两类命令都支持用 `--json` 选择机器输出，并输出一个经结果 schema 校验的 JSON 值加一个换行。对于渲染式
-命令，这个值是最终的规范 `Agent.Result` 值——绝不是 Markdown 表现，也绝不是中间的 Suspense 回退——
-因此某条命令改为渲染式时，收据的消费方不需要改动。
+每条命令运行的就是其工具的组件。交互式终端会就地绘制流式的 `Agent.Progress` 回退；管道输出则是一份
+最终的 Markdown 文档——与 MCP 客户端作为文本内容收到的是同一份标题与报告。`--json` 选择机器输出，
+并输出一个经结果 schema 校验的 JSON 值加一个换行：这是最终的规范 `Agent.Result` 值，绝不是 Markdown
+表现，也绝不是中间的 Suspense 回退，并且与工具调用的 `structuredContent` 逐字节一致。`--report` 与
+`--receipt` 在命令行上和在工具上一样是可选的；传入了的命令仍会写出收据文件。
 
 ## 在工作区中开发
 
diff --git a/website/docs/zh/guide/authoring/package-entries.mdx b/website/docs/zh/guide/authoring/package-entries.mdx
index c52ca72d9..45829371a 100644
--- a/website/docs/zh/guide/authoring/package-entries.mdx
+++ b/website/docs/zh/guide/authoring/package-entries.mdx
@@ -296,7 +296,11 @@ export const mapInput = (
 `mapInput` 是普通的命名导出，其存在性会被静态记录，并且只由 CLI bin 加载；MCP worker 永远不会看到
 该模块。`mapInput` 是表面适配器，不是领域逻辑：它只把 argv 重塑或补默认值成规范输入（重命名、拆分
 列表、派生工作目录）。领域校验与行为留在操作里——它的 `inputSchema` 精化以及它的组件。在 mapper
-里重写一遍命令逻辑，正是投影要去掉的重复。
+里重写一遍命令逻辑，正是投影要去掉的重复。由于 mapper 仍可能拆分或重命名一个值，投影导出了 `mapInput`
+的命令，其 `z.enum` 取值由规范 schema 在 `mapInput` 运行之后判定——因此 `--regions us,uk` 能到达
+mapper——而枚举之外的值仍以 2 退出，并以 CLI 拼写报告为
+`Invalid value for --<option>[<index>]: expected one of: …`。没有 `mapInput` 的投影则像 `src/cli`
+路由一样在解析 argv 时就拒绝未知的枚举值。
 
 | 键 | 含义 |
 | --- | --- |