@softure-ai/mcp-access 0.1.6 → 0.1.8

package/CHANGELOG.md

@@ -4,6 +4,36 @@ Newest first. Each version lists what changed for an app that uses `@softure-ai/
 production, the version gets a line `verified in: <app>@<commit>` ([docs/05](../../docs/05-adoption-playbook.md),
 "Definition of done"). Versions before the first one below are described in their GitHub Releases (`mcp-access@x.y.z`).
 
+## 0.1.8
+
+- OAuth URLs follow the request: `resolveAppOrigin(request)` (with `readRequestOrigin`, which reads
+  `Host` and `X-Forwarded-Proto`) sets the app origin per request for the issuer, the endpoints in
+  the metadata, `resource`, `resource_metadata` in the endpoint's `401`, `iss` and the consent
+  decision's `Origin` check. Without it nothing changes.
+- `resourceOrigins`: other public hosts; the root protected resource metadata asked on one names it
+  as `resource`, and the authorization and token endpoints accept it.
+- `oauth.metadata.authorizationServer` / `.protectedResource`: extra discovery keys (an object, or
+  a function of the request's origins); generated keys win, `resource_name` can be replaced.
+- Discovery documents carry `Vary: host, x-forwarded-proto`; `getAuthorizationServerMetadataRoute`
+  now reads the request (re-exporting it as `GET` keeps working).
+- New exports: `createMcpAccessContext` and `resolveMcpOrigins` (`/server`), `getMcpAccessContext`
+  (`/next`), `OAuthClientRow`, `McpOrigins` and `readRequestOrigin` (root and `/server`). URL
+  builders take the origins as an optional last argument.
+
+## 0.1.7
+
+- OAuth 2.1 for MCP clients, opt-in (`oauth.enabled`): protected resource and authorization server
+  metadata, `resource_metadata` in the endpoint's `401`, dynamic client registration, a consent
+  page with PKCE `S256`, a token endpoint with rotating refresh tokens and replay detection, and a
+  connected apps list whose revoke deletes the grant's access tokens. Mount the new routes and the
+  consent page (README §4) and add `"mcp-oauth"` from `MCP_RATE_LIMIT_BUCKETS` to the security buckets.
+- Separate lifetimes: `tokenLifetimeDays` for hand-issued tokens, `oauth.accessTokenLifetimeMinutes`,
+  `oauth.refreshTokenLifetimeDays` and `oauth.authorizationCodeLifetimeMinutes` for OAuth.
+- `legacyTokenPattern`: tokens an app issued before adopting the module keep working.
+- Migration 2 (`create_oauth_grants`) adds the OAuth tables and `access_tokens.grant_id`.
+- `adoption/move-app-tables.sql`: moves an app's own token and OAuth tables into `mcp` for
+  `baseline: { "mcp-access": 2 }` (README §5).
+
 ## 0.1.6
 
 - Adapters use the configured database handle; `@softure-ai/ui` is a peer dependency.

package/README.md

@@ -2,10 +2,10 @@
 
 Lets the users of a Next.js app connect an AI assistant (Claude Code, Claude Desktop, Cursor) to
 their own data over MCP: hashed, scoped, expiring access tokens, a rate-limited Bearer endpoint
-around the app's own MCP server, and a token page with ready setup instructions. Built from
-FIRE_TRACKER's assistant access (`src/db/access-tokens.ts`, `src/lib/{mcp-auth,access-token-status,mcp-client-config}.ts`,
-`src/app/api/mcp/route.ts`, `src/app/actions/{manage-tokens,tokens,tokens-contract}.ts`), with the
-domain server left to the app and the limit check made race-free.
+around the app's own MCP server, a token page with ready setup instructions and, opt-in, OAuth 2.1
+so assistants such as claude.ai or ChatGPT connect with a consent screen instead of a pasted token.
+Built from an adopting app's assistant access, with the domain server left to the app and the
+limit check made race-free.
 
 ## 1. What it provides
 
@@ -22,11 +22,23 @@ domain server left to the app and the limit check made race-free.
   setup (a prompt for Claude Code and a `claude-cli://` link, the `claude mcp add` command, an
   `mcpServers` file, Claude Desktop through `mcp-remote`, the header), and the user's tokens with
   their status (active, expiring in n days, expired), last use and a revoke button.
+- **OAuth 2.1** (`oauth.enabled`, off by default), as the MCP authorization spec asks for it:
+  - a `401` from the endpoint names the protected resource metadata (`resource_metadata` in the
+    challenge, RFC 9728), which points at the authorization server metadata (RFC 8414);
+  - dynamic client registration (RFC 7591, `POST /api/oauth/register`), public or confidential;
+  - `/oauth/authorize`: authorization code with PKCE `S256` only, on a consent page that shows the
+    app, where the code goes, the signed-in account and the access; writes need the `mcp:write`
+    scope, `allowWrites` and the person's tick;
+  - `POST /api/oauth/token`: `authorization_code` and `refresh_token`. Refresh tokens rotate on
+    every use; presenting a rotated one again (`previous_refresh_token_hash`) revokes the whole
+    grant, and so does reusing a code (RFC 6749 §4.1.2). `resource` (RFC 8707) must name the
+    endpoint when sent; the redirect carries `iss` (RFC 9207);
+  - one grant per account and client, listed on the token page as "connected apps"; revoking it
+    deletes its access tokens at once (`grant_id`, `ON DELETE CASCADE`). OAuth access tokens do not
+    count against `maxTokensPerUser` and are not listed with the hand-issued ones.
+- Tokens an app issued before adopting the module keep working through `legacyTokenPattern`.
 - Server functions for scripts and other hosts, and a health check for `GET /api/health`.
 
