@reclaimprotocol/agent 0.1.4 → 0.1.6

package/src/mcp/api/operations.gen.ts

@@ -98,7 +98,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"AdminProviders": {
-		description: "All verifications (admin-only)\n\nAdmin only. Lists all verifications across all organizations. Supports filtering by visibility, status, and free-text search on title/domain/slug.",
+		description: "All providers (admin-only)\n\nAdmin only. Lists all providers across all organizations. Supports filtering by visibility, status, and free-text search on title/domain/slug.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -485,7 +485,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"CreateProvider": {
-		description: "Create a verification\n\nCreate a new Reclaim verification. Use this only after `providers` returned nothing useful for the domain. The caller must be an active member of the target organization.\nCreates a new verification in the specified organization. `visibility` is coerced to `PRIVATE` at creation regardless of what's sent; the author may toggle to `PUBLIC` later via `PATCH /providers/{id}`. While `PRIVATE`, versions go to the go live freely; once `PUBLIC`, non-admin versions need admin review. See `Provider.visibility`.\nThe server also seeds an initial `0.1.0` version on the `draft` branch in the same transaction so the verification is immediately editable. Its `initialUrl` defaults to `https://<domain>`; all other version fields fall back to their schema-declared defaults (structured verification, empty requests, empty web settings). `Provider.latestVersion` stays `null` until the draft is promoted to the live channel.",
+		description: "Create a provider\n\nCreate a new Reclaim provider. Use this only after `providers` returned nothing useful for the domain. The caller must be an active member of the target organization.\nCreates a new provider in the specified organization. `visibility` is coerced to `PRIVATE` at creation regardless of what's sent; the author may toggle to `PUBLIC` later via `PATCH /providers/{id}`. While `PRIVATE`, versions go to the go live freely; once `PUBLIC`, non-admin versions need admin review. See `Provider.visibility`.\nThe server also seeds an initial `0.1.0` version on the `draft` branch in the same transaction so the provider is immediately editable. Its `initialUrl` defaults to `https://<domain>`; all other version fields fall back to their schema-declared defaults (a `structured` verificationType, empty requests, empty web settings). `Provider.latestVersion` stays `null` until the draft is promoted to the live channel.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -618,7 +618,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"CreateProviderVersion": {
-		description: "Create a new verification version\n\nCreates a new version of the verification. The starting branch\ndepends on the verification's `visibility` and the caller's role:\n\n- `PRIVATE` verification (any caller): the live channel (no review).\n\n- `PUBLIC` verification, admin caller (Reclaim staff): the live channel\n  (no review).\n\n- `PUBLIC` verification, non-admin caller: `draft` (or `ai` if\n  authored by the AI assistant). Must pass review (see\n  `POST /providers/{id}/versions/{version}/review`) before\n  reaching the live channel.\n",
+		description: "Create a new provider version\n\nCreates a new version of the provider. The starting branch\ndepends on the provider's `visibility` and the caller's role:\n\n- `PRIVATE` provider (any caller): the live channel (no review).\n\n- `PUBLIC` provider, admin caller (Reclaim staff): the live channel\n  (no review).\n\n- `PUBLIC` provider, non-admin caller: `draft` (or `ai` if\n  authored by the AI assistant). Must pass review (see\n  `POST /providers/{id}/versions/{version}/review`) before\n  reaching the live channel.\n",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -644,7 +644,7 @@ export const MCP_TOOLS = {
 				"body": {
 					"type": "object",
 					"additionalProperties": false,
-					"description": "Body for creating a new version of a provider. Every new version starts on the `draft` branch — see `CreateProviderVersion`. The request body never sets `branch` directly; going live is a separate, explicit step (publish for PRIVATE, submit-for-review → approve for PUBLIC). The version's `verificationType` is always `structured` and is not settable here; a `prompt` field is reserved for a future AI authoring flow and is also not accepted on this surface.",
+					"description": "Body for creating a new version of a provider. Every new version starts on the `draft` branch — see `CreateProviderVersion`. The request body never sets `branch` directly; going live is a separate, explicit step (publish for PRIVATE, submit-for-review → approve for PUBLIC). `verificationType` defaults to `structured`; pass `llm` with a `prompt` to author an AI-verification provider.",
 					"required": [
 						"initialUrl",
 						"requests",
@@ -652,6 +652,20 @@ export const MCP_TOOLS = {
 						"webSettings"
 					],
 					"properties": {
+						"verificationType": {
+							"type": "string",
+							"description": "How a provider version verifies a claim. `structured` uses the explicit match rules on this version (the `matches` / `allowedJsMatches` and related settings). `llm` defers the verification decision to a language model and requires `prompt` to be set.",
+							"enum": [
+								"llm",
+								"structured"
+							]
+						},
+						"prompt": {
+							"type": "string",
+							"description": "Extraction prompt, used (and required) when `verificationType` is `llm`.",
+							"minLength": 0,
+							"maxLength": 1000000
+						},
 						"version": {
 							"type": "object",
 							"additionalProperties": false,
@@ -1211,7 +1225,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"DecideProviderVersionReview": {
-		description: "Record a decision on a verification version review\n\nAdmin only (Reclaim staff). Approves or rejects a verification version currently on the `in_review` branch. `APPROVED` clears the branch tag and promotes the version to the live channel; `REJECTED` moves it to the `rejected` branch where the author can address feedback and resubmit. A rejected version stays rejected — the author either fixes and resubmits, or abandons it.\nUntil RBAC is designed, \"admin\" is detected via the user's email domain (`@reclaimprotocol.org`). Non-admin callers receive a 403.",
+		description: "Record a decision on a provider version review\n\nAdmin only (Reclaim staff). Approves or rejects a provider version currently on the `in_review` branch. `APPROVED` clears the branch tag and promotes the version to the live channel; `REJECTED` moves it to the `rejected` branch where the author can address feedback and resubmit. A rejected version stays rejected — the author either fixes and resubmits, or abandons it.\nUntil RBAC is designed, \"admin\" is detected via the user's email domain (`@reclaimprotocol.org`). Non-admin callers receive a 403.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -1384,7 +1398,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"DeleteProvider": {
-		description: "Delete a verification\n\nOwner of the verification's organization only. Soft-archives the verification (sets `status` to `ARCHIVED`) so historical references remain resolvable. Supports optimistic concurrency via `If-Match`.",
+		description: "Delete a provider\n\nOwner of the provider's organization only. Soft-archives the provider (sets `status` to `ARCHIVED`) so historical references remain resolvable. Supports optimistic concurrency via `If-Match`.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -1429,7 +1443,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"DeleteProviderVersion": {
-		description: "Delete a verification version\n\nSoft-archives a version on the `draft`, `ai`, or `rejected` branch — sets `status` to `ARCHIVED` so history is preserved. Trunk (live) and `in_review` versions cannot be archived this way; archive the parent verification instead. Supports optimistic concurrency via `If-Match`.",
+		description: "Delete a provider version\n\nSoft-archives a version on the `draft`, `ai`, or `rejected` branch — sets `status` to `ARCHIVED` so history is preserved. Trunk (live) and `in_review` versions cannot be archived this way; archive the parent provider instead. Supports optimistic concurrency via `If-Match`.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -1521,7 +1535,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"DiscoverResolve": {
-		description: "Resolve a website + data points to verification providers\n\nProvider resolution: given a website and the data points the user wants their users to prove, return the smallest set of existing providers whose data points COVER the selection (greedy combine), the `requiredContext` inputs the consumer must supply, and any `uncovered` points no provider exposes yet (`needsCreation` is true then — author a provider with the agent tools). When the chosen providers can be fused into one (same start page, no clashing page scripts) `merge.mergeable` is true.\n\nAgent flow: pick a website (`GET /discover/data-points` lists what's verifiable there), confirm the data points with the user, call this to get the `providers` + `requiredContext`, collect those context values from the user, then `POST /verifications/sessions` with `providers` (pass every id) and `context` to mint a verification.",
+		description: "Resolve a website + data points to providers\n\nProvider resolution: given a website and the data points the user wants their users to prove, return the smallest set of existing providers whose data points COVER the selection (greedy combine), the `requiredContext` inputs the consumer must supply, and any `uncovered` points no provider exposes yet (`needsCreation` is true then — author a provider with the agent tools). When the chosen providers can be fused into one (same start page, no clashing page scripts) `merge.mergeable` is true.\n\nAgent flow: pick a website (`GET /discover/data-points` lists what's verifiable there), confirm the data points with the user, call this to get the `providers` + `requiredContext`, collect those context values from the user, then `POST /verifications/sessions` with `providers` (pass every id) and `context` to mint a verification.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -1792,7 +1806,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"GetProvider": {
-		description: "Get a verification\n\nFetch a single Reclaim verification by id. Returns every field needed\nto integrate it into a flow: domain, the live version (initialUrl + requests),\nand the data points it can prove. Use `providers` first if you only\nhave a query string.\n\nReturns the verification record.\n\n**Canonical URL.** For SEO and stable sharing, the canonical\nHTML URL for a verification is `/providers/{providerId}/{slug}`\n(see `GetProviderBySlug`). HTML callers (`Accept: text/html`)\nthat hit this route — which omits the slug — receive a `301`\nredirect to the slugged URL. JSON callers\n(`Accept: application/json`) receive the body directly without\nredirect; the slug is on the response.\n",
+		description: "Get a provider\n\nFetch a single Reclaim provider by id. Returns every field needed\nto integrate it into a flow: domain, the live version (initialUrl + requests),\nand the data points it can prove. Use `providers` first if you only\nhave a query string.\n\nReturns the provider record.\n\n**Canonical URL.** For SEO and stable sharing, the canonical\nHTML URL for a provider is `/providers/{providerId}/{slug}`\n(see `GetProviderBySlug`). HTML callers (`Accept: text/html`)\nthat hit this route — which omits the slug — receive a `301`\nredirect to the slugged URL. JSON callers\n(`Accept: application/json`) receive the body directly without\nredirect; the slug is on the response.\n",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -1827,7 +1841,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"GetProviderVersion": {
-		description: "Get a specific verification version",
+		description: "Get a specific provider version",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -2165,7 +2179,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"ListProviderVersions": {
-		description: "List a verification's versions\n\nLists versions visible to the caller. Non-public branches (`ai`, `draft`, `in_review`, `rejected`) are only visible to members of the verification's owning organization.",
+		description: "List a provider's versions\n\nLists versions visible to the caller. Non-public branches (`ai`, `draft`, `in_review`, `rejected`) are only visible to members of the provider's owning organization.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -2320,7 +2334,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"Providers": {
-		description: "Search verifications\n\nSearch published Reclaim verifications by domain or data point. A verification is the recipe an end-user follows to prove something about themselves (e.g. \"I have N followers on Twitter\"). Returns a list of matches. Call this BEFORE `create_provider` — most popular domains already have a public verification you can reuse.\nCatalog page listing all verifications. Returns a paginated list of verifications the caller can see. Public verifications are visible to everyone; private verifications are only visible to org members.",
+		description: "Search providers\n\nSearch published Reclaim providers by domain or data point. A provider is the recipe an end-user follows to prove something about themselves (e.g. \"I have N followers on Twitter\"). Returns a list of matches. Call this BEFORE `create_provider` — most popular domains already have a public provider you can reuse.\nCatalog page listing all providers. Returns a paginated list of providers the caller can see. Public providers are visible to everyone; private providers are only visible to org members.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -2366,7 +2380,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"PublishProviderVersion": {
-		description: "Publish a draft version directly (PRIVATE providers only)\n\nPublishes a verification version on the `draft` branch directly to the live channel (trunk). Only allowed for PRIVATE providers — PUBLIC providers must use the review flow (`POST .../review` → admin decision). On success the version's branch transitions from `draft` to `null` (trunk/live).",
+		description: "Publish a draft version directly (PRIVATE providers only)\n\nPublishes a provider version on the `draft` branch directly to the live channel (trunk). Only allowed for PRIVATE providers — PUBLIC providers must use the review flow (`POST .../review` → admin decision). On success the version's branch transitions from `draft` to `null` (trunk/live).",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -2615,7 +2629,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"SubmitProviderVersionForReview": {
-		description: "Submit a verification version for review\n\nSubmits a verification version (currently on the `draft` or `rejected` branch) for admin review. On success the version's branch transitions to `in_review`. Callable by any authenticated member of the verification's owning org. Meaningful only on `PUBLIC` verifications — on `PRIVATE` verifications new versions go to the live channel directly and never need review.",
+		description: "Submit a provider version for review\n\nSubmits a provider version (currently on the `draft` or `rejected` branch) for admin review. On success the version's branch transitions to `in_review`. Callable by any authenticated member of the provider's owning org. Meaningful only on `PUBLIC` providers — on `PRIVATE` providers new versions go to the live channel directly and never need review.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -2666,7 +2680,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"TransferProvider": {
-		description: "Transfer a verification to a different workspace\n\nAdmin-only. Moves the verification's `orgId` to the supplied workspace; preserves slug, versions, members. SQL function `builder.transfer_provider` enforces the admin gate and target existence atomically.",
+		description: "Transfer a provider to a different workspace\n\nAdmin-only. Moves the provider's `orgId` to the supplied workspace; preserves slug, versions, members. SQL function `builder.transfer_provider` enforces the admin gate and target existence atomically.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -2825,7 +2839,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"UpdateProvider": {
-		description: "Update a verification\n\nUpdate a Reclaim verification's metadata. Partial PATCH — pass only fields you want to change. The caller must be an active member of the owning organization. To change the verification's recipe (initialUrl, requests, …) cut a new version via the dashboard. Use `seo` to control how the verification appears in search results and social shares; omit a subfield to keep the server default.\nCaller must be a member of the verification's owning organization. `id`, `orgId`, and `slug` are immutable. Supports optimistic concurrency via `If-Match`.",
+		description: "Update a provider\n\nUpdate a Reclaim provider's metadata. Partial PATCH — pass only fields you want to change. The caller must be an active member of the owning organization. To change the provider's recipe (initialUrl, requests, …) cut a new version via the dashboard. Use `seo` to control how the provider appears in search results and social shares; omit a subfield to keep the server default.\nCaller must be a member of the provider's owning organization. `id`, `orgId`, and `slug` are immutable. Supports optimistic concurrency via `If-Match`.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -2962,7 +2976,7 @@ export const MCP_TOOLS = {
 		}),
 	},
 	"UpdateProviderVersion": {
-		description: "Update a verification version\n\nMutable only while the version is on the `draft` or `rejected` branch. Versions on `in_review` or the live channel reject all writes here. Caller must be a member of the verification's owning organization. Supports optimistic concurrency via `If-Match`.",
+		description: "Update a provider version\n\nMutable only while the version is on the `draft` or `rejected` branch. Versions on `in_review` or the live channel reject all writes here. Caller must be a member of the provider's owning organization. Supports optimistic concurrency via `If-Match`.",
 		inputSchema: toZod({
 			"type": "object",
 			"properties": {
@@ -3004,13 +3018,27 @@ export const MCP_TOOLS = {
 				"body": {
 					"type": "object",
 					"additionalProperties": false,
-					"description": "Partial update of a provider version. Mutable only while the version is on the `draft` or `rejected` branch; versions on `in_review` or the live channel reject all writes here. The semver does not change on update — `build_number` increments instead, giving callers a monotonic revision counter without touching the (major, minor, patch) PK. `verificationType` / `prompt` are not accepted; see `ProviderVersion` for why.",
+					"description": "Partial update of a provider version. Mutable only while the version is on the `draft` or `rejected` branch; versions on `in_review` or the live channel reject all writes here. The semver does not change on update — `build_number` increments instead, giving callers a monotonic revision counter without touching the (major, minor, patch) PK. `verificationType` and `prompt` may be updated; omit either to carry the prior build's value forward.",
 					"properties": {
 						"initialUrl": {
 							"type": "string",
 							"format": "uri",
 							"maxLength": 300
 						},
+						"verificationType": {
+							"type": "string",
+							"description": "How a provider version verifies a claim. `structured` uses the explicit match rules on this version (the `matches` / `allowedJsMatches` and related settings). `llm` defers the verification decision to a language model and requires `prompt` to be set.",
+							"enum": [
+								"llm",
+								"structured"
+							]
+						},
+						"prompt": {
+							"type": "string",
+							"description": "Extraction prompt, used when `verificationType` is `llm`.",
+							"minLength": 0,
+							"maxLength": 1000000
+						},
 						"requests": {
 							"type": "array",
 							"minItems": 0,

package/src/mcp/server.ts

@@ -1,46 +1,16 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
-import type { JSONSchema } from 'zod/v4/core'
+import { type RegisteredTool } from '../tools/registry.ts'
 import { toZod } from './api/to-zod.ts'
 import { remapErrorAsResponse } from './remap_errors.ts'
 
-export interface ToolDefinition {
-	name: string
-	description: string
-	inputSchema: JSONSchema.ObjectSchema
-}
-
-export interface RegisteredTool {
-	definition: ToolDefinition
-	/**
-	 * @param args Tool arguments
-	 * @returns A JSON stringifiable content to be returned to the llm
-	 * @throws Any error encountered during tool execution will be caught and
-	 * returned as a response using
-	 * [remapErrorAsResponse](./src/mcp/remap_errors.ts).
-	 */
-	handler: (args: unknown) => Promise<unknown>
-}
-
-/**
- * Define a tool with a single inputSchema (JSON Schema) used as the
- * source of truth. The handler receives args already parsed and
- * type-narrowed via a Zod schema derived from that same JSON Schema —
- * so the description sent to the MCP client and the validation applied
- * to inbound args cannot drift.
- */
-export function defineTool<TArgs>(
-	definition: ToolDefinition,
-	handler: (args: TArgs) => Promise<unknown>,
-): RegisteredTool {
-	const schema = toZod(definition.inputSchema)
-	return {
-		definition,
-		handler: async(raw) => {
-			const args = schema.parse(raw) as TArgs
-			return await handler(args)
-		},
-	}
-}
+// The tool primitive lives in `../tools/registry.ts` (SDK-free, so the cloud
+// loop can use it too). Re-exported here so the MCP-side tool files can keep
+// importing `defineTool`/`RegisteredTool` from the server module.
+export {
+	defineTool,
+	type RegisteredTool,
+	type ToolDefinition,
+} from '../tools/registry.ts'
 
 /**
  * Registers a list of RegisteredTool entries on a high-level McpServer.

package/src/mcp/start.ts

@@ -7,11 +7,13 @@ import {
 	apiUrl,
 	oldApiUrl,
 	oldLogsUrl,
+	sdkApiUrl,
 	useOldDevtools,
 } from '../consts.ts'
 import { ReclaimOldClient } from '../old/client.ts'
 import { resolveInitialIdentity } from '../old/identity.ts'
 import { OLD_MODE_INSTRUCTIONS } from '../old/instructions.ts'
+import { ReclaimSdkClient } from '../old/sdk-client.ts'
 import { buildOldBackendTools } from '../old/tools/build.ts'
 import { NAME, VERSION } from '../pkg.ts'
 import { registerTools } from './api/tools.ts'
@@ -53,9 +55,10 @@ export async function startMcpServer() {
 			logsBaseUrl: oldLogsUrl(),
 			identity: resolveInitialIdentity(),
 		})
+		const sdkClient = new ReclaimSdkClient({ baseUrl: sdkApiUrl() })
 
 		registerToolList(server, buildLocalCredentialTools())
-		registerToolList(server, buildOldBackendTools(oldClient))
+		registerToolList(server, buildOldBackendTools(oldClient, sdkClient))
 		if(agentToolsEnabled) {
 			// No builder client → no builder publish tool (old mode has its own).
 			registerToolList(server, buildAgentTools())

package/src/mcp/tools/agent/analyze.ts

@@ -18,12 +18,12 @@ export function analyzeTool(captures: CaptureStore): RegisteredTool {
 			},
 		},
 		async({ captureId, requestId }) => {
-			const session = captures.sessions.get(captureId)
-			if(!session) {
+			const entry = captures.sessions.get(captureId)
+			if(!entry) {
 				throw new Error(`no capture ${captureId}`)
 			}
 
-			const r = session.requests.get(requestId)
+			const r = entry.session.requests.get(requestId)
 			if(!r) {
 				throw new Error(`no request ${requestId} in capture ${captureId}`)
 			}

package/src/mcp/tools/agent/build.ts

@@ -4,8 +4,10 @@
  * `@modelcontextprotocol/sdk` `McpServer`. Folds the agent's tools
  * alongside the auto-generated API tools.
  *
- * Shared state — Chrome attach state, capture store, secret store — is
- * built once per server and threaded through every tool factory.
+ * Shared state — Chrome attach state + capture store — is built once per
+ * server and threaded through every tool factory. Per-capture drafts (and the
+ * secrets they hold) live inside each capture entry, so a capture IS the
+ * session for the shared authoring tools.
  */
 
 import type { ReclaimClient } from '@reclaimprotocol/client'
@@ -15,30 +17,21 @@ import { type RegisteredTool } from '../../server.ts'
 import { analyzeTool } from './analyze.ts'
 import { type AttachState, attachTool } from './attach.ts'
 import { type CaptureStore, captureTools } from './capture.ts'
-import { browserTools } from './eval.ts'
-import { findTool } from './find.ts'
+import { listTabsTool } from './eval.ts'
 import { howItWorksTool } from './how-it-works.ts'
-import { proofTool } from './proof.ts'
-import {
-	makeSecretStore,
-	proposeTool,
-	type SecretStore,
-} from './propose.ts'
 import { createVersionFromCaptureTool } from './publish.ts'
-import { replayTool } from './replay.ts'
 import { sessionTools } from './session.ts'
+import { sharedAuthoringTools } from './shared.ts'
 
 export interface AgentState {
 	attach: { current?: AttachState, config: ConfigStore }
 	captures: CaptureStore
-	secrets: SecretStore
 }
 
 function buildAgentState(): AgentState {
 	return {
 		attach: { config: new ConfigStore() },
 		captures: { sessions: new Map() },
-		secrets: makeSecretStore(),
 	}
 }
 
@@ -57,24 +50,23 @@ export function buildAgentTools(
 	// client. No `client` ⇒ old-devtools mode (see `mcp/start.ts`).
 	tools.push(howItWorksTool(!client))
 	tools.push(attachTool(state.attach))
+	tools.push(listTabsTool(state.attach))
 	for(const t of captureTools(state.attach, state.captures)) {
 		tools.push(t)
 	}
 
-	tools.push(findTool(state.captures))
-	for(const t of browserTools(state.attach)) {
+	for(const t of sessionTools(state.attach, state.captures)) {
 		tools.push(t)
 	}
 
-	for(const t of sessionTools(state.attach, state.captures, state.secrets)) {
+	tools.push(analyzeTool(state.captures))
+	// navigate / eval_in_page / wait_for_page / get_cookies / list_requests /
+	// find_requests_containing / propose_provider / replay_request / run_proof —
+	// shared with the cloud loop, bound to each capture's local backend.
+	for(const t of sharedAuthoringTools(state.captures)) {
 		tools.push(t)
 	}
 
-	tools.push(analyzeTool(state.captures))
-	tools.push(proposeTool(state.captures, state.secrets))
-	tools.push(replayTool(state.secrets))
-	tools.push(proofTool(state.secrets))
-
 	if(client) {
 		tools.push(createVersionFromCaptureTool(client))
 	}

package/src/mcp/tools/agent/capture.ts

@@ -1,9 +1,22 @@
+import { type DraftStore, makeDraftStore } from '../../../authoring/index.ts'
 import { type CaptureSession, startCapture } from '../../../cdp/capture.ts'
 import { defineTool, type RegisteredTool } from '../../server.ts'
 import type { AttachState } from './attach.ts'
 
+/**
+ * One capture == a session (network requests) + the tab CDP client it runs on +
+ * a draft store. Bundling the tab client is what lets the shared authoring
+ * tools treat a `captureId` as a full session (drive the browser AND read
+ * capture AND hold drafts) behind one id.
+ */
+export interface CaptureEntry {
+	session: CaptureSession
+	tabClient: Awaited<ReturnType<AttachState['handles']['attachToTab']>>
+	drafts: DraftStore
+}
+
 export interface CaptureStore {
-	sessions: Map<string, CaptureSession>
+	sessions: Map<string, CaptureEntry>
 	activeTab?: string
 }
 
@@ -23,8 +36,9 @@ export function captureTools(
 		{
 			name: 'start_capture',
 			description:
-				'Begin recording network requests on the specified tab. ' +
-				'Returns a captureId.',
+				'Begin recording network requests on the specified tab. '
+				+ 'Returns a captureId — the session handle the authoring tools '
+				+ '(navigate, propose_provider, run_proof, …) all take.',
 			inputSchema: {
 				type: 'object',
 				properties: { tabId: { type: 'string' } },
@@ -35,7 +49,9 @@ export function captureTools(
 			const attached = requireAttached()
 			const tabClient = await attached.handles.attachToTab(tabId)
 			const session = await startCapture(tabClient)
-			captures.sessions.set(session.captureId, session)
+			captures.sessions.set(session.captureId, {
+				session, tabClient, drafts: makeDraftStore(),
+			})
 			captures.activeTab = tabId
 			return { captureId: session.captureId }
 		},
@@ -45,8 +61,8 @@ export function captureTools(
 		{
 			name: 'stop_capture',
 			description:
-				'Stop recording on the given capture. ' +
-				'Captured data remains queryable until reset_session.',
+				'Stop recording on the given capture. '
+				+ 'Captured data remains queryable until reset_session.',
 			inputSchema: {
 				type: 'object',
 				properties: { captureId: { type: 'string' } },
@@ -54,104 +70,13 @@ export function captureTools(
 			},
 		},
 		async({ captureId }) => {
-			const session = captures.sessions.get(captureId)
-			if(!session) {
+			const entry = captures.sessions.get(captureId)
+			if(!entry) {
 				throw new Error(`no capture ${captureId}`)
 			}
 
-			await session.stop()
-			return { stopped: true, requestCount: session.requests.size }
-		},
-	)
-
-	const listTool = defineTool<{
-		captureId: string
-		filter?: {
-			method?: string
-			urlGlob?: string
-			statusMin?: number
-			statusMax?: number
-			contentType?: string
-			graphqlOp?: string
-		}
-	}>(
-		{
-			name: 'list_requests',
-			description:
-				'List metadata for captured requests. ' +
-				'Filter by method, URL glob, status, content-type, ' +
-				'or graphqlOp. Returns only metadata, never bodies — ' +
-				'use get_request for those.',
-			inputSchema: {
-				type: 'object',
-				properties: {
-					captureId: { type: 'string' },
-					filter: {
-						type: 'object',
-						properties: {
-							method: { type: 'string' },
-							urlGlob: { type: 'string' },
-							statusMin: { type: 'number' },
-							statusMax: { type: 'number' },
-							contentType: { type: 'string' },
-							graphqlOp: { type: 'string' },
-						},
-					},
-				},
-				required: ['captureId'],
-			},
-		},
-		async({ captureId, filter }) => {
-			const session = captures.sessions.get(captureId)
-			if(!session) {
-				throw new Error(`no capture ${captureId}`)
-			}
-
-			const out = []
-			for(const r of session.requests.values()) {
-				if(filter?.method && r.method !== filter.method.toUpperCase()) {
-					continue
-				}
-
-				if(filter?.urlGlob && !globMatch(filter.urlGlob, r.url)) {
-					continue
-				}
-
-				if(filter?.statusMin !== undefined && r.status < filter.statusMin) {
-					continue
-				}
-
-				if(filter?.statusMax !== undefined && r.status > filter.statusMax) {
-					continue
-				}
-
-				if(
-					filter?.contentType &&
-					!r.contentType.includes(filter.contentType)
-				) {
-					continue
-				}
-
-				if(filter?.graphqlOp && r.graphqlOp !== filter.graphqlOp) {
-					continue
-				}
-
-				const item: Record<string, unknown> = {
-					requestId: r.requestId,
-					method: r.method,
-					url: r.url,
-					status: r.status,
-					contentType: r.contentType,
-					size: r.size,
-				}
-				if(r.graphqlOp !== undefined) {
-					item.graphqlOp = r.graphqlOp
-				}
-
-				out.push(item)
-			}
-
-			return { requests: out }
+			await entry.session.stop()
+			return { stopped: true, requestCount: entry.session.requests.size }
 		},
 	)
 
@@ -170,17 +95,17 @@ export function captureTools(
 			},
 		},
 		async({ captureId, requestId }) => {
-			const session = captures.sessions.get(captureId)
-			if(!session) {
+			const entry = captures.sessions.get(captureId)
+			if(!entry) {
 				throw new Error(`no capture ${captureId}`)
 			}
 
-			const r = session.requests.get(requestId)
+			const r = entry.session.requests.get(requestId)
 			if(!r) {
 				throw new Error(`no request ${requestId} in capture ${captureId}`)
 			}
 
-			const body = session.bodies.get(requestId)
+			const body = entry.session.bodies.get(requestId)
 			if(!body.available) {
 				return { ...r, bodyAvailable: false, reason: body.reason }
 			}
@@ -189,14 +114,5 @@ export function captureTools(
 		},
 	)
 
-	return [startTool, stopTool, listTool, getTool]
-}
-
-function globMatch(pattern: string, str: string): boolean {
-	const re = new RegExp(
-		'^' +
-			pattern.replace(/[.+^${}()|[\]\\]/g, '\\$&').replace(/\*/g, '.*') +
-			'$',
-	)
-	return re.test(str)
+	return [startTool, stopTool, getTool]
 }