@every-app/sdk 0.2.0 → 0.3.0-rc.10

package/dist/server/everyApp.d.ts

@@ -1,20 +1,41 @@
 /**
  * `everyApp()` — the app-side identity boundary.
  *
- *   import manifest from "../everyapp.config.js";
- *   export default everyApp(handler, manifest);
+ *   export default everyApp(handler, { tools });
  *
  * The wrapper verifies the gateway-injected identity before app code runs,
  * stores the result on the original Request, and then delegates to the
- * worker-style handler.
+ * worker-style handler. The expected audience is the Worker's own name in
+ * `env.EVERYAPP_AUDIENCE`, which `everyAppWorker()` sets at deploy (the
+ * gateway stamps every token it mints for the app with it); only in
+ * development, where `everyapp dev` mints for the app id, does the app id in
+ * `env.EVERYAPP_APP_ID` stand in. The Worker never imports
+ * `everyapp.config.ts` (the Cloudflare Vite plugin hides every file
+ * `cloudflare.config.ts` imports from the Worker in dev).
+ * It also answers the gateway's internal tools contract
+ * (`/__everyapp/tools/*`) for the app's `defineTools()` catalog.
+ *
+ * Around the handler and around each tool call it opens the request
+ * context (context.ts): `currentUser()` reads the user anywhere below, and
+ * every call back to the Gateway is attributed to the request without a
+ * `for`. A deployed Worker is pinned to its organization
+ * (`EVERY_APP_ORG_ID`), and an identity for any other is refused on both
+ * paths. The response leaves without `Set-Cookie`: the perimeter strips
+ * every `Cookie` before a request reaches the app, so a cookie the app's
+ * framework sets could never come back, and one named like the Gateway's
+ * session cookie would lock the person out of the app host.
  */