-OAuth for MCP (discovery, dynamic client registration) is not part of this module: clients that
-send a static header cover the personal-token case.
-
 ## 2. Installation
 
 ```bash
@@ -64,14 +76,28 @@ mcpAccess({
 | `serverName` | `string` | required | The name clients list the server under (lowercase, digits, inner dashes; no quotes needed in a shell). |
 | `tools` | `{ name, access: "read" \| "write", description: { en, pl? } }[]` | `[]` | The catalog the token page shows. Keep it next to the factory; the example app tests that both list the same tools. |
 | `allowWrites` | `boolean` | `false` | Lets write tokens be issued and used. Off, the page offers no write tokens and every token reads only. |
-| `tokenLifetimeDays` | `integer` 1–365 | `90` | How long a token works. There is no renewal: the user issues a new one. |
+| `tokenLifetimeDays` | `integer` 1–365 | `90` | How long a hand-issued token works. There is no renewal: the user issues a new one. |
 | `maxTokensPerUser` | `integer` 1–100 | `20` | Unexpired tokens one account may hold. Counted under a per-user lock, so parallel requests cannot overshoot. |
 | `expiryWarningDays` | `integer` 0–60 | `14` | From how many calendar days before the expiry the list warns. |
-| `routes` | `{ page?, endpoint? }` | `/account/mcp`, `/api/mcp` | Move the page or the endpoint; the endpoint URL in the setup is `appOrigin` + `endpoint`. |
+| `legacyTokenPattern` | `RegExp` | — | Also accept tokens of this shape, issued by the app before it adopted the module (e.g. `/^[0-9a-f]{64}$/`), looked up by the same sha256. Must be anchored (`^…$`), without the `g` or `y` flag; tokens longer than 512 characters are refused before it runs. New tokens are always `sftmcp_`. |
+| `oauth.enabled` | `boolean` | `false` | Turns on the OAuth routes, the consent page, the connected apps list and `resource_metadata`. Off, the OAuth routes answer `404`. |
+| `oauth.accessTokenLifetimeMinutes` | `integer` 5–1440 | `60` | Lifetime of an access token issued through OAuth; the client refreshes it. |
+| `oauth.refreshTokenLifetimeDays` | `integer` 1–365 | `90` | Lifetime of a refresh token, renewed on every rotation. An unused connection ends after it. |
+| `oauth.authorizationCodeLifetimeMinutes` | `integer` 1–10 | `10` | Lifetime of an authorization code (single use). |
+| `oauth.metadata` | `{ authorizationServer?, protectedResource? }`, each an object or `(origins) => object` | — | Extra keys of the discovery documents (`jwks_uri`, `service_documentation`, `resource_documentation`, `agent_auth`…). Generated keys win; a static object that sets one is refused at startup. The protected resource document takes the app's `resource_name` (default: `serverName`). |
+| `resolveAppOrigin` | `(request) => string \| null` | — | The app origin of one request, when it is not the fixed `appOrigin` (an image built once and served elsewhere, a proxy). `readRequestOrigin` reads it from `Host`. Null keeps `appOrigin`; anything but a bare http(s) origin throws. |
+| `resourceOrigins` | `string[]` (≤ 16 http(s) origins) | `[]` | Other public hosts of the app, e.g. the apex next to `app.`: the root protected resource metadata asked on one of them names it as `resource`, and the OAuth endpoints accept it as `resource`. |
+| `routes` | `{ page?, endpoint?, oauthConsent?, oauthDecision?, oauthToken?, oauthRegister? }` | `/account/mcp`, `/api/mcp`, `/oauth/authorize`, `/api/oauth/authorize`, `/api/oauth/token`, `/api/oauth/register` | Move the page, the endpoint or the OAuth paths; URLs in the setup and the metadata are the app origin (`appOrigin`, or `resolveAppOrigin`'s) + the path. |
 | `messages` | partial `en` / `pl` | — | Copy overrides. |
 
-`MCP_RATE_LIMIT_BUCKETS` is `{ mcp: { limit: 200, windowMinutes: 15 } }` per client address. Every
-request counts, valid or not, and before the token lookup; assistants behind one address share it.
+`allowWrites` is a deploy decision, so read it from the environment rather than hard-coding it:
+`allowWrites: process.env.MCP_ALLOW_WRITES === "1"` is the intended way. Any other value, or none,
+keeps every token read-only.
+
+`MCP_RATE_LIMIT_BUCKETS` is `{ mcp: { limit: 200, windowMinutes: 15 }, "mcp-oauth": { limit: 60, windowMinutes: 15 } }`
+per client address. Every endpoint request counts, valid or not, and before the token lookup;
+assistants behind one address share it. `mcp-oauth` counts the public OAuth requests:
+registrations per address, token requests per address and client.
 
 ## 4. Mounting
 
@@ -111,7 +137,70 @@ mid-call notifications (progress, logging) are dropped. Keep `/api/mcp` out of a
 redirects to the login page: the endpoint authenticates by token, not by cookie.
 
 `TokenManager` (`@softure-ai/mcp-access/ui`) takes the actions `issueTokenAction` and
-`revokeTokenAction` (`/next`) as props for an app that composes its own page.
+`revokeTokenAction` (`/next`) as props for an app that composes its own page, and `grants` with
+`revokeGrantAction` for the connected apps list.
+
+With `oauth.enabled`, mount the OAuth routes and the consent page too (the paths for the default
+`routes`):
+
+```ts
+// app/oauth/authorize/page.tsx
+export { OAuthConsentPage as default } from "@softure-ai/mcp-access/next";
+export const dynamic = "force-dynamic";
+
+// app/api/oauth/authorize/route.ts
+export { decideOAuthAuthorizationRoute as POST } from "@softure-ai/mcp-access/next";
+
+// app/api/oauth/token/route.ts and app/api/oauth/register/route.ts
+export { exchangeOAuthTokenRoute as POST, answerOAuthPreflight as OPTIONS } from "@softure-ai/mcp-access/next";
+export { registerOAuthClientRoute as POST, answerOAuthPreflight as OPTIONS } from "@softure-ai/mcp-access/next";
+
+// app/.well-known/oauth-authorization-server/route.ts
+export { getAuthorizationServerMetadataRoute as GET, answerOAuthPreflight as OPTIONS } from "@softure-ai/mcp-access/next";
+
+// app/.well-known/oauth-protected-resource/route.ts and
+// app/.well-known/oauth-protected-resource/api/mcp/route.ts (the endpoint's path after the prefix)
+export { getProtectedResourceMetadataRoute as GET, answerOAuthPreflight as OPTIONS } from "@softure-ai/mcp-access/next";
+```
+
+`/.well-known/oauth-*`, `/api/oauth/token` and `/api/oauth/register` are public: keep them out of
+a proxy guard, like `/api/mcp`. The consent page and the decision route check the session
+themselves (the page sends a signed-out person to the login page and back); the decision route
+also refuses a request whose `Origin` is not the app origin.
+TypeScript's `**` skips dot folders: with an `include` list in `tsconfig.json`, add
+`"app/.well-known/**/*.ts"`.
+
+**Origins.** Every OAuth URL (issuer, endpoints, `resource`, `resource_metadata`, `iss`) and the
+decision's `Origin` check use the app origin of the request: `appOrigin`, unless
+`resolveAppOrigin` answers. The discovery routes read the request, so Next never renders them at
+build time, and they answer with `Vary: host, x-forwarded-proto`.
+
+- *An image built once and served under another origin* (a test stack on another port, a
+  production image against a local stack): `resolveAppOrigin: process.env.APP_ORIGIN ? undefined :
+  readRequestOrigin`. `readRequestOrigin` trusts `Host` and `X-Forwarded-Proto`, so use it only
+  behind a proxy that passes `Host` through and refuses hosts it does not serve. The consent page,
+  its decision and the token endpoint then agree on the origin the browser used.
+- *A second public host* (product on `https://app.example.com`, site on `https://example.com`):
+  `resourceOrigins: ["https://example.com"]`, and route that host's `/.well-known/oauth-*` to the
+  app. Its root protected resource metadata names `https://example.com` as `resource` (RFC 9728
+  §3.3) with the authorization server on the app origin; `Host` only picks among the listed
+  origins.
+- *Discovery extras:* keys the app adds and serves itself, computed from the request's origins:
+
+  ```ts
+  oauth: {
+    enabled: true,
+    metadata: {
+      authorizationServer: ({ appOrigin }) => ({ jwks_uri: `${appOrigin}/.well-known/jwks.json` }),
+      protectedResource: { resource_name: "Acme MCP server", resource_documentation: "https://example.com/docs/mcp" },
+    },
+  },
+  ```
+
+An app that composes its own routes from `/server` builds the context with
+`createMcpAccessContext(config)` (`getMcpAccessContext()` in `/next` reads the registered config),
+resolves origins with `resolveMcpOrigins(config, request)` and passes them to the URL builders,
+whose last argument they are; `OAuthClientRow` is exported from the package root.
 
 ## 5. Migrations and tables
 
