@haven_ai/mcp 0.3.0-alpha.0 → 0.4.0-alpha.0

package/dist/index.d.cts

@@ -67,7 +67,79 @@ declare function loadCredentials(source?: string | HavenCredentialSource | undef
  */
 
 type HavenMcpToolName = 'haven_send' | 'haven_pay_mcp_tool' | 'haven_quote_x402' | 'haven_pay_x402_quote' | 'haven_pay_x402' | 'haven_resume_x402_payment' | 'haven_get_payment_status' | 'haven_get_resume_state' | 'haven_get_agent' | 'haven_get_allowances' | 'haven_list_receipts' | 'haven_verify_receipt' | 'haven_sweep_delegate' | 'haven_discover_tools' | 'haven_submit_catalog_entry';
-declare const toolSchemas: Record<HavenMcpToolName, z.ZodRawShape>;
+declare const toolSchemas: {
+    readonly haven_send: {
+        readonly asset: z.ZodEnum<["ETH", "USDC"]>;
+        readonly recipient: z.ZodString;
+        readonly amount: z.ZodString;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_pay_mcp_tool: {
+        readonly merchant_url: z.ZodString;
+        readonly tool_name: z.ZodString;
+        readonly arguments: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_quote_x402: {
+        readonly url: z.ZodString;
+        readonly method: z.ZodOptional<z.ZodString>;
+        readonly headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        readonly body: z.ZodOptional<z.ZodString>;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_pay_x402_quote: {
+        readonly quote: z.ZodUnknown;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_pay_x402: {
+        readonly url: z.ZodString;
+        readonly method: z.ZodOptional<z.ZodString>;
+        readonly headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        readonly body: z.ZodOptional<z.ZodString>;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_resume_x402_payment: {
+        readonly payment_id: z.ZodOptional<z.ZodString>;
+        readonly resume_state: z.ZodOptional<z.ZodUnknown>;
+    };
+    readonly haven_get_payment_status: {
+        readonly payment_id: z.ZodString;
+    };
+    readonly haven_get_resume_state: {
+        readonly payment_id: z.ZodString;
+    };
+    readonly haven_get_agent: {};
+    readonly haven_get_allowances: {};
+    readonly haven_sweep_delegate: {};
+    readonly haven_discover_tools: {
+        readonly category: z.ZodOptional<z.ZodString>;
+        readonly search: z.ZodOptional<z.ZodString>;
+        readonly rail: z.ZodOptional<z.ZodEnum<["x402", "mpp"]>>;
+        readonly verified: z.ZodOptional<z.ZodEnum<["any", "verified", "operator"]>>;
+    };
+    readonly haven_submit_catalog_entry: {
+        readonly resource_url: z.ZodString;
+        readonly website: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_list_receipts: {
+        readonly limit: z.ZodOptional<z.ZodNumber>;
+        /** #3128: the previous page's next_cursor (a receipt id). */
+        readonly cursor: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_verify_receipt: {
+        readonly receipt: z.ZodUnknown;
+    };
+};
 /**
  * MCP tool descriptions, composed from the shared semantic source in
  * `@haven_ai/sdk`'s `tool-descriptions.ts`. Keeping both the SDK tool-calling
@@ -98,7 +170,25 @@ interface ToolFailure {
     paymentId?: string;
     status?: string;
     phase?: string;
+    /**
+     * @deprecated since #3103 — read `next_action`. Kept with the same value for
+     * one release (the #2908 pattern) and removed in the release after the one
+     * carrying #3103.
+     */
     nextAction?: string;
+    /**
+     * #3103 (epic #3105, decision 10): the same value as `nextAction`, spelled
+     * the way the hosted server and the signer spell it. Dual-emitted for one
+     * release (the #2908 pattern) before `nextAction` is dropped.
+     */
+    next_action?: string;
+    /** #3101 (epic #3105, decision 7): the typed next-step family, additive; `next_tool` never null. */
+    next_tool?: string;
+    next_tool_server?: string;
+    next_tool_name?: string;
+    next_tool_server_role?: 'hosted' | 'signer';
+    next_arguments?: Record<string, unknown>;
+    next_tool_omitted_reason?: string;
     resume_state?: unknown;
     body?: unknown;
     /**
@@ -255,7 +345,7 @@ declare function createHavenMcpServer(options?: HavenMcpServerOptions): Promise<
  * `agent_tool_invocations` rows are always attributed to the right tool.
  */
 declare const MCP_NAME = "@haven_ai/mcp";
-declare const MCP_VERSION = "0.3.0-alpha.0";
+declare const MCP_VERSION = "0.4.0-alpha.0";
 /**
  * Refuse to start on an unsupported Node (#1161).
  *

package/dist/index.d.ts

@@ -67,7 +67,79 @@ declare function loadCredentials(source?: string | HavenCredentialSource | undef
  */
 
 type HavenMcpToolName = 'haven_send' | 'haven_pay_mcp_tool' | 'haven_quote_x402' | 'haven_pay_x402_quote' | 'haven_pay_x402' | 'haven_resume_x402_payment' | 'haven_get_payment_status' | 'haven_get_resume_state' | 'haven_get_agent' | 'haven_get_allowances' | 'haven_list_receipts' | 'haven_verify_receipt' | 'haven_sweep_delegate' | 'haven_discover_tools' | 'haven_submit_catalog_entry';
-declare const toolSchemas: Record<HavenMcpToolName, z.ZodRawShape>;
+declare const toolSchemas: {
+    readonly haven_send: {
+        readonly asset: z.ZodEnum<["ETH", "USDC"]>;
+        readonly recipient: z.ZodString;
+        readonly amount: z.ZodString;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_pay_mcp_tool: {
+        readonly merchant_url: z.ZodString;
+        readonly tool_name: z.ZodString;
+        readonly arguments: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_quote_x402: {
+        readonly url: z.ZodString;
+        readonly method: z.ZodOptional<z.ZodString>;
+        readonly headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        readonly body: z.ZodOptional<z.ZodString>;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_pay_x402_quote: {
+        readonly quote: z.ZodUnknown;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_pay_x402: {
+        readonly url: z.ZodString;
+        readonly method: z.ZodOptional<z.ZodString>;
+        readonly headers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+        readonly body: z.ZodOptional<z.ZodString>;
+        readonly idempotency_key: z.ZodOptional<z.ZodString>;
+        /** Legacy spelling, accepted during the #2366 window. Warns; do not use. */
+        readonly idempotencyKey: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_resume_x402_payment: {
+        readonly payment_id: z.ZodOptional<z.ZodString>;
+        readonly resume_state: z.ZodOptional<z.ZodUnknown>;
+    };
+    readonly haven_get_payment_status: {
+        readonly payment_id: z.ZodString;
+    };
+    readonly haven_get_resume_state: {
+        readonly payment_id: z.ZodString;
+    };
+    readonly haven_get_agent: {};
+    readonly haven_get_allowances: {};
+    readonly haven_sweep_delegate: {};
+    readonly haven_discover_tools: {
+        readonly category: z.ZodOptional<z.ZodString>;
+        readonly search: z.ZodOptional<z.ZodString>;
+        readonly rail: z.ZodOptional<z.ZodEnum<["x402", "mpp"]>>;
+        readonly verified: z.ZodOptional<z.ZodEnum<["any", "verified", "operator"]>>;
+    };
+    readonly haven_submit_catalog_entry: {
+        readonly resource_url: z.ZodString;
+        readonly website: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_list_receipts: {
+        readonly limit: z.ZodOptional<z.ZodNumber>;
+        /** #3128: the previous page's next_cursor (a receipt id). */
+        readonly cursor: z.ZodOptional<z.ZodString>;
+    };
+    readonly haven_verify_receipt: {
+        readonly receipt: z.ZodUnknown;
+    };
+};
 /**
  * MCP tool descriptions, composed from the shared semantic source in
  * `@haven_ai/sdk`'s `tool-descriptions.ts`. Keeping both the SDK tool-calling
@@ -98,7 +170,25 @@ interface ToolFailure {
     paymentId?: string;
     status?: string;
     phase?: string;
+    /**
+     * @deprecated since #3103 — read `next_action`. Kept with the same value for
+     * one release (the #2908 pattern) and removed in the release after the one
+     * carrying #3103.
+     */
     nextAction?: string;
+    /**
+     * #3103 (epic #3105, decision 10): the same value as `nextAction`, spelled
+     * the way the hosted server and the signer spell it. Dual-emitted for one
+     * release (the #2908 pattern) before `nextAction` is dropped.
+     */
+    next_action?: string;
+    /** #3101 (epic #3105, decision 7): the typed next-step family, additive; `next_tool` never null. */
+    next_tool?: string;
+    next_tool_server?: string;
+    next_tool_name?: string;
+    next_tool_server_role?: 'hosted' | 'signer';
+    next_arguments?: Record<string, unknown>;
+    next_tool_omitted_reason?: string;
     resume_state?: unknown;
     body?: unknown;
     /**
@@ -255,7 +345,7 @@ declare function createHavenMcpServer(options?: HavenMcpServerOptions): Promise<
  * `agent_tool_invocations` rows are always attributed to the right tool.
  */
 declare const MCP_NAME = "@haven_ai/mcp";
-declare const MCP_VERSION = "0.3.0-alpha.0";
+declare const MCP_VERSION = "0.4.0-alpha.0";
 /**
  * Refuse to start on an unsupported Node (#1161).
  *

package/dist/index.js

@@ -302,11 +302,14 @@ var toolSchemas = {
     website: z.string().optional()
   },
   haven_list_receipts: {
-    limit: z.number().int().min(1).max(100).optional()
+    limit: z.number().int().min(1).max(100).optional(),
+    /** #3128: the previous page's next_cursor (a receipt id). */
+    cursor: z.string().min(1).optional()
   },
   haven_verify_receipt: {
     receipt: z.unknown()
   }
+  // #3101: keys survive on the type (see the hosted server's contracts.ts).
 };
 var toolDescriptions = {
   haven_send: composeDescription(toolDescriptions$1.send),
@@ -497,12 +500,32 @@ function createToolHandlers(haven) {
           source: entry.source,
           domain_verified: entry.domainVerified,
           verified_payable: entry.verifiedPayable,
-          // Which Haven pay tool reaches this entry from the local MCP surface.
+          // Which Haven pay tool reaches this entry from the local MCP surface,
+          // and — #3100 (epic #3105, decision 4) — the arguments that tool
+          // accepts VERBATIM, spelled in ITS vocabulary (`merchant_url`, not
+          // the entry's `resource_url`). The local surface keeps pointing at
+          // its pay tools: they need no cap, so a verbatim hint exists.
           // #1328: the 'mpp' rail's only-ever catalog row (the Haven MPP demo
           // resource) is delisted with the mpp_demo retirement, so this
           // fallback is unreachable today; it stays x402 rather than naming a
           // deleted tool in case a future non-demo 'mpp' rail entry appears.
-          suggested_tool: entry.protocol === "mcp" ? "haven_pay_mcp_tool" : "haven_pay_x402"
+          // A row without a tool_name cannot get a verbatim hint —
+          // haven_pay_mcp_tool requires tool_name — so it gets the REASON
+          // instead of a hint its own tool refuses (haven-reviewer on #3113;
+          // the epic's "omitted + reason, never null" shape, decision 3).
+          ...entry.protocol === "mcp" ? entry.toolName ? {
+            suggested_tool: "haven_pay_mcp_tool",
+            suggested_arguments: {
+              merchant_url: entry.resourceUrl,
+              tool_name: entry.toolName,
+              ...entry.toolArguments ? { arguments: entry.toolArguments } : {}
+            }
+          } : {
+            suggested_tool_omitted_reason: "this catalog row carries no tool_name, which haven_pay_mcp_tool requires; read the merchant's tool list yourself, then call haven_pay_mcp_tool with merchant_url, tool_name and arguments"
+          } : {
+            suggested_tool: "haven_pay_x402",
+            suggested_arguments: { url: entry.resourceUrl }
+          }
         }));
       });
     },
@@ -522,7 +545,7 @@ function createToolHandlers(haven) {
     },
     haven_list_receipts: async (input) => {
       const args = objectInput("haven_list_receipts", input);
-      return runTool(async () => haven.listReceipts({ limit: args.limit }));
+      return runTool(async () => haven.listReceiptsPage({ limit: args.limit, cursor: args.cursor }));
     },
     haven_verify_receipt: async (input) => {
       const args = objectInput("haven_verify_receipt", input);
@@ -667,7 +690,11 @@ function normalizeError(err) {
       message: err.message,
       statusCode: err.statusCode,
       nextAction: err.nextAction,
-      retry_with_new_quote: err.retryWithNewQuote
+      next_action: err.nextAction,
+      retry_with_new_quote: err.retryWithNewQuote,
+      // #3103: the local runtime's one decision site — no tool can act until
+      // the merchant recovers; the message carries retry_after_s.
+      next_tool_omitted_reason: "the merchant needs to recover first; re-quote after the retry_after_s in the message"
     };
   }
   if (err instanceof HavenPaymentStateError) {
@@ -680,6 +707,7 @@ function normalizeError(err) {
       status: err.status,
       phase: err.phase,
       nextAction: err.nextAction,
+      next_action: err.nextAction,
       resume_state: err.resumeState,
       body: err.body
     };
@@ -701,6 +729,7 @@ function normalizeError(err) {
       paymentId: err.paymentId,
       phase: stringOrUndefined(body?.phase),
       nextAction: stringOrUndefined(body?.nextAction) ?? stringOrUndefined(body?.next_action) ?? AgentPaymentNextAction.StopAndTellUser,
+      next_action: stringOrUndefined(body?.nextAction) ?? stringOrUndefined(body?.next_action) ?? AgentPaymentNextAction.StopAndTellUser,
       body: err.body
     };
   }
@@ -717,7 +746,11 @@ function normalizeError(err) {
     success: false,
     code: "UNKNOWN_ERROR",
     message: err instanceof Error ? err.message : String(err),
-    nextAction: AgentPaymentNextAction.StopAndTellUser
+    nextAction: AgentPaymentNextAction.StopAndTellUser,
+    next_action: AgentPaymentNextAction.StopAndTellUser,
+    // #3103: the second local decision site — nothing structured can follow an
+    // error this runtime did not recognise.
+    next_tool_omitted_reason: "an error this runtime does not recognise; tell the user what the message says"
   };
 }
 function stringOrUndefined(value) {
@@ -921,7 +954,7 @@ async function createHavenMcpServer(options = {}) {
   return buildMcpServer(haven);
 }
 var MCP_NAME = "@haven_ai/mcp";
-var MCP_VERSION = "0.3.0-alpha.0";
+var MCP_VERSION = "0.4.0-alpha.0";
 var MCP_INSTRUCTIONS = [
   "Haven local MCP server: signs in-process with the delegate key it holds on",
   "this machine \u2014 the key never leaves this process. Call haven_get_agent",
@@ -930,7 +963,8 @@ var MCP_INSTRUCTIONS = [
   "",
   "To pay: haven_discover_tools to find a payable service, then",
   "haven_pay_mcp_tool for MCP merchants or haven_pay_x402 for any x402",
-  "paywall. Tool responses carry nextAction \u2014 follow it; description prose",
+  "paywall. Tool responses carry next_action (nextAction is the same value, kept one more",
+  "release) and, when no tool follows, next_tool_omitted_reason \u2014 follow them; description prose",
   "is fallback, not the source of truth.",
   "",
   "A payment outside the agent budget is declined before any money moves. Haven",