@canonry/canonry 7.72.2 → 7.74.0

package/dist/{chunk-JE5QURTR.js → chunk-NXFNXXYM.js}

@@ -20,10 +20,10 @@ import {
   resolveProviderModel,
   schedulableRunKindSchema,
   sentimentEvaluatorProviderSchema
-} from "./chunk-YXAKL5HM.js";
+} from "./chunk-SF5JLMLG.js";
 
 // ../config/src/index.ts
-import { z as z4 } from "zod";
+import { z as z5 } from "zod";
 
 // ../config/src/sentiment.ts
 import { z } from "zod";
@@ -84,78 +84,170 @@ var seoInstallConfigSchema = z3.object({
   }).strict()]))
 }).strict();
 
+// ../config/src/mcp-gateway.ts
+import { z as z4 } from "zod";
+var nonempty = z4.string().trim().min(1);
+var identifier = z4.string().regex(/^[a-z0-9][\w-]{0,127}$/i);
+var url = z4.url().refine((value) => {
+  const parsed = new URL(value);
+  return !parsed.username && !parsed.password && !parsed.hash && !parsed.search;
+}, "URLs must not contain credentials, fragments, or query strings");
+var gatewayTenantSchema = z4.object({
+  id: identifier,
+  displayName: nonempty.max(200),
+  origin: url,
+  issuer: url,
+  resource: url,
+  mcpUrl: url,
+  enabled: z4.boolean(),
+  allowPrivateNetwork: z4.boolean().default(false),
+  protocolVersions: z4.array(nonempty).min(1),
+  catalogVersion: z4.literal("canonry-readonly-v1"),
+  upstreamClientId: nonempty.optional()
+}).strict();
+var clientSchema = z4.object({
+  client_id: identifier,
+  client_name: nonempty.max(200),
+  redirect_uris: z4.array(z4.url()).min(1),
+  token_endpoint_auth_method: z4.literal("none").default("none"),
+  grant_types: z4.array(z4.enum(["authorization_code", "refresh_token"])).default(["authorization_code", "refresh_token"]),
+  response_types: z4.tuple([z4.literal("code")]).default(["code"])
+}).strict();
+var gatewayConfigSchema = z4.object({
+  issuer: url,
+  development: z4.boolean().default(false),
+  host: nonempty.default("127.0.0.1"),
+  port: z4.number().int().min(1).max(65535).default(4101),
+  databasePath: nonempty,
+  clients: z4.array(clientSchema).min(1),
+  tenants: z4.array(gatewayTenantSchema).min(1),
+  requestTimeoutMs: z4.number().int().min(100).max(12e4).default(3e4),
+  trustedProxyAddresses: z4.array(z4.union([z4.ipv4(), z4.ipv6()])).default([]),
+  rateLimitPerMinute: z4.number().int().min(1).max(1e5).default(120),
+  maxBodyBytes: z4.number().int().min(1024).max(10 * 1024 * 1024).default(1024 * 1024),
+  domainVerificationToken: z4.string().regex(/^[\w-]{1,1024}$/).optional()
+}).strict().superRefine((config, ctx) => {
+  const checkTransport = (value, path2) => {
+    const parsed = new URL(value);
+    const loopback = ["localhost", "127.0.0.1", "[::1]"].includes(parsed.hostname);
+    if (parsed.protocol !== "https:" && !(config.development && loopback && parsed.protocol === "http:")) {
+      ctx.addIssue({ code: "custom", path: path2, message: "HTTPS is required except explicit development on loopback" });
+    }
+  };
+  checkTransport(config.issuer, ["issuer"]);
+  const issuer = new URL(config.issuer);
+  if (issuer.pathname !== "/" || config.issuer.endsWith("/")) {
+    ctx.addIssue({ code: "custom", path: ["issuer"], message: "Gateway issuer must be an origin without a trailing slash" });
+  }
+  if (!config.development && config.databasePath === ":memory:") {
+    ctx.addIssue({ code: "custom", path: ["databasePath"], message: "Production requires a durable database path" });
+  }
+  const tenantIds = /* @__PURE__ */ new Set();
+  config.tenants.forEach((tenant, index) => {
+    if (tenantIds.has(tenant.id)) ctx.addIssue({ code: "custom", path: ["tenants", index, "id"], message: "Tenant IDs must be unique" });
+    tenantIds.add(tenant.id);
+    if (new URL(tenant.origin).origin !== tenant.origin) {
+      ctx.addIssue({ code: "custom", path: ["tenants", index, "origin"], message: "Tenant origin must be an origin without a path or trailing slash" });
+    }
+    for (const field of ["origin", "issuer", "resource", "mcpUrl"]) {
+      checkTransport(tenant[field], ["tenants", index, field]);
+      if (new URL(tenant[field]).origin !== tenant.origin) {
+        ctx.addIssue({ code: "custom", path: ["tenants", index, field], message: "Tenant endpoints must belong to the provisioned origin" });
+      }
+    }
+    if (!new URL(tenant.mcpUrl).pathname.endsWith("/api/v1/mcp/readonly")) {
+      ctx.addIssue({ code: "custom", path: ["tenants", index, "mcpUrl"], message: "Only the Canonry read-only MCP endpoint is permitted" });
+    }
+    if (!new URL(tenant.resource).pathname.endsWith("/api/v1/mcp")) {
+      ctx.addIssue({ code: "custom", path: ["tenants", index, "resource"], message: "Canonical MCP resource must end in /api/v1/mcp" });
+    }
+  });
+  const clientIds = /* @__PURE__ */ new Set();
+  config.clients.forEach((client, index) => {
+    if (clientIds.has(client.client_id)) ctx.addIssue({ code: "custom", path: ["clients", index, "client_id"], message: "Client IDs must be unique" });
+    clientIds.add(client.client_id);
+    client.redirect_uris.forEach((redirect, redirectIndex) => {
+      checkTransport(redirect, ["clients", index, "redirect_uris", redirectIndex]);
+      const parsed = new URL(redirect);
+      if (parsed.username || parsed.password || parsed.hash) {
+        ctx.addIssue({ code: "custom", path: ["clients", index, "redirect_uris", redirectIndex], message: "Redirects cannot contain credentials or fragments" });
+      }
+    });
+  });
+});
+
 // ../config/src/index.ts
