@zackbart/connecta 0.28.0 → 0.29.0

package/dist/runtime/storage.js

@@ -17,7 +17,7 @@
 // runtime holds, because createConnecta passes the same two objects to both.
 // A scoped view holds no storage of its own: it reaches Storage through the
 // registry it delegates to, and the result stash is always the root's,
-// because its capacity is runtime-wide.
+// because its capacity is deployment-wide.
 import { Context, Effect } from "effect";
 import { runEdge } from "./run.js";
 import { Logger, Storage } from "./services.js";
@@ -44,6 +44,13 @@ export function storageDelete(key) {
         catch: (error) => error,
     }));
 }
+/** Atomic compare-and-set of one key, as `KVStorage.compareAndSet`. */
+export function storageCompareAndSet(key, expected, next, options) {
+    return Storage.use((storage) => Effect.tryPromise({
+        try: () => Promise.resolve(storage.compareAndSet(key, expected, next, options)),
+        catch: (error) => error,
+    }));
+}
 // One context per partition object, built on first use. A registry's options
 // object lives exactly as long as the registry, so the WeakMap never holds a
 // partition past its owner.

package/dist/sent-secrets.d.ts

@@ -0,0 +1,52 @@
+import type { ConnectorContext, Logger } from "./types.js";
+/** One payload-free warning per configured connector, regardless of requests. */
+export declare function shortSecretWarning(): (value: string | undefined, logger: Logger) => void;
+export declare class SentSecrets {
+    private readonly values;
+    private matcher;
+    private unicode;
+    private readonly recipients;
+    private form;
+    /** The request receives existing and future credentials from every context. */
+    include(source: SentSecrets): void;
+    add(value: string): void;
+    /** Explicit secrets use the same floor as every other credential. */
+    secret(value: string): void;
+    /** Structural fields must be refused, never repaired into different URLs. */
+    contains(value: string, ignoreCase?: boolean): boolean;
+    containsUrl(value: string): boolean;
+    header(value: string): void;
+    request(input: RequestInfo | URL, init?: RequestInit): void;
+    text(value: string): string;
+    /** Skill supporting files may contain arbitrary bytes, including credential echoes. */
+    private blob;
+    /** Decode bounded windows with source spans, including twice-escaped JSON.
+     * Scratch space follows credential length, never the whole skill file. */
+    private escapedText;
+    /** Copy, including non-enumerable Error fields; never retain a raw cause. */
+    redact<T>(value: T): T;
+    /** Match across blocks before isError/JSON unwrapping concatenates them. */
+    private joinedContent;
+}
+export declare function sentSecretsFor(ctx: ConnectorContext): SentSecrets;
+/** One identity per upstream request, including all discovery and call work. */
+export declare function sentSecretsForRequest(scope: object, secrets?: SentSecrets): SentSecrets;
+/** The agent-facing choke point. Apply to values before bridge serialization
+ * and to serialized wire text, so JSON escapes and structured strings share
+ * the same rule. Intake redaction protects caches independently of this edge. */
+export declare function redactAgentOutput<T>(secrets: SentSecrets, value: T): T;
+/** Wrap the complete operation table, including rejections. Adding an operation
+ * cannot add an unredacted exit. A direct invocation owns a fresh scope unless
+ * its HTTP request supplied one. */
+export declare function agentOutputOperations<T extends Record<string, (...args: never[]) => Promise<unknown>>>(create: (scope: object) => T, requestScope?: object): T;
+/** Slot reads cover custom handlers too, including keys put in query strings. */
+export declare function trackCredentialReads(ctx: ConnectorContext): void;
+export declare function redactSentSecrets<T>(ctx: ConnectorContext, value: T): T;
+/** Sanitize listing facts before any cache or consumer receives them. A name
+ * cannot be rewritten without changing dispatch, and dropping one entry would
+ * publish a partial catalog, so refuse the complete listing instead. */
+export declare function redactCatalog<T extends {
+    name: string;
+}>(ctx: ConnectorContext, tools: T[]): T[];
+/** Register only after the transport has assembled the request it sends. */
+export declare function sentSecretsFetch(ctx: ConnectorContext, send?: typeof fetch): typeof fetch;

package/dist/sent-secrets.js

