@zackbart/connecta 0.7.9 → 0.8.1

package/dist/routes/mcp.js

@@ -0,0 +1,270 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
+import { registerExecuteTool } from "../execute.js";
+import { ExecutorAdmissionError, } from "../executor-admission.js";
+import { registerMetaTools } from "../meta-tools.js";
+import { CONNECTA_INSTRUCTIONS } from "../skills.js";
+import { authorize, } from "./shared.js";
+export const MCP_CORS_HEADERS = {
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET, POST, DELETE, OPTIONS",
+    "Access-Control-Allow-Headers": "Content-Type, Authorization, mcp-protocol-version, mcp-session-id",
+};
+// Browser-based MCP clients call /mcp cross-origin. Without CORS on every
+// response — errors included — the browser hides the 401, the client cannot
+// read WWW-Authenticate, and OAuth discovery silently never starts.
+function withMcpCors(response) {
+    const headers = new Headers(response.headers);
+    for (const [name, value] of Object.entries(MCP_CORS_HEADERS)) {
+        headers.set(name, value);
+    }
+    headers.set("Access-Control-Expose-Headers", "WWW-Authenticate, Retry-After, mcp-session-id, mcp-protocol-version");
+    return new Response(response.body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers,
+    });
+}
+function requestAdmissionFailure(error) {
+    const overloaded = error.code === "executor_overloaded";
+    const data = {
+        code: overloaded ? "server_overloaded" : "server_shutting_down",
+        retryable: overloaded,
+        ...(overloaded && error.retryAfterMs !== undefined
+            ? { retryAfterMs: error.retryAfterMs }
+            : {}),
+    };
+    const headers = new Headers({
+        "Content-Type": "application/json",
+        "Cache-Control": "no-store",
+    });
+    if (overloaded && error.retryAfterMs !== undefined) {
+        headers.set("Retry-After", String(Math.max(1, Math.ceil(error.retryAfterMs / 1_000))));
+    }
+    return new Response(JSON.stringify({
+        jsonrpc: "2.0",
+        id: null,
+        error: {
+            code: overloaded ? -32001 : -32002,
+            message: overloaded
+                ? "Server capacity is exhausted. Retry later."
+                : "Server is shutting down.",
+            data,
+        },
+    }), { status: 503, headers });
+}
+/**
+ * A request owns its permit through the response body, not merely until the
+ * handler returns. This is what makes slow clients and response-stream failure
+ * part of the same bounded lifecycle as success, error, and cancellation.
+ */
+function releaseAdmissionWithResponse(response, lease, signal) {
+    let released = false;
+    let onAbort = () => { };
+    const release = () => {
+        if (released)
+            return;
+        released = true;
+        signal.removeEventListener("abort", onAbort);
+        lease.release();
+    };
+    if (!response.body) {
+        release();
+        return response;
+    }
+    const reader = response.body.getReader();
+    onAbort = () => {
+        // `cancel()` belongs to an operator/auth/SDK-provided stream and may
+        // reject. Consume both outcomes: `.finally(release)` would release the
+        // permit but preserve the rejection as an unhandled promise.
+        void reader.cancel(signal.reason).then(release, release);
+    };
+    signal.addEventListener("abort", onAbort, { once: true });
+    if (signal.aborted)
+        onAbort();
+    const body = new ReadableStream({
+        async pull(controller) {
+            try {
+                const next = await reader.read();
+                if (next.done) {
+                    release();
+                    controller.close();
+                }
+                else {
+                    controller.enqueue(next.value);
+                }
+            }
+            catch (error) {
+                release();
+                controller.error(error);
+            }
+        },
+        async cancel(reason) {
+            try {
+                await reader.cancel(reason);
+            }
+            finally {
+                release();
+            }
+        },
+    });
+    return new Response(body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers,
+    });
+}
+/**
+ * 404 for any `?toolkit=` value, kept after the feature's retirement (#178).
+ *
+ * Toolkits are gone, but the URLs that named them are not: clients were handed
+ * MCP endpoint URLs with `?toolkit=` baked in, and nothing about upgrading the
+ * server rotates them. Silently serving those clients the full registry would
+ * turn a former scoping boundary into fail-open — so a request still sending
+ * the param gets the same explicit 404 an unknown toolkit got before, plus an
+ * operator-side log line, which (as ever — issue #47) is the channel that
+ * actually reaches a human.
+ */
+function toolkitRetired(logger) {
+    logger.warn("[connecta] rejected an /mcp connection carrying ?toolkit= with 404: " +
+        "toolkits were retired in issue #178 (see ethos.md) — one deployment " +
+        "serves one audience. The client sees a transport-level failure and " +
+        "never the reason, so remove the ?toolkit= value from its MCP endpoint " +
+        "URL, or point it at the deployment for its audience.");
+    return new Response(JSON.stringify({
+        jsonrpc: "2.0",
+        id: null,
+        error: {
+            code: -32600,
+            message: "This deployment does not accept ?toolkit=. Toolkits were retired " +
+                "in issue #178 — remove the ?toolkit= value from the MCP endpoint " +
+                "URL, or ask the operator for the deployment serving this audience.",
+        },
+    }), {
+        status: 404,
+        headers: {
+            "Content-Type": "application/json",
+            "Cache-Control": "no-store",
+        },
+    });
+}
+async function serveMcp(request, opts, baseUrl, actor, registry, runtimeContext) {
+    // Fresh McpServer + transport per request (SDK ≥1.26 requirement), stateless.
+    const server = new McpServer(opts.serverInfo, {
+        instructions: CONNECTA_INSTRUCTIONS,
+    });
+    const activity = opts.activity
+        ? {
+            sink: opts.activity,
+            actor,
+            requestId: crypto.randomUUID(),
+            serverInfo: opts.serverInfo,
+            ...(opts.activityDeploymentId
+                ? { deploymentId: opts.activityDeploymentId }
+                : {}),
+            ...(runtimeContext?.waitUntil
+                ? { defer: runtimeContext.waitUntil.bind(runtimeContext) }
+                : {}),
+            logger: opts.logger,
+        }
+        : undefined;
+    registerMetaTools(server, registry, {
+        baseUrl,
+        ...(activity ? { activity } : {}),
+        ...(opts.defaultToolTimeoutMs !== undefined
+            ? { defaultToolTimeoutMs: opts.defaultToolTimeoutMs }
+            : {}),
+        ...(opts.probeTimeoutMs !== undefined
+            ? { probeTimeoutMs: opts.probeTimeoutMs }
+            : {}),
+        ...(opts.discoveryConcurrency !== undefined
+            ? { discoveryConcurrency: opts.discoveryConcurrency }
+            : {}),
+        requestSignal: request.signal,
+        ...(runtimeContext
+            ? { defer: runtimeContext.waitUntil.bind(runtimeContext) }
+            : {}),
+    });
+    if (opts.executor) {
+        registerExecuteTool(server, registry, {
+            baseUrl,
+            executor: opts.executor,
+            logger: opts.logger,
+            ...(activity ? { activity } : {}),
+            requestSignal: request.signal,
+            ...(opts.discoveryConcurrency !== undefined
+                ? { discoveryConcurrency: opts.discoveryConcurrency }
+                : {}),
+        });
+    }
+    const transport = new WebStandardStreamableHTTPServerTransport({
+        enableJsonResponse: true,
+    });
+    await server.connect(transport);
+    return transport.handleRequest(request);
+}
+export function createMcpRoute(opts) {
+    let lastAdmissionWarningAt = 0;
+    let suppressedAdmissionWarnings = 0;
+    const warnAdmissionRejected = (error) => {
+        const now = Date.now();
+        if (now - lastAdmissionWarningAt < 1_000) {
+            suppressedAdmissionWarnings++;
+            return;
+        }
+        opts.logger.warn("[connecta] MCP request admission rejected", {
+            retryAfterMs: error.retryAfterMs,
+            active: opts.requestAdmission.activeCount,
+            queued: opts.requestAdmission.queuedCount,
+            suppressedSinceLastWarning: suppressedAdmissionWarnings,
+        });
+        lastAdmissionWarningAt = now;
+        suppressedAdmissionWarnings = 0;
+    };
+    return async function routeMcp(context) {
+        const { path, request, baseUrl, runtimeContext, } = context;
+        if (path !== "/mcp")
+            return null;
+        let admission;
+        try {
+            admission = await opts.requestAdmission.acquire({
+                signal: request.signal,
+            });
+            if (admission.waitMs > 0) {
+                opts.logger.debug("[connecta] MCP request admitted after queue wait", {
+                    waitMs: admission.waitMs,
+                    active: opts.requestAdmission.activeCount,
+                    queued: opts.requestAdmission.queuedCount,
+                });
+            }
+        }
+        catch (error) {
+            if (error instanceof ExecutorAdmissionError &&
+                error.code === "executor_cancelled") {
+                throw request.signal.reason ?? error;
+            }
+            if (error instanceof ExecutorAdmissionError) {
+                if (error.code === "executor_overloaded") {
+                    warnAdmissionRejected(error);
+                }
+                return withMcpCors(requestAdmissionFailure(error));
+            }
+            throw error;
+        }
+        try {
+            const authz = await authorize(request, baseUrl, opts.auth);
+            if (!authz.ok) {
+                return releaseAdmissionWithResponse(withMcpCors(authz.response), admission, request.signal);
+            }
+            if (new URL(request.url).searchParams.has("toolkit")) {
+                return releaseAdmissionWithResponse(withMcpCors(toolkitRetired(opts.logger)), admission, request.signal);
+            }
+            return releaseAdmissionWithResponse(withMcpCors(await serveMcp(request, opts, baseUrl, authz.actor, opts.registry, runtimeContext)), admission, request.signal);
+        }
+        catch (error) {
+            admission.release();
+            throw error;
+        }
+    };
+}
+//# sourceMappingURL=mcp.js.map

