@kya-os/mcp-i-cloudflare 1.9.7 → 1.10.1

package/dist/agent.js

@@ -10,10 +10,14 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { CloudflareRuntime } from "./runtime";
 import { createCloudflareRuntime } from "./index";
 import { mapPrefixedEnv } from "./helpers/env-mapper";
+import { makeEnvSecretResolver } from "./utils/env-secret-resolver.js";
+import { handlePickupInternal } from "./delegation-http/anchor-do";
 import { STORAGE_KEYS } from "./constants/storage-keys";
 import { DEFAULT_SESSION_TTL } from "./constants";
+import { buildNeedsAuthorizationMeta } from "./needs-authorization-meta";
 import { z } from "zod";
-import { OAuthService, IdpTokenResolver, ToolContextBuilder, OAuthRequiredError, DelegationRequiredError, DelegationErrorFormatter, SessionRegistrationService, generateDidKeyFromBase64, logger, } from "@kya-os/mcp-i-core";
+import { generateDidKeyFromBase64, logger } from "@kya-os/mcp";
+import { OAuthService, IdpTokenResolver, ToolContextBuilder, OAuthRequiredError, DelegationRequiredError, DelegationErrorFormatter, SessionRegistrationService, SESSION_ID_PREFIX, recordWireForm, generateResumeToken, } from "@kya-os/mcp-i-runtime"; // product layer — stays (C2/C3)
 import { WebCryptoProvider } from "./providers/crypto";
 // CRITICAL: Import the OAuth service registry - this triggers globalThis registration
 // at module load time, preventing esbuild from tree-shaking the OAuth services
@@ -24,11 +28,11 @@ import { OAuthSecurityService } from "./services/oauth-security.service";
 import { WorkersFetchProvider } from "./providers/storage";
 import { resolveClientIdentity, } from "./services/kta-client-lookup";
 import { findKnownClient } from "./utils/known-clients";
-import { shouldUsePopup, buildPopupResource, } from "@kya-os/consent";
-import { didKeyFragment } from "@kya-os/mcp-i-core/utils/did-helpers";
+import { shouldUsePopup, buildPopupResource } from "@kya-os/consent";
+import { didKeyFragment } from "@kya-os/mcp";
 import { calculateDOInstanceId, parseDORoutingStrategy, parseDOShardCount, } from "./utils/do-routing";
 import { defaultProviderRegistry, } from "@kya-os/provider-registry";
-import { hasApiKeyAuthorization, AuthRequiredError } from "@kya-os/contracts/tool-protection";
+import { hasApiKeyAuthorization, AuthRequiredError, } from "@kya-os/contracts/tool-protection";
 import { VaultResolver } from "./services/vault-resolver";
 // CRITICAL: Force OAuth registry evaluation at module load time
 // This creates an observable side effect that esbuild cannot tree-shake
@@ -184,7 +188,9 @@ export class MCPICloudflareAgent extends McpAgent {
                 hasCapabilities: !!capabilities,
                 capabilityKeys: capabilities ? Object.keys(capabilities) : [],
                 hasExtensions: !!capabilities?.extensions,
-                extensionKeys: capabilities?.extensions ? Object.keys(capabilities.extensions) : [],
+                extensionKeys: capabilities?.extensions
+                    ? Object.keys(capabilities.extensions)
+                    : [],
                 rawCapabilities: JSON.stringify(capabilities)?.substring(0, 500),
             });
             // Store client info for later retrieval (always, not just in dev)
@@ -244,7 +250,10 @@ export class MCPICloudflareAgent extends McpAgent {
             logger.info(`║  Client DID: ${clientIdentity.did.slice(0, 40).padEnd(42)}║`);
             logger.info(`║  DID Source: ${clientIdentity.source.padEnd(42)}║`);
             logger.info("╠════════════════════════════════════════════════════════╣");
-            logger.info(`║  Your Agent: ${isAgentRegistered ? "✓ REGISTERED" : "○ LOCAL"} ${agentDid.slice(0, 33).padEnd(36)}║`);
+            const agentStatus = isAgentRegistered ? "✓ REGISTERED" : "○ LOCAL";
+            const agentPrefix = `  Your Agent: ${agentStatus} `;
+            const agentPadWidth = 56 - agentPrefix.length;
+            logger.info(`║${agentPrefix}${agentDid.slice(0, agentPadWidth).padEnd(agentPadWidth)}║`);
             logger.info("╚════════════════════════════════════════════════════════╝");
             logger.info("");
         }