@@ -0,0 +1,474 @@
+// Credentials used by one upstream request. Memory only; never part of a context's public
+// shape, a failure record, storage, or a log. Web APIs only.
+import { carryFailureFacts } from "./operator-record.js";
+import { ConnectorCallError } from "./errors.js";
+import { credentialUrlViews } from "./credential-url.js";
+const REDACTED = "[redacted]";
+const encoder = new TextEncoder();
+const contexts = new WeakMap();
+const requests = new WeakMap();
+const wrappedCredentials = new WeakSet();
+const sensitiveName = /key|token|secret|password|auth|signature|session/i;
+const explicitSecretName = /secret|password/i;
+// Short credentials can match protocol fields or legitimate configuration.
+const MIN_SECRET_LENGTH = 8;
+/** One payload-free warning per configured connector, regardless of requests. */
+export function shortSecretWarning() {
+    let warned = false;
+    return (value, logger) => {
+        if (warned || !value || value.length >= MIN_SECRET_LENGTH)
+            return;
+        warned = true;
+        const fact = { code: "short_secret_not_redacted" };
+        logger.warn("[connecta] Credentials shorter than 8 characters are not redacted from echoes; use longer secrets.", fact);
+    };
+}
+function literal(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+/** Percent escapes are case insensitive; the credential's other bytes are not. */
+function wirePattern(value) {
+    return value
+        .split(/(%[0-9a-f]{2})/i)
+        .map((part) => /^%[0-9a-f]{2}$/i.test(part)
+        ? `%${part
+            .slice(1)
+            .split("")
+            .map((char) => (/[a-f]/i.test(char) ? `[${char.toUpperCase()}${char.toLowerCase()}]` : char))
+            .join("")}`
+        : literal(part))
+        .join("");
+}
+const jsonEscape = /\\(?:u[0-9a-fA-F]{4}|["\\/bfnrt])/g;
+const shortEscape = {
+    '"': '"',
+    "\\": "\\",
+    "/": "/",
+    b: "\b",
+    f: "\f",
+    n: "\n",
+    r: "\r",
+    t: "\t",
+};
+function base64(value) {
+    let binary = "";
+    for (const byte of encoder.encode(value))
+        binary += String.fromCharCode(byte);
+    return btoa(binary);
+}
+export class SentSecrets {
+    values = new Set();
+    matcher;
+    unicode = false;
+    recipients = new Set();
+    form(value) {
+        if (this.values.has(value))
+            return;
+        this.values.add(value);
+        this.matcher = undefined;
+        this.unicode ||= [...value].some((char) => char.charCodeAt(0) > 127);
+        for (const recipient of this.recipients)
+            recipient.form(value);
+    }
+    /** The request receives existing and future credentials from every context. */
+    include(source) {
+        if (source === this)
+            return;
+        source.recipients.add(this);
+        for (const value of source.values)
+            this.form(value);
+    }
+    add(value) {
+        if (value.length < MIN_SECRET_LENGTH)
+            return;
+        for (const form of [value, `Bearer ${value}`, `token ${value}`]) {
+            this.form(form);
+            this.form(encodeURIComponent(form));
+            this.form(encodeURI(form));
+            this.form(new URLSearchParams({ value: form }).toString().slice(6));
+            const encoded = base64(form);
+            this.form(encoded);
+            this.form(encoded.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, ""));
+        }
+    }
+    /** Explicit secrets use the same floor as every other credential. */
+    secret(value) {
+        this.add(value);
+    }
+    /** Structural fields must be refused, never repaired into different URLs. */
+    contains(value, ignoreCase = false) {
+        return [...this.values].some((secret) => new RegExp(wirePattern(secret), ignoreCase ? "i" : "").test(value));
+    }
+    containsUrl(value) {
+        const { hosts, components, joined } = credentialUrlViews(value);
+        return (hosts.some((host) => this.contains(host, true)) || [...components, ...joined].some((view) => this.contains(view)));
+    }
+    header(value) {
+        this.add(value);
+        const framed = /^(?:Bearer|token|Basic)\s+(.+)$/i.exec(value);
+        if (!framed)
+            return;
+        this.add(framed[1]);
+        if (/^Basic\s/i.test(value)) {
+            try {
+                const decoded = atob(framed[1].replace(/-/g, "+").replace(/_/g, "/"));
+                this.add(decoded);
+                const colon = decoded.indexOf(":");
+                if (colon !== -1) {
+                    this.add(decoded.slice(0, colon));
+                    this.secret(decoded.slice(colon + 1));
+                }
+            }
+            catch {
+                /* An invalid Basic value is still registered verbatim. */
+            }
+        }
+        else
+            this.secret(framed[1]);
+    }
+    request(input, init) {
+        const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined));
+        for (const [name, value] of headers) {
+            if (explicitSecretName.test(name))
+                this.secret(value);
+            else if (name === "cookie" || sensitiveName.test(name))
+                this.header(value);
+            if (name === "cookie") {
+                for (const cookie of value.split(";")) {
+                    const equals = cookie.indexOf("=");
+                    if (equals !== -1)
+                        this.add(cookie.slice(equals + 1).trim());
+                }
+            }
+        }
+        const url = new URL(input instanceof Request ? input.url : String(input));
+        for (const [name, value] of url.searchParams) {
+            if (explicitSecretName.test(name))
+                this.secret(value);
+            else if (sensitiveName.test(name))
+                this.add(value);
+        }
+        // The OAuth SDK sends token requests as form data. Do not read a body
+        // stream or clone a Request: registration must not consume its payload.
+        if (headers.get("content-type")?.startsWith("application/x-www-form-urlencoded") &&
+            (typeof init?.body === "string" || init?.body instanceof URLSearchParams)) {
+            for (const [name, value] of new URLSearchParams(init.body)) {
+                if (/^(?:client_secret|password)$/i.test(name))
+                    this.secret(value);
+                else if (/^(?:refresh_token|code|client_assertion)$/i.test(name))
+                    this.add(value);
+            }
+        }
+    }
+    text(value) {
+        if (this.values.size === 0)
+            return value;
+        const original = value;
+        // Replace longer forms first so a raw token cannot leave its prefix or
+        // encoded suffix behind. Literal matches only: ordinary diagnostics stay.
+        this.matcher ??= new RegExp([literal(REDACTED), ...[...this.values].sort((a, b) => b.length - a.length).map(wirePattern)].join("|"), "gu");
+        // A single pass never scans a newly inserted placeholder as credential
+        // text. Protect existing placeholders when another boundary runs too.
+        value = value.replace(this.matcher, REDACTED);
+        if (value.includes("\\"))
+            value = this.escapedText(value);
+        // Ordinary skill bytes, including example credential header names, stay
+        // exact. Header-line scrubbing belongs to an actual credential echo.
+        if (value === original)
+            return value;
+        return value.replace(/(^|[\r\n])([\t ]*(?:cookie|set-cookie|[a-z0-9-]*(?:key|token|secret|auth|signature|session)[a-z0-9-]*)\s*:\s*)[^\r\n]*/gi, `$1$2${REDACTED}`);
+    }
+    /** Skill supporting files may contain arbitrary bytes, including credential echoes. */
+    blob(value) {
+        let binary;
+        try {
+            binary = atob(value);
+        }
+        catch {
+            return this.text(value);
+        }
+        const forms = [...this.values].map((secret) => Array.from(encoder.encode(secret), (byte) => String.fromCharCode(byte)).join(""));
+        const pattern = new RegExp(forms
+            .sort((a, b) => b.length - a.length)
+            .map(literal)
+            .join("|"), "g");
+        let redacted = this.text(binary.replace(pattern, REDACTED));
+        if (this.unicode) {
+            // atob returns byte-valued code units. A UTF-8 view also detects mixed
+            // literal/JSON-escaped Unicode echoes. Never re-encode that view: an
+            // arbitrary supporting file may contain invalid UTF-8 or a leading BOM.
+            const view = new TextDecoder("utf-8", { fatal: false, ignoreBOM: true }).decode(Uint8Array.from(redacted, (char) => char.charCodeAt(0)));
+            if (this.text(view) !== view)
+                redacted = REDACTED;
+        }
+        const encoded = redacted === binary ? value : btoa(redacted);
+        // A file's encoding can itself equal a credential. Withhold that file as
+        // a valid encoded placeholder, never insert prose into its base64 field.
+        if (this.text(encoded) === encoded)
+            return encoded;
+        const withheld = btoa(REDACTED);
+        return this.text(withheld) === withheld ? withheld : "";
+    }
+    /** Decode bounded windows with source spans, including twice-escaped JSON.
+     * Scratch space follows credential length, never the whole skill file. */
+    escapedText(source) {
+        const step = 65_536;
+        let longest = 0;
+        for (const value of this.values)
+            longest = Math.max(longest, value.length);
+        // Each of two Unicode escape layers expands a code unit at most sixfold.
+        const overlap = 36 * longest + 12;
+        const output = [];
+        let copied = 0;
+        for (let offset = 0; offset < source.length;) {
+            let view = source.slice(offset, offset + step + overlap);
+            let starts;
+            let ends;
+            const matches = [];
+            for (let pass = 0; pass < 2 && view.includes("\\"); pass++) {
+                const parts = [];
+                const nextStarts = new Uint32Array(view.length);
+                const nextEnds = new Uint32Array(view.length);
+                let cursor = 0;
+                let length = 0;
+                const copy = (end) => {
+                    if (cursor < end)
+                        parts.push(view.slice(cursor, end));
+                    for (; cursor < end; cursor++, length++) {
+                        nextStarts[length] = starts?.[cursor] ?? cursor;
+                        nextEnds[length] = ends?.[cursor] ?? cursor + 1;
+                    }
+                };
+                for (const match of view.matchAll(jsonEscape)) {
+                    copy(match.index);
+                    const code = match[0].slice(1);
+                    parts.push(code.startsWith("u") ? String.fromCharCode(parseInt(code.slice(1), 16)) : shortEscape[code]);
+                    nextStarts[length] = starts?.[match.index] ?? match.index;
+                    cursor = match.index + match[0].length;
+                    nextEnds[length++] = ends?.[cursor - 1] ?? cursor;
+                }
+                if (cursor === 0)
+                    break;
+                copy(view.length);
+                view = parts.join("");
+                starts = nextStarts.subarray(0, length);
+                ends = nextEnds.subarray(0, length);
+                for (const match of view.matchAll(this.matcher)) {
+                    const start = starts[match.index];
+                    if (match[0] !== REDACTED && start < step)
+                        matches.push({ start, end: ends[match.index + match[0].length - 1] });
+                }
+            }
+            matches.sort((a, b) => a.start - b.start || b.end - a.end);
+            let rewritten = "";
+            let cursor = 0;
+            for (let i = 0; i < matches.length; i++) {
+                const match = matches[i];
+                let end = match.end;
+                while (matches[i + 1] && matches[i + 1].start <= end)
+                    end = Math.max(end, matches[++i].end);
+                rewritten += source.slice(offset + cursor, offset + match.start) + REDACTED;
+                cursor = end;
+            }
+            if (cursor) {
+                output.push(source.slice(copied, offset), rewritten);
+                copied = offset + cursor;
+            }
+            let boundary = step;
+            if (starts && ends) {
+                // Keep the next window at an original escape boundary. Starting at
+                // the second slash of a JSON pair changes its meaning and can leave
+                // an invalid escape immediately before a redaction placeholder.
+                let left = 0;
+                let right = ends.length;
+                while (left < right) {
+                    const middle = (left + right) >>> 1;
+                    if (ends[middle] <= step)
+                        left = middle + 1;
+                    else
+                        right = middle;
+                }
+                if (left < starts.length)
+                    boundary = Math.min(step, starts[left]);
+            }
+            offset += Math.max(boundary, cursor);
+        }
+        return output.length ? output.join("") + source.slice(copied) : source;
+    }
+    /** Copy, including non-enumerable Error fields; never retain a raw cause. */
+    redact(value) {
+        if (this.values.size === 0)
+            return value;
+        const seen = new Map();
+        let changed = false;
+        const text = (value) => {
+            const redacted = this.text(value);
+            changed ||= redacted !== value;
+            return redacted;
+        };
+        const visit = (item) => {
+            if (typeof item === "string")
+                return text(item);
+            if (item === null || typeof item !== "object")
+                return item;
+            const prior = seen.get(item);
+            if (prior)
+                return prior;
+            const copy = Array.isArray(item)
+                ? []
+                : item instanceof Error
+                    ? Object.create(Object.getPrototypeOf(item))
+                    : {};
+            seen.set(item, copy);
+            for (const [key, descriptor] of Object.entries(Object.getOwnPropertyDescriptors(item))) {
+                // V8 lazily renders Error.stack through an own accessor. Snapshot it
+                // before rebuilding an error, so its diagnostic is redacted too.
+                if (key === "stack" && item instanceof Error && !("value" in descriptor)) {
+                    Object.defineProperty(copy, key, { value: visit(item.stack), configurable: true, writable: true });
+                    continue;
+                }
+                // JSON and errors carry data properties. A downstream-authored getter
+                // is not a safe way to expose a diagnostic to an agent.
+                if (!("value" in descriptor)) {
+                    changed = true;
+                    continue;
+                }
+                const redactedKey = text(key);
+                const blob = key === "blob" && "uri" in item && typeof descriptor.value === "string";
+                const field = key === "content"
+                    ? this.joinedContent(descriptor.value)
+                    : blob
+                        ? this.blob(descriptor.value)
+                        : descriptor.value;
+                changed ||= field !== descriptor.value;
+                Object.defineProperty(copy, redactedKey, {
+                    ...descriptor,
+                    value: blob ? field : visit(field),
+                    ...(redactedKey !== key ? { configurable: true } : {}),
+                });
+            }
+            return item instanceof Error ? carryFailureFacts(item, copy) : copy;
+        };
+        const copy = visit(value);
+        return changed ? copy : value;
+    }
+    /** Match across blocks before isError/JSON unwrapping concatenates them. */
+    joinedContent(value) {
+        if (!Array.isArray(value))
+            return value;
+        const blocks = value.filter((block) => block?.type === "text" && typeof block.text === "string");
+        if (blocks.length < 2)
+            return value;
+        for (const separator of ["", "\n"]) {
+            const joined = blocks.map((block) => block.text).join(separator);
+            const redacted = this.text(joined);
+            if (redacted === blocks.map((block) => this.text(block.text)).join(separator))
+                continue;
+            let first = true;
+            return value.map((block) => {
+                if (!blocks.includes(block))
+                    return block;
+                const text = first ? redacted : "";
+                first = false;
+                return { ...block, text };
+            });
+        }
+        return value;
+    }
+}
+export function sentSecretsFor(ctx) {
+    let secrets = contexts.get(ctx);
+    if (!secrets) {
+        secrets = new SentSecrets();
+        contexts.set(ctx, secrets);
+    }
+    sentSecretsForRequest(ctx.requestScope ?? ctx).include(secrets);
+    return secrets;
+}
+/** One identity per upstream request, including all discovery and call work. */
+export function sentSecretsForRequest(scope, secrets) {
+    let request = requests.get(scope);
+    if (!request) {
+        request = secrets ?? new SentSecrets();
+        requests.set(scope, request);
+    }
+    else if (secrets) {
+        request.include(secrets);
+    }
+    return request;
+}
+/** The agent-facing choke point. Apply to values before bridge serialization
+ * and to serialized wire text, so JSON escapes and structured strings share
+ * the same rule. Intake redaction protects caches independently of this edge. */
+export function redactAgentOutput(secrets, value) {
+    return secrets.redact(value);
+}
+/** Wrap the complete operation table, including rejections. Adding an operation
+ * cannot add an unredacted exit. A direct invocation owns a fresh scope unless
+ * its HTTP request supplied one. */
+export function agentOutputOperations(create, requestScope) {
+    return Object.fromEntries(Object.keys(create(requestScope ?? {})).map((name) => [
+        name,
+        async (...args) => {
+            const scope = requestScope ?? {};
+            const secrets = sentSecretsForRequest(scope);
+            try {
+                return redactAgentOutput(secrets, await create(scope)[name](...args));
+            }
+            catch (error) {
+                throw redactAgentOutput(secrets, error);
+            }
+        },
+    ]));
+}
+/** Slot reads cover custom handlers too, including keys put in query strings. */
+export function trackCredentialReads(ctx) {
+    if (!ctx.credential || wrappedCredentials.has(ctx))
+        return;
+    wrappedCredentials.add(ctx);
+    const credential = ctx.credential;
+    ctx.credential = {
+        async get(field) {
+            const value = await credential.get(field);
+            if (value) {
+                const secrets = sentSecretsFor(ctx);
+                if (field && explicitSecretName.test(field))
+                    secrets.secret(value);
+                else
+                    secrets.add(value);
+            }
+            return value;
+        },
+        async getAll() {
+            const values = await credential.getAll();
+            for (const [field, value] of Object.entries(values ?? {})) {
+                if (explicitSecretName.test(field))
+                    sentSecretsFor(ctx).secret(value);
+                else
+                    sentSecretsFor(ctx).add(value);
+            }
+            return values;
+        },
+    };
+}
+export function redactSentSecrets(ctx, value) {
+    return sentSecretsFor(ctx).redact(value);
+}
+/** Sanitize listing facts before any cache or consumer receives them. A name
+ * cannot be rewritten without changing dispatch, and dropping one entry would
+ * publish a partial catalog, so refuse the complete listing instead. */
+export function redactCatalog(ctx, tools) {
+    sentSecretsFor(ctx);
+    const redacted = sentSecretsForRequest(ctx.requestScope ?? ctx).redact(tools);
+    if (redacted.some((tool, index) => tool.name !== tools[index].name)) {
+        throw new ConnectorCallError("connector_call_failed", "Downstream catalog contains a tool name that echoes a sent credential; refusing the complete catalog.", { retryable: false });
+    }
+    return redacted;
+}
+/** Register only after the transport has assembled the request it sends. */
+export function sentSecretsFetch(ctx, send = fetch) {
+    return (input, init) => {
+        sentSecretsFor(ctx).request(input, init);
+        return send(input, init);
+    };
+}