@sanoma-ai/workflows 0.9.1 → 0.10.1

package/dist/load.js

@@ -0,0 +1,391 @@
+import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";
+import { createRequire, registerHooks } from "node:module";
+import { dirname, isAbsolute, join, relative, sep } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { collectionIn } from "./collection.js";
+import { callerFile } from "./define.js";
+import { defineApp, defineSite } from "./definitions.js";
+import { VENDOR } from "./op.js";
+import { APPS_DIR, appOfPath, DATA_ENTRIES, inside, relPath, SECRET_ENTRIES, SITE_ENTRIES } from "./paths.js";
+import { isDeclared, isObject, joinPath, resourceTypesOf } from "./resource.js";
+import { secret } from "./secret.js";
+import { errorMessage } from "./shared.js";
+// A company's files, loaded: synchronously (`require` of an ES module, Node's type stripping and
+// `module.registerHooks`), since what reads them is (`describeConfig`, `readPeople`). Each load
+// is a *generation*: its files are modules of their own (`file:…?sanoma-load=<id>`), so an edit
+// is read once a new generation starts, and what they import from the runtime (constructors,
+// `collection`, `defineSite`, `defineApp`) is served from the loader's own objects, which record
+// where each value was made. A superseded generation's modules stay in Node's cache: each edit
+// costs one copy of the files it read.
+/** The scheme of the loader's own modules: an entry, `sanoma-load:<id>/<file URL>`, and a runtime module, `sanoma-load:<id>/<specifier>`. */
+const SCHEME = "sanoma-load:";
+/** The query that tags a company file with its generation: `file:///…/github.ts?sanoma-load=<id>`. */
+const QUERY = "sanoma-load";
+const registry = (globalThis[Symbol.for("sanoma.load")] ??= {
+    generations: new Map(),
+    seq: 0,
+    ids: new WeakMap(),
+    made: new WeakMap(),
+});
+const require = createRequire(import.meta.url);
+/** Where `value` was made, when a company file made it with a constructor the loader served. */
+export const madeOf = (value) => typeof value === "object" && value !== null ? registry.made.get(value) : undefined;
+/** Where `defineApp` comes from, served only to an app's `app.ts`. */
+const APP_ENTRIES = new Set(["sanoma", "@sanoma-ai/workflows"]);
+/**
+ * Loads `paths` (absolute, under `root`) as the generation of `root` and the constructors of
+ * `connectors` (`types`, by default theirs) has them, and says what each gave, by its path
+ * relative to the root with `/`, sorted. The same generation, and the same answer for the same
+ * paths, while no file it read, nor any file's directory, changed (by size and modification time:
+ * one `stat` each); else a new one, so a caller may key what it makes of the answer by it (and
+ * never changes it). `only` loads only the files whose text it passes; the answer is kept by its
+ * identity, so pass one function, not a new one per call.
+ *
+ * Served to the files, by specifier: `sanoma/resources` and `@sanoma-ai/workflows/resources`
+ * (`sanoma`, the constructors of the vendor `sanoma`, and `secret`); each connector's
+ * `<info.package>/resources` (its vendor's constructors, under its id); `sanoma/data` and
+ * `@sanoma-ai/workflows/data` (`collection`); `sanoma/site` and `@sanoma-ai/app/site`
+ * (`defineSite`); and to an app's `apps/<app>/app.ts` alone, `sanoma` and `@sanoma-ai/workflows`
+ * (`defineApp`). Anything else is resolved as Node does.
+ */
+export function loadModules(root, paths, connectors, { only, types = resourceTypesOf(connectors), } = {}) {
+    // Nothing to load, and a root that may not be there yet (a company not made): nothing to resolve.
+    if (!paths.length)
+        return new Map();
+    hook();
+    const real = realpathSync(root);
+    const gen = generationOf(real, connectors, types);
+    const files = paths.map((path) => join(real, relative(root, path)));
+    const byPaths = gen.answers.get(only ?? gen) ?? new Map();
+    gen.answers.set(only ?? gen, byPaths);
+    const key = files.join("\0");
+    const answered = byPaths.get(key);
+    if (answered)
+        return answered;
+    const answer = new Map();
+    for (const file of files) {
+        touch(gen, file);
+        if (only && !only(readFileSync(file, "utf8")))
+            continue;
+        const rel = relPath(gen.root, file);
+        const loaded = loadOne(gen, file, rel);
+        answer.set(rel, loaded);
+        if ("failedIn" in loaded)
+            answer.set(loaded.failedIn, gen.loaded.get(loaded.failedIn));
+    }
+    const result = new Map([...answer].toSorted(([a], [b]) => byOrder(a, b)));
+    // A value made in one file and exported by another is listed at the file that made it.
+    const owner = new Map();
+    for (const [rel, l] of result) {
+        if (!("exports" in l))
+            continue;
+        for (const [, value] of l.exports)
+            if (madeOf(value)?.file === rel)
+                owner.set(value, rel);
+    }
+    for (const [rel, l] of result) {
+        if (!("exports" in l))
+            continue;
+        const exports = l.exports
+            .filter(([, value]) => (owner.get(value) ?? rel) === rel)
+            .toSorted(([, a], [, b]) => byOrder(madeOf(a)?.seq ?? Infinity, madeOf(b)?.seq ?? Infinity));
+        result.set(rel, { exports });
+    }
+    byPaths.set(key, result);
+    answerGenerations.set(result, gen);
+    return result;
+}
+/**
+ * What `answer` (a `loadModules` answer) gave for `file`: its exports, or the error it threw (or a
+ * helper it imports threw) as a problem on one line, at the file that threw it; undefined when the
+ * answer does not have the file.
+ */
+export function exportsOf(answer, file) {
+    const loaded = answer.get(file);
+    if (loaded === undefined)
+        return undefined;
+    if ("failedIn" in loaded)
+        return exportsOf(answer, loaded.failedIn);
+    if ("exports" in loaded)
+        return loaded;
+    const { error, line, column } = loaded;
+    const message = errorMessage(error).replaceAll(/\s*\n\s*/g, " ");
+    return { problem: { file, ...(line !== undefined && { line, column: column ?? 1 }), message } };
+}
+/** The generation each answer is of. */
+const answerGenerations = new WeakMap();
+/** Every value the files of `answer` (a `loadModules` answer) made, exported or not, in the order made. */
+export const madeWith = (answer) => (answerGenerations.get(answer)?.made ?? []).filter((value) => answer.has(madeOf(value).file));
+/**
+ * The company files `answer` (a `loadModules` answer) was read from, by path relative to the root:
+ * its files and every company file they import, directly or not (or that another answer of its
+ * generation imported: never fewer).
+ */
+export const filesRead = (answer) => new Set([...answer.keys(), ...(answerGenerations.get(answer)?.imported ?? [])]);
+/** One file of a generation, required once; an error placed at its own file, and reported there once. */
+function loadOne(gen, file, rel) {
+    const done = gen.loaded.get(rel);
+    if (done)
+        return done;
+    let loaded;
+    try {
+        const { ns } = require(`${SCHEME}${gen.id}/${pathToFileURL(file).href}`);
+        loaded = { exports: Object.entries(ns) };
+    }
+    catch (error) {
+        // A file that imports one that threw throws the same object: reported once, where it was thrown.
+        const at = typeof error === "object" ? gen.reported.get(error) : undefined;
+        if (at !== undefined)
+            loaded = { failedIn: at };
+        else {
+            const placed = placeOf(gen, error);
+            // Never over a file that loaded (a stack cut short at `Error.stackTraceLimit`): then it is this file's.
+            const there = placed && gen.loaded.get(placed.file);
+            const { file: own = rel, line, column } = there && "exports" in there ? {} : (placed ?? {});
+            if (typeof error === "object")
+                gen.reported.set(error, own);
+            const report = { error, ...(line !== undefined && { line }), ...(column !== undefined && { column }) };
+            gen.loaded.set(own, report);
+            loaded = own === rel ? report : { failedIn: own };
+        }
+    }
+    gen.loaded.set(rel, loaded);
+    return loaded;
+}
+/** A frame of a generation's company file in a stack: its URL, without the query, then the tag, line and column. */
+const TAGGED_FRAME = new RegExp(`(file://[^\\s()?]*)\\?${QUERY}=([\\w-]+):(\\d+):(\\d+)`, "g");
+/**
+ * Where an error belongs: the last (outermost) frame of its stack in one of the generation's
+ * files, the top level of the file that was running, not a helper it called in another file; for
+ * a syntax error, the file and line its stack starts with (the caret's column); none for an error
+ * thrown before any file ran (top-level `await`, an import Node cannot find).
+ */
+function placeOf(gen, error) {
+    const stack = isObject(error) && typeof error.stack === "string" ? error.stack : undefined;
+    if (stack === undefined)
+        return undefined;
+    const frame = [...stack.matchAll(TAGGED_FRAME)].findLast(([, , tag]) => tag === gen.id);
+    if (frame) {
+        const [, url, , line, column] = frame;
+        return { file: relPath(gen.root, fileURLToPath(url)), line: Number(line), column: Number(column) };
+    }
+    // A syntax error's stack starts `<path or URL>:<line>`, then the source and a caret under the column.
+    const [first = "", ...lines] = stack.split("\n");
+    const syntax = /^(.+):(\d+)$/.exec(first);
+    const path = syntax && (syntax[1].startsWith("file:") ? fileURLToPath(syntax[1]) : syntax[1]);
+    if (syntax && path && isAbsolute(path) && inside(gen.root, path)) {
+        const caret = lines.slice(0, lines.indexOf("")).findLast((line) => /^\s*\^+\s*$/.test(line));
+        return { file: relPath(gen.root, path), line: Number(syntax[2]), ...(caret && { column: caret.indexOf("^") + 1 }) };
+    }
+    return undefined;
+}
+/**
+ * Each company file under `root` a load has read, and each one's folder, with its stamp
+ * (`stampOf`) as it was before the file was read: the latest generation's for a file several
+ * read. Taken after a load, it still says what the load read, so a file changed while it read is
+ * found changed after.
+ */
+export function stampsOf(root) {
+    const stamps = new Map();
+    if (!existsSync(root))
+        return stamps;
+    const real = realpathSync(root);
+    // In the order made: a later generation's stamp is the newer.
+    for (const gen of registry.generations.values()) {
+        if (gen.root === real)
+            for (const [path, stamp] of gen.stamps)
+                stamps.set(path, stamp);
+    }
+    return stamps;
+}
+const byOrder = (a, b) => (a < b ? -1 : a > b ? 1 : 0);
+/** A file's size and modification time, or that it is gone: what a generation keeps of each file it read. */
+export function stampOf(path) {
+    const stat = statSync(path, { bigint: true, throwIfNoEntry: false });
+    return stat ? `${stat.size} ${stat.mtimeNs}` : "gone";
+}
+/** True while each path's stamp (`stampOf`) is still the one kept. */
+export function fresh(stamps) {
+    for (const [path, stamp] of stamps)
+        if (stampOf(path) !== stamp)
+            return false;
+    return true;
+}
+/** Records a file of the generation, and its directory, as they are now: before it is read, so an edit after is seen. */
+function touch(gen, file) {
+    for (const path of [file, dirname(file)])
+        if (!gen.stamps.has(path))
+            gen.stamps.set(path, stampOf(path));
+}
+/**
+ * The generation of `root` and these constructors: the current one while nothing it stamped
+ * changed, else a new one. A generation of `root` whose files changed goes, whatever its
+ * constructors, so `stampsOf` never keeps the stamps of one no load will make again.
+ */
+function generationOf(root, connectors, types) {
+    const packages = connectors.flatMap((c) => {
+        const { id, info } = c[VENDOR];
+        return info?.package ? [`${info.package}/resources`, id] : [];
+    });
+    const typesKey = [...packages, ...[...types.values()].map(idOf)].join(" ");
+    let current;
+    for (const gen of registry.generations.values()) {
+        if (gen.root !== root)
+            continue;
+        if (!fresh(gen.stamps))
+            registry.generations.delete(gen.id);
+        else if (gen.typesKey === typesKey)
+            current = gen;
+    }
+    if (current !== undefined)
+        return current;
+    const gen = {
+        id: String(++registry.seq),
+        root,
+        typesKey,
+        virtual: new Map(),
+        stamps: new Map(),
+        made: [],
+        imported: new Set(),
+        loaded: new Map(),
+        reported: new Map(),
+        answers: new WeakMap(),
+    };
+    gen.virtual = runtimeModules(gen, connectors, types);
+    registry.generations.set(gen.id, gen);
+    return gen;
+}
+function idOf(object) {
+    let id = registry.ids.get(object);
+    if (id === undefined)
+        registry.ids.set(object, (id = ++registry.seq));
+    return id;
+}
+/** The runtime's modules a generation serves its files, by specifier: each constructor wrapped to record where it was called. */
+function runtimeModules(gen, connectors, types) {
+    const byVendor = new Map();
+    for (const resource of types.values()) {
+        const constructors = byVendor.get(resource.vendor) ?? {};
+        // Frame 2 of `callerFile` is the wrapper's caller: the company file.
+        constructors[resource.type] = (fields, options) => record(gen, callerFile(), resource(fields, options), refersIn(fields));
+        byVendor.set(resource.vendor, constructors);
+    }
+    // A type the vendor does not declare is refused where it is called for, as `<vendor>.<type>`;
+    // an object's own names (`toString`, `toJSON`) are not types, so printing the vendor still works.
+    const constructorsOf = (vendor) => new Proxy(byVendor.get(vendor) ?? {}, {
+        get(target, key) {
+            if (typeof key !== "string" || key in target || key === "toJSON")
+                return Reflect.get(target, key);
+            const known = Object.keys(target);
+            throw new TypeError(`${vendor} has no resource type ${key}: its types are ${known.join(", ") || "none"}`);
+        },
+    });
+    const modules = new Map();
+    for (const connector of connectors) {
+        const { id, info } = connector[VENDOR];
+        if (info?.package)
+            modules.set(`${info.package}/resources`, { [id]: constructorsOf(id) });
+    }
+    for (const entry of SECRET_ENTRIES)
+        modules.set(entry, { sanoma: constructorsOf("sanoma"), secret });
+    const collection = (declaration) => {
+        const file = callerFile();
+        return record(gen, file, collectionIn(file === undefined ? undefined : appOfPath(relPath(gen.root, file)), declaration));
+    };
+    for (const entry of DATA_ENTRIES)
+        modules.set(entry, { collection });
+    const site = (definition) => record(gen, callerFile(), defineSite(definition));
+    for (const entry of SITE_ENTRIES)
+        modules.set(entry, { defineSite: site });
+    const app = (definition) => record(gen, callerFile(), defineApp(definition));
+    for (const entry of APP_ENTRIES)
+        modules.set(entry, { defineApp: app });
+    return modules;
+}
+/** Records where `value` was made, and returns it. */
+function record(gen, file, value, refers = {}) {
+    gen.made.push(value);
+    registry.made.set(value, { file: file === undefined ? "" : relPath(gen.root, file), seq: gen.made.length, refers });
+    return value;
+}
+/** Each declared resource in a constructor's fields, by its dotted path, as the constructor walks them. */
+function refersIn(value, at = "", into = {}) {
+    if (isDeclared(value))
+        into[at] = value;
+    else if (Array.isArray(value))
+        value.forEach((item, i) => refersIn(item, joinPath(at, String(i)), into));
+    else if (isObject(value))
+        for (const [field, item] of Object.entries(value))
+            refersIn(item, joinPath(at, field), into);
+    return into;
+}
+/** True for an app's `apps/<app>/app.ts`, by URL. */
+const isAppFile = (gen, url) => {
+    const [top, app, file, ...rest] = relPath(gen.root, fileURLToPath(url)).split("/");
+    return top === APPS_DIR && app !== undefined && file === "app.ts" && !rest.length;
+};
+/** The generation a module URL belongs to: the query on a company file's, the first segment of the loader's own. */
+function tagOf(url) {
+    if (url?.startsWith("file:"))
+        return new URL(url).searchParams.get(QUERY);
+    if (url?.startsWith(SCHEME))
+        return url.slice(SCHEME.length, url.indexOf("/"));
+    return null;
+}
+/**
+ * Registers the loader's hooks, once per process (the registry's flag, for two copies of the
+ * package). A file of a generation resolves the runtime's modules to the generation's, and each
+ * company file (under the root, outside `node_modules`) to itself tagged with the generation,
+ * recorded and stamped; an entry is a module exporting the tagged file's namespace as `ns`, since
+ * `require` of a `file:` URL drops its query (the CommonJS loader keys by file name).
+ */
+function hook() {
+    if (registry.hooked)
+        return;
+    registry.hooked = true;
+    registerHooks({
+        resolve(specifier, context, next) {
+            if (specifier.startsWith(SCHEME))
+                return { url: specifier, shortCircuit: true };
+            const tag = tagOf(context.parentURL);
+            const gen = tag === null ? undefined : registry.generations.get(tag);
+            if (gen === undefined)
+                return next(specifier, context);
+            if (gen.virtual.has(specifier) &&
+                (!APP_ENTRIES.has(specifier) || (context.parentURL.startsWith("file:") && isAppFile(gen, context.parentURL)))) {
+                return { url: `${SCHEME}${gen.id}/${specifier}`, shortCircuit: true };
+            }
+            const resolved = next(specifier, context);
+            if (!resolved.url.startsWith("file:"))
+                return resolved;
+            const url = new URL(resolved.url);
+            const file = fileURLToPath(url);
+            if (!inside(gen.root, file) || file.split(sep).includes("node_modules"))
+                return resolved;
+            touch(gen, file);
+            gen.imported.add(relPath(gen.root, file));
+            url.searchParams.set(QUERY, gen.id);
+            return { ...resolved, url: url.href };
+        },
+        load(url, context, next) {
+            if (!url.startsWith(SCHEME))
+                return next(url, context);
+            const tag = tagOf(url);
+            const rest = url.slice(url.indexOf("/") + 1);
+            if (rest.startsWith("file:")) {
+                const target = new URL(rest);
+                target.searchParams.set(QUERY, tag);
+                return { format: "module", source: `export * as ns from ${JSON.stringify(target.href)};`, shortCircuit: true };
+            }
+            // Read from the registry by the module itself, so a company file gets the generation's own objects.
+            const from = `globalThis[Symbol.for("sanoma.load")].generations.get(${JSON.stringify(tag)}).virtual.get(${JSON.stringify(rest)})`;
+            const names = Object.keys(registry.generations.get(tag)?.virtual.get(rest) ?? {});
+            const source = [
+                `const m = ${from};`,
+                ...names.map((name, i) => `const e${i} = m[${JSON.stringify(name)}];\nexport { e${i} as ${JSON.stringify(name)} };`),
+            ].join("\n");
+            return { format: "module", source, shortCircuit: true };
+        },
+    });
+}
+//# sourceMappingURL=load.js.map

