@every-app/sdk 0.3.0-rc.3 → 0.3.0-rc.5

package/dist/server/emailBinding.js

@@ -0,0 +1,124 @@
+/**
+ * `gatewayEmailBinding(env)`: the Gateway's `email` capability as a
+ * `send_email` binding, for code written against `env.EMAIL.send(message)`.
+ *
+ * An app on Every App binds no `send_email` of its own: the Gateway sends
+ * with its sender, checks `from` against the installation's senders and
+ * keeps the mail budgets. Code that already calls `env.EMAIL.send()` gets
+ * this object in its place:
+ *
+ *   const EMAIL = gatewayEmailBinding(env, { for: request });
+ *   await EMAIL.send({ from, to, subject, text });
+ *
+ * Each `send()` is a `sendEmail()` (the manifest lists `capabilities: {
+ * email: { access: "write" } }`), so local development works the same way:
+ * checked and printed, or sent with the developer's own Email Sending
+ * account (EMAIL_REST_API_TOKEN, CLOUDFLARE_ACCOUNT_ID, EMAIL_FROM).
+ */
+import { ConfigurationError, } from "../internal/index.js";
+import { GatewayRefusalError } from "./integrationFetch.js";
+import { sendEmail } from "./sendEmail.js";
+/**
+ * A `send_email` binding (`SendEmail`) over the Gateway: pass it where code
+ * takes `env.EMAIL`. `send()` takes the structured message (`from`, `to`,
+ * `cc`, `bcc`, `subject`, `text`, `html`, `replyTo`, `headers`,
+ * `attachments`) and resolves `{ messageId }`. A raw MIME `EmailMessage`
+ * (`new EmailMessage(from, to, raw)`) is refused with `GatewayRefusalError`
+ * `email_invalid_message`: the Gateway takes structured mail only.
+ *
+ * Errors are sendEmail()'s: `GatewayRefusalError` with the Gateway's code
+ * (`email_sender_not_allowed`, `email_budget_exhausted`,
+ * `integration_not_configured`, …) and `ConfigurationError` with neither a
+ * binding nor `everyapp dev`. Nothing is checked when the binding is made.
+ */
+export function gatewayEmailBinding(env, options = {}) {
+    const binding = {
+        async send(message) {
+            const result = await sendEmail({
+                env,
+                ...(options.for === undefined ? {} : { for: options.for }),
+                message: toSendEmailMessage(message),
+            });
+            return { messageId: result.messageId ?? "" };
+        },
+    };
+    // `SendEmail` is the app's own Workers types' interface, whose `send()`
+    // overloads change with the version; this `send()` takes both forms.
+    return binding;
+}
+/**
+ * The binding's message as sendEmail()'s: recipients as bare addresses,
+ * `from` and `replyTo` with their display names, attachments base64.
+ */
+export function toSendEmailMessage(message) {
+    if (!message || typeof message !== "object") {
+        throw new ConfigurationError("EMAIL.send() takes a message object.");
+    }
+    if (!("subject" in message)) {
+        throw new GatewayRefusalError({
+            status: 400,
+            code: "email_invalid_message",
+            message: "Raw MIME messages can't be sent through the Every App gateway; send a structured message ({ from, to, subject, text or html }).",
+        });
+    }
+    const m = message;
+    return {
+        to: addresses(m.to) ?? [],
+        ...(m.cc === undefined ? {} : { cc: addresses(m.cc) }),
+        ...(m.bcc === undefined ? {} : { bcc: addresses(m.bcc) }),
+        subject: m.subject,
+        ...(m.text ? { text: m.text } : {}),
+        ...(m.html ? { html: m.html } : {}),
+        from: named(m.from),
+        ...(m.replyTo ? { replyTo: named(m.replyTo) } : {}),
+        ...(m.headers && Object.keys(m.headers).length > 0
+            ? { headers: m.headers }
+            : {}),
+        ...(m.attachments?.length
+            ? { attachments: m.attachments.map(attachment) }
+            : {}),
+    };
+}
+/**
+ * One attachment in the Gateway's shape. An inline part without a content
+ * id can't be referenced (and the Gateway refuses it), so it goes as an
+ * ordinary attachment.
+ */
+function attachment(a) {
+    const contentId = a.contentId?.trim();
+    return {
+        filename: a.filename,
+        contentType: a.type,
+        content: base64(a.content),
+        ...(a.disposition === "inline" && contentId
+            ? { disposition: "inline", contentId }
+            : {}),
+    };
+}
+function named(address) {
+    if (typeof address === "string")
+        return { address };
+    return {
+        address: address.email,
+        ...(address.name?.trim() ? { name: address.name } : {}),
+    };
+}
+function addresses(recipients) {
+    if (recipients === undefined)
+        return undefined;
+    const of = (a) => (typeof a === "string" ? a : a.email);
+    return Array.isArray(recipients) ? recipients.map(of) : of(recipients);
+}
+/** Strings are taken as base64 already, as the binding takes them; bytes are encoded. */
+function base64(content) {
+    if (typeof content === "string")
+        return content;
+    const bytes = content instanceof ArrayBuffer
+        ? new Uint8Array(content)
+        : new Uint8Array(content.buffer, content.byteOffset, content.byteLength);
+    let binary = "";
+    for (let i = 0; i < bytes.length; i += 0x8000) {
+        binary += String.fromCharCode(...bytes.subarray(i, i + 0x8000));
+    }
+    return btoa(binary);
+}

