@reclaimprotocol/agent 0.1.32 → 0.1.33

package/lib/mcp/api/operations.gen.d.ts

@@ -26,6 +26,7 @@ export declare const MCP_TOOLS: {
     BindVerificationSessionTeeNonce: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     CancelPublicListingRequest: {
         description: string;
@@ -34,6 +35,7 @@ export declare const MCP_TOOLS: {
     CreateCallbackSubscription: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     CreateOrg: {
         description: string;
@@ -54,6 +56,7 @@ export declare const MCP_TOOLS: {
     CreateVerificationSession: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     DecideProviderVersionReview: {
         description: string;
@@ -62,6 +65,7 @@ export declare const MCP_TOOLS: {
     DeleteCallbackSubscription: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     DeleteOrgCallbackSubscription: {
         description: string;
@@ -122,6 +126,7 @@ export declare const MCP_TOOLS: {
     GetVerificationSession: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     ImportDevtoolsProvider: {
         description: string;
@@ -138,6 +143,7 @@ export declare const MCP_TOOLS: {
     ListCallbackSubscriptions: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     ListOrgCallbackSubscriptions: {
         description: string;
@@ -166,10 +172,12 @@ export declare const MCP_TOOLS: {
     ListVerificationDeliveries: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     ListVerificationEvents: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     MakePrivate: {
         description: string;
@@ -190,6 +198,7 @@ export declare const MCP_TOOLS: {
     RetryVerificationCallback: {
         description: string;
         inputSchema: import("zod").ZodType<unknown, unknown, import("zod/v4/core").$ZodTypeInternals<unknown, unknown>>;
+        orgTokenOnly: boolean;
     };
     RevokeOrgToken: {
         description: string;

package/lib/mcp/api/operations.gen.js

@@ -1,5 +1,5 @@
 // AUTO-GENERATED by packages/app/scripts/mcp-tools-gen.ts
-// from packages/app/openapi.yaml (spec v0.1.0, source sha256:099a5bcf4fba).
+// from packages/app/openapi.yaml (spec v0.1.0, source sha256:3e28ff308da3).
 // The hash catches drift the version misses (a spec can change without a
 // version bump) — do not remove it as "redundant" with the version.
 // Run `npm run openapi:gen --workspace=packages/app` to regenerate. Do not edit by hand.
@@ -7,7 +7,7 @@
 import { toZod } from "./to-zod.js";
 export const MCP_TOOLS = {
     "AddOrgMember": {
-        description: "Invite a member to an organization\n\nOwner only. Invites a user to the organization by email. The invitee does **not** need to be a registered user — an invite is created in either case, and an invite email with an accept link is dispatched. The new row is returned with `status: PENDING`; it flips to `ACTIVE` only when the invitee explicitly accepts via `POST /orgs/{orgId}/invite`. `PERSONAL` organizations reject this call (409).",
+        description: "Invite a member to an organization\n\nOwner only. Invites a user to the organization by email. The invitee does **not** need to be a registered user — an invite is created in either case, and an invite email with an accept link is dispatched. The new row is returned with `status: PENDING`; it flips to `ACTIVE` only when the invitee explicitly accepts via `POST /orgs/{orgId}/invite`.",
         inputSchema: toZod({
             "type": "object",
             "properties": {
@@ -46,7 +46,7 @@ export const MCP_TOOLS = {
                         },
                         "role": {
                             "type": "string",
-                            "description": "Role a user holds in an organization. `OWNER` can invite, promote, demote, and remove members, and delete the org. `MEMBER` has read/write access to resources owned by the org but cannot manage membership. `PERSONAL` orgs have exactly one `OWNER` and reject all member-mutating operations.",
+                            "description": "Role a user holds in an organization. `OWNER` can invite, promote, demote, and remove members, and delete the org. `MEMBER` has read/write access to resources owned by the org but cannot manage membership.",
                             "enum": [
                                 "OWNER",
                                 "MEMBER"
@@ -407,6 +407,12 @@ export const MCP_TOOLS = {
                             "maxLength": 132
                         }
                     }
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -416,6 +422,7 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "CancelPublicListingRequest": {
         description: "Cancel a pending public listing review request\n\nCancels a pending public listing request by moving the version from `in_review` back to `draft`. Only org members can cancel their own review requests. This allows users to withdraw a request before admin review if they change their mind.",
@@ -557,6 +564,12 @@ export const MCP_TOOLS = {
                             }
                         }
                     }
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -566,9 +579,10 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "CreateOrg": {
-        description: "Create an organization\n\nCreates a new `ORG`-kind organization with the caller as its first `OWNER`. The personal org is created automatically at user signup and is not created via this endpoint.",
+        description: "Create an organization\n\nCreates a new `ORG`-kind organization with the caller as its first `OWNER`. Every user gets a default organization at sign-up, and it counts toward their org-creation limit (1 active organization unless Reclaim support raises it). Past the limit this returns `409`; contact support@reclaimprotocol.org to raise the limit or archive an organization.",
         inputSchema: toZod({
             "type": "object",
             "properties": {
@@ -583,7 +597,7 @@ export const MCP_TOOLS = {
                 "body": {
                     "type": "object",
                     "additionalProperties": false,
-                    "description": "Body for `POST /orgs` — just a name. Every org is created keyless, like auto-provisioned personal orgs; its Ethereum (secp256k1) key pair is published separately via `PUT /orgs/{orgId}/keypair`, which is also where `canEncryptResult` is set. Creation deliberately collects nothing else so it never blocks on generating and safeguarding a private key.",
+                    "description": "Body for `POST /orgs` — just a name. Every org is created keyless, like each user's default org; its Ethereum (secp256k1) key pair is published separately via `PUT /orgs/{orgId}/keypair`, which is also where `canEncryptResult` is set. Creation deliberately collects nothing else so it never blocks on generating and safeguarding a private key.",
                     "required": [
                         "name"
                     ],
@@ -1538,7 +1552,7 @@ export const MCP_TOOLS = {
         }),
     },
     "CreateVerificationSession": {
-        description: "Create a verification session\n\nCreates an end-user verification session. Requires an OrgToken and a callback subscription; pass providers, context, and an optional registered verificationClientUrl (omitted: the Portal). Billing refusal returns 402 or 429 with event billing_required and a terminal sessionId.",
+        description: "Create a verification session\n\nCreates an end-user verification session. Requires an OrgToken and a callback subscription; pass providers, context, and an optional registered verificationClientUrl (omitted: the Portal). Send the end user to the returned verificationUrl; that is where they verify. Billing refusal returns 402 or 429 with event billing_required and a terminal sessionId.",
         inputSchema: toZod({
             "type": "object",
             "properties": {
@@ -1592,9 +1606,16 @@ export const MCP_TOOLS = {
                         },
                         "verificationClientUrl": {
                             "type": "string",
-                            "description": "Optional. Must exactly equal the base URL of a registered verification client (see the `verification_clients` registry / `/admin/verification-clients`). Omit to use the default (`portals`) client. The Builder resolves and stores the registered client UUID, then returns the ready-to-share `verificationUrl` with the session id and `api=2`. A URL that is not a registered client's base is rejected with 400. Consumers append any client-owned redirect parameters after receiving the URL; Builder does not manage them.",
+                            "description": "Optional. Must exactly equal the base URL of a registered verification client (see the `verification_clients` registry / `/admin/verification-clients`). Omit to use the default (`portals`) client. The Builder resolves and stores the registered client UUID, then returns the ready-to-share `verificationUrl` with the session id and `api=2`. A URL that is not a registered client's base is rejected with 400. Consumers append any client-owned redirect parameters after receiving the URL; Builder does not manage them. The built-in clients are `{origin}/share/{name}`, listed in the examples.",
                             "maxLength": 2000,
-                            "pattern": "^https?://"
+                            "pattern": "^https?://",
+                            "examples": [
+                                "https://build.reclaimprotocol.org/share/portals",
+                                "https://build.reclaimprotocol.org/share/verifier-app",
+                                "https://build.reclaimprotocol.org/share/reclaim-browser-extension",
+                                "https://build.reclaimprotocol.org/share/builder",
+                                "https://build.reclaimprotocol.org/share/inapp-sdk"
+                            ]
                         },
                         "themeId": {
                             "type": "string",
@@ -1709,6 +1730,12 @@ export const MCP_TOOLS = {
                             }
                         }
                     }
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -1718,6 +1745,7 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "DecideProviderVersionReview": {
         description: "Record a decision on a provider version review\n\nApproves or rejects a provider version awaiting review. Admin only. Approval promotes the version to the live channel; rejection moves it to the rejected branch with a reason. Use admin_reviews to find versions waiting on a decision.",
@@ -1803,6 +1831,12 @@ export const MCP_TOOLS = {
                 },
                 "body": {
                     "type": "object"
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -1811,6 +1845,7 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "DeleteOrgCallbackSubscription": {
         description: "Delete an organization's callback subscription\n\nRemoves a callback subscription. Caller must be an active member of the owning org.",
@@ -2092,15 +2127,22 @@ export const MCP_TOOLS = {
                             "type": "string",
                             "enum": [
                                 "claude",
+                                "copilot",
                                 "cursor",
+                                "omp",
                                 "opencode",
                                 "codex",
+                                "antigravity",
                                 "others"
                             ]
                         },
                         "providerId": {
-                            "type": "string",
-                            "format": "uuid"
+                            "type": "array",
+                            "maxItems": 20,
+                            "items": {
+                                "type": "string",
+                                "format": "uuid"
+                            }
                         },
                         "client": {
                             "type": "string",
@@ -2495,6 +2537,12 @@ export const MCP_TOOLS = {
                 },
                 "body": {
                     "type": "object"
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -2503,6 +2551,7 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "ImportDevtoolsProvider": {
         description: "Import a provider from devtools\n\nImports a public legacy provider into Builder by UUID. Requires human BearerAuth and a target orgId; preserves the provider UUID and is idempotent for seeded providers. Returns 409 if another Builder org owns the UUID.",
@@ -2616,6 +2665,12 @@ export const MCP_TOOLS = {
                 },
                 "body": {
                     "type": "object"
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -2624,6 +2679,7 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "ListOrgCallbackSubscriptions": {
         description: "List an organization's callback subscriptions\n\nReturns every callback subscription owned by the organization. Caller must be an active member of the org.",
@@ -2659,7 +2715,7 @@ export const MCP_TOOLS = {
         }),
     },
     "ListOrgs": {
-        description: "List organizations the caller belongs to\n\nLists the organizations the caller belongs to, personal and shared. Use it first to find an organization id — most other tools take one.",
+        description: "List organizations the caller belongs to\n\nLists the organizations the caller belongs to. Use it first to find an organization id — most other tools take one.",
         inputSchema: toZod({
             "type": "object",
             "properties": {
@@ -2920,6 +2976,12 @@ export const MCP_TOOLS = {
                 },
                 "body": {
                     "type": "object"
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -2928,6 +2990,7 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "ListVerificationEvents": {
         description: "Get the event log for a session\n\nLists append-only lifecycle events for a session. Requires the owning organization's token. Use after get_verification_session to find the first missing or failed milestone; inspect eventData for failure details.",
@@ -2954,6 +3017,12 @@ export const MCP_TOOLS = {
                 },
                 "body": {
                     "type": "object"
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -2962,6 +3031,7 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "MakePrivate": {
         description: "Change a PUBLIC provider back to PRIVATE\n\nChanges a PUBLIC provider's visibility to PRIVATE. Unlike the reverse (PRIVATE → PUBLIC), this does not require review since it restricts rather than expands access. Existing live versions remain but are no longer publicly listed.",
@@ -3143,7 +3213,7 @@ export const MCP_TOOLS = {
         }),
     },
     "RetryVerificationCallback": {
-        description: "Re-enqueue callback delivery for a session\n\nRe-enqueues delivery of a session's stored result to its callback subscriptions. Use this after `list_verification_deliveries` shows a `failed` or dead-lettered delivery, once the consumer's callback endpoint is reachable again and answers 2xx — it re-attempts every not-yet-delivered callback for the session. Usable by the session creator (authenticated by the consumer's `OrgToken`) to recover from a transient consumer-side outage.",
+        description: "Re-enqueue callback delivery for a session\n\nRe-enqueues delivery of a session's stored result to its callback subscriptions. Use this after `list_verification_deliveries` shows a `failed` or dead-lettered delivery, once the consumer's callback endpoint is reachable again and answers 2xx — it re-attempts every not-yet-delivered callback for the session. Usable by the session creator (authenticated by the consumer's `OrgToken`) to recover from a transient consumer-side outage. A result left undelivered for 7 days is purged and can no longer be retried.",
         inputSchema: toZod({
             "type": "object",
             "properties": {
@@ -3167,6 +3237,12 @@ export const MCP_TOOLS = {
                 },
                 "body": {
                     "type": "object"
+                },
+                "orgToken": {
+                    "type": "string",
+                    "pattern": "^rorg_",
+                    "maxLength": 200,
+                    "description": "The organization API key (`rorg_…`) this call authenticates with: from `issue_org_token`, or the app's RECLAIM_ORG_SECRET. Defaults to the MCP server's RECLAIM_ORG_SECRET. Never echo it back to the user."
                 }
             },
             "required": [
@@ -3175,6 +3251,7 @@ export const MCP_TOOLS = {
             ],
             "additionalProperties": false
         }),
+        orgTokenOnly: true,
     },
     "RevokeOrgToken": {
         description: "Revoke one of the organization's API keys\n\nRevokes a single API key by id (leaving the org's other keys intact). The caller must be an active **OWNER** of the organization. The key stops authenticating immediately.",

package/lib/mcp/api/tools.d.ts

@@ -1,3 +1,11 @@
 import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import type { ReclaimClient } from '@reclaimprotocol/client/api';
-export declare function registerTools(server: McpServer, client: ReclaimClient): void;
+import { ReclaimClient } from '@reclaimprotocol/client/api';
+/** The client for a call that presents the organization's API key. */
+export type OrgClientFactory = (orgToken: string) => ReclaimClient;
+/**
+ * Register a tool per generated operation. Calls go out with the developer's
+ * session token, except operations only an org API key (`rorg_…`) authorizes:
+ * those take an `orgToken` input (else the server's RECLAIM_ORG_SECRET) and go
+ * out through `orgClient` with that key.
+ */
+export declare function registerTools(server: McpServer, client: ReclaimClient, orgClient?: OrgClientFactory): void;

package/lib/mcp/api/tools.js

@@ -1,3 +1,7 @@
+import { unauthorized } from '@hapi/boom';
+import { ReclaimClient } from '@reclaimprotocol/client/api';
+import assert from 'node:assert';
+import { orgSecret } from "../../consts.js";
 import { remapErrorAsResponse } from "../remap_errors.js";
 import { successResponse } from "../success-response.js";
 import { MCP_TOOLS } from "./operations.gen.js";
@@ -14,8 +18,22 @@ function toSnakeCase(name) {
         .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
         .toLowerCase();
 }
-export function registerTools(server, client) {
-    for (const [opId, shape] of Object.entries(MCP_TOOLS)) {
+/**
+ * Register a tool per generated operation. Calls go out with the developer's
+ * session token, except operations only an org API key (`rorg_…`) authorizes:
+ * those take an `orgToken` input (else the server's RECLAIM_ORG_SECRET) and go
+ * out through `orgClient` with that key.
+ */
+export function registerTools(server, client, orgClient = (orgToken) => new ReclaimClient({
+    baseUrl: client.baseUrl,
+    token: orgToken,
+})) {
+    for (const [opId, tool] of Object.entries(MCP_TOOLS)) {
+        const orgTokenOnly = 'orgTokenOnly' in tool && tool.orgTokenOnly === true;
+        const shape = {
+            description: tool.description,
+            inputSchema: tool.inputSchema,
+        };
         if (!isOperationId(opId)) {
             throw new Error(`Generated MCP operation is not in the API client: ${opId}`);
         }
@@ -23,12 +41,19 @@ export function registerTools(server, client) {
         // a hand-written tool throws here at startup — intentional: hand-written
         // and generated names must stay disjoint (see start.ts), so a clash is a
         // bug to surface, not silently shadow.
-        server.registerTool(toSnakeCase(opId), shape, async (args) => {
+        server.registerTool(toSnakeCase(opId), shape, async (input) => {
             try {
+                if (!isRecord(input)) {
+                    throw new Error(`Invalid generated MCP arguments for ${opId}`);
+                }
+                const { orgToken, ...args } = input;
                 if (!isOperationArgs(opId, args)) {
                     throw new Error(`Invalid generated MCP arguments for ${opId}`);
                 }
-                const result = await client.call(opId, args);
+                const caller = orgTokenOnly
+                    ? orgClient(orgTokenFor(toSnakeCase(opId), orgToken))
+                    : client;
+                const result = await caller.call(opId, args);
                 return successResponse(result.data);
             }
             catch (err) {
@@ -56,3 +81,16 @@ function isOperationId(value) {
 function isOperationArgs(_operationId, value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/** The org API key a call authenticates with: its `orgToken`, else the
+ *  server's RECLAIM_ORG_SECRET. The session token (the developer's sign-in)
+ *  can't stand in, since these routes accept only an org key. */
+function orgTokenFor(tool, orgToken) {
+    const token = (typeof orgToken === 'string' && orgToken) || orgSecret();
+    assert(token, unauthorized(`${tool} authenticates with the organization's API key. Pass `
+        + 'orgToken: one from issue_org_token, or the app\'s '
+        + 'RECLAIM_ORG_SECRET. Or set RECLAIM_ORG_SECRET for the MCP server.'));
+    return token;
+}

package/lib/mcp/start.js

@@ -79,7 +79,12 @@ export async function startMcpServer() {
         registerToolList(server, buildVerificationTools());
         // Add auto-generated tools with snake_case wrappers
         // for every MCP-tagged operation.
-        registerTools(server, client);
+        // Org-key-only operations go out with the call's `orgToken` instead.
+        registerTools(server, client, (orgToken) => new ReclaimClient({
+            baseUrl: apiUrl(),
+            token: orgToken,
+            headers: { 'User-Agent': `${NAME}/${VERSION}` },
+        }));
         if (agentToolsEnabled) {
             agentState = buildAgentState();
             registerToolList(server, buildAgentTools(client, client, agentState));

package/lib/mcp/tools/verification/result.js

@@ -11,16 +11,25 @@ const TERMINAL = new Set([
     'cancelled',
     'expired',
 ]);
+/** Events whose delivery is a signed result; the rest are plaintext event
+ *  notifications. Mirrors `verification_result_events()`. */
+const RESULT_EVENTS = new Set([
+    'verification_success',
+    'verification_rejected',
+    'verification_error',
+    'verification_cancelled',
+]);
 /**
  * Resolve the org secret used to authenticate verification reads. Auth is a
- * single per-org bearer secret (`rorg_…`), not an eth signature — read it from
- * `RECLAIM_ORG_SECRET`.
+ * single per-org bearer secret (`rorg_…`), not an eth signature: the call's
+ * `orgToken`, else `RECLAIM_ORG_SECRET`.
  */
-function resolveOrgSecret() {
-    const secret = orgSecret()?.trim();
-    assert(secret, new Error('RECLAIM_ORG_SECRET is not set. Verification reads authenticate with ' +
-        'the org secret (rorg_…) — issue one from the dashboard ' +
-        '(POST /orgs/{orgId}/token) and export it as RECLAIM_ORG_SECRET.'));
+function resolveOrgSecret(orgToken) {
+    const secret = orgToken?.trim() || orgSecret()?.trim();
+    assert(secret, new Error('No organization API key. Verification reads authenticate with the org '
+        + 'secret (rorg_…): pass orgToken (from issue_org_token, or the '
+        + 'app\'s RECLAIM_ORG_SECRET), or export RECLAIM_ORG_SECRET for the '
+        + 'MCP server.'));
     return secret;
 }
 /**
@@ -36,8 +45,11 @@ function resolveOrgSecret() {
 export function verificationResultTool() {
     return defineTool({
         name: 'get_verification_result',
-        description: 'Fetches and verifies a terminal Builder result for one session. '
-            + 'Requires `RECLAIM_ORG_SECRET`; encrypted deliveries also require '
+        description: 'Fetches and verifies a terminal Builder result for one session, '
+            + 'while Builder still holds it: until its callback is delivered, or '
+            + '7 days undelivered. The callback is the normal way to get results. '
+            + 'Authenticates with the org API key: `orgToken`, else '
+            + '`RECLAIM_ORG_SECRET`. Encrypted deliveries also require '
             + 'the matching ETH decryption key. Returns `ready: false` until a '
             + 'payload is available. Invalid results fail verification and are not '
             + 'returned. Use `list_verification_events` to diagnose '
@@ -50,10 +62,19 @@ export function verificationResultTool() {
                     type: 'string',
                     description: 'The verification session id from create_verification_session.',
                 },
+                orgToken: {
+                    type: 'string',
+                    pattern: '^rorg_',
+                    maxLength: 200,
+                    description: 'The organization API key (`rorg_…`): from '
+                        + '`issue_org_token`, or the app\'s RECLAIM_ORG_SECRET. '
+                        + 'Defaults to the MCP server\'s RECLAIM_ORG_SECRET. Never echo '
+                        + 'it back to the user.',
+                },
             },
         },
     }, async (args) => {
-        const secret = resolveOrgSecret();
+        const secret = resolveOrgSecret(args.orgToken);
         // Optional eth decryption key — absent ⇒ plaintext-only.
         const decryptionKey = await resolveDecryptionKey();
         const reclaim = ReclaimVerification.create({
@@ -70,13 +91,29 @@ export function verificationResultTool() {
         const resultRes = await reclaim.api('GetVerificationResult', {
             params: { sessionId: args.reclaimSessionId },
         });
-        const { items } = resultRes.data;
+        const signed = resultRes.data.items
+            .filter((item) => RESULT_EVENTS.has(item.event));
+        if (!signed.length) {
+            return {
+                reclaimSessionId: args.reclaimSessionId,
+                status,
+                ready: false,
+                note: 'Session is terminal but no result is stored: none submitted '
+                    + 'yet, or no callback subscription covers its ending event.',
+            };
+        }
+        // Builder keeps a result (which can carry proofs) only until its
+        // callback is delivered, or 7 days undelivered.
+        const items = signed.flatMap((item) => (item.payload === null ? [] : [{ ...item, payload: item.payload }]));
         if (!items.length) {
             return {
                 reclaimSessionId: args.reclaimSessionId,
                 status,
                 ready: false,
-                note: 'Session is terminal but no result has been submitted yet.',
+                delivered: signed.some((item) => (item.deliveryStatus === 'delivered')),
+                note: 'Builder no longer holds this result: it was delivered to '
+                    + 'the callback (read it there), or went undelivered for 7 days. '
+                    + 'See list_verification_deliveries.',
             };
         }
         // Each item's `payload` is an ECIES ciphertext encrypted to the org's

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@reclaimprotocol/agent",
 	"title": "Reclaim Agent",
-	"version": "0.1.32",
+	"version": "0.1.33",
 	"description": "Reclaim Protocol tools for AI coding agents. Reclaim lets your app verify data points about its users, such as a follower count, an account balance, or an order history. This package is the Reclaim MCP server: it gives your agent the tools to find, build, test, and fix data verification providers by capturing and replaying browser requests, drafting provider recipes, running zkTLS proofs, and publishing provider versions.",
 	"type": "module",
 	"main": "./lib/index.js",
@@ -83,7 +83,7 @@
 		"@modelcontextprotocol/sdk": "^1.29.0",
 		"@noble/hashes": "^2.2.0",
 		"@reclaimprotocol/attestor-core": "^5.1.5",
-		"@reclaimprotocol/client": "0.1.32",
+		"@reclaimprotocol/client": "0.1.33",
 		"@reclaimprotocol/tls": "^0.1.3",
 		"chrome-remote-interface": "^0.33.0",
 		"domhandler": "^6.0.0",

package/skill/SKILL.builder.md

@@ -403,7 +403,8 @@ use, run the same flow the Discover UI does:
    `create_verification_session({ providers: [{ providerId }, …], context,
    verificationClientUrl })` with EVERY resolved provider id and the collected
    context, give them `verificationUrl`, poll `get_verification_session` until
-   it is terminal, and report the outcome with `get_verification_result`.
+   it is terminal, and report the outcome with `get_verification_result`
+   (builder-mode instructions cover the org key and temporary callback).
    Integrate or new app → topic `integration`.
 
 `merge.mergeable` only signals the set *could* collapse into one provider — you

package/skill/builder-mode.md

@@ -17,14 +17,32 @@ to try it or want it in an app (skip this if they already said):
 > Want to (1) just try it right now, (2) integrate it into an existing backend
 > or frontend (this directory or another path), or (3) create a new app for it?
 
-- **Just try it:** no app, callback, or client package. Create the session the
-  HTTP way (`create_verification_session`, i.e. `POST /verifications/sessions`
-  with the org secret as `Authorization: Bearer`; `issue_org_token` if there is
-  none), give the developer `verificationUrl` to open, then check the session
-  yourself (`get_verification_session`) until it is terminal and report the
-  outcome with `get_verification_result`.
+- **Just try it:** no app or client package, but the same production API the
+  app will use. You need an org API key (`rorg_…`): reuse one the developer
+  already has, else `issue_org_token` (owner only; the key is shown once).
+  Session creation returns 409 while the org has no callback subscription, and
+  the result is only stored for subscriptions to the event the session ends
+  with. If the org has none, register a temporary one for all five ending
+  events with `create_org_callback_subscription` (for example, a tunnel to a
+  local listener that saves the body it receives). Then call
+  `create_verification_session` with `orgToken`, give the developer
+  `verificationUrl` to open, poll `get_verification_session` (with `orgToken`)
+  until it is terminal, and report the outcome: from the body your listener
+  received, or with `get_verification_result` (with `orgToken`), which only
+  works until the callback is delivered. Delete the temporary subscription with
+  `delete_org_callback_subscription` only after that: deleting it also deletes
+  its stored results.
 - **Integrate, or new app:** follow the setup below in the path they named.
 
+**Org API key vs. sign-in.** Management tools (`list_orgs`,
+`create_org_callback_subscription`, `issue_org_token`, …) use the developer's
+sign-in. Session tools (`create_verification_session`,
+`get_verification_session`, `list_verification_events`,
+`list_verification_deliveries`, `retry_verification_callback`) are the
+production API a backend calls, so they take the org key as `orgToken`
+(defaulting to this server's `RECLAIM_ORG_SECRET`). Never print the key back to
+the developer.
+
 **Prefer the HTTP API over `@reclaimprotocol/client`** for every option:
 create sessions with `POST /verifications/sessions`, open `verificationUrl`,
 poll `GET /verifications/sessions/{sessionId}`, and take the result on the