@@ -130,6 +219,33 @@ redirects to the login page: the endpoint authenticates by token, not by cookie.
 Issuing deletes the issuer's expired tokens; `pruneAccessTokens(ctx)` (`/server`) deletes every
 expired token, for a scheduled job. Rollback: in the migration header.
 
+`migrations/0002_create_oauth_grants.sql` creates `mcp.oauth_clients` (client id, name, redirect
+URIs, auth method, sha256 of a confidential client's secret), `mcp.oauth_authorization_codes`
+(sha256, PKCE challenge, redirect URI, single use through `used_at`) and `mcp.oauth_grants` (one
+per account and client: write flag, sha256 of the current and the previous refresh token, refresh
+expiry, last use), and adds `access_tokens.grant_id` (null for hand-issued tokens). Every row goes
+with the account. `pruneOAuthRecords(ctx)` deletes expired codes, grants whose refresh token has
+expired (with their access tokens) and clients registered over a day ago that hold no grant.
+
+### Adopting an app's own tables
+
+An app that ran its own `public.access_tokens` (with `grant_id`) and `oauth_clients`,
+`oauth_authorization_codes` and `oauth_grants` tables, with the module's column names, adopts them
+without losing a row. `adoption/move-app-tables.sql` (shipped in the package, tested in
+`tests/adoption.test.ts`) moves the four tables into `mcp`, drops the app's constraints, indexes
+and defaults whatever their names, cuts names to 60 characters, drops authorization codes the
+module cannot verify, and creates the module's constraints and indexes. Run it as the app's own
+migration in `before`, then declare the baseline ([adoption playbook](../../docs/05-adoption-playbook.md) step 3):
+
+```ts
+app: { before, baseline: { "mcp-access": 2 } }
+```
+
+Old tokens keep working with `legacyTokenPattern`; connected apps keep their grants, and their old
+refresh tokens rotate into module-shaped ones on the next refresh. An app without OAuth tables
+drops its `grant_id` column (if any), deletes the OAuth part of the script and uses
+`baseline: { "mcp-access": 1 }`; file 2 then runs as a normal migration.
+
 ## 6. Environment variables
 
 None of its own. The endpoint URL comes from `appOrigin` in `softure.config.ts`.
@@ -147,8 +263,9 @@ None. `allowWrites` is configuration, not a runtime switch: changing who may wri
 ## 9. Copy
 
 `mcpAccessMessages.{en,pl}`: `page`, `tools`, `issue`, `issued`, `setup.assistantPrompt`
-(placeholders `{serverName}` and `{command}`), `list`, and `errors` for the codes
-`mcp-access.name_required`, `name_too_long`, `token_limit_reached`, `token_not_found`,
+(placeholders `{serverName}` and `{command}`), `list`, `grants` (connected apps), `consent` (the
+consent page and its errors), and `errors` for the codes
+`mcp-access.name_required`, `name_too_long`, `token_limit_reached`, `token_not_found`, `grant_not_found`,
 `auth.unauthenticated`, `core.database_failed` and `core.unexpected`. Tool descriptions come from
 the `tools` option, per locale.
 
@@ -157,22 +274,30 @@ the `tools` option, per locale.
 The MCP server factory passed to `createMcpRoute` is the module's only hook. `/server` also exports
 `createMcpEndpoint({ createServer })`, a `(ctx, request) => Response` for hosts other than Next, and
 `issueAccessToken`, `listAccessTokens`, `revokeAccessToken`, `verifyAccessToken` and
-`pruneAccessTokens` for scripts.
+`pruneAccessTokens` for scripts. For OAuth: `listOAuthGrants`, `revokeOAuthGrant`,
+`pruneOAuthRecords`, the protocol steps (`registerMcpClient`, `createAuthorizationCode`,
+`exchangeAuthorizationCode`, `refreshMcpGrant`) and the HTTP handlers behind the routes
+(`handleClientRegistration`, `handleTokenRequest`, `handleAuthorizationDecision`,
+`validateAuthorizationRequest`, `serveDiscoveryDocument`) for hosts other than Next.
 
 ## 11. GDPR
 
 The rows hold no personal data beyond the owner's id and the token names. The module contributes
 to `@softure-ai/privacy` (`privacy` flags on):
 
-- **Export** (`exportMcpAccessUserData`): `accessTokens`, each token's name, write flag and
-  created, expiry and last-use dates. Never the token hash.
-- **Deletion** (`deleteMcpAccessUserData`): every token of the user, before auth deletes the
-  account (the foreign key's cascade would remove them too).
+- **Export** (`exportMcpAccessUserData`): `accessTokens`, each hand-issued token's name, write
+  flag and created, expiry and last-use dates, and `connectedApps`, each grant's client name, write
+  flag, created and last-use dates. Never a hash.
+- **Deletion** (`deleteMcpAccessUserData`): the user's authorization codes, grants and tokens,
+  before auth deletes the account (the foreign keys' cascade would remove them too). Registered
+  clients hold no personal data and are pruned when unused.
 
 ## 12. Limitations / known gaps
 
-- No OAuth for MCP: clients without a header field use `mcp-remote` (Claude Desktop) or another
-  bridge.
+- OAuth has no token introspection or revocation endpoint (RFC 7009) for clients: the person
+  disconnects an app on the token page. Access tokens are opaque; the package serves no JWKS (an
+  app that wants `jwks_uri` adds it through `oauth.metadata` and serves the empty set itself).
+- Only `S256` PKCE and the `authorization_code` and `refresh_token` grants.
 - Write access is per token, not per tool; finer scopes would be a new option.
 - The rate limit is per client address, not per token.
 - `responseMode: "json"` drops mid-call notifications; a streaming tool would need a different mode.

package/adoption/move-app-tables.sql

@@ -0,0 +1,100 @@
+-- Example adoption migration (README §5): an app that ran its own MCP tokens and OAuth tables in
+-- `public` moves them into the module's schema, so `migrate` with `baseline: { "mcp-access": 2 }`
+-- (or `softure migrate --adopt mcp-access@<version> --through 2`) can adopt files 1 and 2 without
+-- running them. Run it as the app's own migration, in its `before` hook, once. It keeps every row:
+-- issued tokens, connected assistants and their refresh tokens keep working.
+--
+-- Assumed app shape: public.access_tokens (id, user_id, name, token_hash, can_write, created_at,
+-- expires_at, last_used_at, grant_id), public.oauth_clients, public.oauth_authorization_codes and
+-- public.oauth_grants with the module's column names, user_id referencing auth.users. Constraint
+-- and index names, column defaults and checks may differ: the script drops the app's and creates
+-- the module's. An app without OAuth tables deletes the OAuth part and adopts `--through 1` after
+-- dropping its grant_id column (or has none).
+-- Rollback: move the tables back with ALTER TABLE mcp.<table> SET SCHEMA public before anything
+-- else writes to them.
+
+CREATE SCHEMA IF NOT EXISTS mcp;
+ALTER TABLE public.oauth_clients SET SCHEMA mcp;
+ALTER TABLE public.oauth_authorization_codes SET SCHEMA mcp;
+ALTER TABLE public.oauth_grants SET SCHEMA mcp;
+ALTER TABLE public.access_tokens SET SCHEMA mcp;
+
+-- The app's constraints (but the primary keys) and indexes, whatever their names.
+DO $$
+DECLARE
+  item record;
+BEGIN
+  FOR item IN
+    SELECT con.conrelid::regclass AS table_name, con.conname
+    FROM pg_constraint con JOIN pg_class c ON c.oid = con.conrelid JOIN pg_namespace n ON n.oid = c.relnamespace
+    WHERE n.nspname = 'mcp' AND c.relname IN ('access_tokens', 'oauth_grants', 'oauth_authorization_codes', 'oauth_clients')
+      AND con.contype IN ('f', 'u', 'c', 'x')
+    ORDER BY con.contype = 'f' DESC
+  LOOP
+    EXECUTE format('ALTER TABLE %s DROP CONSTRAINT %I', item.table_name, item.conname);
+  END LOOP;
+  FOR item IN
+    SELECT i.relname
+    FROM pg_index x JOIN pg_class i ON i.oid = x.indexrelid JOIN pg_class c ON c.oid = x.indrelid JOIN pg_namespace n ON n.oid = c.relnamespace
+    WHERE n.nspname = 'mcp' AND c.relname IN ('access_tokens', 'oauth_grants', 'oauth_authorization_codes', 'oauth_clients') AND NOT x.indisprimary
+  LOOP
+    EXECUTE format('DROP INDEX mcp.%I', item.relname);
+  END LOOP;
+END $$;
+
+-- Defaults: the module sets every value itself, ids aside.
+ALTER TABLE mcp.access_tokens ALTER COLUMN can_write DROP DEFAULT, ALTER COLUMN created_at DROP DEFAULT;
+ALTER TABLE mcp.oauth_clients ALTER COLUMN created_at DROP DEFAULT;
+ALTER TABLE mcp.oauth_authorization_codes ALTER COLUMN can_write DROP DEFAULT, ALTER COLUMN created_at DROP DEFAULT;
+ALTER TABLE mcp.oauth_grants ALTER COLUMN can_write DROP DEFAULT, ALTER COLUMN created_at DROP DEFAULT;
+
+-- Data the module's checks refuse: names over 60 characters (a client name is also the name of
+-- its access tokens) or with outer spaces.
+UPDATE mcp.oauth_clients SET client_name = btrim(left(btrim(client_name), 60)) WHERE client_name <> btrim(left(btrim(client_name), 60));
+UPDATE mcp.access_tokens SET name = btrim(left(btrim(name), 60)) WHERE name <> btrim(left(btrim(name), 60));
+-- Codes live minutes: one the module could not verify (not an S256 challenge) is dropped, and the
+-- client starts its authorization again.
+DELETE FROM mcp.oauth_authorization_codes WHERE code_challenge !~ '^[A-Za-z0-9_-]{43}$' OR expires_at <= created_at;
+
+-- The module's constraints and indexes (migrations/0001 and 0002), by the names it gives them.
+ALTER TABLE mcp.oauth_clients
+  ADD CONSTRAINT oauth_clients_client_id_check CHECK (char_length(client_id) BETWEEN 1 AND 255),
+  ADD CONSTRAINT oauth_clients_client_name_check CHECK (char_length(client_name) BETWEEN 1 AND 60 AND client_name = btrim(client_name)),
+  ADD CONSTRAINT oauth_clients_redirect_uris_check CHECK (jsonb_typeof(redirect_uris) = 'array' AND jsonb_array_length(redirect_uris) BETWEEN 1 AND 10),
+  ADD CONSTRAINT oauth_clients_token_endpoint_auth_method_check CHECK (token_endpoint_auth_method IN ('none', 'client_secret_post', 'client_secret_basic')),
+  ADD CONSTRAINT oauth_clients_client_secret_hash_check CHECK (client_secret_hash ~ '^[0-9a-f]{64}$'),
+  ADD CONSTRAINT oauth_clients_client_id_key UNIQUE (client_id),
+  ADD CONSTRAINT oauth_clients_secret_matches_method CHECK ((token_endpoint_auth_method = 'none') = (client_secret_hash IS NULL));
+
+ALTER TABLE mcp.oauth_authorization_codes
+  ADD CONSTRAINT oauth_authorization_codes_code_hash_check CHECK (code_hash ~ '^[0-9a-f]{64}$'),
+  ADD CONSTRAINT oauth_authorization_codes_client_id_fkey FOREIGN KEY (client_id) REFERENCES mcp.oauth_clients (id) ON DELETE CASCADE,
+  ADD CONSTRAINT oauth_authorization_codes_user_id_fkey FOREIGN KEY (user_id) REFERENCES auth.users (id) ON DELETE CASCADE,
+  ADD CONSTRAINT oauth_authorization_codes_code_challenge_check CHECK (code_challenge ~ '^[A-Za-z0-9_-]{43}$'),
+  ADD CONSTRAINT oauth_authorization_codes_check CHECK (expires_at > created_at),
+  ADD CONSTRAINT oauth_authorization_codes_code_hash_key UNIQUE (code_hash);
+CREATE INDEX oauth_authorization_codes_client_id_idx ON mcp.oauth_authorization_codes (client_id);
+CREATE INDEX oauth_authorization_codes_user_id_idx ON mcp.oauth_authorization_codes (user_id);
+CREATE INDEX oauth_authorization_codes_expires_at_idx ON mcp.oauth_authorization_codes (expires_at);
+
+ALTER TABLE mcp.oauth_grants
+  ADD CONSTRAINT oauth_grants_user_id_fkey FOREIGN KEY (user_id) REFERENCES auth.users (id) ON DELETE CASCADE,
+  ADD CONSTRAINT oauth_grants_client_id_fkey FOREIGN KEY (client_id) REFERENCES mcp.oauth_clients (id) ON DELETE CASCADE,
+  ADD CONSTRAINT oauth_grants_refresh_token_hash_check CHECK (refresh_token_hash ~ '^[0-9a-f]{64}$'),
+  ADD CONSTRAINT oauth_grants_previous_refresh_token_hash_check CHECK (previous_refresh_token_hash ~ '^[0-9a-f]{64}$'),
+  ADD CONSTRAINT oauth_grants_refresh_token_hash_key UNIQUE (refresh_token_hash),
+  ADD CONSTRAINT oauth_grants_user_id_client_id_key UNIQUE (user_id, client_id);
+CREATE INDEX oauth_grants_client_id_idx ON mcp.oauth_grants (client_id);
+CREATE INDEX oauth_grants_previous_refresh_token_hash_idx ON mcp.oauth_grants (previous_refresh_token_hash);
+CREATE INDEX oauth_grants_refresh_expires_at_idx ON mcp.oauth_grants (refresh_expires_at);
+
+ALTER TABLE mcp.access_tokens
+  ADD CONSTRAINT access_tokens_user_id_fkey FOREIGN KEY (user_id) REFERENCES auth.users (id) ON DELETE CASCADE,
+  ADD CONSTRAINT access_tokens_name_check CHECK (char_length(name) BETWEEN 1 AND 60 AND name = btrim(name)),
+  ADD CONSTRAINT access_tokens_token_hash_check CHECK (token_hash ~ '^[0-9a-f]{64}$'),
+  ADD CONSTRAINT access_tokens_check CHECK (expires_at > created_at),
+  ADD CONSTRAINT access_tokens_token_hash_key UNIQUE (token_hash),
+  ADD CONSTRAINT access_tokens_grant_id_fkey FOREIGN KEY (grant_id) REFERENCES mcp.oauth_grants (id) ON DELETE CASCADE;
+CREATE INDEX access_tokens_user_id_created_at_idx ON mcp.access_tokens (user_id, created_at DESC);
+CREATE INDEX access_tokens_expires_at_idx ON mcp.access_tokens (expires_at);
+CREATE INDEX access_tokens_grant_id_idx ON mcp.access_tokens (grant_id);

package/dist/contract.d.ts

@@ -1,5 +1,5 @@
 import type { CoreErrorCode } from "@softure-ai/core";
-export type McpAccessErrorCode = "mcp-access.name_required" | "mcp-access.name_too_long" | "mcp-access.token_limit_reached" | "mcp-access.token_not_found";
+export type McpAccessErrorCode = "mcp-access.name_required" | "mcp-access.name_too_long" | "mcp-access.token_limit_reached" | "mcp-access.token_not_found" | "mcp-access.grant_not_found";
 /** Every code the token page can show: its own, a missing session and the generic ones. */
 export type TokenFormErrorCode = McpAccessErrorCode | "auth.unauthenticated" | CoreErrorCode;
 /** What the app's MCP server factory receives for one request. */
@@ -68,6 +68,16 @@ export type IssueTokenFormState = {
     readonly status: "error";
     readonly error: TokenFormErrorCode;
 };
+/** A connected app (an OAuth grant) as its owner sees it. */
+export interface OAuthGrantView {
+    readonly id: string;
+    /** The name the client registered with, cut to 60 characters. */
+    readonly clientName: string;
+    /** Granted with write access (it still writes only while the app allows writes). */
+    readonly canWrite: boolean;
+    readonly createdAt: Date;
+    readonly lastUsedAt: Date | null;
+}
 /** What the revoke action returns to one token's form. */
 export type RevokeTokenFormState = {
     readonly status: "idle";
@@ -77,4 +87,6 @@ export type RevokeTokenFormState = {
     readonly status: "error";
     readonly error: TokenFormErrorCode;
 };
+/** What the disconnect action returns to one connected app's form. */
+export type RevokeGrantFormState = RevokeTokenFormState;
 //# sourceMappingURL=contract.d.ts.map

package/dist/contract.d.ts.map

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

package/dist/index.d.ts

@@ -9,6 +9,15 @@ export declare const MCP_RATE_LIMIT_BUCKETS: {
         readonly limit: 200;
         readonly windowMinutes: 15;
     };
+    /**
+     * OAuth registration (per address) and token requests (per address and client id), when
+     * `oauth.enabled`. Enough for an assistant platform refreshing many users' tokens per client,
+     * too little for a script filling the clients table.
+     */
+    readonly "mcp-oauth": {
+        readonly limit: 60;
+        readonly windowMinutes: 15;
+    };
 };
 /**
  * Enables MCP access in `softure.config.ts` (after `security` and `auth`):
@@ -17,6 +26,10 @@ export declare const MCP_RATE_LIMIT_BUCKETS: {
 export declare const mcpAccess: import("@softure-ai/core").ModuleFactory<{
     page: string;
     endpoint: string;
+    oauthConsent: string;
+    oauthDecision: string;
+    oauthToken: string;
+    oauthRegister: string;
 }, {
     page: {
         title: string;
@@ -77,12 +90,40 @@ export declare const mcpAccess: import("@softure-ai/core").ModuleFactory<{
         revoke: string;
         revoking: string;
     };
+    grants: {
+        title: string;
+        lead: string;
+        empty: string;
+        connectedOn: string;
+        disconnect: string;
+        disconnecting: string;
+    };
+    consent: {
+        title: string;
+        lead: string;
+        app: string;
+        returnsTo: string;
+        account: string;
+        access: string;
+        readAccess: string;
+        allowWrite: string;
+        allowWriteHint: string;
+        allow: string;
+        deny: string;
+        errorTitle: string;
+        unknownClient: string;
+        redirectMismatch: string;
+        invalidRequest: string;
+        nothingGranted: string;
+        backToApp: string;
+    };
     errors: {
         "mcp-access": {
             name_required: string;
             name_too_long: string;
             token_limit_reached: string;
             token_not_found: string;
+            grant_not_found: string;
         };
         auth: {
             unauthenticated: string;
@@ -109,11 +150,25 @@ export declare const mcpAccess: import("@softure-ai/core").ModuleFactory<{
     tokenLifetimeDays: import("zod").ZodDefault<import("zod").ZodInt>;
     maxTokensPerUser: import("zod").ZodDefault<import("zod").ZodInt>;
     expiryWarningDays: import("zod").ZodDefault<import("zod").ZodInt>;
+    legacyTokenPattern: import("zod").ZodOptional<import("zod").ZodInstanceOf<RegExp>>;
+    resolveAppOrigin: import("zod").ZodOptional<import("zod").ZodCustom<import("./options.js").McpAppOriginResolver, import("./options.js").McpAppOriginResolver>>;
+    resourceOrigins: import("zod").ZodDefault<import("zod").ZodArray<import("zod").ZodPipe<import("zod").ZodString, import("zod").ZodTransform<string, string>>>>;
+    oauth: import("zod").ZodPrefault<import("zod").ZodObject<{
+        enabled: import("zod").ZodDefault<import("zod").ZodBoolean>;
+        accessTokenLifetimeMinutes: import("zod").ZodDefault<import("zod").ZodInt>;
+        refreshTokenLifetimeDays: import("zod").ZodDefault<import("zod").ZodInt>;
+        authorizationCodeLifetimeMinutes: import("zod").ZodDefault<import("zod").ZodInt>;
+        metadata: import("zod").ZodPrefault<import("zod").ZodObject<{
+            authorizationServer: import("zod").ZodOptional<import("zod").ZodUnion<readonly [import("zod").ZodCustom<(origins: import("./origins.js").McpOrigins) => Readonly<Record<string, unknown>>, (origins: import("./origins.js").McpOrigins) => Readonly<Record<string, unknown>>>, import("zod").ZodRecord<import("zod").ZodString, import("zod").ZodUnknown>]>>;
+            protectedResource: import("zod").ZodOptional<import("zod").ZodUnion<readonly [import("zod").ZodCustom<(origins: import("./origins.js").McpOrigins) => Readonly<Record<string, unknown>>, (origins: import("./origins.js").McpOrigins) => Readonly<Record<string, unknown>>>, import("zod").ZodRecord<import("zod").ZodString, import("zod").ZodUnknown>]>>;
+        }, import("zod/v4/core").$strict>>;
+    }, import("zod/v4/core").$strict>>;
 }, import("zod/v4/core").$strict>>;
 export { getAuthorizationHeader, getClaudeCodeCommand, getClaudeCodeLink, getDesktopConfig, getJsonConfig, getMcpClientSetup, type McpClientSetupInput, } from "./client-setup.js";
-export type { AccessTokenStatus, AccessTokenView, IssuedToken, IssueTokenFormState, McpAccessErrorCode, McpClientSetup, McpServerIdentity, RevokeTokenFormState, TokenFormErrorCode, } from "./contract.js";
+export type { AccessTokenStatus, AccessTokenView, IssuedToken, IssueTokenFormState, McpAccessErrorCode, McpClientSetup, McpServerIdentity, OAuthGrantView, RevokeGrantFormState, RevokeTokenFormState, TokenFormErrorCode, } from "./contract.js";
 export { getTokenErrorMessage, mcpAccessMessages, type McpAccessMessages } from "./messages/index.js";
-export { MAX_TOKEN_NAME_LENGTH, SERVER_NAME_PATTERN, TOOL_NAME_PATTERN, type McpAccessOptions, type McpAccessOptionsInput, type McpToolAccess, type McpToolDefinition, type McpToolDefinitionInput, } from "./options.js";
-export { accessTokens } from "./schema.js";
+export { MAX_PRESENTED_TOKEN_LENGTH, MAX_TOKEN_NAME_LENGTH, SERVER_NAME_PATTERN, TOOL_NAME_PATTERN, GENERATED_AUTHORIZATION_SERVER_KEYS, GENERATED_PROTECTED_RESOURCE_KEYS, type McpAccessOptions, type McpAccessOptionsInput, type McpAppOriginResolver, type McpMetadataExtension, type McpOAuthOptions, type McpToolAccess, type McpToolDefinition, type McpToolDefinitionInput, } from "./options.js";
+export { readRequestOrigin, type McpOriginRequest, type McpOrigins } from "./origins.js";
+export { accessTokens, oauthAuthorizationCodes, oauthClients, oauthGrants, type OAuthClientRow, type OAuthTokenEndpointAuthMethod } from "./schema.js";
 export { getAccessTokenStatus, type AccessTokenStatusOptions } from "./token-status.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,SAAS,eAAe,CAAC;AAEtC;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;;;CAEzB,CAAC;AAEX;;;GAGG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kCAqBpB,CAAC;AAEH,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,KAAK,mBAAmB,GACzB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACtG,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,iBAAiB,EACjB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAE,KAAK,wBAAwB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,SAAS,eAAe,CAAC;AAEtC;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;;;;IAEjC;;;;OAIG;;;;;CAEK,CAAC;AAEX;;;GAGG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kCAmCpB,CAAC;AAEH,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,KAAK,mBAAmB,GACzB,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EACV,iBAAiB,EACjB,eAAe,EACf,WAAW,EACX,mBAAmB,EACnB,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,kBAAkB,GACnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACtG,OAAO,EACL,0BAA0B,EAC1B,qBAAqB,EACrB,mBAAmB,EACnB,iBAAiB,EACjB,mCAAmC,EACnC,iCAAiC,EACjC,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,iBAAiB,EAAE,KAAK,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,YAAY,EAAE,WAAW,EAAE,KAAK,cAAc,EAAE,KAAK,4BAA4B,EAAE,MAAM,aAAa,CAAC;AACvJ,OAAO,EAAE,oBAAoB,EAAE,KAAK,wBAAwB,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/index.js

@@ -15,6 +15,12 @@ export const MODULE_ID = "mcp-access";
  */
 export const MCP_RATE_LIMIT_BUCKETS = {
     mcp: { limit: 200, windowMinutes: 15 },
+    /**
+     * OAuth registration (per address) and token requests (per address and client id), when
+     * `oauth.enabled`. Enough for an assistant platform refreshing many users' tokens per client,
+     * too little for a script filling the clients table.
+     */
+    "mcp-oauth": { limit: 60, windowMinutes: 15 },
 };
 /**
  * Enables MCP access in `softure.config.ts` (after `security` and `auth`):
@@ -23,16 +29,30 @@ export const MCP_RATE_LIMIT_BUCKETS = {
 export const mcpAccess = defineModule({
     manifest: {
         id: MODULE_ID,
-        version: "0.1.6",
+        version: "0.1.8",
         dependsOn: { security: "^0.1.0", auth: "^0.1.0" },
         dbSchema: "mcp",
-        tables: ["access_tokens"],
+        tables: ["access_tokens", "oauth_clients", "oauth_authorization_codes", "oauth_grants"],
         env: [],
         switches: [],
-        routes: { page: "/account/mcp", endpoint: "/api/mcp" },
+        routes: {
+            page: "/account/mcp",
+            endpoint: "/api/mcp",
+            oauthConsent: "/oauth/authorize",
+            oauthDecision: "/api/oauth/authorize",
+            oauthToken: "/api/oauth/token",
+            oauthRegister: "/api/oauth/register",
+        },
         mount: [
             { kind: "page", path: "app/account/mcp/page.tsx", export: "McpAccessPage" },
             { kind: "route-handler", path: "app/api/mcp/route.ts", export: "createMcpRoute" },
+            { kind: "page", path: "app/oauth/authorize/page.tsx", export: "OAuthConsentPage" },
+            { kind: "route-handler", path: "app/api/oauth/authorize/route.ts", export: "decideOAuthAuthorizationRoute" },
+            { kind: "route-handler", path: "app/api/oauth/token/route.ts", export: "exchangeOAuthTokenRoute" },
+            { kind: "route-handler", path: "app/api/oauth/register/route.ts", export: "registerOAuthClientRoute" },
+            { kind: "route-handler", path: "app/.well-known/oauth-authorization-server/route.ts", export: "getAuthorizationServerMetadataRoute" },
+            { kind: "route-handler", path: "app/.well-known/oauth-protected-resource/route.ts", export: "getProtectedResourceMetadataRoute" },
+            { kind: "route-handler", path: "app/.well-known/oauth-protected-resource/api/mcp/route.ts", export: "getProtectedResourceMetadataRoute" },
         ],
         privacy: { exports: true, deletes: true },
     },
@@ -44,7 +64,8 @@ export const mcpAccess = defineModule({
 });
 export { getAuthorizationHeader, getClaudeCodeCommand, getClaudeCodeLink, getDesktopConfig, getJsonConfig, getMcpClientSetup, } from "./client-setup.js";
 export { getTokenErrorMessage, mcpAccessMessages } from "./messages/index.js";
-export { MAX_TOKEN_NAME_LENGTH, SERVER_NAME_PATTERN, TOOL_NAME_PATTERN, } from "./options.js";
-export { accessTokens } from "./schema.js";
+export { MAX_PRESENTED_TOKEN_LENGTH, MAX_TOKEN_NAME_LENGTH, SERVER_NAME_PATTERN, TOOL_NAME_PATTERN, GENERATED_AUTHORIZATION_SERVER_KEYS, GENERATED_PROTECTED_RESOURCE_KEYS, } from "./options.js";
+export { readRequestOrigin } from "./origins.js";
+export { accessTokens, oauthAuthorizationCodes, oauthClients, oauthGrants } from "./schema.js";
 export { getAccessTokenStatus } from "./token-status.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,kGAAkG;AAClG,kGAAkG;AAClG,mDAAmD;AACnD,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,MAAM,CAAC,MAAM,SAAS,GAAG,YAAY,CAAC;AAEtC;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE;CAC9B,CAAC;AAEX;;;GAGG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,YAAY,CAAC;IACpC,QAAQ,EAAE;QACR,EAAE,EAAE,SAAS;QACb,OAAO,EAAE,OAAO;QAChB,SAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QACjD,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,CAAC,eAAe,CAAC;QACzB,GAAG,EAAE,EAAE;QACP,QAAQ,EAAE,EAAE;QACZ,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE;QACtD,KAAK,EAAE;YACL,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,EAAE,MAAM,EAAE,eAAe,EAAE;YAC3E,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,EAAE,MAAM,EAAE,gBAAgB,EAAE;SAClF;QACD,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;KAC1C;IACD,QAAQ,EAAE,iBAAiB;IAC3B,OAAO,EAAE,sBAAsB;IAC/B,UAAU,EAAE,EAAE,GAAG,EAAE,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,EAAE;IAC5E,OAAO,EAAE,2BAA2B;IACpC,MAAM,EAAE,sBAAsB;CAC/B,CAAC,CAAC;AAEH,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,GAElB,MAAM,mBAAmB,CAAC;AAY3B,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAA0B,MAAM,qBAAqB,CAAC;AACtG,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,iBAAiB,GAMlB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,oBAAoB,EAAiC,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}