package/dist/load.js.map

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

package/dist/lockfile.d.ts

@@ -1,3 +1,4 @@
+import { type ConnectionRef } from "./connection.ts";
 import type { ResourceProblem } from "./resources.ts";
 /** Where the lockfile is, relative to the config's root. */
 export declare const LOCKFILE = "resources/sanoma.lock.json";
@@ -5,6 +6,7 @@ export declare const LOCKFILE = "resources/sanoma.lock.json";
 export interface Binding {
     type: string;
     id: string;
+    connection?: ConnectionRef;
 }
 /** The lockfile's content: by declaration key, `<file>#<export>` (the file relative to the config's root, with `/`). */
 export type Bindings = Record<string, Binding>;

package/dist/lockfile.js

@@ -1,3 +1,4 @@
+import { connectionRefSchema } from "./connection.js";
 import { existsSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { z } from "zod";
@@ -5,7 +6,11 @@ import { z } from "zod";
 // hold intent only), as `package-lock.json` is from `package.json`. Only apply writes it.
 /** Where the lockfile is, relative to the config's root. */
 export const LOCKFILE = "resources/sanoma.lock.json";
-const lockfile = z.record(z.string().regex(/^resources\/[^#]+#[^#]+$/), z.strictObject({ type: z.string().regex(/^[^.\s]+\.[^.\s]+$/), id: z.string().min(1) }));
+const lockfile = z.record(z.string().regex(/^resources\/[^#]+#[^#]+$/), z.strictObject({
+    type: z.string().regex(/^[^.\s]+\.[^.\s]+$/),
+    id: z.string().min(1),
+    connection: connectionRefSchema.optional(),
+}));
 /**
  * The lockfile under `root`: no bindings when there is none, and no bindings with a problem when
  * it is not JSON or not a map of `<file>#<export>` to `{ type, id }`.
@@ -35,7 +40,7 @@ export function readLockfile(root) {
 export function serializeLockfile(bindings) {
     const sorted = Object.entries(bindings)
         .toSorted(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))
-        .map(([key, { type, id }]) => [key, { type, id }]);
+        .map(([key, { type, id, connection }]) => [key, { type, id, ...(connection && { connection }) }]);
     return `${JSON.stringify(Object.fromEntries(sorted), null, 2)}\n`;
 }
 /** Writes the lockfile under `root` whole or not at all: to a file beside it, then renamed over it. Apply only. */
@@ -61,7 +66,7 @@ export function diffLockfiles(before, after) {
             return was ? [{ key, type: was.type, kind: "unbind", from: was.id }] : [];
         if (!was)
             return [{ key, type: now.type, kind: "bind", to: now.id }];
-        if (was.id === now.id && was.type === now.type)
+        if (was.id === now.id && was.type === now.type && JSON.stringify(was.connection) === JSON.stringify(now.connection))
             return [];
         return [{ key, type: now.type, kind: "rebind", from: was.id, to: now.id }];
     });

package/dist/lockfile.js.map

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

package/dist/op.d.ts

@@ -1,3 +1,6 @@
+import type { Principal } from "./define.ts";
+import type { Authentication, CallAuthentication } from "./authentication.ts";
+import type { ConnectionSnapshot } from "./connection.ts";
 import type { ProviderV4 } from "@ai-sdk/provider";
 import type { z } from "zod";
 import type { Fake } from "./fake.ts";
@@ -39,6 +42,8 @@ export interface OpSpec<I extends z.ZodType = z.ZodType, O extends z.ZodType = z
      * (a resource type's `handle`): the ledger records each as `"<name>"`, never its value.
      */
     opaque?: readonly string[];
+    /** Logical destinations this operation may create with Secrets.ensure, derived from its authorized input. */
+    createsSecrets?: (input: any) => readonly string[];
 }
 /** One vendor operation, such as `ghost.post.publish`. Declares the contract only; drivers implement it. */
 export interface Op<V extends string = string, R extends string = string, N extends string = string, I = any, O = any> {
@@ -59,6 +64,7 @@ export interface Op<V extends string = string, R extends string = string, N exte
     };
     /** From the spec: fields the ledger records by name only. */
     readonly opaque?: readonly string[];
+    readonly createsSecrets?: (input: any) => readonly string[];
     readonly input: z.ZodType<any, I>;
     readonly output: z.ZodType<O>;
 }
@@ -100,7 +106,7 @@ export type Connector<V extends string, S extends Specs> = {
  * and `resolveConfig` reads only a record of its own shape (`checkConnector`): change it with
  * the record, so a build refuses a connector another build made in another shape.
  */
-export declare const CONNECTOR_FORMAT = 1;
+export declare const CONNECTOR_FORMAT = 3;
 /**
  * A connector's vendor: its id, who it is (`defineConnector`'s third argument, for a UI), its
  * resource types, and the driver and fake its package attaches (`withSetup`).
@@ -152,6 +158,12 @@ export declare function defineConnector<const V extends string, const S extends
  * not repeat the side effect.
  */
 export interface CallContext {
+    /** Authenticated initiating principal; never supplied by operation input. */
+    principal?: Principal;
+    /** Authorized account metadata. Credential material stays inside the driver boundary. */
+    connection?: ConnectionSnapshot;
+    /** Resolved after policy, for this call alone. Never return it from a driver. */
+    authentication?: CallAuthentication;
     idempotencyKey: string;
     runId: string;
     opId: string;
@@ -202,13 +214,15 @@ export declare function retryableStatus(status: number): boolean;
  */
 export type DriverEnv = z.ZodObject<Record<string, z.ZodType<string | undefined, string | undefined>>>;
 /**
- * Implements a vendor's operations, keyed `"resource.name"`. A driver reads its credentials
- * from the environment when it is called, never from the config file; `env` declares them.
+ * Implements a vendor's operations, keyed `"resource.name"`. Named authentication is supplied
+ * in the call context. `env` describes a driver that has not added named-account support.
  */
 export interface Driver {
     readonly vendor: string;
     readonly ops: Readonly<Record<string, DriverFn>>;
     readonly env?: DriverEnv;
+    /** Methods this driver consumes from CallContext.authentication. Others fail closed. */
+    readonly authentication?: readonly string[];
 }
 /**
  * What a connector package attaches to its connector (`withSetup`), for the config's resolver
@@ -219,7 +233,9 @@ export interface Driver {
  * no repository a change is reviewed on.
  */
 export interface ConnectorSetup {
-    /** Makes the live driver, which reads its credentials from the environment when called: once per resolved config. */
+    /** Auth methods available to named connections; login identity is separate. */
+    authentication?: Readonly<Record<string, Authentication>>;
+    /** Makes the live driver once per resolved config; credentials belong to each invocation. */
     driver?: () => Driver;
     /** Makes a fake of the vendor (`defineFake`): once per sandbox run, its own. */
     fake?: () => Fake<any, any>;
@@ -333,7 +349,8 @@ export type OpIdOf<V extends string, S extends Specs> = {
  * connector doesn't declare, is refused here rather than when a run calls it. `options.env`
  * declares the environment variables it reads (see `DriverEnv`).
  */
-export declare function defineDriver<V extends string, S extends Specs>(connector: Connector<V, S>, impl: DriverImpl<S>, options?: {
+export declare function defineDriver<V extends string, S extends Specs>(connector: Connector<V, S>, impl: DriverImpl<S> | ((call: CallContext) => DriverImpl<S>), options?: {
     env?: DriverEnv;
+    authentication?: readonly string[];
 }): Driver;
 export {};

package/dist/op.js

@@ -16,7 +16,7 @@ export const VENDOR = Symbol.for("sanoma.vendor");
  * and `resolveConfig` reads only a record of its own shape (`checkConnector`): change it with
  * the record, so a build refuses a connector another build made in another shape.
  */
-export const CONNECTOR_FORMAT = 1;
+export const CONNECTOR_FORMAT = 3;
 /** One `<svg>` element, with nothing but whitespace around it: what a logo must be. */
 const SVG_ELEMENT = /^\s*<svg[\s>][\s\S]*<\/svg>\s*$/;
 /** Whether `svg` is a logo as `VendorInfo` takes it: one `<svg>…</svg>` element. */
@@ -74,6 +74,7 @@ export function defineConnector(vendor, specs, info) {
                 target: spec.target,
                 phrases: spec.phrases,
                 ...(spec.opaque?.length ? { opaque: spec.opaque } : {}),
+                ...(spec.createsSecrets && { createsSecrets: spec.createsSecrets }),
                 input: spec.input,
                 output: spec.output,
             });
@@ -174,6 +175,18 @@ export function defineDriver(connector, impl, options = {}) {
     }
     const vendor = connector[VENDOR].id;
     const ops = {};
+    if (typeof impl === "function") {
+        // Build clients only once the runtime has authorized and authenticated this invocation.
+        for (const key of declared.keys()) {
+            ops[key] = async (input, call) => defineDriver(connector, impl(call), options).ops[key](input, call);
+        }
+        return Object.freeze({
+            vendor,
+            ops: Object.freeze(ops),
+            ...(options.env && { env: options.env }),
+            ...(options.authentication && { authentication: Object.freeze([...options.authentication]) }),
+        });
+    }
     const extra = [];
     for (const [resource, fns] of Object.entries(impl)) {
         for (const [name, fn] of Object.entries(fns ?? {})) {
@@ -191,6 +204,11 @@ export function defineDriver(connector, impl, options = {}) {
     ];
     if (problems.length)
         throw new Error(`defineDriver("${vendor}"): ${problems.join("; ")}`);
-    return Object.freeze({ vendor, ops: Object.freeze(ops), ...(options.env && { env: options.env }) });
+    return Object.freeze({
+        vendor,
+        ops: Object.freeze(ops),
+        ...(options.env && { env: options.env }),
+        ...(options.authentication && { authentication: Object.freeze([...options.authentication]) }),
+    });
 }
 //# sourceMappingURL=op.js.map