package/dist/routes/mcp.js.map

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

package/dist/routes/oauth.d.ts

@@ -0,0 +1,4 @@
+import { type RouteContext } from "./shared.js";
+export declare function routeOAuthManagement(context: RouteContext): Promise<Response | null>;
+export declare function routeOAuthCallback(context: RouteContext): Promise<Response | null>;
+//# sourceMappingURL=oauth.d.ts.map

package/dist/routes/oauth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../src/routes/oauth.ts"],"names":[],"mappings":"AAQA,OAAO,EAML,KAAK,YAAY,EAClB,MAAM,aAAa,CAAC;AAgGrB,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAS1B;AAyHD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CA4E1B"}

package/dist/routes/oauth.js

@@ -0,0 +1,263 @@
+import { oauthValueStorageKey } from "../auth/downstream-oauth.js";
+import { closeConnectorScope } from "../connector-scope.js";
+import { isSafeHttpUrl, resolveBranding } from "../ui.js";
+import { authorizeUiAdmin, isSameOrigin, loggableValue, msg, privateJson, } from "./shared.js";
+async function handleOAuthManagementRequest(context, connectorId) {
+    const { request, baseUrl, opts, defer } = context;
+    if (!isSameOrigin(request, baseUrl)) {
+        return privateJson({ error: "same-origin request required" }, { status: 403 });
+    }
+    const admin = await authorizeUiAdmin(request, baseUrl, opts.auth, "OAuth management");
+    if (!admin.ok)
+        return admin.response;
+    const connector = opts.registry.getConnector(connectorId);
+    if (!connector?.disconnectAuth || !connector.startAuth) {
+        return privateJson({ error: "unknown OAuth connector" }, { status: 404 });
+    }
+    if (request.method !== "DELETE" && request.method !== "POST") {
+        return privateJson({ error: "method not allowed" }, { status: 405 });
+    }
+    const requestScope = {};
+    const ctx = opts.registry.contextFor(connectorId, baseUrl, requestScope);
+    try {
+        let result;
+        let operationError;
+        try {
+            if (request.method === "DELETE") {
+                await connector.disconnectAuth(ctx);
+            }
+            else {
+                result = await connector.startAuth(ctx, { force: true });
+            }
+        }
+        catch (error) {
+            operationError = error;
+        }
+        // The old grant and its cached catalog are invalid after either operation,
+        // including a partially failed physical cleanup whose epoch fence succeeded.
+        try {
+            await opts.registry.invalidateStored(connectorId);
+        }
+        catch (error) {
+            operationError ??= error;
+        }
+        if (operationError) {
+            return privateJson({ error: msg(operationError) }, { status: 400 });
+        }
+        if (request.method === "DELETE") {
+            return new Response(null, {
+                status: 204,
+                headers: {
+                    "Cache-Control": "no-store",
+                    "Referrer-Policy": "no-referrer",
+                },
+            });
+        }
+        const authorizationUrl = isSafeHttpUrl(result.authorizationUrl)
+            ? result.authorizationUrl
+            : undefined;
+        if (result.state === "error") {
+            return privateJson({ error: result.message || "OAuth authorization could not start" }, { status: 502 });
+        }
+        if (result.state === "auth_required" && !authorizationUrl) {
+            return privateJson({
+                error: result.message ||
+                    "OAuth authorization requires consent but no safe URL is available",
+            }, { status: 502 });
+        }
+        return privateJson({
+            state: result.state,
+            ...(result.message ? { message: result.message } : {}),
+            ...(authorizationUrl ? { authorizationUrl } : {}),
+        });
+    }
+    finally {
+        await closeConnectorScope(connector, ctx, defer);
+    }
+}
+export async function routeOAuthManagement(context) {
+    const match = /^\/ui\/oauth\/([a-z0-9_-]+)$/.exec(context.path);
+    if (!match)
+        return null;
+    const connectorId = match[1];
+    if (!connectorId)
+        return null;
+    if (context.request.method === "OPTIONS") {
+        return privateJson({ error: "method not allowed" }, { status: 405 });
+    }
+    return handleOAuthManagementRequest(context, connectorId);
+}
+function escapeHtml(value) {
+    return value
+        .replaceAll("&", "&")
+        .replaceAll("<", "&lt;")
+        .replaceAll(">", "&gt;")
+        .replaceAll('"', "&quot;");
+}
+/** `body` is escaped — callback params and error messages are attacker-influenced. */
+function html(body, status = 200, branding) {
+    const brand = resolveBranding(branding);
+    const title = brand.pageTitle;
+    const owner = brand.ownerName
+        ? brand.ownerUrl
+            ? `<a class="brand" href="${escapeHtml(brand.ownerUrl)}">${escapeHtml(brand.ownerName)}</a>`
+            : `<span class="brand">${escapeHtml(brand.ownerName)}</span>`
+        : brand.productUrl
+            ? `<a class="brand" href="${escapeHtml(brand.productUrl)}">${escapeHtml(brand.productName)}</a>`
+            : `<span class="brand">${escapeHtml(brand.productName)}</span>`;
+    const product = brand.ownerName
+        ? brand.productUrl
+            ? `<a class="product" href="${escapeHtml(brand.productUrl)}">${escapeHtml(brand.productName)}</a>`
+            : `<span class="product">${escapeHtml(brand.productName)}</span>`
+        : "";
+    return new Response(`<!doctype html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<meta name="theme-color" content="${escapeHtml(brand.themeColor)}">
+<link rel="icon" href="${escapeHtml(brand.faviconHref)}" type="image/svg+xml">
+<link rel="shortcut icon" href="/favicon.ico">
+<title>${escapeHtml(title)}</title>
+<style>
+  * { border-radius: 0; box-sizing: border-box; }
+  html { color: #000; background: #fff; font: 16px/1.5 "Helvetica Neue",
+    Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; }
+  body { margin: 0; min-height: 100vh; }
+  ::selection { color: #fff; background: #000; }
+  .shell { margin: 0 auto; max-width: 70rem; padding: 1rem; }
+  .grid { display: grid; gap: 1rem 1.5rem;
+    grid-template-columns: repeat(3, minmax(0, 1fr)); }
+  .brand { font-weight: 500; grid-column: 1; text-decoration: none; }
+  .product { grid-column: 2 / -1; }
+  main { margin-top: 5rem; }
+  h1, p { font: inherit; margin: 0; }
+  h1 { grid-column: 1; }
+  .copy { grid-column: 2 / -1; max-width: 34em; }
+  .copy > * + * { margin-top: 1.5rem; }
+  a { color: inherit; text-decoration: underline; text-decoration-thickness: 1.5px;
+    text-underline-offset: .22em; }
+  a:hover { text-decoration-color: transparent; }
+  a:focus-visible { outline: 1px solid #000; outline-offset: 2px; }
+  @media (max-width: 36.99rem) {
+    .grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+    .product { grid-column: 2; }
+    main { margin-top: 3rem; }
+    h1, .copy { grid-column: 1 / -1; }
+  }
+</style>
+</head>
+<body>
+  <header class="shell grid">
+    ${owner}
+    ${product}
+  </header>
+  <main class="shell grid">
+    <h1>Connection status</h1>
+    <div class="copy">
+      <p>${escapeHtml(body)}</p>
+      <p><a href="/">Return to ${escapeHtml(brand.productName)}</a></p>
+    </div>
+  </main>
+</body>
+</html>`, { status, headers: { "Content-Type": "text/html; charset=utf-8" } });
+}
+/**
+ * Pay the storage read a real downstream-OAuth refusal pays, on the refusal
+ * paths that would otherwise pay nothing.
+ *
+ * Identical bodies do not hide a connector id if the clock still sorts them.
+ * `KvOAuthProvider.verifyState` reads `oauth:state` and its generation before
+ * it can reject a mismatched value, so a configured id costs two storage round
+ * trips on the ordinary path while an id naming nothing used to touch no I/O.
+ * That gap is an oracle: sample the two and a wordlist recovers the connector
+ * list the flat 400 was meant to withhold. So zero-I/O refusals read the same
+ * keys in the same `conn:<id>:` namespace, where an unconfigured id gets misses.
+ *
+ * This is deliberately *not* a constant-time claim, and documentation/connectors.md says
+ * so in prose: a hit and a miss are not identical in a KV store, and a connector
+ * shipping its own `verifyState` may do more or less work. What it
+ * removes is the order-of-magnitude "no I/O versus a round trip" difference,
+ * which is the only part of the signal that makes enumeration cheap.
+ *
+ * A throwing read is swallowed: the refusal is the answer either way, and
+ * turning it into a 500 would hand back exactly the distinguishable response
+ * this whole path exists to deny.
+ */
+async function equalizeRefusalCost(context) {
+    try {
+        const generation = await context.storage.get("oauth:generation");
+        await context.storage.get(oauthValueStorageKey("oauth:state", generation));
+    }
+    catch {
+        // Deliberately ignored — see above.
+    }
+}
+export async function routeOAuthCallback(context) {
+    const { path, url, baseUrl, opts } = context;
+    if (!path.startsWith("/oauth/callback/"))
+        return null;
+    const error = url.searchParams.get("error");
+    if (error)
+        return html(`Authorization denied: ${error}`, 400, opts.branding);
+    const code = url.searchParams.get("code");
+    if (!code)
+        return html("Missing authorization code.", 400, opts.branding);
+    const id = path.slice("/oauth/callback/".length);
+    const connector = opts.registry.getConnector(id);
+    // Safe to build before we know the id names anything: `contextFor` is a pure
+    // constructor — a namespaced storage view over `conn:<id>:` and, only for a
+    // connector that declares one, a lazy credential accessor. It neither throws
+    // nor touches storage for an unknown id, which is what lets the refusals
+    // below borrow it to equalize their cost.
+    const connectorContext = opts.registry.contextFor(id, baseUrl);
+    const refused = () => html("Authorization could not be completed. Re-run authorization from " +
+        "connecta and try again.", 400, opts.branding);
+    if (!connector || !connector.finishAuth) {
+        await equalizeRefusalCost(connectorContext);
+        return refused();
+    }
+    // CSRF / login-fixation guard: this route is intentionally public, so verify
+    // the `state` matches the flow connecta started BEFORE exchanging the code.
+    if (!connector.verifyState) {
+        await equalizeRefusalCost(connectorContext);
+        opts.logger.warn(`[connecta] refused an OAuth callback for connector ` +
+            `${loggableValue(id)} with 400: it implements finishAuth but no ` +
+            "verifyState, so connecta cannot establish that it started this flow. " +
+            "No authorization code was exchanged. Implement verifyState before " +
+            "trying again.");
+        return refused();
+    }
+    const state = url.searchParams.get("state");
+    let stateMatches;
+    try {
+        stateMatches = await connector.verifyState(state, connectorContext);
+    }
+    catch (err) {
+        opts.logger.warn(`[connecta] refused an OAuth callback for connector ` +
+            `${loggableValue(id)} with 400: verifyState threw ` +
+            `${loggableValue(msg(err))}. No authorization code was exchanged. ` +
+            "Re-run authorization from connecta and check the verifier if it " +
+            "fails again.");
+        return refused();
+    }
+    if (!stateMatches) {
+        opts.logger.warn(`[connecta] refused an OAuth callback for connector ` +
+            `${loggableValue(id)} with 400: ` +
+            (state === null
+                ? "the state parameter was missing"
+                : "the state did not match the pending authorization flow") +
+            ". No authorization code was exchanged. Re-run authorization from " +
+            "connecta and try again.");
+        return refused();
+    }
+    try {
+        await connector.finishAuth(code, connectorContext);
+        await opts.registry.invalidateStored(id);
+        return html(`Connected "${id}". You can close this window.`, 200, opts.branding);
+    }
+    catch (err) {
+        return html(`Authorization failed: ${msg(err)}`, 500, opts.branding);
+    }
+}
+//# sourceMappingURL=oauth.js.map