package/dist/server/emit.d.ts

@@ -59,5 +59,5 @@ export interface EmitOptions {
  * the gateway checks it, printed, and answered `{ id: "dev-…", type }`;
  * nothing is delivered.
  */
-export declare function emit({ env, for: target, event, data, }: EmitOptions): Promise<EmitEventResult>;
+export declare function emit({ env, for: explicitTarget, event, data, }: EmitOptions): Promise<EmitEventResult>;
 //# sourceMappingURL=emit.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../src/server/emit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EASL,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,WAAW;IAC1B,8FAA8F;IAC9F,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,IAAI,CAAC,EACzB,GAAG,EACH,GAAG,EAAE,MAAM,EACX,KAAK,EACL,IAAI,GACL,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAoBxC"}
+{"version":3,"file":"emit.d.ts","sourceRoot":"","sources":["../../src/server/emit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EASL,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAI1B,MAAM,WAAW,WAAW;IAC1B,8FAA8F;IAC9F,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,cAAc,CAAC;IACrB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,IAAI,CAAC,EACzB,GAAG,EACH,GAAG,EAAE,cAAc,EACnB,KAAK,EACL,IAAI,GACL,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAoBxC"}

package/dist/server/emit.js

@@ -9,7 +9,7 @@
  * two can't drift.
  */
 import { APP_EVENT_DATA_MAX_BYTES, APP_ID_ENV, ConfigurationError, EVENTS_EMIT_PATH, appEventNameProblem, appEventType, checkEventData, } from "../internal/index.js";
-import { applyAttribution, checkAttribution, } from "./attribution.js";
+import { applyAttribution, attributionFor, } from "./attribution.js";
 import { BINDING_ORIGIN } from "./gatewayFetch.js";
 import { GatewayRefusalError, gatewayRefusal } from "./integrationFetch.js";
 /**
@@ -36,8 +36,8 @@ import { GatewayRefusalError, gatewayRefusal } from "./integrationFetch.js";
  * the gateway checks it, printed, and answered `{ id: "dev-…", type }`;
  * nothing is delivered.
  */
-export async function emit({ env, for: target, event, data, }) {
-    checkAttribution(env, target, "emit");
+export async function emit({ env, for: explicitTarget, event, data, }) {
+    const target = attributionFor(env, explicitTarget, "emit");
     const values = env;
     const binding = values["EVERY_APP_GATEWAY"];
     if (binding) {
@@ -66,7 +66,7 @@ async function emitThroughGateway(binding, target, body) {
         throw new GatewayRefusalError({
             status: response.status,
             code: "event_emit_failed",
-            message: `The Every App gateway answered ${response.status} to the event.`,
+            message: `The EveryApp gateway answered ${response.status} to the event.`,
         });
     }
     return (await response.json());

package/dist/server/env.d.ts

@@ -0,0 +1,41 @@
+/**
+ * `EveryAppEnv`: what Every App puts in an app Worker's `env`, for an app
+ * that types its env by hand. An app built with `everyAppWorker()` needs
+ * none of it: `cf workers types` writes the same names into `Env` from the
+ * Worker's definition.
+ */
+import type { EveryAppManifest } from "../manifest.js";
+/** The `env` keys Every App sets on an app's Worker, deployed and under `everyapp dev`. */
+export interface EveryAppEnv<M extends EveryAppManifest = EveryAppManifest> {
+    /** The manifest's `id`. */
+    EVERYAPP_APP_ID: string;
+    /**
+     * The manifest (`everyapp.config.ts`) as JSON: what the app asked for,
+     * for a page that shows it. `EveryAppEnv<typeof manifest>` types it as
+     * the app's own.
+     */
+    EVERYAPP_MANIFEST: M;
+    /** The Gateway's URL; links back to it go through `gatewayUrl(env)`. */
+    GATEWAY_URL: string;
+    /** The identity tokens' issuer: the Gateway's URL, or the dev issuer. */
+    EVERYAPP_IDENTITY_ISSUER: string;
+    /** The public keys (JSON array of PEMs) `everyApp()` verifies identities with. */
+    EVERYAPP_IDENTITY_PUBLIC_KEYS: string;
+    /** Deployed: the Worker's name, the identity tokens' audience. */
+    EVERYAPP_AUDIENCE?: string;
+    /** Deployed: the organization the app is installed for. */
+    EVERY_APP_ORG_ID?: string;
+    /** Deployed, on an app installed for every organization: `"1"`. */
+    EVERYAPP_SHARED?: string;
+    /** Deployed: the service binding to the Gateway, which capabilities, AI and email go through. */
+    EVERY_APP_GATEWAY?: Fetcher;
+    /** `"1"` under `everyapp dev`, absent when deployed. */
+    EVERYAPP_DEV?: string;
+    /** Under `everyapp dev`: the manifest's `capabilities`, as JSON, for the SDK's dev fallbacks. */
+    EVERYAPP_DEV_CAPABILITIES?: string;
+    /** Under `everyapp dev`: the app's `.everyapp/providers/*.json`, as JSON. */
+    EVERYAPP_DEV_PROVIDERS?: string;
+    /** Under `everyapp dev`, from `.dev.vars`: the senders standing in for `everyapp email set --sender`. */
+    EVERYAPP_EMAIL_SENDERS?: string;
+}
+//# sourceMappingURL=env.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/server/env.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEvD,2FAA2F;AAC3F,MAAM,WAAW,WAAW,CAAC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB;IACxE,2BAA2B;IAC3B,eAAe,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,iBAAiB,EAAE,CAAC,CAAC;IACrB,wEAAwE;IACxE,WAAW,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,wBAAwB,EAAE,MAAM,CAAC;IACjC,kFAAkF;IAClF,6BAA6B,EAAE,MAAM,CAAC;IACtC,kEAAkE;IAClE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,2DAA2D;IAC3D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mEAAmE;IACnE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iGAAiG;IACjG,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,wDAAwD;IACxD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iGAAiG;IACjG,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,6EAA6E;IAC7E,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,yGAAyG;IACzG,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC"}

package/dist/server/env.js

@@ -0,0 +1 @@
+export {};

package/dist/server/everyApp.d.ts

@@ -14,11 +14,21 @@
  * `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";
+import { ConfigurationError, IdentityError, isAdmin, type EveryAppUser, type IdentityResult, type OrgRole } from "../internal/index.js";
 import type { ToolSet } from "./tools.js";
-export { ConfigurationError, IdentityError };
-export type { EveryAppUser, IdentityResult };
+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,
@@ -60,15 +70,25 @@ interface EveryAppExport<TEnv, TCtx extends ExecutionContextLike> {
 }
 /**
  * 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;
 /** 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>;

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

@@ -1 +1 @@
-{"version":3,"file":"everyApp.d.ts","sourceRoot":"","sources":["../../src/server/everyApp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAGL,kBAAkB,EAElB,aAAa,EAIb,KAAK,YAAY,EACjB,KAAK,cAAc,EAEpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,CAAC;AAC7C,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC;AAE7C;;;;;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;AAoHD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAS9B;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;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"}
+{"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

@@ -14,10 +14,21 @@
  * `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, AUDIENCE_ENV, ConfigurationError, DEV_ENV, IdentityError, ISSUER_ENV, PUBLIC_KEYS_ENV, getIdentityFromRequest, } from "../internal/index.js";
+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 };
+export { ConfigurationError, IdentityError, isAdmin };
 const requestIdentities = new WeakMap();
 function envValue(env, key) {
     if (!env || typeof env !== "object")
@@ -68,6 +79,17 @@ function audienceFor(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 });
 }
@@ -77,6 +99,7 @@ function misconfigured(message) {
 function identityOptions(env, config, audience) {
     return {
         audience,
+        organizationId: pinnedOrganization(env, config),
         issuer: config.issuer ?? envValue(env, ISSUER_ENV),
         publicKeys: config.publicKeys,
         env: env,
@@ -91,15 +114,54 @@ async function resolveIdentity(request, env, config) {
 function rememberIdentity(request, identity) {
     requestIdentities.set(request, identity);
 }
+/**
+ * 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();
+    }
+    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 fromContext = contextUserFor(request);
+    if (fromContext)
+        return fromContext;
     const identity = await resolveIdentity(request, env, {
         keysEnvVar: PUBLIC_KEYS_ENV,
     });
@@ -125,6 +187,40 @@ 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);
 }
@@ -179,7 +275,12 @@ export function everyApp(handler, manifestOrOptions, legacyOptions = {}) {
                     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"}