@anchrd/intel-api 0.2.0 → 0.2.1

package/README.md

@@ -16,8 +16,8 @@ customer CLI.
 
 ## Requirements
 
-- A [Gate](https://www.npmjs.com/package/@anchrd/gate-sdk) instance — Gate owns identity, capabilities
-  and the encrypted connection vault, and is the only required Anchrd dependency
+- A [Gate](https://www.npmjs.com/package/@anchrd/gate-sdk) instance — Gate owns identity and
+  capabilities, and is the only required Anchrd dependency
 - A Cloudflare account with Workers, D1, R2, Queues and Workflows (Vectorize and Workers AI are
   optional and only add semantic search and attachment conversion)
 - Node 22 or newer
@@ -71,17 +71,19 @@ uses PKCE and dynamic public-client registration; browser access tokens stay ins
 `HttpOnly` cookie and are never exposed to the UI bundle or D1. Copy
 `node_modules/@anchrd/intel-api/examples/dev.vars.example` to `.dev.vars` for a local customer Worker.
 
-Approved MCP sources expose RFC 9728 metadata. The Tools UI follows that metadata, dynamically
-registers with Gate or Cloudflare Access, and completes a separate PKCE flow. Source access and
-refresh tokens are stored only in Gate's encrypted connection vault and refreshed just in time.
-The Intel audience token is never forwarded to another OAuth resource.
+The portal endpoint exposes RFC 9728 metadata. The Tools UI follows that metadata, dynamically
+registers with Gate or Cloudflare Access, and completes a separate PKCE flow. The only tool secret
+Intel stores is the resulting per-user access token for its own portal endpoint, sealed with a key
+derived from `INTEL_SESSION_SECRET` and kept in the `portal_tokens` table of your D1; provider
+credentials stay with the portal and never reach Intel. The Intel audience token is never forwarded
+to another OAuth resource.
 
 The reference Wrangler deployment binds `DB`, `CONTENT`, `INDEXING`, `AI`, `SEARCH`, `FLOWS`, and
 `ASSETS`. Create `SEARCH` as a 1024-dimension cosine Vectorize index for the default multilingual
 Workers AI `@cf/baai/bge-m3` embedding adapter. `FLOWS` targets the exported
-`IntelFlowWorkflow` class. Tool sources speak standard Streamable HTTP MCP; Intel caches schemas
-and resolves the caller's Portal token just in time from Gate. Durable Flow state contains no
-browser, Gate, or provider credentials.
+`IntelFlowWorkflow` class. The portal speaks standard Streamable HTTP MCP; Intel caches schemas and
+unseals the caller's portal token from `portal_tokens` just in time, refreshing it shortly before
+use. Durable Flow state contains no browser, Gate, or provider credentials.
 
 ## Related packages
 

package/dist/build/build.js

@@ -12,6 +12,12 @@ const IntelConfig = z.strictObject({
 const Catalog = z.record(z.string(), z.string());
 const defaultTheme = `/* Generated by \`intel build\`. Intel defaults are active. */\n`;
 const defaultLogo = `export const customLogoUrl: string | null = null;\n`;
+// Customer paths from intel.json are written into generated CSS and TypeScript comments. A path
+// containing `*/` or a newline would close the comment early, leaving broken output or — in
+// custom-logo.ts — customer-controlled text outside the comment and inside the UI bundle.
+function asComment(path) {
+    return path.replaceAll("*/", "*\\/").replace(/[\r\n]+/g, " ");
+}
 function validationMessage(error) {
     return error.issues
         .map((issue) => `${issue.path.join(".") || "intel.json"}: ${issue.message}`)
@@ -64,7 +70,14 @@ export function createBuild(deps) {
                 const config = parsed.data.ui;
                 const englishPath = `${location.dir}/src/i18n/en.json`;
                 const englishRaw = await readRequired(englishPath, "built-in English catalog");
-                const englishParsed = Catalog.safeParse(JSON.parse(englishRaw));
+                let englishJson;
+                try {
+                    englishJson = JSON.parse(englishRaw);
+                }
+                catch {
+                    throw new Error(`${englishPath} is not valid JSON`);
+                }
+                const englishParsed = Catalog.safeParse(englishJson);
                 if (!englishParsed.success)
                     throw new Error("Intel's built-in English catalog is invalid");
                 const english = englishParsed.data;
@@ -91,15 +104,15 @@ export function createBuild(deps) {
                     throw new Error(`ui.defaultLanguage ${JSON.stringify(config.defaultLanguage)} is not listed in ui.languages`);
                 }
                 const theme = config.theme
-                    ? `/* Generated by \`intel build\` from ${config.theme}. */\n${await readRequired(config.theme, "ui.theme")}\n`
+                    ? `/* Generated by \`intel build\` from ${asComment(config.theme)}. */\n${await readRequired(config.theme, "ui.theme")}\n`
                     : defaultTheme;
                 const logoSvg = config.logo ? await readSvg(config.logo, "ui.logo") : null;
                 const faviconPath = config.favicon ?? config.logo;
                 const faviconSvg = faviconPath
                     ? await readSvg(faviconPath, config.favicon ? "ui.favicon" : "ui.logo")
                     : await readRequired(`${location.dir}/src/branding/favicon.default.svg`, "default favicon");
-                const logoModule = logoSvg
-                    ? `/* Generated by \`intel build\` from ${config.logo}. */\nexport const customLogoUrl = ${JSON.stringify(asSvgDataUrl(logoSvg))};\n`
+                const logoModule = config.logo && logoSvg
+                    ? `/* Generated by \`intel build\` from ${asComment(config.logo)}. */\nexport const customLogoUrl = ${JSON.stringify(asSvgDataUrl(logoSvg))};\n`
                     : defaultLogo;
                 const languageBundle = `${JSON.stringify({ defaultLanguage: config.defaultLanguage, catalogs }, null, 2)}\n`;
                 await deps.writeTextFile(`${location.dir}/src/theme/custom.css`, theme);

package/dist/indexing/indexing.js

@@ -40,7 +40,10 @@ export function createIndexing(deps) {
                 await deps.repository.markIndexed(versionId, deps.now().toISOString());
             }
             catch (error) {
-                await deps.repository.markError(versionId, error instanceof Error ? error.message : "indexing_failed", deps.now().toISOString());
+                // Only Intel's own permanent messages are stored. A converter or fetch failure can carry
+                // content excerpts or URLs with query parameters, and this column is read by operators and
+                // shown in the UI, so an arbitrary upstream message must not be persisted here.
+                await deps.repository.markError(versionId, error instanceof PermanentIndexingError ? error.message.slice(0, 500) : "indexing_failed", deps.now().toISOString());
                 throw error;
             }
         },

package/dist/intel/intel.js

@@ -7,7 +7,11 @@ import { problemDetails } from "../shared/problem-details/problem-details.js";
 export function createIntel(deps) {
     const baseUrl = deps.baseUrl.replace(/\/+$/, "");
     const resource = `${baseUrl}/mcp`;
-    const resourceMetadataUrl = `${baseUrl}/.well-known/oauth-protected-resource`;
+    // RFC 9728 inserts the well-known segment between host and resource path: the document for a
+    // resource ending in /mcp belongs at /.well-known/oauth-protected-resource/mcp. A client that
+    // constructs that URL itself — Intel's own portal client in adapters/openid is one — finds
+    // nothing under the bare root path, and only a client that follows WWW-Authenticate gets through.
+    const resourceMetadataUrl = `${baseUrl}/.well-known/oauth-protected-resource/mcp`;
     const app = new Hono();
     app.onError((error, context) => {
         if (error instanceof IntelError) {
@@ -16,11 +20,15 @@ export function createIntel(deps) {
         return context.json(problemDetails(500, "internal_error", "Internal server error"), 500);
     });
     app.get("/health", (context) => context.json({ status: "ok" }));
-    app.get("/.well-known/oauth-protected-resource", (context) => context.json({
+    const resourceMetadata = {
         resource,
         authorization_servers: [deps.gateUrl.replace(/\/+$/, "")],
         bearer_methods_supported: ["header"],
-    }));
+    };
+    app.get("/.well-known/oauth-protected-resource/mcp", (context) => context.json(resourceMetadata));
+    // The root path stays as a compatibility alias: 0.2.0 published the document only here, and a
+    // client that stored that URL from an earlier WWW-Authenticate header keeps working.
+    app.get("/.well-known/oauth-protected-resource", (context) => context.json(resourceMetadata));
     const browserAuth = deps.auth;
     if (browserAuth) {
         app.get("/auth/login", async (context) => await browserAuth.login(new URL(context.req.url)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anchrd/intel-api",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "license": "UNLICENSED",
   "repository": {

package/dist/adapters/db/db-tools.d.ts

@@ -1,6 +0,0 @@
-import type { ToolRepository } from "../../tools/tools.types.js";
-import type { D1Database } from "./db.types.js";
-export declare function createToolRepository(deps: {
-    db: D1Database;
-    now(): Date;
-}): ToolRepository;

package/dist/adapters/db/db-tools.js

@@ -1,200 +0,0 @@
-import { ToolAnnotations, ToolCapability, ToolSource, } from "@anchrd/intel-contract";
-const sourceColumns = `source.id, source.name, source.url, source.connection_handle,
-  source.enabled, source.created_by, source.created_at, source.updated_at,
-  source.last_discovered_at`;
-const catalogColumns = `${sourceColumns}, tool.name AS tool_name, tool.title AS tool_title,
-  tool.description AS tool_description, tool.input_schema_json, tool.output_schema_json,
-  tool.annotations_json, tool.fingerprint, tool.discovered_at`;
-// Predicate and bindings are produced together: the placeholder count depends on the roles filter,
-// so returning them separately would let a caller shift every binding without the compiler noticing.
-// An empty roles array means "any role", because `IN ()` is invalid SQL.
-function access(actor, now, roles = []) {
-    const role = roles.length ? `AND grant_row.role IN (${roles.map(() => "?").join(", ")})` : "";
-    return {
-        sql: `(source.created_by = ? OR EXISTS (
-    SELECT 1 FROM resource_grants grant_row
-    WHERE grant_row.resource_type = 'tool-source' AND grant_row.resource_id = source.id
-      AND (
-        (grant_row.principal_type = 'user' AND grant_row.principal_id = ?)
-        OR (grant_row.principal_type = 'email' AND lower(grant_row.principal_id) = lower(?))
-        OR (grant_row.principal_type = 'organization' AND grant_row.principal_id = '*')
-      )
-      ${role}
-      AND (grant_row.expires_at IS NULL OR grant_row.expires_at > ?)
-  ))`,
-        bindings: [actor.id, actor.id, actor.email, ...roles, now],
-    };
-}
-function mapSource(row) {
-    return ToolSource.parse({
-        id: row.id,
-        name: row.name,
-        url: row.url,
-        connectionHandle: row.connection_handle,
-        enabled: row.enabled === 1,
-        createdBy: row.created_by,
-        createdAt: row.created_at,
-        updatedAt: row.updated_at,
-        lastDiscoveredAt: row.last_discovered_at,
-    });
-}
-function mapCapability(row) {
-    return ToolCapability.parse({
-        sourceId: row.id,
-        name: row.tool_name,
-        title: row.tool_title,
-        description: row.tool_description,
-        inputSchema: JSON.parse(row.input_schema_json),
-        outputSchema: row.output_schema_json ? JSON.parse(row.output_schema_json) : null,
-        annotations: ToolAnnotations.parse(JSON.parse(row.annotations_json)),
-        fingerprint: row.fingerprint,
-        discoveredAt: row.discovered_at,
-    });
-}
-export function createToolRepository(deps) {
-    const db = deps.db;
-    return {
-        async listVisible(actor) {
-            const allowed = access(actor, deps.now().toISOString());
-            const result = await db
-                .prepare(`SELECT ${sourceColumns} FROM tool_sources source
-          WHERE ${allowed.sql} ORDER BY lower(source.name), source.id`)
-                .bind(...allowed.bindings)
-                .all();
-            return (result.results ?? []).map(mapSource);
-        },
-        async getVisible(actor, sourceId) {
-            const allowed = access(actor, deps.now().toISOString());
-            const row = await db
-                .prepare(`SELECT ${sourceColumns} FROM tool_sources source
-          WHERE source.id = ? AND ${allowed.sql}`)
-                .bind(sourceId, ...allowed.bindings)
-                .first();
-            return row ? mapSource(row) : null;
-        },
-        async canManage(actor, sourceId) {
-            const permitted = access(actor, deps.now().toISOString(), ["manager"]);
-            const row = await db
-                .prepare(`SELECT 1 AS allowed FROM tool_sources source
-          WHERE source.id = ? AND ${permitted.sql}`)
-                .bind(sourceId, ...permitted.bindings)
-                .first();
-            return row?.allowed === 1;
-        },
-        async findIdempotent(actorId, operation, key) {
-            const row = await db
-                .prepare(`SELECT resource_id FROM idempotency_keys
-          WHERE actor_id = ? AND operation = ? AND idempotency_key = ?`)
-                .bind(actorId, operation, key)
-                .first();
-            return row?.resource_id ?? null;
-        },
-        async insertSource(input) {
-            const source = input.source;
-            try {
-                await db.batch([
-                    db
-                        .prepare(`INSERT INTO tool_sources (
-              id, name, url, connection_handle, enabled, created_by,
-              created_at, updated_at, last_discovered_at
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-                        .bind(source.id, source.name, source.url, source.connectionHandle, source.enabled ? 1 : 0, source.createdBy, source.createdAt, source.updatedAt, source.lastDiscoveredAt),
-                    db
-                        .prepare(`INSERT INTO resource_grants (
-              id, resource_type, resource_id, principal_type, principal_id, role,
-              expires_at, created_by, created_at
-            ) VALUES (?, 'tool-source', ?, 'organization', '*', 'viewer', NULL, ?, ?)`)
-                        .bind(input.grantId, source.id, source.createdBy, source.createdAt),
-                    db
-                        .prepare(`INSERT INTO idempotency_keys (
-              actor_id, operation, idempotency_key, resource_id, created_at
-            ) VALUES (?, 'tools.create', ?, ?, ?)`)
-                        .bind(source.createdBy, input.idempotencyKey, source.id, source.createdAt),
-                    db
-                        .prepare(`INSERT INTO audit_events (
-              id, actor_id, action, resource_type, resource_id, metadata_json, occurred_at
-            ) VALUES (?, ?, 'tools.create', 'tool-source', ?, ?, ?)`)
-                        .bind(input.auditId, source.createdBy, source.id, JSON.stringify({ name: source.name, url: source.url }), source.createdAt),
-                ]);
-                return source;
-            }
-            catch (error) {
-                const replayedId = await this.findIdempotent(source.createdBy, "tools.create", input.idempotencyKey);
-                const replayed = replayedId
-                    ? await db
-                        .prepare(`SELECT ${sourceColumns} FROM tool_sources source WHERE source.id = ?`)
-                        .bind(replayedId)
-                        .first()
-                    : null;
-                if (replayed)
-                    return mapSource(replayed);
-                throw error;
-            }
-        },
-        async replaceCatalog(input) {
-            const replayed = await this.findIdempotent(input.actorId, "tools.discover", input.idempotencyKey);
-            if (replayed)
-                return;
-            const statements = [
-                db.prepare("DELETE FROM tool_catalog WHERE source_id = ?").bind(input.sourceId),
-                ...input.capabilities.map((capability) => db
-                    .prepare(`INSERT INTO tool_catalog (
-              source_id, name, title, description, input_schema_json, output_schema_json,
-              annotations_json, fingerprint, discovered_at
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-                    .bind(capability.sourceId, capability.name, capability.title, capability.description, JSON.stringify(capability.inputSchema), capability.outputSchema ? JSON.stringify(capability.outputSchema) : null, JSON.stringify(capability.annotations), capability.fingerprint, capability.discoveredAt)),
-                db
-                    .prepare(`UPDATE tool_sources
-            SET last_discovered_at = ?, updated_at = ?
-            WHERE id = ?`)
-                    .bind(input.discoveredAt, input.discoveredAt, input.sourceId),
-                db
-                    .prepare(`INSERT INTO idempotency_keys (
-            actor_id, operation, idempotency_key, resource_id, created_at
-          ) VALUES (?, 'tools.discover', ?, ?, ?)`)
-                    .bind(input.actorId, input.idempotencyKey, input.sourceId, input.discoveredAt),
-                db
-                    .prepare(`INSERT INTO audit_events (
-            id, actor_id, action, resource_type, resource_id, metadata_json, occurred_at
-          ) VALUES (?, ?, 'tools.discover', 'tool-source', ?, ?, ?)`)
-                    .bind(input.auditId, input.actorId, input.sourceId, JSON.stringify({ toolCount: input.capabilities.length }), input.discoveredAt),
-            ];
-            try {
-                await db.batch(statements);
-            }
-            catch (error) {
-                const concurrentReplay = await this.findIdempotent(input.actorId, "tools.discover", input.idempotencyKey);
-                if (concurrentReplay === input.sourceId)
-                    return;
-                throw error;
-            }
-        },
-        async listCatalogVisible(actor) {
-            const allowed = access(actor, deps.now().toISOString());
-            const result = await db
-                .prepare(`SELECT ${catalogColumns}
-        FROM tool_catalog tool
-        JOIN tool_sources source ON source.id = tool.source_id
-        WHERE source.enabled = 1 AND ${allowed.sql}
-        ORDER BY lower(source.name), lower(coalesce(tool.title, tool.name)), tool.name`)
-                .bind(...allowed.bindings)
-                .all();
-            return (result.results ?? []).map((row) => ({
-                source: mapSource(row),
-                capability: mapCapability(row),
-            }));
-        },
-        async getCapabilityVisible(actor, sourceId, name) {
-            const allowed = access(actor, deps.now().toISOString());
-            const row = await db
-                .prepare(`SELECT ${catalogColumns}
-        FROM tool_catalog tool
-        JOIN tool_sources source ON source.id = tool.source_id
-        WHERE source.id = ? AND tool.name = ? AND source.enabled = 1
-          AND ${allowed.sql}`)
-                .bind(sourceId, name, ...allowed.bindings)
-                .first();
-            return row ? mapCapability(row) : null;
-        },
-    };
-}