package/dist/routes/oauth.js.map

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

package/dist/routes/shared.d.ts

@@ -0,0 +1,76 @@
+import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import type { ActivityActor, ActivityReadGate, ActivityStore } from "../activity.js";
+import type { CredentialVault } from "../credentials.js";
+import type { DeferredWork } from "../connector-scope.js";
+import type { AdmissionController } from "../executor-admission.js";
+import type { Registry } from "../registry.js";
+import type { ConnectaBranding, Executor, InboundAuth, Logger } from "../types.js";
+export interface ServerOptions {
+    registry: Registry;
+    auth: InboundAuth[];
+    publicUrl?: string;
+    serverInfo: ConstructorParameters<typeof McpServer>[0];
+    logger: Logger;
+    activity?: ActivityStore;
+    activityReadGate?: ActivityReadGate;
+    activityDeploymentId?: string;
+    deploymentInfo?: Record<string, unknown>;
+    /** Deadline for call_tool/batch_call calls that pass no timeoutMs. Off when unset. */
+    defaultToolTimeoutMs?: number;
+    /** Per-connector deadline for the list/search/describe probe fan-out. Default 30_000. */
+    probeTimeoutMs?: number;
+    /** Maximum simultaneous connector discovery operations. Default 4. */
+    discoveryConcurrency?: number;
+    /** When set, the execute_code meta-tool is registered on top of the nine. */
+    executor?: Executor;
+    /** Global FIFO boundary for all non-preflight `/mcp` requests. */
+    requestAdmission: AdmissionController;
+    /** Encrypted connector-credential storage backing the Credentials page. */
+    credentialVault?: CredentialVault;
+    /** Optional browser UI and OAuth result-page labels. */
+    branding?: ConnectaBranding;
+}
+export interface RuntimeExecutionContext {
+    waitUntil(promise: Promise<unknown>): void;
+}
+export interface RouteContext {
+    request: Request;
+    url: URL;
+    path: string;
+    baseUrl: string;
+    opts: ServerOptions;
+    defer: DeferredWork | undefined;
+    runtimeContext: RuntimeExecutionContext | undefined;
+}
+export declare function msg(err: unknown): string;
+export declare function privateJson(body: unknown, init?: ResponseInit): Response;
+/**
+ * Bounded, escaped form of a caller-influenced value (an identity id or OAuth
+ * callback connector id) for the operator log. Goes
+ * through JSON.stringify so a caller-controlled newline or control character
+ * cannot forge a log line, plus a hand-rolled escape for U+2028/U+2029, which
+ * JSON.stringify leaves raw even though a log reader treats them as line
+ * terminators. Truncated to a small shared cap so an oversized value cannot
+ * flood the log either.
+ */
+export declare function loggableValue(requested: string): string;
+export declare function activityActorNamespace(provider: InboundAuth): string | undefined;
+export declare function authorize(request: Request, baseUrl: string, auth: InboundAuth[]): Promise<{
+    ok: true;
+    actor: ActivityActor;
+    /** True only when the admitting provider can also authorize UI mutation. */
+    uiAdminEligible?: boolean;
+} | {
+    ok: false;
+    response: Response;
+}>;
+export declare function authorizeUiAdmin(request: Request, baseUrl: string, auth: InboundAuth[], purpose?: string): Promise<{
+    ok: true;
+    userId: string;
+} | {
+    ok: false;
+    response: Response;
+}>;
+export declare function isSameOrigin(request: Request, baseUrl: string): boolean;
+export declare function withSecurityHeaders(response: Response, requestUrl: URL, path: string): Response;
+//# sourceMappingURL=shared.d.ts.map

package/dist/routes/shared.d.ts.map

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