@@ -382,10 +391,10 @@ export class MCPICloudflareAgent extends McpAgent {
                 : this.env;
             // ✅ CRITICAL: Use same session ID resolution logic as executeToolWithProof
             // This ensures session registration uses the same ID that proofs will use
-            // Priority: getSessionId() (from agents SDK) > DO ID fallback > mcpi_{uuid}
+            // Priority: getSessionId() (from agents SDK) > DO ID fallback > kyaos_{uuid}
             const mcpSessionId = this.getSessionId();
             const doId = this.ctx.id.toString();
-            const sessionId = mcpSessionId || doId || `mcpi_${crypto.randomUUID()}`;
+            const sessionId = mcpSessionId || doId || `${SESSION_ID_PREFIX}${crypto.randomUUID()}`;
             // Log session ID source for debugging (matches executeToolWithProof pattern)
             if (this._environment === "development") {
                 logger.debug("[SessionRegistration] Session ID resolved:", {
@@ -560,7 +569,7 @@ export class MCPICloudflareAgent extends McpAgent {
             const [extApps, consentMcpApp, extAppsConstants] = await Promise.all([
                 import("@modelcontextprotocol/ext-apps/server").catch(() => null),
                 import("@kya-os/consent/mcp-app").catch(() => null),
-                import("@kya-os/mcp-i-core/runtime/ext-apps-constants").catch(() => null),
+                import("@kya-os/mcp-i-runtime/runtime/ext-apps-constants").catch(() => null),
             ]);
             if (!extApps || !consentMcpApp || !extAppsConstants) {
                 logger.info("[MCPICloudflareAgent] MCP Apps consent UI not available (missing optional dependencies)");
@@ -809,7 +818,7 @@ export class MCPICloudflareAgent extends McpAgent {
           send({
             jsonrpc: "2.0", id: reqId, method: "tools/call",
             params: {
-              name: "_mcpi_credential_auth",
+              name: "_kyaos_credential_auth",
               arguments: {
                 tool: consentData.tool,
                 scopes: consentData.scopes,
@@ -827,7 +836,7 @@ export class MCPICloudflareAgent extends McpAgent {
           send({
             jsonrpc: "2.0", id: reqId, method: "tools/call",
             params: {
-              name: "_mcpi_approve_consent",
+              name: "_kyaos_approve_consent",
               arguments: {
                 tool: consentData.tool,
                 scopes: consentData.scopes,
@@ -915,14 +924,21 @@ export class MCPICloudflareAgent extends McpAgent {
             // The sandboxed MCP Apps iframe cannot call fetch() directly, so it
             // uses tools/call (proxied via postMessage through the host) to invoke
             // this tool which handles the /consent/approve logic server-side.
-            this.server.tool("_mcpi_approve_consent", "DO NOT call this tool directly. Internal system tool used by the consent UI iframe to process approval actions. Only the embedded consent form should invoke this.", {
+            // C4 (#2918) dual-accept: register the consent-approval tool under the
+            // canonical `_kyaos_` name and keep the legacy `_mcpi_` name as a thin
+            // alias during the window. The server-rendered iframe already calls the
+            // new name; the alias is defensive for an in-flight pre-deploy iframe.
+            // Same handler, two names — DIF aliases `_kyaos_handshake` the same way.
+            const approveConsentDescription = "DO NOT call this tool directly. Internal system tool used by the consent UI iframe to process approval actions. Only the embedded consent form should invoke this.";
+            const approveConsentSchema = {
                 tool: z.string(),
                 scopes: z.array(z.string()),
                 session_id: z.string(),
                 agent_did: z.string(),
                 project_id: z.string(),
                 resume_token: z.string(),
-            }, async (args) => {
+            };
+            const approveConsentHandler = async (args) => {
                 const envPrefix = this.getEnvPrefix();
                 const mappedEnv = envPrefix
                     ? mapPrefixedEnv(this.env, envPrefix)
@@ -930,7 +946,17 @@ export class MCPICloudflareAgent extends McpAgent {
                 const serverUrl = mappedEnv.MCP_SERVER_URL ??
                     this._autoDetectedOrigin;
                 if (!serverUrl) {
-                    return { content: [{ type: "text", text: JSON.stringify({ success: false, error: "No server URL configured" }) }] };
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: JSON.stringify({
+                                    success: false,
+                                    error: "No server URL configured",
+                                }),
+                            },
+                        ],
+                    };
                 }
                 try {
                     const resp = await fetch(`${serverUrl}/consent/approve`, {
@@ -948,21 +974,48 @@ export class MCPICloudflareAgent extends McpAgent {
                         }),
                     });
                     if (!resp.ok) {
-                        return { content: [{ type: "text", text: JSON.stringify({ success: false, error: `Server error: ${resp.status}` }) }] };
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: JSON.stringify({
+                                        success: false,
+                                        error: `Server error: ${resp.status}`,
+                                    }),
+                                },
+                            ],
+                        };
                     }
                     const data = await resp.json();
                     return { content: [{ type: "text", text: JSON.stringify(data) }] };
                 }
                 catch (err) {
                     const msg = err instanceof Error ? err.message : "Unknown error";
-                    return { content: [{ type: "text", text: JSON.stringify({ success: false, error: msg }) }] };
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: JSON.stringify({ success: false, error: msg }),
+                            },
+                        ],
+                    };
                 }
+            };
+            this.server.tool("_kyaos_approve_consent", approveConsentDescription, approveConsentSchema, approveConsentHandler);
+            this.server.tool("_mcpi_approve_consent", approveConsentDescription, approveConsentSchema, async (args) => {
+                recordWireForm("tool_name", "old", {
+                    tool: "_kyaos_approve_consent",
+                });
+                return approveConsentHandler(args);
             });
             // Register internal tool for iframe-based credential authentication.
             // Same sandbox workaround as _mcpi_approve_consent: the iframe calls
             // tools/call via postMessage, which the host proxies to this tool.
             // This tool does credential auth + delegation in a single step.
-            this.server.tool("_mcpi_credential_auth", "DO NOT call this tool directly. Internal system tool used by the consent UI iframe to process credential authentication. Only the embedded consent form should invoke this.", {
+            // C4 (#2918) dual-accept: same accept-both treatment as approve_consent —
+            // canonical `_kyaos_credential_auth` plus the legacy `_mcpi_` alias.
+            const credentialAuthDescription = "DO NOT call this tool directly. Internal system tool used by the consent UI iframe to process credential authentication. Only the embedded consent form should invoke this.";
+            const credentialAuthSchema = {
                 tool: z.string(),
                 scopes: z.array(z.string()),
                 session_id: z.string(),
@@ -972,7 +1025,8 @@ export class MCPICloudflareAgent extends McpAgent {
                 username: z.string(),
                 password: z.string(),
                 provider: z.string(),
-            }, async (args) => {
+            };
+            const credentialAuthHandler = async (args) => {
                 const envPrefix = this.getEnvPrefix();
                 const mappedEnv = envPrefix
                     ? mapPrefixedEnv(this.env, envPrefix)
@@ -1012,15 +1066,39 @@ export class MCPICloudflareAgent extends McpAgent {
                         }),
                     });
                     if (!resp.ok) {
-                        return { content: [{ type: "text", text: JSON.stringify({ success: false, error: `Server error: ${resp.status}` }) }] };
+                        return {
+                            content: [
+                                {
+                                    type: "text",
+                                    text: JSON.stringify({
+                                        success: false,
+                                        error: `Server error: ${resp.status}`,
+                                    }),
+                                },
+                            ],
+                        };
                     }
                     const data = await resp.json();
                     return { content: [{ type: "text", text: JSON.stringify(data) }] };
                 }
                 catch (err) {
                     const msg = err instanceof Error ? err.message : "Unknown error";
-                    return { content: [{ type: "text", text: JSON.stringify({ success: false, error: msg }) }] };
+                    return {
+                        content: [
+                            {
+                                type: "text",
+                                text: JSON.stringify({ success: false, error: msg }),
+                            },
+                        ],
+                    };
                 }
+            };
+            this.server.tool("_kyaos_credential_auth", credentialAuthDescription, credentialAuthSchema, credentialAuthHandler);
+            this.server.tool("_mcpi_credential_auth", credentialAuthDescription, credentialAuthSchema, async (args) => {
+                recordWireForm("tool_name", "old", {
+                    tool: "_kyaos_credential_auth",
+                });
+                return credentialAuthHandler(args);
             });
             logger.info("[MCPICloudflareAgent] Registered MCP Apps consent UI resource");
         }
@@ -1128,7 +1206,8 @@ export class MCPICloudflareAgent extends McpAgent {
                 // ✅ Automatically extract sessionId from ToolExtraArguments
                 // This ensures delegation tokens stored with the original session ID
                 // can be retrieved on subsequent tool calls
-                const sessionId = extra?.sessionId;
+                const sessionId = extra
+                    ?.sessionId;
                 return this.executeToolWithProof(name, args, handler, sessionId);
             };
             // Build tool config with optional MCP Apps UI metadata
@@ -1205,7 +1284,7 @@ export class MCPICloudflareAgent extends McpAgent {
                         body: JSON.stringify({ mcpSessionId: mcpSdkSessionId }),
                     });
                     if (response.ok) {
-                        const result = await response.json();
+                        const result = (await response.json());
                         if (result.success && result.handshakeSessionId) {
                             handshakeSessionId = result.handshakeSessionId;
                             if (this._environment === "development") {
@@ -1250,15 +1329,26 @@ export class MCPICloudflareAgent extends McpAgent {
                     sessionId: handshakeSessionId.slice(0, 20) + "...",
                     reason: validationResult.reason,
                 });
-                // Fall back to other session sources (don't trust the client's session ID)
+                // Fall back to other session sources (don't trust the client's session ID).
+                // Prefer the stable Durable Object id over an ephemeral mcpi_{uuid} so the
+                // consent→reuse storage key matches across calls to this DO (mirrors the
+                // session-registration path); the random uuid is a last resort only.
                 sessionId =
-                    providedSessionId || mcpSdkSessionId || `mcpi_${crypto.randomUUID()}`;
+                    providedSessionId ||
+                        mcpSdkSessionId ||
+                        this.ctx.id.toString() ||
+                        `${SESSION_ID_PREFIX}${crypto.randomUUID()}`;
             }
         }
         else {
-            // No handshake session provided - use fallback
+            // No handshake session provided — use fallback. Prefer the stable Durable
+            // Object id over an ephemeral mcpi_{uuid} so the consent→reuse storage key
+            // stays stable across calls to this DO; the random uuid is a last resort.
             sessionId =
-                providedSessionId || mcpSdkSessionId || `mcpi_${crypto.randomUUID()}`;
+                providedSessionId ||
+                    mcpSdkSessionId ||
+                    this.ctx.id.toString() ||
+                    `${SESSION_ID_PREFIX}${crypto.randomUUID()}`;
         }
         // Log session ID source for debugging
         if (this._environment === "development") {
@@ -1314,8 +1404,8 @@ export class MCPICloudflareAgent extends McpAgent {
             if (delegationStorage) {
                 const identityKey = STORAGE_KEYS.sessionIdentity(sessionId);
                 const sessionKey = STORAGE_KEYS.session(sessionId);
-                const identityData = await delegationStorage.get(identityKey, "json");
-                const sessionData = await delegationStorage.get(sessionKey, "json");
+                const identityData = (await delegationStorage.get(identityKey, "json"));
+                const sessionData = (await delegationStorage.get(sessionKey, "json"));
                 userDid = identityData?.userDid || sessionData?.userDid;
                 clientDid = sessionData?.clientDid;
             }
@@ -1445,7 +1535,10 @@ export class MCPICloudflareAgent extends McpAgent {
                     const scopes = credError.toolProtection?.requiredScopes || [
                         `${toolName}:execute`,
                     ];
-                    const resumeToken = `resume_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
+                    // CSPRNG resume token (capability-bearing) — replaces the prior
+                    // Date.now()+Math.random() form which leaked creation time and was
+                    // weakly unguessable. See generateResumeToken in @kya-os/mcp-i-core.
+                    const resumeToken = generateResumeToken("resume");
                     // Try MCP Apps inline credential UI first (preferred path)
                     // Note: clientCapabilities not available in this context — pass undefined.
                     // buildConsentUIResult gates on isExtAppsAvailable(), not client caps.
@@ -1540,7 +1633,10 @@ export class MCPICloudflareAgent extends McpAgent {
                         isCredentialProvider,
                     });
                     let authUrl;
-                    const resumeToken = `resume_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`;
+                    // CSPRNG resume token (capability-bearing) — replaces the prior
+                    // Date.now()+Math.random() form which leaked creation time and was
+                    // weakly unguessable. See generateResumeToken in @kya-os/mcp-i-core.
+                    const resumeToken = generateResumeToken("resume");
                     if (isCredentialProvider) {
                         // Try MCP Apps inline credential UI first
                         const inlineResult = this.mcpiRuntime?.buildConsentUIResult(oauthError.toolName, oauthError.requiredScopes, session, resumeToken, session.projectId, session.serverOrigin, undefined, "credentials", oauthError.provider || "credentials");
@@ -1593,7 +1689,9 @@ export class MCPICloudflareAgent extends McpAgent {
             // we MUST re-throw the original error to prevent unauthorized tool execution.
             // Only log and continue for non-auth errors (backward compatibility).
             // Note: pendingInlineResult means auth is handled via inline UI — skip re-throw.
-            if (!pendingAuthError && !pendingInlineResult && !pendingAuthRequiredError) {
+            if (!pendingAuthError &&
+                !pendingInlineResult &&
+                !pendingAuthRequiredError) {
                 if (originalAuthError) {
                     // Auth was required but URL building failed - MUST block execution
                     logger.error("[MCPICloudflareAgent] SECURITY: Auth required but URL building failed, blocking tool execution:", { originalError: originalAuthError.message, buildError: error });
@@ -1699,15 +1797,12 @@ export class MCPICloudflareAgent extends McpAgent {
                         },
                     ],
                     isError: true,
-                    _meta: {
-                        errorType: "authorization_required",
-                        toolName: toolNameForError,
-                        requiredScopes: scopes,
-                        consentUrl,
-                        authorizationUrl: consentUrl,
-                        resumeToken,
-                        ...(popupResource ? { popupResource } : {}),
-                    },
+                    // C4 (#2918) 3c dual-emit: carry BOTH the ratified DIF
+                    // needs_authorization envelope AND the legacy proprietary keys
+                    // (`errorType: "authorization_required"` — the kya-http §8.1
+                    // challenge trigger). See buildNeedsAuthorizationMeta.
+                    _meta: buildNeedsAuthorizationMeta(delegationError, consentUrl, delegationError.interceptedCall?.expiresAt ??
+                        Date.now() + 1_800_000, popupResource ? { popupResource } : {}),
                 };
             }
             // Handle OAuthRequiredError - use formatOAuth() to preserve provider name
@@ -1962,7 +2057,9 @@ export class MCPICloudflareAgent extends McpAgent {
                     if (!this._vaultResolver) {
                         const identity = await this.mcpiRuntime.getIdentity();
                         // Decode base64/base64url private key to bytes (self-contained, no private method access)
-                        const b64 = identity.privateKey.replace(/-/g, "+").replace(/_/g, "/");
+                        const b64 = identity.privateKey
+                            .replace(/-/g, "+")
+                            .replace(/_/g, "/");
                         const padded = b64 + "=".repeat((4 - (b64.length % 4)) % 4);
                         const binaryStr = atob(padded);
                         const keyBytes = new Uint8Array(binaryStr.length);
@@ -1979,8 +2076,8 @@ export class MCPICloudflareAgent extends McpAgent {
                                 : keyBytes;
                         // Wrap as PKCS#8 for crypto.subtle.importKey
                         const pkcs8Header = new Uint8Array([
-                            0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05,
-                            0x06, 0x03, 0x2b, 0x65, 0x70, 0x04, 0x22, 0x04, 0x20,
+                            0x30, 0x2e, 0x02, 0x01, 0x00, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65,
+                            0x70, 0x04, 0x22, 0x04, 0x20,
                         ]);
                         const pkcs8 = new Uint8Array(pkcs8Header.length + rawKey.length);
                         pkcs8.set(pkcs8Header);
@@ -2087,6 +2184,21 @@ export class MCPICloudflareAgent extends McpAgent {
                 agentShieldApiUrl: env.AGENTSHIELD_API_URL || "https://kya.vouched.id",
                 agentShieldApiKey: env.AGENTSHIELD_API_KEY,
                 projectId,
+                // WFP fix (see makeEnvSecretResolver): resolve the client secret from the
+                // RAW worker env. We pass `this.env`, NOT the `env` param — `env` here is
+                // `mappedEnv` (mapPrefixedEnv(this.env, …) on prefixed deployments), a
+                // WHITELISTED CloudflareEnv that DROPS dynamically-named secret bindings like
+                // KYA_…_CLIENT_SECRET, so resolving off it would miss the secret. `this.env`
+                // is the unmapped worker bindings and keeps them. (The other options above
+                // read whitelisted keys, so `env` is correct for those.) Injected for SYMMETRY
+                // with the two callback sites; this tool-execution path mainly refreshes IdP
+                // tokens and refreshTokenPKCE sends no client_secret, so it isn't exercised for
+                // its value today, but wiring it correctly keeps all three sites consistent.
+                // Coverage: agent.ts can't load in the node test runtime (cloudflare: imports),
+                // so this site is verified by the source wiring guard in
+                // oauth-callback-env-secret.test.ts; the resolver is covered 100% in
+                // env-secret-resolver*.test.ts.
+                secretResolver: makeEnvSecretResolver(this.env),
             });
             const oauthSecurityService = new OAuthSecurityService(env.DELEGATION_STORAGE, env.OAUTH_ENCRYPTION_SECRET);
             // Only create IdpTokenStorage if DELEGATION_STORAGE is available
@@ -2318,6 +2430,16 @@ export class MCPICloudflareAgent extends McpAgent {
      */
     async fetch(request) {
         const url = new URL(request.url);
+        // draft-kya-http-02 §13 pickup-anchor dispatch.
+        // These requests target dedicated `pickup:<sid>` durable-object instances and
+        // must run BEFORE any origin detection, handshake-session side effects, or
+        // super/PartyServer routing — a pickup-anchor instance must never trip agent
+        // init. Precedent: the `/_internal/delegation/*` routes handled further below.
+        if (url.pathname.startsWith("/_internal/pickup/")) {
+            // `this.ctx` is the McpAgent base's DurableObjectState, typed against the
+            // SDK's bundled @cloudflare/workers-types; bridge it to this package's copy.
+            return handlePickupInternal(this.ctx, request);
+        }
         // Auto-detect and store server origin for consent URL building.
         // CRITICAL: When requests are routed through Cloudflare DO routing, the URL is
         // transformed to an internal URL (e.g., http://dummy-example.cloudflare.com).
@@ -2552,12 +2674,19 @@ export class MCPICloudflareAgent extends McpAgent {
         // This is called by consent.service.ts to store delegation tokens directly in DO storage.
         // Using DO storage instead of KV eliminates eventual consistency issues since
         // both storage and retrieval happen on the same DO instance (strongly consistent).
-        if (url.pathname === "/_internal/delegation/store" && request.method === "POST") {
+        if (url.pathname === "/_internal/delegation/store" &&
+            request.method === "POST") {
             logger.info("[MCPICloudflareAgent] Handling internal delegation store request");
             try {
-                const body = await request.json();
-                if (!body.sessionId || !body.delegationToken || !body.delegationId || !body.agentDid) {
-                    return new Response(JSON.stringify({ success: false, error: "Missing required fields" }), { status: 400, headers: { "Content-Type": "application/json" } });
+                const body = (await request.json());
+                if (!body.sessionId ||
+                    !body.delegationToken ||
+                    !body.delegationId ||
+                    !body.agentDid) {
+                    return new Response(JSON.stringify({
+                        success: false,
+                        error: "Missing required fields",
+                    }), { status: 400, headers: { "Content-Type": "application/json" } });
                 }
                 await this.storeDelegationToStorage(body);
                 logger.info("[MCPICloudflareAgent] ✅ Delegation stored to DO storage:", {
@@ -2565,7 +2694,10 @@ export class MCPICloudflareAgent extends McpAgent {
                     delegationId: body.delegationId,
                     hasUserDid: !!body.userDid,
                 });
-                return new Response(JSON.stringify({ success: true }), { status: 200, headers: { "Content-Type": "application/json" } });
+                return new Response(JSON.stringify({ success: true }), {
+                    status: 200,
+                    headers: { "Content-Type": "application/json" },
+                });
             }
             catch (error) {
                 logger.error("[MCPICloudflareAgent] Delegation store request failed:", error);
@@ -2579,10 +2711,11 @@ export class MCPICloudflareAgent extends McpAgent {
         // This is called by getDelegationFromStorage() to read from singleton DO
         // when using singleton routing strategy. This ensures the agent reads from
         // the same DO that consent.service.ts wrote to.
-        if (url.pathname === "/_internal/delegation/get" && request.method === "POST") {
+        if (url.pathname === "/_internal/delegation/get" &&
+            request.method === "POST") {
             logger.debug("[MCPICloudflareAgent] Handling internal delegation get request");
             try {
-                const body = await request.json();
+                const body = (await request.json());
                 if (!body.sessionId) {
                     return new Response(JSON.stringify({ success: false, error: "Missing sessionId" }), { status: 400, headers: { "Content-Type": "application/json" } });
                 }
@@ -2613,7 +2746,10 @@ export class MCPICloudflareAgent extends McpAgent {
                     hasUserDid: !!body.userDid,
                     hasAgentDid: !!body.agentDid,
                 });
-                return new Response(JSON.stringify({ success: true, data: null }), { status: 200, headers: { "Content-Type": "application/json" } });
+                return new Response(JSON.stringify({ success: true, data: null }), {
+                    status: 200,
+                    headers: { "Content-Type": "application/json" },
+                });
             }
             catch (error) {
                 logger.error("[MCPICloudflareAgent] Delegation get request failed:", error);
@@ -2626,12 +2762,16 @@ export class MCPICloudflareAgent extends McpAgent {
         // Handle internal session mapping storage request
         // This is called to store MCP session ID → handshake session ID mapping in DO storage
         // for strong consistency (avoiding KV eventual consistency issues)
-        if (url.pathname === "/_internal/session-mapping/store" && request.method === "POST") {
+        if (url.pathname === "/_internal/session-mapping/store" &&
+            request.method === "POST") {
             logger.debug("[MCPICloudflareAgent] Handling internal session mapping store request");
             try {
-                const body = await request.json();
+                const body = (await request.json());
                 if (!body.mcpSessionId || !body.handshakeSessionId) {
-                    return new Response(JSON.stringify({ success: false, error: "Missing required fields" }), { status: 400, headers: { "Content-Type": "application/json" } });
+                    return new Response(JSON.stringify({
+                        success: false,
+                        error: "Missing required fields",
+                    }), { status: 400, headers: { "Content-Type": "application/json" } });
                 }
                 // Store in DO storage
                 // Note: DO storage doesn't support TTL like KV, but the mapping is cleaned up
@@ -2642,7 +2782,10 @@ export class MCPICloudflareAgent extends McpAgent {
                     mcpSessionId: body.mcpSessionId.slice(0, 20) + "...",
                     handshakeSessionId: body.handshakeSessionId.slice(0, 20) + "...",
                 });
-                return new Response(JSON.stringify({ success: true }), { status: 200, headers: { "Content-Type": "application/json" } });
+                return new Response(JSON.stringify({ success: true }), {
+                    status: 200,
+                    headers: { "Content-Type": "application/json" },
+                });
             }
             catch (error) {
                 logger.error("[MCPICloudflareAgent] Session mapping store request failed:", error);
@@ -2654,10 +2797,11 @@ export class MCPICloudflareAgent extends McpAgent {
         }
         // Handle internal session mapping retrieval request
         // This is called to retrieve MCP session ID → handshake session ID mapping from DO storage
-        if (url.pathname === "/_internal/session-mapping/get" && request.method === "POST") {
+        if (url.pathname === "/_internal/session-mapping/get" &&
+            request.method === "POST") {
             logger.debug("[MCPICloudflareAgent] Handling internal session mapping get request");
             try {
-                const body = await request.json();
+                const body = (await request.json());
                 if (!body.mcpSessionId) {
                     return new Response(JSON.stringify({ success: false, error: "Missing mcpSessionId" }), { status: 400, headers: { "Content-Type": "application/json" } });
                 }
@@ -2686,7 +2830,8 @@ export class MCPICloudflareAgent extends McpAgent {
         }
         // Handle internal client capabilities request
         // Returns stored MCP client capabilities from the initialize message
-        if (url.pathname === "/_internal/client-capabilities" && request.method === "GET") {
+        if (url.pathname === "/_internal/client-capabilities" &&
+            request.method === "GET") {
             try {
                 const mcpClientInfo = await this.getMcpClientInfo();
                 return new Response(JSON.stringify({
@@ -2922,7 +3067,7 @@ export class MCPICloudflareAgent extends McpAgent {
                     body: JSON.stringify({ sessionId, userDid, agentDid }),
                 });
                 if (response.ok) {
-                    const result = await response.json();
+                    const result = (await response.json());
                     if (result.success && result.data) {
                         logger.debug("[MCPICloudflareAgent] ✅ Delegation found via DO:", {
                             sessionId: sessionId.slice(0, 20) + "...",