@opendatalabs/personal-server-ts-server 0.0.1-canary.016adf9 → 0.0.1-canary.052d47e

package/dist/routes/grants.js

@@ -1,208 +1,30 @@
 /**
- * Grants routes — GET / (owner), POST / (create grant), POST /verify (public).
+ * Grants routes — GET / (owner), POST / (create grant), DELETE /:grantId
+ * (revoke grant), POST /verify (public).
  */
 import { Hono } from "hono";
-import { verifyTypedData } from "viem";
-import { GRANT_DOMAIN, GRANT_TYPES, } from "@opendatalabs/personal-server-ts-core/grants";
-import { createWeb3AuthMiddleware } from "../middleware/web3-auth.js";
-import { createOwnerCheckMiddleware } from "../middleware/owner-check.js";
-function isValidCreateBody(body) {
-    if (body === null || typeof body !== "object" || Array.isArray(body))
-        return false;
-    const b = body;
-    if (typeof b.granteeAddress !== "string" ||
-        !b.granteeAddress.startsWith("0x"))
-        return false;
-    if (!Array.isArray(b.scopes) || b.scopes.length === 0)
-        return false;
-    if (!b.scopes.every((s) => typeof s === "string"))
-        return false;
-    if (b.expiresAt !== undefined && typeof b.expiresAt !== "number")
-        return false;
-    if (b.nonce !== undefined && typeof b.nonce !== "number")
-        return false;
-    return true;
-}
-function isValidVerifyBody(body) {
-    if (body === null || typeof body !== "object" || Array.isArray(body))
-        return false;
-    const b = body;
-    if (typeof b.grantId !== "string" || b.grantId.length === 0)
-        return false;
-    if (typeof b.signature !== "string" || !b.signature.startsWith("0x"))
-        return false;
-    if (b.payload === null ||
-        typeof b.payload !== "object" ||
-        Array.isArray(b.payload))
-        return false;
-    const p = b.payload;
-    if (typeof p.user !== "string" || !p.user.startsWith("0x"))
-        return false;
-    if (typeof p.builder !== "string" || !p.builder.startsWith("0x"))
-        return false;
-    if (!Array.isArray(p.scopes) || p.scopes.length === 0)
-        return false;
-    if (!p.scopes.every((s) => typeof s === "string"))
-        return false;
-    if (typeof p.expiresAt !== "number")
-        return false;
-    if (typeof p.nonce !== "number")
-        return false;
-    return true;
-}
+import { handlePersonalServerGrantsRequest, } from "@opendatalabs/personal-server-ts-core/api";
+import { createServerApiAuth } from "../api-auth.js";
 export function grantsRoutes(deps) {
     const app = new Hono();
-    const web3Auth = createWeb3AuthMiddleware({
+    const auth = createServerApiAuth({
         serverOrigin: deps.serverOrigin,
         devToken: deps.devToken,
+        accessToken: deps.accessToken,
+        tokenStore: deps.tokenStore,
         serverOwner: deps.serverOwner,
+        gateway: deps.gateway,
     });
-    const ownerCheck = createOwnerCheckMiddleware(deps.serverOwner);
-    // GET / — list all grants for the server owner (owner auth required)
-    app.get("/", web3Auth, ownerCheck, async (c) => {
-        if (!deps.serverOwner) {
-            return c.json({
-                error: {
-                    code: 500,
-                    errorCode: "SERVER_NOT_CONFIGURED",
-                    message: "Server owner address not configured. Set VANA_MASTER_KEY_SIGNATURE environment variable.",
-                },
-            }, 500);
-        }
-        const grants = await deps.gateway.listGrantsByUser(deps.serverOwner);
-        return c.json({ grants });
-    });
-    // POST / — create a grant (owner-only, called by Desktop App)
-    app.post("/", web3Auth, ownerCheck, async (c) => {
-        if (!deps.serverOwner) {
-            return c.json({
-                error: {
-                    code: 500,
-                    errorCode: "SERVER_NOT_CONFIGURED",
-                    message: "Server owner address not configured. Set VANA_MASTER_KEY_SIGNATURE environment variable.",
-                },
-            }, 500);
-        }
-        if (!deps.serverSigner) {
-            return c.json({
-                error: {
-                    code: 500,
-                    errorCode: "SERVER_SIGNER_NOT_CONFIGURED",
-                    message: "Server signer not configured. Set VANA_MASTER_KEY_SIGNATURE environment variable.",
-                },
-            }, 500);
-        }
-        let body;
-        try {
-            body = await c.req.json();
-        }
-        catch {
-            return c.json({ error: "INVALID_BODY", message: "Invalid JSON body" }, 400);
-        }
-        if (!isValidCreateBody(body)) {
-            return c.json({
-                error: "INVALID_BODY",
-                message: "Body must include granteeAddress (0x string) and scopes (non-empty string array)",
-            }, 400);
-        }
-        const { granteeAddress, scopes, expiresAt, nonce } = body;
-        // Look up builder to get their on-chain ID
-        const builder = await deps.gateway.getBuilder(granteeAddress);
-        if (!builder) {
-            return c.json({
-                error: {
-                    code: 404,
-                    errorCode: "BUILDER_NOT_REGISTERED",
-                    message: `Builder ${granteeAddress} is not registered on-chain`,
-                },
-            }, 404);
-        }
-        // Build the grant payload JSON string
-        const grantPayload = JSON.stringify({
-            user: deps.serverOwner,
-            builder: granteeAddress,
-            scopes,
-            expiresAt: expiresAt ?? 0,
-            nonce: nonce ?? Date.now(),
-        });
-        // Sign EIP-712 GrantRegistration
-        const signature = await deps.serverSigner.signGrantRegistration({
-            grantorAddress: deps.serverOwner,
-            granteeId: builder.id,
-            grant: grantPayload,
-            fileIds: [],
-        });
-        // Submit to Gateway
-        const result = await deps.gateway.createGrant({
-            grantorAddress: deps.serverOwner,
-            granteeId: builder.id,
-            grant: grantPayload,
-            fileIds: [],
-            signature,
-        });
-        return c.json({ grantId: result.grantId }, 201);
-    });
-    // POST /verify — public endpoint, no auth required
-    app.post("/verify", async (c) => {
-        let body;
-        try {
-            body = await c.req.json();
-        }
-        catch {
-            return c.json({ error: "INVALID_BODY", message: "Invalid JSON body" }, 400);
-        }
-        if (!isValidVerifyBody(body)) {
-            return c.json({
-                error: "INVALID_BODY",
-                message: "Body must include grantId (string), payload (object with user, builder, scopes, expiresAt, nonce), and signature (0x string)",
-            }, 400);
-        }
-        const { payload, signature } = body;
-        // Verify EIP-712 signature — recover signer and check === payload.user
-        let valid;
-        try {
-            valid = await verifyTypedData({
-                address: payload.user,
-                domain: GRANT_DOMAIN,
-                types: GRANT_TYPES,
-                primaryType: "Grant",
-                message: {
-                    user: payload.user,
-                    builder: payload.builder,
-                    scopes: payload.scopes,
-                    expiresAt: BigInt(payload.expiresAt),
-                    nonce: BigInt(payload.nonce),
-                },
-                signature: signature,
-            });
-        }
-        catch {
-            return c.json({
-                valid: false,
-                error: "EIP-712 signature verification failed",
-            });
-        }
-        if (!valid) {
-            return c.json({
-                valid: false,
-                error: "Grant signature does not match user",
-            });
-        }
-        // Check expiry: expiresAt > 0 means there IS an expiry
-        if (payload.expiresAt > 0) {
-            const nowSeconds = Math.floor(Date.now() / 1000);
-            if (payload.expiresAt < nowSeconds) {
-                return c.json({ valid: false, error: "Grant has expired" });
-            }
-        }
-        return c.json({
-            valid: true,
-            user: payload.user,
-            builder: payload.builder,
-            scopes: payload.scopes,
-            expiresAt: payload.expiresAt,
-        });
-    });
+    const handler = (c) => handlePersonalServerGrantsRequest(c.req.raw, {
+        auth,
+        gateway: deps.gateway,
+        gatewayConfig: deps.gatewayConfig,
+        serverOwner: deps.serverOwner,
+        serverSigner: deps.serverSigner,
+    }, { basePath: deps.mountPath });
+    app.all("/", handler);
+    app.delete("/:grantId", handler);
+    app.all("/*", handler);
     return app;
 }
 //# sourceMappingURL=grants.js.map

package/dist/routes/grants.js.map

@@ -1 +1 @@
-{"version":3,"file":"grants.js","sourceRoot":"","sources":["../../src/routes/grants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grants.js","sourceRoot":"","sources":["../../src/routes/grants.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,IAAI,EAAgB,MAAM,MAAM,CAAC;AAM1C,OAAO,EACL,iCAAiC,GAElC,MAAM,2CAA2C,CAAC;AAGnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAerD,MAAM,UAAU,YAAY,CAAC,IAAqB;IAChD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,MAAM,IAAI,GAAG,mBAAmB,CAAC;QAC/B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAY,CAAC,CAAC,EAAE,EAAE,CAC7B,iCAAiC,CAC/B,CAAC,CAAC,GAAG,CAAC,GAAG,EACT;QACE,IAAI;QACJ,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,WAAW,EAAE,IAAI,CAAC,WAAW;QAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,EACD,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,CAC7B,CAAC;IAEJ,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACtB,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACjC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEvB,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/routes/health.d.ts

@@ -1,16 +1,22 @@
 import { Hono } from "hono";
-import type { GatewayClient } from "@opendatalabs/personal-server-ts-core/gateway";
+import type { DataPortabilityGatewayConfig, GatewayClient } from "@opendatalabs/vana-sdk/node";
+import type { RuntimeAvailabilityPort } from "@opendatalabs/personal-server-ts-core/ports";
 import type { Logger } from "pino";
 import type { IdentityInfo } from "../app.js";
 import type { TunnelStatusInfo } from "../tunnel/index.js";
 export interface HealthDeps {
     version: string;
     startedAt: Date;
+    serverOrigin?: string | (() => string);
     serverOwner?: `0x${string}`;
     identity?: IdentityInfo;
     gateway?: GatewayClient;
+    gatewayConfig?: DataPortabilityGatewayConfig & {
+        url?: string;
+    };
     logger?: Logger;
     getTunnelStatus?: () => TunnelStatusInfo | null;
+    runtimeAvailability?: RuntimeAvailabilityPort;
 }
 export declare function healthRoute(deps: HealthDeps): Hono;
 //# sourceMappingURL=health.d.ts.map

package/dist/routes/health.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,WAAW,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,gBAAgB,GAAG,IAAI,CAAC;CACjD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CA0ClD"}
+{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EACV,4BAA4B,EAC5B,aAAa,EACd,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACvC,WAAW,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,aAAa,CAAC,EAAE,4BAA4B,GAAG;QAAE,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAChD,mBAAmB,CAAC,EAAE,uBAAuB,CAAC;CAC/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAsFlD"}

package/dist/routes/health.js

@@ -22,14 +22,51 @@ export function healthRoute(deps) {
                 serverId,
             }
             : null;
-        const tunnel = deps.getTunnelStatus?.() ?? null;
+        const tunnelStatus = deps.getTunnelStatus?.() ?? null;
+        const fallbackOrigin = typeof deps.serverOrigin === "function"
+            ? deps.serverOrigin()
+            : deps.serverOrigin;
+        const tunnelPublicUrl = tunnelStatus?.publicUrl ?? null;
+        const tunnelReady = tunnelStatus?.status === "connected" && tunnelStatus.routable !== false;
+        const apiOrigin = tunnelReady && tunnelPublicUrl
+            ? tunnelPublicUrl
+            : (fallbackOrigin ?? null);
+        const registrationUrl = tunnelPublicUrl ?? apiOrigin;
+        const registration = deps.serverOwner && identity && registrationUrl
+            ? {
+                ownerAddress: deps.serverOwner,
+                serverAddress: identity.address,
+                publicKey: identity.publicKey,
+                serverUrl: registrationUrl,
+                serverId,
+                registered: Boolean(serverId),
+            }
+            : null;
+        const tunnel = tunnelStatus && registration && tunnelStatus.publicUrl
+            ? {
+                ...tunnelStatus,
+                routable: registration.registered && tunnelStatus.routable !== false,
+                warning: registration.registered
+                    ? tunnelStatus.warning
+                    : "Server not registered with gateway",
+            }
+            : tunnelStatus;
+        const runtimeAvailable = (await deps.runtimeAvailability?.isAvailable()) ?? true;
         return c.json({
-            status: "healthy",
+            status: runtimeAvailable ? "healthy" : "unavailable",
             version: deps.version,
             uptime: Math.floor(uptimeMs / 1000),
             owner: deps.serverOwner ?? null,
+            apiOrigin,
+            gatewayUrl: deps.gatewayConfig?.url ?? null,
+            gatewayConfig: deps.gatewayConfig ?? null,
             identity,
+            registration,
             tunnel,
+            runtime: {
+                kind: "ps-node",
+                available: runtimeAvailable,
+            },
         });
     });
     return app;

package/dist/routes/health.js.map

@@ -1 +1 @@
-{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAiB5B,MAAM,UAAU,WAAW,CAAC,IAAgB;IAC1C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACvD,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,EAAE,QAAQ,IAAI,IAAI,CAAC;QAE/C,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACnE,QAAQ,GAAG,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC;YAChC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,iEAAiE;gBACjE,QAAQ,GAAG,IAAI,CAAC;gBAChB,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,EAAE,GAAG,EAAE,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAC7C,2CAA2C,CAC5C,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ;YAC5B,CAAC,CAAC;gBACE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO;gBAC9B,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS;gBAClC,QAAQ;aACT;YACH,CAAC,CAAC,IAAI,CAAC;QAET,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,IAAI,CAAC;QAEhD,OAAO,CAAC,CAAC,IAAI,CAAC;YACZ,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;YACnC,KAAK,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI;YAC/B,QAAQ;YACR,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"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"}

package/dist/routes/mcp.d.ts

@@ -0,0 +1,115 @@
+/**
+ * MCP routes — both the Claude-facing `/mcp/:token` Streamable HTTP endpoint
+ * and the owner-only `/v1/mcp/connections` management surface.
+ *
+ * §1–§3 of `260604-PLAN-vana-mcp-personal-server.md`.
+ *
+ * Owner endpoints reuse `createServerApiAuth().authorizeOwner` so the same
+ * auth surface that gates `/v1/grants` gates connection management. The
+ * Claude-facing endpoint uses the connection token as a capability — there
+ * is no Web3Signed payload from Claude; the token resolves to a connection
+ * and we then sign reads ourselves with the per-connection grantee.
+ *
+ * NOTE on Phase-1 storage: this route accepts an `McpConnectionStore` from
+ * the caller. The in-memory implementation in `core/src/mcp/store.ts` is
+ * fine for tests and the first server-side smoke; for Web PS Lite an
+ * IndexedDB-backed adapter is the natural production path (Phase-2 §4
+ * "encrypt grantee private keys at rest" applies there).
+ */
+import { Hono } from "hono";
+import type { Logger } from "pino";
+import type { DataPortabilityGatewayConfig, GatewayClient } from "@opendatalabs/vana-sdk/node";
+import { buildMcpUrl, buildStableMcpUrl, type McpProofReplayStore, type McpConnectionStore, type McpSessionStore, type McpOAuthAuthorizationStore, type McpActivityRecorder } from "@opendatalabs/personal-server-ts-core/mcp";
+import type { PersonalServerReadFulfillmentReporter } from "@opendatalabs/personal-server-ts-core/api";
+import type { AccessLogWriter } from "@opendatalabs/personal-server-ts-core/logging/access-log";
+import type { ServerSigner } from "@opendatalabs/personal-server-ts-core/signing";
+import type { HierarchyManagerOptions } from "@opendatalabs/personal-server-ts-core/storage/hierarchy";
+import type { IndexManager } from "@opendatalabs/personal-server-ts-core/storage/index";
+import type { DataStoragePort, RuntimeAvailabilityPort } from "@opendatalabs/personal-server-ts-core/ports";
+import type { TokenStore } from "../token-store.js";
+export interface McpRouteDeps {
+    logger: Logger;
+    /**
+     * `serverOrigin` used both as the Web3Signed `aud` for the per-connection
+     * grantee's self-issued read requests AND as the base URL printed back to
+     * the user when they create a connection ("paste this into Claude").
+     * Caller may pass a thunk if the public origin depends on relay state.
+     */
+    serverOrigin: string | (() => string);
+    serverOwner?: `0x${string}`;
+    /** The server's own account address — required for x402 payment settlement. */
+    serverAddress?: `0x${string}`;
+    serverSigner?: Pick<ServerSigner, "signGrantRegistration" | "signRecordDataAccess">;
+    gateway: GatewayClient;
+    gatewayConfig?: (DataPortabilityGatewayConfig & {
+        url?: string;
+    }) | null;
+    /**
+     * Enables x402 pay-per-read for self-signing (chatbot) MCP sessions only.
+     * The owner/OAuth connection path is always free regardless of this flag.
+     */
+    paymentEnabled?: boolean;
+    devToken?: string;
+    accessToken?: string;
+    tokenStore?: TokenStore;
+    accessLogWriter: AccessLogWriter;
+    readFulfillmentReporter?: PersonalServerReadFulfillmentReporter;
+    indexManager?: IndexManager;
+    hierarchyOptions?: HierarchyManagerOptions;
+    dataStorage?: DataStoragePort;
+    runtimeAvailability?: RuntimeAvailabilityPort;
+    /** Per-process connection store. Defaults to in-memory. */
+    connectionStore?: McpConnectionStore;
+    /**
+     * Per-process store for self-signing chatbot MCP sessions (Option A).
+     * Defaults to in-memory. Shared within `mcpStreamableHttpRoutes` between the
+     * `/mcp/session` handshake and the `/mcp` reads.
+     */
+    sessionStore?: McpSessionStore;
+    /**
+     * Per-process replay guard for `/mcp/session` handshake proofs. Defaults to
+     * in-memory. Rejects reuse of a still-valid Web3Signed proof.
+     */
+    proofReplayStore?: McpProofReplayStore;
+    /**
+     * OAuth authorization store shared by `/mcp/oauth/authorize`,
+     * `/mcp/oauth/token`, and the owner approval endpoint.
+     */
+    oauthAuthorizationStore?: McpOAuthAuthorizationStore;
+    /** Activity recorder for live MCP call visibility. */
+    activityRecorder?: McpActivityRecorder;
+    /**
+     * Vana Web approval surface. `/mcp/oauth/authorize` redirects owners here
+     * with `mcp_authorization` and `ps_origin` query params.
+     */
+    oauthApprovalUrl?: string | (() => string);
+}
+/**
+ * Hono sub-app for the owner-only `/v1/mcp/connections` endpoints.
+ * Mount under `/v1/mcp/connections` in `app.ts`.
+ */
+export declare function mcpConnectionsRoutes(deps: McpRouteDeps): Hono;
+/**
+ * Top-level MCP OAuth/discovery routes.
+ *
+ * Mount at `/` so the well-known documents are served from the PS origin and
+ * Claude can discover auth for the stable `/mcp` resource.
+ */
+export declare function mcpOAuthRoutes(deps: McpRouteDeps): Hono;
+/**
+ * Hono sub-app for the Claude-facing Streamable HTTP endpoint.
+ * Mount under `/mcp` in `app.ts`; stable `/mcp` accepts OAuth bearer tokens
+ * and legacy `/mcp/:connectionToken` still accepts token-in-path calls.
+ *
+ * NOTE: this MUST receive the SAME `connectionStore` instance you pass to
+ * `mcpConnectionsRoutes` — otherwise the management API creates connections
+ * that the Claude endpoint can never see.
+ */
+export declare function mcpStreamableHttpRoutes(deps: McpRouteDeps): Hono;
+/**
+ * Owner-only activity feed route. Mount at `/v1/mcp/activity` in `app.ts`.
+ * Returns the current snapshot from the shared `McpActivityRecorder`.
+ */
+export declare function mcpActivityRoutes(deps: McpRouteDeps): Hono;
+export { buildMcpUrl, buildStableMcpUrl };
+//# sourceMappingURL=mcp.d.ts.map

package/dist/routes/mcp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"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"}