@paybond/kit 0.11.5 → 0.11.6

package/README.md

@@ -70,7 +70,7 @@ npx -p @paybond/kit paybond agent sandbox smoke \
   --format json
 ```
 
-With `--policy-file`, Kit sends `completion_preset` from the tool's `evidence_preset` and omits `evidence_schema` and `template_id` (Gateway rejects conflicting bootstrap fields). Requires `@paybond/kit` 0.11.5+.
+With `--policy-file`, Kit sends `completion_preset` from the tool's `evidence_preset` and omits `evidence_schema` and `template_id` (Gateway rejects conflicting bootstrap fields). Requires `@paybond/kit` 0.11.6+.
 
 `agent sandbox smoke` only requires `@paybond/kit`. Framework demo commands (`agent demo vercel-ai smoke`, etc.) load their optional peers on demand.
 

package/dist/agent/interceptor.js

@@ -332,9 +332,18 @@ export class PaybondToolInterceptor {
         const toolCallId = input.toolCallId.trim();
         const operation = (input.operation ?? defaultOperation).trim();
         assertOperationAllowed(operation, this.binding.allowedTools);
-        const requestedSpendCents = input.requestedSpendCents ??
-            this.binding.registry.resolveSpendCents(toolName, input.arguments) ??
-            0;
+        let requestedSpendCents = input.requestedSpendCents;
+        if (requestedSpendCents === undefined) {
+            requestedSpendCents = this.binding.registry.resolveSpendCents(toolName, input.arguments);
+        }
+        if (this.binding.sandbox !== undefined) {
+            const sandboxSpend = this.binding.sandbox.requestedSpendCents;
+            requestedSpendCents =
+                requestedSpendCents === undefined
+                    ? sandboxSpend
+                    : Math.min(requestedSpendCents, sandboxSpend);
+        }
+        requestedSpendCents ??= 0;
         return {
             toolName,
             toolCallId,

package/dist/cli/commands/agent.js

@@ -748,18 +748,26 @@ export async function handleAgentSandboxSmoke(ctx, argv) {
     const bindResult = await handleAgentRunBind(ctx, bindArgv);
     smokeOperation = String(bindResult.data.operation ?? smokeOperation);
     const runId = String(bindResult.data.run_id ?? "");
+    const storedForExecute = await loadAgentRunContext(ctx.cwd, runId);
+    const executeArgv = [
+        ...(productionFlag.present ? ["--production"] : []),
+        "--run-id",
+        runId,
+        "--operation",
+        smokeOperation,
+        "--tool-call-id",
+        "smoke-1",
+        "--result-body",
+        JSON.stringify(resultBody),
+    ];
+    if (storedForExecute.requested_spend_cents != null) {
+        executeArgv.push("--requested-spend-cents", String(storedForExecute.requested_spend_cents));
+    }
+    else if (resolvedSpend) {
+        executeArgv.push("--requested-spend-cents", resolvedSpend);
+    }
     try {
-        const executeResult = await handleAgentToolExecute(ctx, [
-            ...(productionFlag.present ? ["--production"] : []),
-            "--run-id",
-            runId,
-            "--operation",
-            smokeOperation,
-            "--tool-call-id",
-            "smoke-1",
-            "--result-body",
-            JSON.stringify(resultBody),
-        ]);
+        const executeResult = await handleAgentToolExecute(ctx, executeArgv);
         const stored = await loadAgentRunContext(ctx.cwd, runId);
         const bindForChecklist = {
             ...bindResult.data,

package/dist/cli/http-error-message.d.ts

@@ -0,0 +1,13 @@
+import type { CliErrorDetails } from "./types.js";
+/**
+ * Summarize an HTTP error body for operator-facing CLI output.
+ * Never includes raw edge payloads (Cloudflare ray IDs, zones, HTML, etc.).
+ */
+export declare function summarizeGatewayHttpError(statusCode: number, bodyText: string): {
+    message: string;
+    details: CliErrorDetails;
+};
+/**
+ * Build a CLI-safe message for SDK HTTP failures that embed raw bodies in `.message`.
+ */
+export declare function formatSdkHttpErrorMessage(rawMessage: string, statusCode: number, bodyText: string): string;

package/dist/cli/http-error-message.js

@@ -0,0 +1,93 @@
+function asRecord(value) {
+    return value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+/**
+ * Summarize an HTTP error body for operator-facing CLI output.
+ * Never includes raw edge payloads (Cloudflare ray IDs, zones, HTML, etc.).
+ */
+export function summarizeGatewayHttpError(statusCode, bodyText) {
+    const trimmed = bodyText.trim();
+    if (!trimmed) {
+        return {
+            message: `Gateway HTTP ${statusCode}`,
+            details: { gateway_status: statusCode },
+        };
+    }
+    try {
+        const body = JSON.parse(trimmed);
+        if (body.cloudflare_error === true) {
+            const retryAfter = typeof body.retry_after === "number" ? body.retry_after : undefined;
+            const title = typeof body.title === "string"
+                ? body.title.replace(/^Error \d+:\s*/i, "")
+                : "service temporarily unavailable";
+            let message = `Gateway unavailable (HTTP ${statusCode}): ${title}`;
+            if (retryAfter !== undefined) {
+                message += `. Retry after ${retryAfter} seconds.`;
+            }
+            return {
+                message,
+                details: {
+                    gateway_status: statusCode,
+                    ...(retryAfter !== undefined ? { retry_after: retryAfter } : {}),
+                },
+            };
+        }
+        const nested = asRecord(body.error);
+        if (nested) {
+            const gatewayCode = typeof nested.code === "string" ? nested.code : String(nested.code ?? "");
+            const gatewayMessage = typeof nested.message === "string" ? nested.message : "";
+            if (gatewayMessage) {
+                return {
+                    message: gatewayMessage,
+                    details: {
+                        gateway_status: statusCode,
+                        ...(gatewayCode ? { gateway_code: gatewayCode } : {}),
+                    },
+                };
+            }
+        }
+        const flatMessage = typeof body.message === "string" ? body.message : "";
+        if (flatMessage) {
+            const gatewayCode = typeof body.code === "string" ? body.code : "";
+            return {
+                message: flatMessage,
+                details: {
+                    gateway_status: statusCode,
+                    ...(gatewayCode ? { gateway_code: gatewayCode } : {}),
+                },
+            };
+        }
+        if (typeof body.title === "string") {
+            const detail = typeof body.detail === "string" ? body.detail : "";
+            const combined = detail ? `${body.title}: ${detail}` : body.title;
+            const message = combined.length > 240 ? `${combined.slice(0, 237)}...` : combined;
+            return {
+                message,
+                details: { gateway_status: statusCode },
+            };
+        }
+    }
+    catch {
+        // Non-JSON bodies must not be echoed (HTML, stack traces, etc.).
+    }
+    return {
+        message: `Gateway HTTP ${statusCode}`,
+        details: { gateway_status: statusCode },
+    };
+}
+/**
+ * Build a CLI-safe message for SDK HTTP failures that embed raw bodies in `.message`.
+ */
+export function formatSdkHttpErrorMessage(rawMessage, statusCode, bodyText) {
+    const operation = rawMessage.replace(/ HTTP \d+:[\s\S]*$/u, "").trim() || "Gateway request";
+    const summary = summarizeGatewayHttpError(statusCode, bodyText);
+    if (summary.message === `Gateway HTTP ${statusCode}`) {
+        return `${operation} HTTP ${statusCode}`;
+    }
+    if (summary.message.startsWith("Gateway unavailable")) {
+        return `${operation}: ${summary.message}`;
+    }
+    return `${operation} HTTP ${statusCode}: ${summary.message}`;
+}

package/dist/cli/offline-session.d.ts

@@ -0,0 +1,9 @@
+import type { CliContext } from "./context.js";
+export type OfflineDevSession = {
+    ctx: CliContext;
+    restore: () => void;
+};
+/** Reject offline mode when production credentials are present in env or env file. */
+export declare function assertOfflineDevCredentialsSafe(ctx: CliContext): Promise<void>;
+/** Patch ctx.fetch with the in-process offline Gateway mock. */
+export declare function beginOfflineDevSession(ctx: CliContext): OfflineDevSession;

package/dist/cli/offline-session.js

@@ -0,0 +1,33 @@
+import { activateOfflineDevMode, createOfflineDevGatewayFetch, isProductionApiKey, } from "../dev/offline-gateway.js";
+import { loadEnvFile } from "./credentials.js";
+import { CliError } from "./types.js";
+function rejectOfflineWithProductionKey(apiKey) {
+    const trimmed = apiKey?.trim();
+    if (trimmed && isProductionApiKey(trimmed)) {
+        throw new CliError("offline dev mode cannot be used with production API keys (paybond_sk_live_...); unset PAYBOND_API_KEY or use a sandbox key", {
+            category: "validation",
+            code: "cli.dev.offline_production_key",
+            exitCode: 1,
+        });
+    }
+}
+/** Reject offline mode when production credentials are present in env or env file. */
+export async function assertOfflineDevCredentialsSafe(ctx) {
+    rejectOfflineWithProductionKey(process.env.PAYBOND_API_KEY);
+    if (process.env.PAYBOND_API_KEY?.trim()) {
+        return;
+    }
+    const fromFile = await loadEnvFile(ctx.globals.envFile, ctx.cwd);
+    rejectOfflineWithProductionKey(fromFile);
+}
+/** Patch ctx.fetch with the in-process offline Gateway mock. */
+export function beginOfflineDevSession(ctx) {
+    const { restore } = activateOfflineDevMode();
+    return {
+        ctx: {
+            ...ctx,
+            fetch: createOfflineDevGatewayFetch(),
+        },
+        restore,
+    };
+}

package/dist/cli/router.js

@@ -1,4 +1,6 @@
+import { HarborHttpError, SignalHttpError } from "../index.js";
 import { commandPath, createContext } from "./context.js";
+import { formatSdkHttpErrorMessage, summarizeGatewayHttpError } from "./http-error-message.js";
 import { handleA2a, handleAuditExports, handleMandates, handleReceipts, handleSignal, } from "./commands/discovery.js";
 import { handleConfig, handleDoctor, handleDiagnose, handleInitCompletion, handleInitAgentMiddleware, handleInitGuardrail, handleInitWizard, handleLogin, handleMcpInstall, handleMcpServe, handleMcpTools, handleMcpVerifyConfig, handleVersion, handleWhoami, } from "./commands/setup.js";
 import { handlePolicyExtend, handlePolicyImportMcpReceipt, handlePolicyImportX402Receipt, handlePolicyInit, handlePolicyInitOrg, handlePolicyPresetsList, handlePolicyPresetsShow, handlePolicyPreview, handlePolicyTemplates, handlePolicyValidateEvidence, handlePolicyValidateTools, } from "./commands/policy.js";
@@ -13,7 +15,7 @@ import { generateRequestId } from "./request-id.js";
 import { colorize, shouldUseColor } from "./color.js";
 import { formatUnknownCommandMessage } from "./suggest.js";
 import { handleCompletionCommand, handleExamplesCommand, handleHelpCommand, handleOnboarding, } from "./ux.js";
-import { CliError, EXIT_SUCCESS, } from "./types.js";
+import { CliError, EXIT_SUCCESS, exitCodeForHttpStatus, } from "./types.js";
 function isHelp(argv) {
     return argv.length === 0 || argv.includes("--help") || argv.includes("-h");
 }
@@ -36,6 +38,32 @@ function renderTable(command, result, globals) {
     }
     return lines;
 }
+function isSdkHttpError(err) {
+    if (err instanceof HarborHttpError || err instanceof SignalHttpError) {
+        return true;
+    }
+    if (!(err instanceof Error)) {
+        return false;
+    }
+    const candidate = err;
+    return typeof candidate.statusCode === "number" && typeof candidate.bodyText === "string";
+}
+function sdkHttpErrorShape(err) {
+    const mapped = exitCodeForHttpStatus(err.statusCode);
+    const summary = summarizeGatewayHttpError(err.statusCode, err.bodyText);
+    const gatewayCode = typeof summary.details.gateway_code === "string"
+        ? summary.details.gateway_code
+        : undefined;
+    return {
+        shape: {
+            category: mapped.category,
+            code: gatewayCode || `cli.gateway.http_${err.statusCode}`,
+            message: formatSdkHttpErrorMessage(err.message, err.statusCode, err.bodyText),
+            details: summary.details,
+        },
+        exitCode: mapped.exitCode,
+    };
+}
 function toErrorShape(err) {
     if (err instanceof CliError) {
         if (err.message === "help") {
@@ -54,6 +82,9 @@ function toErrorShape(err) {
             exitCode: err.exitCode,
         };
     }
+    if (isSdkHttpError(err)) {
+        return sdkHttpErrorShape(err);
+    }
     return {
         shape: {
             category: "internal",

package/dist/gateway-retry.d.ts

@@ -0,0 +1,16 @@
+/** True when the body is a Cloudflare-generated edge error (not Paybond gateway JSON). */
+export declare function isCloudflareEdgeErrorBody(bodyText: string): boolean;
+/** Whether an HTTP status/body pair should be retried by SDK gateway clients. */
+export declare function shouldRetryGatewayHttpStatus(status: number, bodyText: string): boolean;
+/** Inspect a response body (via clone) to decide whether to retry transient gateway errors. */
+export declare function shouldRetryGatewayResponse(res: Response): Promise<boolean>;
+export declare function backoffMs(attempt: number): number;
+export declare function parseRetryAfterSeconds(value: string | null): number | null;
+/** Prefer `Retry-After` when present; otherwise exponential backoff with jitter. */
+export declare function gatewayRetryDelayMs(attempt: number, retryAfterHeader: string | null): number;
+/**
+ * Shared 429/5xx retry loop for Paybond gateway HTTP clients.
+ * Skips retries on Cloudflare edge error bodies. Returns the response on success;
+ * otherwise throws the last network error.
+ */
+export declare function fetchWithGatewayRetries(url: string, init: RequestInit, maxRetries: number): Promise<Response>;

package/dist/gateway-retry.js

@@ -0,0 +1,83 @@
+/** True when the body is a Cloudflare-generated edge error (not Paybond gateway JSON). */
+export function isCloudflareEdgeErrorBody(bodyText) {
+    const trimmed = bodyText.trim();
+    if (!trimmed) {
+        return false;
+    }
+    try {
+        const body = JSON.parse(trimmed);
+        return body.cloudflare_error === true;
+    }
+    catch {
+        return false;
+    }
+}
+/** Whether an HTTP status/body pair should be retried by SDK gateway clients. */
+export function shouldRetryGatewayHttpStatus(status, bodyText) {
+    if (![429, 500, 502, 503, 504].includes(status)) {
+        return false;
+    }
+    if (isCloudflareEdgeErrorBody(bodyText)) {
+        return false;
+    }
+    return true;
+}
+/** Inspect a response body (via clone) to decide whether to retry transient gateway errors. */
+export async function shouldRetryGatewayResponse(res) {
+    if (![429, 500, 502, 503, 504].includes(res.status)) {
+        return false;
+    }
+    const peek = await res.clone().text();
+    return shouldRetryGatewayHttpStatus(res.status, peek);
+}
+export function backoffMs(attempt) {
+    const base = 200 * 2 ** attempt;
+    const jitter = Math.random() * 100;
+    return Math.min(base + jitter, 5000);
+}
+export function parseRetryAfterSeconds(value) {
+    if (!value) {
+        return null;
+    }
+    const n = Number.parseFloat(value.trim());
+    if (!Number.isFinite(n)) {
+        return null;
+    }
+    return Math.min(n, 30);
+}
+/** Prefer `Retry-After` when present; otherwise exponential backoff with jitter. */
+export function gatewayRetryDelayMs(attempt, retryAfterHeader) {
+    const raSec = parseRetryAfterSeconds(retryAfterHeader);
+    return raSec != null ? raSec * 1000 : backoffMs(attempt);
+}
+/**
+ * Shared 429/5xx retry loop for Paybond gateway HTTP clients.
+ * Skips retries on Cloudflare edge error bodies. Returns the response on success;
+ * otherwise throws the last network error.
+ */
+export async function fetchWithGatewayRetries(url, init, maxRetries) {
+    let lastErr;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+        let res;
+        try {
+            res = await fetch(url, init);
+        }
+        catch (e) {
+            lastErr = e;
+            if (attempt + 1 >= maxRetries) {
+                throw e;
+            }
+            await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, null)));
+            continue;
+        }
+        if ([429, 500, 502, 503, 504].includes(res.status) && attempt + 1 < maxRetries) {
+            if (!(await shouldRetryGatewayResponse(res))) {
+                return res;
+            }
+            await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, res.headers.get("retry-after"))));
+            continue;
+        }
+        return res;
+    }
+    throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+}

package/dist/index.js

@@ -6,6 +6,7 @@ import { buildSignedCreateIntentBody, buildSignedCreateIntentBodyWithPolicyBindi
 import { signPayeeEvidenceBinding } from "./payee-evidence.js";
 import { PaybondAgentRunFacade, PaybondInstrumentBuilder, createGuardedAgent, createGuardedAgentRunner, createPaybondAgent, createPaybondToolRegistry, instrumentPaybondAgent, instrumentPaybondClaudeAgents, instrumentPaybondLangGraph, instrumentPaybondMCP, instrumentPaybondOpenAI, instrumentPaybondVercel, resolveAgentPolicySource, wrapPaybondTools, } from "./agent/index.js";
 import { GatewayAgentRunTraceReporter, } from "./agent/gateway-trace-reporter.js";
+import { fetchWithGatewayRetries, gatewayRetryDelayMs, shouldRetryGatewayResponse, } from "./gateway-retry.js";
 import { parsePolicyRemoteValidateResponse, policyValidateQueryString, } from "./policy/validate-remote.js";
 import { parsePolicyEffectiveResolveResponse, } from "./policy/load-effective.js";
 import { paybondPolicyPresets } from "./policy/policy-api.js";
@@ -187,19 +188,6 @@ function protocolHTTPErrorMessage(prefix, statusCode, bodyText) {
 function normalizeBase(url) {
     return requireSecureGatewayUrl(url);
 }
-function backoffMs(attempt) {
-    const base = 200 * 2 ** attempt;
-    const jitter = Math.random() * 100;
-    return Math.min(base + jitter, 5000);
-}
-function parseRetryAfterSeconds(v) {
-    if (!v)
-        return null;
-    const n = Number.parseFloat(v.trim());
-    if (!Number.isFinite(n))
-        return null;
-    return Math.min(n, 30);
-}
 function normalizeExpectedEnvironment(value) {
     if (value === undefined)
         return null;
@@ -462,16 +450,17 @@ export class HarborClient {
                 lastErr = e;
                 if (attempt + 1 >= this.maxRetries)
                     throw e;
-                await new Promise((r) => setTimeout(r, backoffMs(attempt)));
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, null)));
                 continue;
             }
             if ([429, 500, 502, 503, 504].includes(res.status)) {
                 if (attempt + 1 >= this.maxRetries) {
                     return res;
                 }
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
+                if (!(await shouldRetryGatewayResponse(res))) {
+                    return res;
+                }
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, res.headers.get("retry-after"))));
                 continue;
             }
             return res;
@@ -494,16 +483,17 @@ export class HarborClient {
                 lastErr = e;
                 if (attempt + 1 >= this.maxRetries)
                     throw e;
-                await new Promise((r) => setTimeout(r, backoffMs(attempt)));
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, null)));
                 continue;
             }
             if ([429, 500, 502, 503, 504].includes(res.status)) {
                 if (attempt + 1 >= this.maxRetries) {
                     return res;
                 }
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
+                if (!(await shouldRetryGatewayResponse(res))) {
+                    return res;
+                }
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, res.headers.get("retry-after"))));
                 if (retryBodyText !== undefined) {
                     init = {
                         ...init,
@@ -804,28 +794,7 @@ export class GatewayHarborClient {
         return headers;
     }
     async fetchWithRetries(url, init) {
-        let lastErr;
-        for (let attempt = 0; attempt < this.maxRetries; attempt++) {
-            let res;
-            try {
-                res = await fetch(url, init);
-            }
-            catch (e) {
-                lastErr = e;
-                if (attempt + 1 >= this.maxRetries)
-                    throw e;
-                await new Promise((r) => setTimeout(r, backoffMs(attempt)));
-                continue;
-            }
-            if ([429, 500, 502, 503, 504].includes(res.status) && attempt + 1 < this.maxRetries) {
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
-                continue;
-            }
-            return res;
-        }
-        throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+        return fetchWithGatewayRetries(url, init, this.maxRetries);
     }
     async postJSON(path, payload, extraHeaders) {
         return this.requestJSON("POST", path, payload, extraHeaders);
@@ -1052,28 +1021,7 @@ export class PaybondGuardrails {
         return headers;
     }
     async fetchWithRetries(url, init) {
-        let lastErr;
-        for (let attempt = 0; attempt < this.maxRetries; attempt++) {
-            let res;
-            try {
-                res = await fetch(url, init);
-            }
-            catch (e) {
-                lastErr = e;
-                if (attempt + 1 >= this.maxRetries)
-                    throw e;
-                await new Promise((r) => setTimeout(r, backoffMs(attempt)));
-                continue;
-            }
-            if ([429, 500, 502, 503, 504].includes(res.status) && attempt + 1 < this.maxRetries) {
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
-                continue;
-            }
-            return res;
-        }
-        throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+        return fetchWithGatewayRetries(url, init, this.maxRetries);
     }
     async postJSON(path, payload, options) {
         const url = `${this.base}${path.replace(/^\/+/, "")}`;
@@ -1118,7 +1066,7 @@ export class PaybondGuardrails {
         }
         const { res, text, url } = await this.postJSON("/v1/sandbox/guardrails/bootstrap", payload, { idempotencyKey: input.idempotencyKey });
         if (!res.ok) {
-            throw new HarborHttpError(`Gateway sandbox guardrail bootstrap HTTP ${res.status}: ${text}`, {
+            throw new HarborHttpError(`Gateway sandbox guardrail bootstrap HTTP ${res.status}`, {
                 statusCode: res.status,
                 url,
                 bodyText: text,
@@ -1153,7 +1101,7 @@ export class PaybondGuardrails {
         }
         const { res, text, url } = await this.postJSON(`/v1/sandbox/guardrails/${encodeURIComponent(input.intentId)}/evidence`, payload, { idempotencyKey: input.idempotencyKey });
         if (!res.ok) {
-            throw new HarborHttpError(`Gateway sandbox guardrail evidence HTTP ${res.status}: ${text}`, {
+            throw new HarborHttpError(`Gateway sandbox guardrail evidence HTTP ${res.status}`, {
                 statusCode: res.status,
                 url,
                 bodyText: text,
@@ -1433,16 +1381,17 @@ export class GatewaySignalClient {
                 lastErr = e;
                 if (attempt + 1 >= this.maxRetries)
                     throw e;
-                await new Promise((r) => setTimeout(r, backoffMs(attempt)));
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, null)));
                 continue;
             }
             if ([429, 500, 502, 503, 504].includes(res.status)) {
                 if (attempt + 1 >= this.maxRetries) {
                     return res;
                 }
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
+                if (!(await shouldRetryGatewayResponse(res))) {
+                    return res;
+                }
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, res.headers.get("retry-after"))));
                 continue;
             }
             return res;
@@ -1594,16 +1543,17 @@ export class GatewayFraudClient {
                 lastErr = e;
                 if (attempt + 1 >= this.maxRetries)
                     throw e;
-                await new Promise((r) => setTimeout(r, backoffMs(attempt)));
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, null)));
                 continue;
             }
             if ([429, 500, 502, 503, 504].includes(res.status)) {
                 if (attempt + 1 >= this.maxRetries) {
                     return res;
                 }
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
+                if (!(await shouldRetryGatewayResponse(res))) {
+                    return res;
+                }
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, res.headers.get("retry-after"))));
                 continue;
             }
             return res;
@@ -1875,16 +1825,17 @@ export class GatewayA2AClient {
                 lastErr = e;
                 if (attempt + 1 >= this.maxRetries)
                     throw e;
-                await new Promise((r) => setTimeout(r, backoffMs(attempt)));
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, null)));
                 continue;
             }
             if ([429, 500, 502, 503, 504].includes(res.status)) {
                 if (attempt + 1 >= this.maxRetries) {
                     return res;
                 }
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
+                if (!(await shouldRetryGatewayResponse(res))) {
+                    return res;
+                }
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, res.headers.get("retry-after"))));
                 continue;
             }
             return res;
@@ -1944,29 +1895,7 @@ export class GatewayProtocolClient {
         this.maxRetries = Math.max(1, init?.maxRetries ?? 3);
     }
     async fetchWithRetries(url, init) {
-        let lastErr;
-        for (let attempt = 0; attempt < this.maxRetries; attempt++) {
-            let res;
-            try {
-                res = await fetch(url, init);
-            }
-            catch (e) {
-                lastErr = e;
-                if (attempt + 1 >= this.maxRetries) {
-                    throw e;
-                }
-                await new Promise((r) => setTimeout(r, backoffMs(attempt)));
-                continue;
-            }
-            if ([429, 500, 502, 503, 504].includes(res.status) && attempt + 1 < this.maxRetries) {
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
-                continue;
-            }
-            return res;
-        }
-        throw lastErr instanceof Error ? lastErr : new Error(String(lastErr));
+        return fetchWithGatewayRetries(url, init, this.maxRetries);
     }
     headers(extra) {
         const headers = new Headers(extra);
@@ -2132,15 +2061,13 @@ async function resolveGatewayTenantId(gatewayBaseUrl, apiKey, principalPath, max
             if (attempt + 1 >= maxRetries) {
                 throw e;
             }
-            await new Promise((r) => setTimeout(r, backoffMs(attempt)));
+            await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, null)));
             continue;
         }
         const text = await res.text();
         if (!res.ok) {
             if ([429, 500, 502, 503, 504].includes(res.status) && attempt + 1 < maxRetries) {
-                const raSec = parseRetryAfterSeconds(res.headers.get("retry-after"));
-                const delayMs = raSec != null ? raSec * 1000 : backoffMs(attempt);
-                await new Promise((r) => setTimeout(r, delayMs));
+                await new Promise((r) => setTimeout(r, gatewayRetryDelayMs(attempt, res.headers.get("retry-after"))));
                 continue;
             }
             throw new GatewayAuthError(`gateway principal HTTP ${res.status}`, {

package/dist/mcp-server.js

@@ -13,7 +13,7 @@ import { McpCapabilityTokenCache, mcpToolStoresCapabilityToken, parseMcpCapabili
 import { createMcpPolicyGatewayAdapter, McpPolicyReloadGate, parseMcpPolicyReloadConfig, } from "./mcp-policy-reload.js";
 import { DEFAULT_PAYBOND_GATEWAY_BASE_URL, GatewayFraudClient, GatewaySignalClient, } from "./index.js";
 const SERVER_NAME = "Paybond MCP";
-const SERVER_VERSION = "0.11.5";
+const SERVER_VERSION = "0.11.6";
 const MCP_PROTOCOL_VERSION = "2025-11-25";
 const DEFAULT_PRINCIPAL_PATH = "/v1/auth/principal";
 const DEFAULT_RECOGNITION_VERIFIER_ID = "paybond-gateway";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paybond/kit",
-  "version": "0.11.5",
+  "version": "0.11.6",
   "mcpName": "io.github.nonameuserd/paybond",
   "description": "Paybond Kit for TypeScript: agent spend governance for paid tool calls with spend authorization, evidence receipts, refunds, disputes, hosted Gateway sessions, and settlement.",
   "license": "Apache-2.0",
@@ -117,6 +117,7 @@
     "test": "vitest run",
     "pack:dry-run": "npm pack --dry-run",
     "verify:release": "node ./scripts/verify-release.mjs",
+    "verify:template-locks": "node ./scripts/verify-template-lock-integrity.mjs",
     "prepack": "npm run build"
   },
   "peerDependencies": {

package/templates/manifest.json

@@ -13,7 +13,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 18700 },
       "dependencies": {
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "@langchain/core": "^1.2.1",
         "@langchain/langgraph": "^1.4.7",
         "zod": "^4.2.0"
@@ -33,7 +33,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 4500 },
       "dependencies": {
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "ai": "^5.0.0",
         "zod": "^4.2.0"
       },
@@ -52,7 +52,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 2900 },
       "dependencies": {
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "@openai/agents": "^0.4.0",
         "zod": "^4.2.0"
       },
@@ -71,7 +71,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 4500 },
       "dependencies": {
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "@openai/agents": "^0.4.0",
         "zod": "^4.2.0"
       },
@@ -90,7 +90,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 18700 },
       "dependencies": {
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "@anthropic-ai/claude-agent-sdk": "^0.2.100",
         "zod": "^4.2.0"
       },
@@ -110,7 +110,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 500 },
       "dependencies": {
-        "@paybond/kit": "^0.11.5"
+        "@paybond/kit": "^0.11.6"
       },
       "mcp_tool_policy": "spend-write"
     },
@@ -127,7 +127,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 12000 },
       "dependencies": {
-        "@paybond/kit": "^0.11.5"
+        "@paybond/kit": "^0.11.6"
       },
       "demo_mode": "generic"
     },
@@ -143,7 +143,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 12500 },
       "dependencies": {
-        "@paybond/kit": "^0.11.5"
+        "@paybond/kit": "^0.11.6"
       },
       "demo_mode": "generic"
     },
@@ -159,7 +159,7 @@
       "evidence_preset": "cost_and_completion",
       "smoke_result_body": { "status": "completed", "cost_cents": 2900 },
       "python_dependencies": {
-        "paybond-kit": ">=0.11.5",
+        "paybond-kit": ">=0.11.6",
         "langgraph": ">=1.2.0"
       },
       "demo_import": "paybond_kit.langgraph_sandbox_demo",

package/templates/openai-shopping-agent/package-lock.json

@@ -7,7 +7,7 @@
       "name": "openai-shopping-agent",
       "dependencies": {
         "@openai/agents": "^0.4.0",
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "zod": "^4.2.0"
       },
       "devDependencies": {
@@ -169,9 +169,9 @@
       }
     },
     "node_modules/@paybond/kit": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.5.tgz",
-      "integrity": "sha512-Xaw0LnF/0iP7tEYqrNk/KtIjAFhBvVPezIItKeU30IZfIEnaW8iPMryw74r0IatL9uby2Ax06Icid1N5u8IaSg==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.6.tgz",
+      "integrity": "sha512-j4MYl0iqP2XG7Y2vshOxN+tC9ZdJCjlM9burdol2z6b2r45/IpgpA2qiy0L21uLo0qaB+Q9wakoPMIlmnS1Tsg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/ed25519": "^2.2.1",

package/templates/openai-shopping-agent/package.json

@@ -8,7 +8,7 @@
     "smoke": "paybond agent sandbox smoke --policy-file paybond.policy.yaml --operation commerce.checkout --requested-spend-cents 4500 --result-body '{\"status\":\"completed\",\"cost_cents\":4500}' --format json"
   },
   "dependencies": {
-    "@paybond/kit": "^0.11.5",
+    "@paybond/kit": "^0.11.6",
     "@openai/agents": "^0.4.0",
     "zod": "^4.2.0"
   },

package/templates/paybond-aws-operator/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "name": "paybond-aws-operator",
       "dependencies": {
-        "@paybond/kit": "^0.11.5"
+        "@paybond/kit": "^0.11.6"
       },
       "devDependencies": {
         "@types/node": "^22.10.1",
@@ -47,9 +47,9 @@
       }
     },
     "node_modules/@paybond/kit": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.5.tgz",
-      "integrity": "sha512-rU45zNsuIKzkL1YhHu5q9Mg79GSoiYg5fii+Rv4jk/4y9MDQfvn+MZAUR52Uzr71z1vBkqBo3NxgSmtQDtNDew==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.6.tgz",
+      "integrity": "sha512-j4MYl0iqP2XG7Y2vshOxN+tC9ZdJCjlM9burdol2z6b2r45/IpgpA2qiy0L21uLo0qaB+Q9wakoPMIlmnS1Tsg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/ed25519": "^2.2.1",

package/templates/paybond-aws-operator/package.json

@@ -8,7 +8,7 @@
     "smoke": "paybond agent sandbox smoke --policy-file paybond.policy.yaml --operation aws.ec2.start_instance --requested-spend-cents 12500 --result-body '{\"status\":\"completed\",\"cost_cents\":12500}' --format json"
   },
   "dependencies": {
-    "@paybond/kit": "^0.11.5"
+    "@paybond/kit": "^0.11.6"
   },
   "devDependencies": {
     "@types/node": "^22.10.1",

package/templates/paybond-claude-agents-demo/package-lock.json

@@ -7,7 +7,7 @@
       "name": "paybond-claude-agents-demo",
       "dependencies": {
         "@anthropic-ai/claude-agent-sdk": "^0.2.100",
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "zod": "^4.2.0"
       },
       "devDependencies": {
@@ -260,9 +260,9 @@
       }
     },
     "node_modules/@paybond/kit": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.5.tgz",
-      "integrity": "sha512-7rWc4Qn9s1ufEsL5XcqptmgYt/+kMnp+rWvLWOsG+kif9hgjPwVwq5OfEhiWFmwFxKaseBvY95KDPcHDJgmP5A==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.6.tgz",
+      "integrity": "sha512-j4MYl0iqP2XG7Y2vshOxN+tC9ZdJCjlM9burdol2z6b2r45/IpgpA2qiy0L21uLo0qaB+Q9wakoPMIlmnS1Tsg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/ed25519": "^2.2.1",

package/templates/paybond-claude-agents-demo/package.json

@@ -8,7 +8,7 @@
     "smoke": "paybond agent sandbox smoke --policy-file paybond.policy.yaml --operation travel.book_hotel --requested-spend-cents 18700 --result-body '{\"status\":\"completed\",\"cost_cents\":18700}' --format json"
   },
   "dependencies": {
-    "@paybond/kit": "^0.11.5",
+    "@paybond/kit": "^0.11.6",
     "@anthropic-ai/claude-agent-sdk": "^0.2.100",
     "zod": "^4.2.0"
   },

package/templates/paybond-invoice-agent/requirements.txt

@@ -1,2 +1,2 @@
-paybond-kit>=0.11.5
+paybond-kit>=0.11.6
 langgraph>=1.2.0

package/templates/paybond-mcp-coding-agent/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "name": "paybond-mcp-coding-agent",
       "dependencies": {
-        "@paybond/kit": "^0.11.5"
+        "@paybond/kit": "^0.11.6"
       },
       "devDependencies": {
         "@types/node": "^22.10.1",
@@ -47,9 +47,9 @@
       }
     },
     "node_modules/@paybond/kit": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.5.tgz",
-      "integrity": "sha512-2FMq8b++6AmgcICEfUzYnW3w2FqAjgbT9b0bslW0Fm9e5QNGbc7HwcXkVVzqJGqPySs4Ht8NtePrdEuliT0TXA==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.6.tgz",
+      "integrity": "sha512-j4MYl0iqP2XG7Y2vshOxN+tC9ZdJCjlM9burdol2z6b2r45/IpgpA2qiy0L21uLo0qaB+Q9wakoPMIlmnS1Tsg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/ed25519": "^2.2.1",

package/templates/paybond-mcp-coding-agent/package.json

@@ -8,7 +8,7 @@
     "smoke": "paybond agent sandbox smoke --policy-file paybond.policy.yaml --operation deploy.preview --requested-spend-cents 500 --result-body '{\"status\":\"completed\",\"cost_cents\":500}' --format json"
   },
   "dependencies": {
-    "@paybond/kit": "^0.11.5"
+    "@paybond/kit": "^0.11.6"
   },
   "devDependencies": {
     "@types/node": "^22.10.1",

package/templates/paybond-openai-agents-demo/package-lock.json

@@ -7,7 +7,7 @@
       "name": "paybond-openai-agents-demo",
       "dependencies": {
         "@openai/agents": "^0.4.0",
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "zod": "^4.2.0"
       },
       "devDependencies": {
@@ -169,9 +169,9 @@
       }
     },
     "node_modules/@paybond/kit": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.5.tgz",
-      "integrity": "sha512-zDczNvZilk/4F1GBxCrExbSItw+E0ZlSvhSVLx9HQb8p2pYnKoA7ceapxuzXPKAc46grFyj6sXTKKob7qMtDyQ==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.6.tgz",
+      "integrity": "sha512-j4MYl0iqP2XG7Y2vshOxN+tC9ZdJCjlM9burdol2z6b2r45/IpgpA2qiy0L21uLo0qaB+Q9wakoPMIlmnS1Tsg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/ed25519": "^2.2.1",

package/templates/paybond-openai-agents-demo/package.json

@@ -8,7 +8,7 @@
     "smoke": "paybond agent sandbox smoke --policy-file paybond.policy.yaml --operation saas.provision_seat --requested-spend-cents 2900 --result-body '{\"status\":\"completed\",\"cost_cents\":2900}' --format json"
   },
   "dependencies": {
-    "@paybond/kit": "^0.11.5",
+    "@paybond/kit": "^0.11.6",
     "@openai/agents": "^0.4.0",
     "zod": "^4.2.0"
   },

package/templates/paybond-procurement-agent/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "name": "paybond-procurement-agent",
       "dependencies": {
-        "@paybond/kit": "^0.11.5"
+        "@paybond/kit": "^0.11.6"
       },
       "devDependencies": {
         "@types/node": "^22.10.1",
@@ -47,9 +47,9 @@
       }
     },
     "node_modules/@paybond/kit": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.5.tgz",
-      "integrity": "sha512-hcoFqLsGAlI3sQmdpA5P4SxCeH/ZawRgbUSx0+9ouJkoGVw4rfwUk2EPptjmjN27Y/4Gow/PgQA5K2ao0QX0WA==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.6.tgz",
+      "integrity": "sha512-j4MYl0iqP2XG7Y2vshOxN+tC9ZdJCjlM9burdol2z6b2r45/IpgpA2qiy0L21uLo0qaB+Q9wakoPMIlmnS1Tsg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/ed25519": "^2.2.1",

package/templates/paybond-procurement-agent/package.json

@@ -8,7 +8,7 @@
     "smoke": "paybond agent sandbox smoke --policy-file paybond.policy.yaml --operation procurement.submit_po --requested-spend-cents 12000 --result-body '{\"status\":\"completed\",\"cost_cents\":12000}' --format json"
   },
   "dependencies": {
-    "@paybond/kit": "^0.11.5"
+    "@paybond/kit": "^0.11.6"
   },
   "devDependencies": {
     "@types/node": "^22.10.1",

package/templates/paybond-travel-agent/package-lock.json

@@ -8,7 +8,7 @@
       "dependencies": {
         "@langchain/core": "^1.2.1",
         "@langchain/langgraph": "^1.4.7",
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "zod": "^4.2.0"
       },
       "devDependencies": {
@@ -178,9 +178,9 @@
       }
     },
     "node_modules/@paybond/kit": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.5.tgz",
-      "integrity": "sha512-eyIWPe/jQGAW79+dL3eRDsEsZcWSLAP5Kq0vvULq3n9VYjHlOnmlH+erhMgkPCtX8n8P+Nm9jH7lvOSP8FXIpg==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.6.tgz",
+      "integrity": "sha512-j4MYl0iqP2XG7Y2vshOxN+tC9ZdJCjlM9burdol2z6b2r45/IpgpA2qiy0L21uLo0qaB+Q9wakoPMIlmnS1Tsg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/ed25519": "^2.2.1",

package/templates/paybond-travel-agent/package.json

@@ -8,7 +8,7 @@
     "smoke": "paybond agent sandbox smoke --policy-file paybond.policy.yaml --operation travel.book_hotel --requested-spend-cents 18700 --result-body '{\"status\":\"completed\",\"cost_cents\":18700}' --format json"
   },
   "dependencies": {
-    "@paybond/kit": "^0.11.5",
+    "@paybond/kit": "^0.11.6",
     "@langchain/core": "^1.2.1",
     "@langchain/langgraph": "^1.4.7",
     "zod": "^4.2.0"

package/templates/paybond-vercel-shopping-agent/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "name": "paybond-vercel-shopping-agent",
       "dependencies": {
-        "@paybond/kit": "^0.11.5",
+        "@paybond/kit": "^0.11.6",
         "ai": "^5.0.0",
         "zod": "^4.2.0"
       },
@@ -104,9 +104,9 @@
       }
     },
     "node_modules/@paybond/kit": {
-      "version": "0.11.5",
-      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.5.tgz",
-      "integrity": "sha512-enBWsO/QADB1wjFpG74dPoadswT/l/5qg/l5LNUSQ+8Lt7+z8TZ2E30X08lHk0eauNOhVhUCmDnSZ8Eba2g7fw==",
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/@paybond/kit/-/kit-0.11.6.tgz",
+      "integrity": "sha512-j4MYl0iqP2XG7Y2vshOxN+tC9ZdJCjlM9burdol2z6b2r45/IpgpA2qiy0L21uLo0qaB+Q9wakoPMIlmnS1Tsg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/ed25519": "^2.2.1",

package/templates/paybond-vercel-shopping-agent/package.json

@@ -8,7 +8,7 @@
     "smoke": "paybond agent sandbox smoke --policy-file paybond.policy.yaml --operation commerce.checkout --requested-spend-cents 4500 --result-body '{\"status\":\"completed\",\"cost_cents\":4500}' --format json"
   },
   "dependencies": {
-    "@paybond/kit": "^0.11.5",
+    "@paybond/kit": "^0.11.6",
     "ai": "^5.0.0",
     "zod": "^4.2.0"
   },