-import { ConfigurationError, IdentityError, type EveryAppUser, type IdentityResult } from "../internal/index.js";
-export { ConfigurationError, IdentityError };
-export type { EveryAppUser, IdentityResult };
-export interface ExecutionContextLike {
-    waitUntil(promise: Promise<unknown>): void;
-    passThroughOnException?(): void;
-}
+import { ConfigurationError, IdentityError, isAdmin, type EveryAppUser, type IdentityResult, type OrgRole } from "../internal/index.js";
+import type { ToolSet } from "./tools.js";
+export { ConfigurationError, IdentityError, isAdmin };
+export type { EveryAppUser, IdentityResult, OrgRole };
+/**
+ * The runtime's `ExecutionContext`, which `everyApp()` passes to the handler
+ * as the Worker received it, so it goes on to Hono's `app.fetch(request,
+ * env, ctx)` or React Router's request handler as is. Tests that call
+ * `fetch` themselves pass a stub cast to it.
+ */
+export type ExecutionContextLike = ExecutionContext;
 export interface EveryAppManifestLike {
     id: string;
     [key: string]: unknown;
@@ -31,25 +52,50 @@ export interface EveryAppOptions {
      * Never enable this in production.
      */
     allowDevIdentities?: boolean;
+    /**
+     * Agent tools from `defineTools()`. The gateway snapshots them at deploy
+     * and serves them to MCP clients; see `defineTools`.
+     */
+    tools?: ToolSet;
     /** Override for tests. */
     now?: number;
 }
-/** The handler accepted by everyApp, with the verified user as a 4th argument. */
-export type EveryAppHandler<TEnv = Record<string, unknown>> = (request: Request, env: TEnv, ctx: ExecutionContextLike, user: EveryAppUser | null) => Response | Promise<Response>;
-interface EveryAppExport<TEnv> {
-    fetch(request: Request, env: TEnv, ctx: ExecutionContextLike): Promise<Response>;
+/**
+ * The handler accepted by everyApp, with the verified user as a 4th argument.
+ * `TCtx` narrows the context, e.g. to `ExecutionContext<Props>`.
+ */
+export type EveryAppHandler<TEnv = Record<string, unknown>, TCtx extends ExecutionContextLike = ExecutionContext> = (request: Request, env: TEnv, ctx: TCtx, user: EveryAppUser | null) => Response | Promise<Response>;
+interface EveryAppExport<TEnv, TCtx extends ExecutionContextLike> {
+    fetch(request: Request, env: TEnv, ctx: TCtx): Promise<Response>;
 }
 /**
  * Return the verified Every App user for this request, or null for a declared
- * public request. Uses the request cache first, then verifies the identity
- * headers from the app id and public keys configured in env.
+ * public request. `request` is the inbound `Request` or just its `Headers`
+ * (a framework that hands out headers alone needs no made-up Request).
+ * Answers from the request context or the per-request cache first, then
+ * verifies the identity headers from the audience and public keys in env.
+ * Inside a handler `everyApp()` serves, `currentUser()` is the shorter way.
  */
-export declare function getEveryAppUser(request: Request, env: object): Promise<EveryAppUser | null>;
+export declare function getEveryAppUser(request: Request | Headers, env: object): Promise<EveryAppUser | null>;
 /**
  * Return the verified user, or throw the same 401 JSON Response shape as
  * everyApp() when the request is public or unauthenticated.
  */
-export declare function requireEveryAppUser(request: Request, env: object): Promise<EveryAppUser>;
+export declare function requireEveryAppUser(request: Request | Headers, env: object): Promise<EveryAppUser>;
+/**
+ * The user of the request being served (`currentUser()`), or throw the
+ * same 401 JSON Response as `requireEveryAppUser()` on a public route.
+ * Outside a request (`withOrganization()` work, a handler not under
+ * `everyApp()`) it throws `RequestContextError`, as `currentUser()` does.
+ */
+export declare function requireCurrentUser(): EveryAppUser;
 export declare function hasScope(user: EveryAppUser, scope: string): boolean;
-export declare function everyApp<TEnv = Record<string, unknown>>(handler: EveryAppHandler<TEnv>, manifest: EveryAppManifestLike, options?: EveryAppOptions): EveryAppExport<TEnv>;
+/** Wrap a Worker fetch handler with Every App identity verification. */
+export declare function everyApp<TEnv = Record<string, unknown>, TCtx extends ExecutionContextLike = ExecutionContext>(handler: EveryAppHandler<TEnv, TCtx>, options?: EveryAppOptions): EveryAppExport<TEnv, TCtx>;
+/**
+ * @deprecated Drop the manifest: the app id now comes from
+ *   `env.EVERYAPP_APP_ID` and the audience from `env.EVERYAPP_AUDIENCE`.
+ *   When passed, it must match the app id.
+ */
+export declare function everyApp<TEnv = Record<string, unknown>, TCtx extends ExecutionContextLike = ExecutionContext>(handler: EveryAppHandler<TEnv, TCtx>, manifest: EveryAppManifestLike | undefined, options?: EveryAppOptions): EveryAppExport<TEnv, TCtx>;
 //# sourceMappingURL=everyApp.d.ts.map

package/dist/server/everyApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"everyApp.d.ts","sourceRoot":"","sources":["../../src/server/everyApp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAEL,kBAAkB,EAElB,aAAa,EAIb,KAAK,YAAY,EACjB,KAAK,cAAc,EACpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,CAAC;AAC7C,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC;AAE7C,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;IAC3C,sBAAsB,CAAC,IAAI,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC9B,iGAAiG;IACjG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qFAAqF;IACrF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,0BAA0B;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,kFAAkF;AAClF,MAAM,MAAM,eAAe,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAC5D,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,IAAI,EACT,GAAG,EAAE,oBAAoB,EACzB,IAAI,EAAE,YAAY,GAAG,IAAI,KACtB,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAElC,UAAU,cAAc,CAAC,IAAI;IAC3B,KAAK,CACH,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,IAAI,EACT,GAAG,EAAE,oBAAoB,GACxB,OAAO,CAAC,QAAQ,CAAC,CAAC;CACtB;AAiFD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAW9B;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,YAAY,CAAC,CAevB;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED,wBAAgB,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrD,OAAO,EAAE,eAAe,CAAC,IAAI,CAAC,EAC9B,QAAQ,EAAE,oBAAoB,EAC9B,OAAO,GAAE,eAAoB,GAC5B,cAAc,CAAC,IAAI,CAAC,CAqBtB"}
+{"version":3,"file":"everyApp.d.ts","sourceRoot":"","sources":["../../src/server/everyApp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,EAGL,kBAAkB,EAElB,aAAa,EAMb,OAAO,EACP,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,OAAO,EAEb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC;AACtD,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAEpD,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC9B,iGAAiG;IACjG,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qFAAqF;IACrF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,0BAA0B;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,CACzB,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,IAAI,SAAS,oBAAoB,GAAG,gBAAgB,IAClD,CACF,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,IAAI,EACT,GAAG,EAAE,IAAI,EACT,IAAI,EAAE,YAAY,GAAG,IAAI,KACtB,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAElC,UAAU,cAAc,CAAC,IAAI,EAAE,IAAI,SAAS,oBAAoB;IAC9D,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CAClE;AAuKD;;;;;;;GAOG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,GAAG,OAAO,EAC1B,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAW9B;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,OAAO,GAAG,OAAO,EAC1B,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,YAAY,CAAC,CAevB;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,IAAI,YAAY,CAMjD;AA0BD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAEnE;AAUD,wEAAwE;AACxE,wBAAgB,QAAQ,CACtB,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,IAAI,SAAS,oBAAoB,GAAG,gBAAgB,EAEpD,OAAO,EAAE,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,EACpC,OAAO,CAAC,EAAE,eAAe,GACxB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9B;;;;GAIG;AACH,wBAAgB,QAAQ,CACtB,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,IAAI,SAAS,oBAAoB,GAAG,gBAAgB,EAEpD,OAAO,EAAE,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,EACpC,QAAQ,EAAE,oBAAoB,GAAG,SAAS,EAC1C,OAAO,CAAC,EAAE,eAAe,GACxB,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC"}

package/dist/server/everyApp.js

@@ -1,15 +1,34 @@
 /**
  * `everyApp()` — the app-side identity boundary.
  *
- *   import manifest from "../everyapp.config.js";
- *   export default everyApp(handler, manifest);
+ *   export default everyApp(handler, { tools });
  *
  * The wrapper verifies the gateway-injected identity before app code runs,
  * stores the result on the original Request, and then delegates to the
- * worker-style handler.
+ * worker-style handler. The expected audience is the Worker's own name in
+ * `env.EVERYAPP_AUDIENCE`, which `everyAppWorker()` sets at deploy (the
+ * gateway stamps every token it mints for the app with it); only in
+ * development, where `everyapp dev` mints for the app id, does the app id in
+ * `env.EVERYAPP_APP_ID` stand in. The Worker never imports
+ * `everyapp.config.ts` (the Cloudflare Vite plugin hides every file
+ * `cloudflare.config.ts` imports from the Worker in dev).
+ * It also answers the gateway's internal tools contract
+ * (`/__everyapp/tools/*`) for the app's `defineTools()` catalog.
+ *
+ * Around the handler and around each tool call it opens the request
+ * context (context.ts): `currentUser()` reads the user anywhere below, and
+ * every call back to the Gateway is attributed to the request without a
+ * `for`. A deployed Worker is pinned to its organization
+ * (`EVERY_APP_ORG_ID`), and an identity for any other is refused on both
+ * paths. The response leaves without `Set-Cookie`: the perimeter strips
+ * every `Cookie` before a request reaches the app, so a cookie the app's
+ * framework sets could never come back, and one named like the Gateway's
+ * session cookie would lock the person out of the app host.
  */
-import { APP_ID_ENV, ConfigurationError, DEV_ENV, IdentityError, ISSUER_ENV, PUBLIC_KEYS_ENV, getIdentityFromRequest, } from "../internal/index.js";
-export { ConfigurationError, IdentityError };
+import { APP_ID_ENV, AUDIENCE_ENV, ConfigurationError, DEV_ENV, IdentityError, IDENTITY_HEADER, ISSUER_ENV, ORG_ID_ENV, PUBLIC_KEYS_ENV, getIdentityFromRequest, isAdmin, } from "../internal/index.js";
+import { currentUser, serveRequest } from "./context.js";
+import { handleToolsRequest } from "./toolsEndpoint.js";
+export { ConfigurationError, IdentityError, isAdmin };
 const requestIdentities = new WeakMap();
 function envValue(env, key) {
     if (!env || typeof env !== "object")
@@ -19,7 +38,7 @@ function envValue(env, key) {
 }
 function configFrom(manifest, options = {}) {
     return {
-        audience: manifest.id,
+        manifestAppId: manifest?.id,
         issuer: options.issuer,
         keysEnvVar: options.keysEnvVar ?? PUBLIC_KEYS_ENV,
         publicKeys: options.publicKeys,
@@ -27,51 +46,125 @@ function configFrom(manifest, options = {}) {
         now: options.now,
     };
 }
+/**
+ * The app id: EVERYAPP_APP_ID, or a manifest passed to everyApp() for
+ * Workers without it; the two must agree when both are present.
+ */
+function appIdFor(env, config) {
+    const fromEnv = envValue(env, APP_ID_ENV);
+    if (fromEnv && config.manifestAppId && fromEnv !== config.manifestAppId) {
+        throw new ConfigurationError(`${APP_ID_ENV} ("${fromEnv}") does not match the manifest id ("${config.manifestAppId}").`);
+    }
+    return fromEnv ?? config.manifestAppId;
+}
+function devIdentitiesAllowed(env, config) {
+    const devEnv = envValue(env, DEV_ENV);
+    return (config.allowDevIdentities ??
+        (devEnv !== undefined &&
+            (devEnv === "1" || devEnv.toLowerCase() === "true")));
+}
+/**
+ * The audience identity tokens must carry: this Worker's name, from
+ * EVERYAPP_AUDIENCE. The gateway mints for the Worker, not the app id, so a
+ * token for one organization's copy of an app never opens another's. Only
+ * under the dev opt-in, where `everyapp dev` mints for the app id, does the
+ * app id stand in when EVERYAPP_AUDIENCE is unset.
+ */
+function audienceFor(env, config) {
+    const appId = appIdFor(env, config);
+    const audience = envValue(env, AUDIENCE_ENV);
+    if (audience)
+        return audience;
+    if (appId && devIdentitiesAllowed(env, config))
+        return appId;
+    throw new ConfigurationError(`${AUDIENCE_ENV} is not set — the app's cloudflare.config.ts must declare it (everyAppWorker() does at deploy).`);
+}
+/**
+ * The organization a deployed Worker serves ({@link ORG_ID_ENV}), which an
+ * identity must name. Under the dev opt-in there is none to enforce: the
+ * stub gateway's one organization is the only one, and `everyapp dev
+ * --mode mirror` signs real organizations in.
+ */
+function pinnedOrganization(env, config) {
+    if (devIdentitiesAllowed(env, config))
+        return undefined;
+    return envValue(env, ORG_ID_ENV);
+}
 function unauthorized(message) {
     return Response.json({ error: "unauthenticated", message }, { status: 401 });
 }
 function misconfigured(message) {
     return Response.json({ error: "misconfigured", message }, { status: 500 });
 }
-async function resolveIdentity(request, env, config) {
-    const devEnv = env && typeof env === "object"
-        ? env[DEV_ENV]
-        : undefined;
-    return getIdentityFromRequest(request, {
-        audience: config.audience,
+function identityOptions(env, config, audience) {
+    return {
+        audience,
+        organizationId: pinnedOrganization(env, config),
         issuer: config.issuer ?? envValue(env, ISSUER_ENV),
         publicKeys: config.publicKeys,
         env: env,
         keysEnvVar: config.keysEnvVar,
-        allowDevIdentities: config.allowDevIdentities ??
-            (typeof devEnv === "string" &&
-                (devEnv === "1" || devEnv.toLowerCase() === "true")),
+        allowDevIdentities: devIdentitiesAllowed(env, config),
         now: config.now,
-    });
+    };
+}
+async function resolveIdentity(request, env, config) {
+    return getIdentityFromRequest(request, identityOptions(env, config, audienceFor(env, config)));
 }
 function rememberIdentity(request, identity) {
     requestIdentities.set(request, identity);
 }
-function helperConfigFromEnv(env) {
-    const audience = envValue(env, APP_ID_ENV);
-    if (!audience) {
-        throw new ConfigurationError(`${APP_ID_ENV} is not set — the CLI must inject the app id for identity verification.`);
+/**
+ * The user the request context already verified, when `request` carries
+ * the same identity token: a framework that rebuilds the request (TanStack
+ * Start's `getRequest()`, a Hono context) still gets the one verification.
+ */
+function contextUserFor(request) {
+    const headers = "headers" in request ? request.headers : request;
+    const token = headers.get(IDENTITY_HEADER);
+    if (!token)
+        return null;
+    const scoped = servedRequestToken();
+    return scoped && scoped.token === token ? scoped.user : null;
+}
+/**
+ * The served request's token and user, or null outside a request. Reads
+ * the context without throwing (currentUser() throws outside one).
+ */
+function servedRequestToken() {
+    let user;
+    try {
+        user = currentUser();
     }
-    return {
-        audience,
-        keysEnvVar: PUBLIC_KEYS_ENV,
-    };
+    catch {
+        return null;
+    }
+    if (!user)
+        return null;
+    const served = servedRequests.get(user);
+    return served ? { token: served, user } : null;
 }
+// The identity token of each request everyApp() serves, by its user, so a
+// second read of the same token answers from the context.
+const servedRequests = new WeakMap();
 /**
  * Return the verified Every App user for this request, or null for a declared
- * public request. Uses the request cache first, then verifies the identity
- * headers from the app id and public keys configured in env.
+ * public request. `request` is the inbound `Request` or just its `Headers`
+ * (a framework that hands out headers alone needs no made-up Request).
+ * Answers from the request context or the per-request cache first, then
+ * verifies the identity headers from the audience and public keys in env.
+ * Inside a handler `everyApp()` serves, `currentUser()` is the shorter way.
  */
 export async function getEveryAppUser(request, env) {
     const cached = requestIdentities.get(request);
     if (cached)
         return cached.user;
-    const identity = await resolveIdentity(request, env, helperConfigFromEnv(env));
+    const fromContext = contextUserFor(request);
+    if (fromContext)
+        return fromContext;
+    const identity = await resolveIdentity(request, env, {
+        keysEnvVar: PUBLIC_KEYS_ENV,
+    });
     rememberIdentity(request, identity);
     return identity.user;
 }
@@ -94,16 +187,83 @@ export async function requireEveryAppUser(request, env) {
         throw error;
     }
 }
+/**
+ * The user of the request being served (`currentUser()`), or throw the
+ * same 401 JSON Response as `requireEveryAppUser()` on a public route.
+ * Outside a request (`withOrganization()` work, a handler not under
+ * `everyApp()`) it throws `RequestContextError`, as `currentUser()` does.
+ */
+export function requireCurrentUser() {
+    const user = currentUser();
+    if (!user) {
+        throw unauthorized("this request does not have an authenticated user");
+    }
+    return user;
+}
+/**
+ * `response` without `Set-Cookie`: the perimeter strips every `Cookie`
+ * before a request reaches the app, so no cookie the app sets ever comes
+ * back, and one named like the Gateway's session cookie locks the person
+ * out of the app host (the perimeter refuses a session cookie sent twice).
+ * A WebSocket handshake (101) passes as it is: it can't be rebuilt from
+ * its body, and the perimeter drops its cookies' `Domain`.
+ */
+function withoutCookies(response) {
+    if (response.status === 101 || !response.headers.has("set-cookie")) {
+        return response;
+    }
+    console.warn("[everyapp] Dropped a Set-Cookie header: the Gateway never sends an app's cookies back to it.");
+    const headers = new Headers(response.headers);
+    headers.delete("set-cookie");
+    return new Response(response.body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers,
+    });
+}
 export function hasScope(user, scope) {
     return user.scopes.includes("*") || user.scopes.includes(scope);
 }
-export function everyApp(handler, manifest, options = {}) {
+function isManifest(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        typeof value.id === "string");
+}
+export function everyApp(handler, manifestOrOptions, legacyOptions = {}) {
+    const manifest = isManifest(manifestOrOptions)
+        ? manifestOrOptions
+        : undefined;
+    const options = manifest || manifestOrOptions === undefined
+        ? legacyOptions
+        : manifestOrOptions;
     const config = configFrom(manifest, options);
     return {
         async fetch(request, env, ctx) {
+            let audience;
+            let appId;
+            try {
+                audience = audienceFor(env, config);
+                appId = appIdFor(env, config) ?? audience;
+            }
+            catch (err) {
+                if (err instanceof ConfigurationError) {
+                    console.error(err);
+                    return misconfigured(err.message);
+                }
+                throw err;
+            }
+            // The reserved tools contract carries its own gateway-minted tokens and
+            // never reaches the app's handler.
+            const toolsResponse = await handleToolsRequest(request, env, ctx, {
+                toolSet: options.tools,
+                appId,
+                identity: identityOptions(env, config, audience),
+            });
+            if (toolsResponse)
+                return toolsResponse;
             let identity;
             try {
-                identity = await resolveIdentity(request, env, config);
+                identity = await getIdentityFromRequest(request, identityOptions(env, config, audience));
                 rememberIdentity(request, identity);
             }
             catch (err) {
@@ -115,7 +275,12 @@ export function everyApp(handler, manifest, options = {}) {
                     return unauthorized(err.message);
                 throw err;
             }
-            return handler(request, env, ctx, identity.user);
+            const { user, expiresAt } = identity;
+            if (user) {
+                servedRequests.set(user, request.headers.get(IDENTITY_HEADER) ?? "");
+            }
+            const response = await serveRequest({ request, user, expiresAt }, () => handler(request, env, ctx, user));
+            return withoutCookies(response);
         },
     };
 }

package/dist/server/fromMcpTools.d.ts

@@ -0,0 +1,89 @@
+/**
+ * `fromMcpTools()` — an app's existing MCP tools as `defineTools()` entries.
+ *
+ *   const tools: McpToolLike[] = [];
+ *   registerMyTools((name, config, handler) =>
+ *     tools.push({ name, ...config, handler }),
+ *   );
+ *   export default everyApp(handler, {
+ *     tools: defineTools(fromMcpTools(tools), { instructions }),
+ *   });
+ *
+ * Takes the shape `McpServer.registerTool(name, config, handler)` is called
+ * with (or what a low-level server's `tools/list` returns, plus a handler),
+ * structurally: the SDK takes no dependency on `@modelcontextprotocol/sdk`,
+ * and a live `McpServer` keeps its registry private, so the app hands over
+ * the list it registers from.
+ */
+import { type ToolRisk } from "../internal/index.js";
+import { type StandardSchemaWithJSON, type ToolContext, type ToolDefinition, type ToolSchema } from "./tools.js";
+/** MCP tool annotations (all hints); only these are read. */
+export interface McpToolAnnotationsLike {
+    title?: string;
+    readOnlyHint?: boolean;
+    destructiveHint?: boolean;
+    idempotentHint?: boolean;
+    openWorldHint?: boolean;
+}
+/** An MCP `CallToolResult`, structurally. */
+export interface McpToolResultLike {
+    content?: ReadonlyArray<{
+        readonly type: string;
+    }>;
+    structuredContent?: unknown;
+    isError?: boolean;
+}
+/**
+ * A tool schema as MCP servers write one: a {@link ToolSchema} (a full zod
+ * object, `{ jsonSchema, validate }`), a raw shape of Standard Schemas
+ * (`{ query: z.string() }`, what `McpServer.registerTool` takes), or a plain
+ * JSON Schema object (a low-level server's `tools/list`), which is described
+ * but not validated: the handler checks its own arguments, as it did before.
+ */
+export type McpToolSchemaLike = ToolSchema | Readonly<Record<string, StandardSchemaWithJSON>> | Readonly<Record<string, unknown>>;
+/** One MCP tool: `registerTool`'s name, config and handler, flattened. */
+export interface McpToolLike<TExtra = ToolContext> {
+    name: string;
+    title?: string;
+    description?: string;
+    /** Omitted: the tool takes no arguments. */
+    inputSchema?: McpToolSchemaLike;
+    outputSchema?: McpToolSchemaLike;
+    annotations?: McpToolAnnotationsLike;
+    /**
+     * Called with the validated arguments and the value of
+     * {@link FromMcpToolsOptions.context} (the call's {@link ToolContext} by
+     * default). Return a `CallToolResult`; throw {@link ToolError} for a message
+     * the model may read.
+     */
+    handler: (args: never, extra: TExtra) => McpToolResultLike | Promise<McpToolResultLike>;
+}
+export interface FromMcpToolsOptions<TExtra = ToolContext> {
+    /**
+     * What each handler gets as its second argument, built per call from the
+     * verified caller (`user`, `env`, `request`, `callId`). Default: the
+     * {@link ToolContext} itself.
+     */
+    context?: (context: ToolContext) => TExtra | Promise<TExtra>;
+    /**
+     * A tool's risk, overriding the default for the tools it returns a risk
+     * for. Default: `readOnlyHint: true` is `read`, `destructiveHint: true`
+     * is `destructive`, anything else `write`.
+     */
+    risk?: (tool: McpToolLike<TExtra>) => ToolRisk | undefined;
+}
+/**
+ * Adapt MCP tools into `defineTools()` entries, keyed by tool name, to spread
+ * beside the app's own: `defineTools({ ...fromMcpTools(list), my_tool })`.
+ *
+ * - `title`, `description` (the name when absent), `idempotentHint` and
+ *   `openWorldHint` carry over; risk as {@link FromMcpToolsOptions.risk}.
+ * - A result's text blocks, joined by a blank line, are what the model
+ *   reads; `structuredContent` is sent as structured content (checked
+ *   against `outputSchema` when there is one). Other blocks are dropped.
+ * - `isError: true` becomes a {@link ToolError} with the result's text.
+ *
+ * Names must already be lowercase snake_case; `defineTools()` checks them.
+ */
+export declare function fromMcpTools<TExtra = ToolContext>(tools: Iterable<McpToolLike<TExtra>>, options?: FromMcpToolsOptions<TExtra>): Record<string, ToolDefinition>;
+//# sourceMappingURL=fromMcpTools.d.ts.map

package/dist/server/fromMcpTools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fromMcpTools.d.ts","sourceRoot":"","sources":["../../src/server/fromMcpTools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAqB,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AAIpB,6DAA6D;AAC7D,MAAM,WAAW,sBAAsB;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,6CAA6C;AAC7C,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,aAAa,CAAC;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,GACzB,UAAU,GACV,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,GAChD,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEtC,0EAA0E;AAC1E,MAAM,WAAW,WAAW,CAAC,MAAM,GAAG,WAAW;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4CAA4C;IAC5C,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC;;;;;OAKG;IACH,OAAO,EAAE,CACP,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,MAAM,KACV,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACrD;AAED,MAAM,WAAW,mBAAmB,CAAC,MAAM,GAAG,WAAW;IACvD;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7D;;;;OAIG;IACH,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,KAAK,QAAQ,GAAG,SAAS,CAAC;CAC5D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAG,WAAW,EAC/C,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EACpC,OAAO,GAAE,mBAAmB,CAAC,MAAM,CAAM,GACxC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA+ChC"}