-var dashboardManagedSweepsSchema = z4.boolean().nullish();
-var researchAllowViewersSchema = z4.boolean().nullish();
-var agentAllowViewersSchema = z4.boolean().nullish();
+var dashboardManagedSweepsSchema = z5.boolean().nullish();
+var researchAllowViewersSchema = z5.boolean().nullish();
+var agentAllowViewersSchema = z5.boolean().nullish();
 var AGENT_REASONING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
-var agentReasoningSchema = z4.enum(AGENT_REASONING_LEVELS).nullish();
-var researchViewerDailyRunLimitSchema = z4.number().int().positive().nullish();
-var dashboardManagedRunKindsSchema = z4.array(schedulableRunKindSchema).nullish();
+var agentReasoningSchema = z5.enum(AGENT_REASONING_LEVELS).nullish();
+var researchViewerDailyRunLimitSchema = z5.number().int().positive().nullish();
+var dashboardManagedRunKindsSchema = z5.array(schedulableRunKindSchema).nullish();
 var agentProviderSchema = agentProviderIdSchema.nullish();
-var agentModelSchema = z4.string().trim().min(1).nullish();
+var agentModelSchema = z5.string().trim().min(1).nullish();
 function resolveOperatorApiKeyIds(source) {
   const raw = source.CANONRY_OPERATOR_KEY_IDS?.trim();
   if (!raw) return [];
-  const parsed = z4.array(z4.string().regex(/^[\w-]{1,256}$/)).max(100).safeParse(raw.split(",").map((id) => id.trim()));
+  const parsed = z5.array(z5.string().regex(/^[\w-]{1,256}$/)).max(100).safeParse(raw.split(",").map((id) => id.trim()));
   if (!parsed.success) throw new Error("CANONRY_OPERATOR_KEY_IDS must contain at most 100 comma-separated API key IDs (letters, digits, underscores, hyphens; no wildcards).");
   return [...new Set(parsed.data)];
 }
-var envSchema = z4.object({
-  DATABASE_URL: z4.string().default("postgresql://aeo:aeo@postgres:5432/aeo_platform"),
-  API_PORT: z4.coerce.number().int().positive().default(3e3),
-  WORKER_PORT: z4.coerce.number().int().positive().default(3001),
-  WEB_PORT: z4.coerce.number().int().positive().default(4173),
-  BOOTSTRAP_SECRET: z4.string().default("change-me"),
-  CANONRY_BASE_PATH: z4.string().default("/"),
+var envSchema = z5.object({
+  DATABASE_URL: z5.string().default("postgresql://aeo:aeo@postgres:5432/aeo_platform"),
+  API_PORT: z5.coerce.number().int().positive().default(3e3),
+  WORKER_PORT: z5.coerce.number().int().positive().default(3001),
+  WEB_PORT: z5.coerce.number().int().positive().default(4173),
+  BOOTSTRAP_SECRET: z5.string().default("change-me"),
+  CANONRY_BASE_PATH: z5.string().default("/"),
   // Gemini
-  GEMINI_API_KEY: z4.string().optional(),
-  GEMINI_MODEL: z4.string().optional(),
-  GEMINI_BASE_URL: z4.string().optional(),
-  GEMINI_MAX_CONCURRENCY: z4.coerce.number().int().positive().default(2),
-  GEMINI_MAX_REQUESTS_PER_MINUTE: z4.coerce.number().int().positive().default(10),
-  GEMINI_MAX_REQUESTS_PER_DAY: z4.coerce.number().int().positive().default(1e3),
+  GEMINI_API_KEY: z5.string().optional(),
+  GEMINI_MODEL: z5.string().optional(),
+  GEMINI_BASE_URL: z5.string().optional(),
+  GEMINI_MAX_CONCURRENCY: z5.coerce.number().int().positive().default(2),
+  GEMINI_MAX_REQUESTS_PER_MINUTE: z5.coerce.number().int().positive().default(10),
+  GEMINI_MAX_REQUESTS_PER_DAY: z5.coerce.number().int().positive().default(1e3),
   // Gemini Vertex AI (alternative to API key auth)
-  GEMINI_VERTEX_PROJECT: z4.string().optional(),
-  GEMINI_VERTEX_REGION: z4.string().optional(),
-  GEMINI_VERTEX_CREDENTIALS: z4.string().optional(),
+  GEMINI_VERTEX_PROJECT: z5.string().optional(),
+  GEMINI_VERTEX_REGION: z5.string().optional(),
+  GEMINI_VERTEX_CREDENTIALS: z5.string().optional(),
   // OpenAI
-  OPENAI_API_KEY: z4.string().optional(),
-  OPENAI_MODEL: z4.string().optional(),
-  OPENAI_BASE_URL: z4.string().optional(),
-  OPENAI_MAX_CONCURRENCY: z4.coerce.number().int().positive().default(2),
-  OPENAI_MAX_REQUESTS_PER_MINUTE: z4.coerce.number().int().positive().default(10),
-  OPENAI_MAX_REQUESTS_PER_DAY: z4.coerce.number().int().positive().default(1e3),
-  OPENROUTER_API_KEY: z4.string().optional(),
-  OPENROUTER_MODEL: z4.string().optional(),
-  OPENROUTER_MAX_CONCURRENCY: z4.coerce.number().int().positive().default(2),
-  OPENROUTER_MAX_REQUESTS_PER_MINUTE: z4.coerce.number().int().positive().default(10),
-  OPENROUTER_MAX_REQUESTS_PER_DAY: z4.coerce.number().int().positive().default(1e3),
+  OPENAI_API_KEY: z5.string().optional(),
+  OPENAI_MODEL: z5.string().optional(),
+  OPENAI_BASE_URL: z5.string().optional(),
+  OPENAI_MAX_CONCURRENCY: z5.coerce.number().int().positive().default(2),
+  OPENAI_MAX_REQUESTS_PER_MINUTE: z5.coerce.number().int().positive().default(10),
+  OPENAI_MAX_REQUESTS_PER_DAY: z5.coerce.number().int().positive().default(1e3),
+  OPENROUTER_API_KEY: z5.string().optional(),
+  OPENROUTER_MODEL: z5.string().optional(),
+  OPENROUTER_MAX_CONCURRENCY: z5.coerce.number().int().positive().default(2),
+  OPENROUTER_MAX_REQUESTS_PER_MINUTE: z5.coerce.number().int().positive().default(10),
+  OPENROUTER_MAX_REQUESTS_PER_DAY: z5.coerce.number().int().positive().default(1e3),
   // Anthropic / Claude
-  ANTHROPIC_API_KEY: z4.string().optional(),
-  ANTHROPIC_MODEL: z4.string().optional(),
-  ANTHROPIC_MAX_CONCURRENCY: z4.coerce.number().int().positive().default(2),
-  ANTHROPIC_MAX_REQUESTS_PER_MINUTE: z4.coerce.number().int().positive().default(10),
-  ANTHROPIC_MAX_REQUESTS_PER_DAY: z4.coerce.number().int().positive().default(1e3),
+  ANTHROPIC_API_KEY: z5.string().optional(),
+  ANTHROPIC_MODEL: z5.string().optional(),
+  ANTHROPIC_MAX_CONCURRENCY: z5.coerce.number().int().positive().default(2),
+  ANTHROPIC_MAX_REQUESTS_PER_MINUTE: z5.coerce.number().int().positive().default(10),
+  ANTHROPIC_MAX_REQUESTS_PER_DAY: z5.coerce.number().int().positive().default(1e3),
   // Perplexity
-  PERPLEXITY_API_KEY: z4.string().optional(),
-  PERPLEXITY_MODEL: z4.string().optional(),
-  PERPLEXITY_MAX_CONCURRENCY: z4.coerce.number().int().positive().default(2),
-  PERPLEXITY_MAX_REQUESTS_PER_MINUTE: z4.coerce.number().int().positive().default(10),
-  PERPLEXITY_MAX_REQUESTS_PER_DAY: z4.coerce.number().int().positive().default(1e3),
+  PERPLEXITY_API_KEY: z5.string().optional(),
+  PERPLEXITY_MODEL: z5.string().optional(),
+  PERPLEXITY_MAX_CONCURRENCY: z5.coerce.number().int().positive().default(2),
+  PERPLEXITY_MAX_REQUESTS_PER_MINUTE: z5.coerce.number().int().positive().default(10),
+  PERPLEXITY_MAX_REQUESTS_PER_DAY: z5.coerce.number().int().positive().default(1e3),
   // Meta Muse
-  MUSE_API_KEY: z4.string().optional(),
-  MUSE_MODEL: z4.string().optional(),
-  MUSE_BASE_URL: z4.string().optional(),
-  MUSE_MAX_CONCURRENCY: z4.coerce.number().int().positive().default(2),
-  MUSE_MAX_REQUESTS_PER_MINUTE: z4.coerce.number().int().positive().default(10),
-  MUSE_MAX_REQUESTS_PER_DAY: z4.coerce.number().int().positive().default(1e3),
+  MUSE_API_KEY: z5.string().optional(),
+  MUSE_MODEL: z5.string().optional(),
+  MUSE_BASE_URL: z5.string().optional(),
+  MUSE_MAX_CONCURRENCY: z5.coerce.number().int().positive().default(2),
+  MUSE_MAX_REQUESTS_PER_MINUTE: z5.coerce.number().int().positive().default(10),
+  MUSE_MAX_REQUESTS_PER_DAY: z5.coerce.number().int().positive().default(1e3),
   // Secret for HMAC-signing Google OAuth state parameters. Required for
   // cloud deployments that mount googleRoutes; the plugin refuses to register
   // without it (see packages/api-routes/src/google.ts).
-  GOOGLE_STATE_SECRET: z4.string().optional(),
-  CANONRY_RESEARCH_ALLOW_VIEWERS: z4.string().optional(),
-  CANONRY_RESEARCH_VIEWER_DAILY_RUN_LIMIT: z4.coerce.number().int().positive().default(DEFAULT_VIEWER_RESEARCH_DAILY_RUN_LIMIT)
+  GOOGLE_STATE_SECRET: z5.string().optional(),
+  CANONRY_RESEARCH_ALLOW_VIEWERS: z5.string().optional(),
+  CANONRY_RESEARCH_VIEWER_DAILY_RUN_LIMIT: z5.coerce.number().int().positive().default(DEFAULT_VIEWER_RESEARCH_DAILY_RUN_LIMIT)
 });
 var BOOTSTRAP_PROVIDER_DEFAULT_MODELS = {
   gemini: "gemini-flash-latest",
@@ -178,33 +270,33 @@ function withBootstrapProviderDefaults(name, entry) {
     quota: entry.quota ?? { ...BOOTSTRAP_PROVIDER_DEFAULT_QUOTA }
   };
 }
-var bootstrapEnvSchema = z4.object({
-  CANONRY_API_KEY: z4.string().optional(),
-  CANONRY_API_URL: z4.string().optional(),
-  CANONRY_DATABASE_PATH: z4.string().optional(),
-  GEMINI_API_KEY: z4.string().optional(),
-  GEMINI_MODEL: z4.string().optional(),
-  GEMINI_BASE_URL: z4.string().optional(),
-  GEMINI_VERTEX_PROJECT: z4.string().optional(),
-  GEMINI_VERTEX_REGION: z4.string().optional(),
-  GEMINI_VERTEX_CREDENTIALS: z4.string().optional(),
-  OPENAI_API_KEY: z4.string().optional(),
-  OPENAI_MODEL: z4.string().optional(),
-  OPENAI_BASE_URL: z4.string().optional(),
-  OPENROUTER_API_KEY: z4.string().optional(),
-  OPENROUTER_MODEL: z4.string().optional(),
-  ANTHROPIC_API_KEY: z4.string().optional(),
-  ANTHROPIC_MODEL: z4.string().optional(),
-  PERPLEXITY_API_KEY: z4.string().optional(),
-  PERPLEXITY_MODEL: z4.string().optional(),
-  MUSE_API_KEY: z4.string().optional(),
-  MUSE_MODEL: z4.string().optional(),
-  MUSE_BASE_URL: z4.string().optional(),
-  LOCAL_BASE_URL: z4.string().optional(),
-  LOCAL_API_KEY: z4.string().optional(),
-  LOCAL_MODEL: z4.string().optional(),
-  GOOGLE_CLIENT_ID: z4.string().optional(),
-  GOOGLE_CLIENT_SECRET: z4.string().optional()
+var bootstrapEnvSchema = z5.object({
+  CANONRY_API_KEY: z5.string().optional(),
+  CANONRY_API_URL: z5.string().optional(),
+  CANONRY_DATABASE_PATH: z5.string().optional(),
+  GEMINI_API_KEY: z5.string().optional(),
+  GEMINI_MODEL: z5.string().optional(),
+  GEMINI_BASE_URL: z5.string().optional(),
+  GEMINI_VERTEX_PROJECT: z5.string().optional(),
+  GEMINI_VERTEX_REGION: z5.string().optional(),
+  GEMINI_VERTEX_CREDENTIALS: z5.string().optional(),
+  OPENAI_API_KEY: z5.string().optional(),
+  OPENAI_MODEL: z5.string().optional(),
+  OPENAI_BASE_URL: z5.string().optional(),
+  OPENROUTER_API_KEY: z5.string().optional(),
+  OPENROUTER_MODEL: z5.string().optional(),
+  ANTHROPIC_API_KEY: z5.string().optional(),
+  ANTHROPIC_MODEL: z5.string().optional(),
+  PERPLEXITY_API_KEY: z5.string().optional(),
+  PERPLEXITY_MODEL: z5.string().optional(),
+  MUSE_API_KEY: z5.string().optional(),
+  MUSE_MODEL: z5.string().optional(),
+  MUSE_BASE_URL: z5.string().optional(),
+  LOCAL_BASE_URL: z5.string().optional(),
+  LOCAL_API_KEY: z5.string().optional(),
+  LOCAL_MODEL: z5.string().optional(),
+  GOOGLE_CLIENT_ID: z5.string().optional(),
+  GOOGLE_CLIENT_SECRET: z5.string().optional()
 });
 function getBootstrapEnv(source, overrides) {
   const filtered = overrides ? Object.fromEntries(Object.entries(overrides).filter(([, v]) => v != null)) : {};
@@ -1013,9 +1105,9 @@ Do not use "canonry init --force" for recovery. It replaces credentials without
   const portOverride = process.env.CANONRY_PORT?.trim();
   if (portOverride) {
     try {
-      const url = new URL(parsed.apiUrl);
-      url.port = portOverride;
-      parsed.apiUrl = url.origin;
+      const url2 = new URL(parsed.apiUrl);
+      url2.port = portOverride;
+      parsed.apiUrl = url2.origin;
     } catch {
     }
   }
@@ -1026,9 +1118,9 @@ Do not use "canonry init --force" for recovery. It replaces credentials without
   if (parsed.basePath) {
     const normalizedBase = "/" + parsed.basePath.replace(/^\/|\/$/g, "");
     try {
-      const url = new URL(parsed.apiUrl);
-      if (normalizedBase !== "/" && !url.pathname.startsWith(normalizedBase)) {
-        parsed.apiUrl = url.origin + normalizedBase;
+      const url2 = new URL(parsed.apiUrl);
+      if (normalizedBase !== "/" && !url2.pathname.startsWith(normalizedBase)) {
+        parsed.apiUrl = url2.origin + normalizedBase;
       }
     } catch {
     }
@@ -1053,11 +1145,11 @@ function parseExternalMcpEnv(raw) {
   for (const entry of value) {
     if (!entry || typeof entry !== "object") continue;
     const candidate = entry;
-    const url = typeof candidate.url === "string" ? candidate.url.trim() : "";
+    const url2 = typeof candidate.url === "string" ? candidate.url.trim() : "";
     const token = typeof candidate.token === "string" ? candidate.token : "";
-    if (!url || !token) continue;
+    if (!url2 || !token) continue;
     const label = typeof candidate.label === "string" ? candidate.label : void 0;
-    servers.push({ url, token, ...label ? { label } : {} });
+    servers.push({ url: url2, token, ...label ? { label } : {} });
   }
   return servers.length > 0 ? servers : void 0;
 }

package/dist/{chunk-Q25JQANW.js → chunk-O4D66XPL.js}

@@ -2,13 +2,16 @@ import {
   findMcpClient,
   listMcpClientIds
 } from "./chunk-VJWDBFSL.js";
+import {
+  createApiClient
+} from "./chunk-BICUWFV4.js";
 import {
   CliError,
   isMachineFormat
 } from "./chunk-HGMYEDAQ.js";
 import {
   describeError
-} from "./chunk-YXAKL5HM.js";
+} from "./chunk-SF5JLMLG.js";
 
 // src/commands/mcp.ts
 import fs from "fs";
@@ -196,9 +199,21 @@ function emitInstallResult(result, format) {
     console.log(result.snippet);
   }
 }
+async function showMcpProfile(format) {
+  const profile = await createApiClient().getMcpProfile();
+  if (isMachineFormat(format)) {
+    console.log(JSON.stringify(profile, null, 2));
+    return;
+  }
+  console.log(`${profile.displayName} (${profile.userId})`);
+  console.log(`Instance: ${profile.instance.issuer}`);
+  console.log(`Resource: ${profile.instance.resource}`);
+  console.log(`Scopes: ${profile.scopes.join(", ")}`);
+}
 
 export {
   renderClientSnippet,
   installMcp,
-  printMcpConfig
+  printMcpConfig,
+  showMcpProfile
 };

package/dist/{chunk-O7WOCTBD.js → chunk-PAIYFNNY.js}

@@ -20,7 +20,7 @@ import {
   templateLinkRatio,
   templateLinkUbiquityAvailable,
   validationError
-} from "./chunk-YXAKL5HM.js";
+} from "./chunk-SF5JLMLG.js";
 import {
   __export
 } from "./chunk-MLKGABMK.js";
@@ -125,6 +125,7 @@ __export(schema_exports, {
   notifications: () => notifications,
   oauthAuthorizationCodes: () => oauthAuthorizationCodes,
   oauthClients: () => oauthClients,
+  oauthGrants: () => oauthGrants,
   oauthTokens: () => oauthTokens,
   projects: () => projects,
   providerBatchRequests: () => providerBatchRequests,
@@ -858,12 +859,15 @@ var apiKeys = sqliteTable2("api_keys", {
   projectId: text2("project_id").references(() => projects.id, { onDelete: "cascade" }),
   /** Internal delegated session identity, never accepted by the key-create API. */
   delegatedUserId: text2("delegated_user_id").references(() => users.id, { onDelete: "cascade" }),
+  /** Authorization that minted this internal MCP credential. */
+  delegatedOAuthGrantId: text2("delegated_oauth_grant_id").references(() => oauthGrants.id, { onDelete: "cascade" }),
   createdAt: text2("created_at").notNull(),
   lastUsedAt: text2("last_used_at"),
   revokedAt: text2("revoked_at")
 }, (table) => [
   index2("idx_api_keys_prefix").on(table.keyPrefix),
-  index2("idx_api_keys_project").on(table.projectId)
+  index2("idx_api_keys_project").on(table.projectId),
+  index2("idx_api_keys_oauth_grant").on(table.delegatedOAuthGrantId)
 ]);
 var users = sqliteTable2("users", {
   id: text2("id").primaryKey(),
@@ -901,7 +905,7 @@ var oauthClients = sqliteTable2("oauth_clients", {
   id: text2("id").primaryKey(),
   name: text2("name").notNull(),
   /**
-   * scrypt digest, or NULL for a public client that authenticates by PKCE
+   * SHA-256 digest, or NULL for a public client that authenticates by PKCE
    * alone. Never the secret: a client secret is a bearer credential, and a
    * copied database file must not be a working client.
    */
@@ -920,6 +924,18 @@ var oauthClients = sqliteTable2("oauth_clients", {
   createdAt: text2("created_at").notNull(),
   revokedAt: text2("revoked_at")
 });
+var oauthGrants = sqliteTable2("oauth_grants", {
+  id: text2("id").primaryKey(),
+  clientId: text2("client_id").notNull().references(() => oauthClients.id, { onDelete: "cascade" }),
+  userId: text2("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
+  resource: text2("resource"),
+  scope: text2("scope"),
+  createdAt: text2("created_at").notNull(),
+  revokedAt: text2("revoked_at")
+}, (table) => [
+  index2("idx_oauth_grants_client").on(table.clientId),
+  index2("idx_oauth_grants_user").on(table.userId)
+]);
 var oauthAuthorizationCodes = sqliteTable2("oauth_authorization_codes", {
   /** SHA-256 of the code. The code itself is 256 bits of randomness. */
   codeHash: text2("code_hash").primaryKey(),
@@ -943,6 +959,8 @@ var oauthAuthorizationCodes = sqliteTable2("oauth_authorization_codes", {
 var oauthTokens = sqliteTable2("oauth_tokens", {
   tokenHash: text2("token_hash").primaryKey(),
   kind: text2("kind").$type().notNull(),
+  /** Nullable only for an older binary writing after this migration. */
+  grantId: text2("grant_id").references(() => oauthGrants.id, { onDelete: "cascade" }),
   clientId: text2("client_id").notNull().references(() => oauthClients.id, { onDelete: "cascade" }),
   userId: text2("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
   /** Audience. Enforced on every resource request. */
@@ -952,6 +970,7 @@ var oauthTokens = sqliteTable2("oauth_tokens", {
   revokedAt: text2("revoked_at"),
   createdAt: text2("created_at").notNull()
 }, (table) => [
+  index2("idx_oauth_tokens_grant").on(table.grantId),
   index2("idx_oauth_tokens_user").on(table.userId),
   index2("idx_oauth_tokens_expires").on(table.expiresAt)
 ]);
@@ -8284,6 +8303,54 @@ var MIGRATION_VERSIONS = [
     statements: [
       `ALTER TABLE site_crawl_attempts ADD COLUMN url_versions_skipped INTEGER NOT NULL DEFAULT 0`
     ]
+  },
+  {
+    version: 199,
+    name: "oauth-authorization-grants",
+    statements: [
+      `CREATE TABLE IF NOT EXISTS oauth_grants (
+        id TEXT PRIMARY KEY,
+        client_id TEXT NOT NULL REFERENCES oauth_clients(id) ON DELETE CASCADE,
+        user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+        resource TEXT,
+        scope TEXT,
+        created_at TEXT NOT NULL,
+        revoked_at TEXT
+      )`,
+      `CREATE INDEX IF NOT EXISTS idx_oauth_grants_client ON oauth_grants(client_id)`,
+      `CREATE INDEX IF NOT EXISTS idx_oauth_grants_user ON oauth_grants(user_id)`,
+      `ALTER TABLE oauth_tokens ADD COLUMN grant_id TEXT REFERENCES oauth_grants(id) ON DELETE CASCADE`,
+      `ALTER TABLE api_keys ADD COLUMN delegated_oauth_grant_id TEXT REFERENCES oauth_grants(id) ON DELETE CASCADE`,
+      `CREATE INDEX IF NOT EXISTS idx_oauth_tokens_grant ON oauth_tokens(grant_id)`,
+      `CREATE INDEX IF NOT EXISTS idx_api_keys_oauth_grant ON api_keys(delegated_oauth_grant_id)`,
+      // Credentials whose account or client was removed with foreign keys off
+      // are already unusable. Drop them before enforcing the new grant FKs.
+      `DELETE FROM oauth_tokens WHERE NOT EXISTS (SELECT 1 FROM oauth_clients WHERE id = oauth_tokens.client_id)
+         OR NOT EXISTS (SELECT 1 FROM users WHERE id = oauth_tokens.user_id)`,
+      // Historical rotations carry no lineage. Preserve access while grouping
+      // only the same client, person, audience and consented scope for revocation.
+      `INSERT OR IGNORE INTO oauth_grants (id, client_id, user_id, resource, scope, created_at)
+       SELECT 'legacy:' || MIN(token_hash), client_id, user_id, resource, scope, MIN(created_at)
+       FROM oauth_tokens WHERE grant_id IS NULL
+         AND EXISTS (SELECT 1 FROM oauth_clients WHERE id = oauth_tokens.client_id)
+         AND EXISTS (SELECT 1 FROM users WHERE id = oauth_tokens.user_id)
+       GROUP BY client_id, user_id, resource, scope`,
+      `UPDATE oauth_tokens SET grant_id = (
+         SELECT id FROM oauth_grants g
+         WHERE g.id LIKE 'legacy:%' AND g.client_id = oauth_tokens.client_id
+           AND g.user_id = oauth_tokens.user_id AND g.resource IS oauth_tokens.resource AND g.scope IS oauth_tokens.scope
+       ) WHERE grant_id IS NULL`,
+      // Old MCP keys lack a grant link and cannot be assigned safely. Match
+      // the bound constructor and the older reserved namespace without user
+      // linkage. A manually named key in that namespace also requires reissue.
+      `DELETE FROM dashboard_sessions WHERE api_key_id IN (
+         SELECT id FROM api_keys WHERE (delegated_user_id IS NOT NULL AND name = 'mcp-session:' || delegated_user_id)
+           OR (delegated_user_id IS NULL AND name GLOB 'mcp-session:*')
+       )`,
+      `UPDATE api_keys SET revoked_at = COALESCE(revoked_at, strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))
+       WHERE (delegated_user_id IS NOT NULL AND name = 'mcp-session:' || delegated_user_id)
+         OR (delegated_user_id IS NULL AND name GLOB 'mcp-session:*')`
+    ]
   }
 ];
 var AERO_LEDGER_REBUILDS = [
@@ -9727,6 +9794,7 @@ export {
   userSessions,
   dashboardSessions,
   oauthClients,
+  oauthGrants,
   oauthAuthorizationCodes,
   oauthTokens,
   schedules,

package/dist/{chunk-JEBY6MS6.js → chunk-QS6RIP37.js}

@@ -8,7 +8,7 @@ import {
   classifyJourneyEntry,
   hostMatchesDomain,
   hostOf
-} from "./chunk-YXAKL5HM.js";
+} from "./chunk-SF5JLMLG.js";
 
 // ../integration-traffic/src/ip-ranges/amazonbot.json
 var amazonbot_default = {

package/dist/{chunk-4LTL5RNY.js → chunk-SCRPC2PQ.js}

@@ -2,13 +2,13 @@ import {
   bucketCliCommandDuration,
   isTelemetryEnabled,
   trackEvent
-} from "./chunk-MJYO6UK2.js";
+} from "./chunk-DL3LTSBV.js";
 import {
   getConfigDir
-} from "./chunk-JE5QURTR.js";
+} from "./chunk-NXFNXXYM.js";
 import {
   currentOutcomeAttribution
-} from "./chunk-BADJCT6U.js";
+} from "./chunk-GWDMWKM6.js";
 import {
   AGENT_NONE,
   OutcomeSurfaces,
@@ -19,7 +19,7 @@ import {
   integrationConnectionPropertiesSchema,
   normalizeAgentSlug,
   usageSurfaceSchema
-} from "./chunk-YXAKL5HM.js";
+} from "./chunk-SF5JLMLG.js";
 
 // src/outcome-telemetry.ts
 import fs from "fs";