@capybara-hq/kernel 0.1.0-rc.2 → 0.1.0-rc.21

package/dist/extensions/bootstrap.js

@@ -15,6 +15,7 @@ import { parseBootstrapManifest, SDK_VERSION, } from "@capybara-hq/plugin-sdk";
 import { Inject, Injectable, Optional } from "@nestjs/common";
 import { sql } from "kysely";
 import semver from "semver";
+import { otherNameOwner } from "../catalog/ownership.js";
 import { catalogPackageError } from "../catalog/plugin-import.js";
 import { PluginPackageError, readPluginPackage } from "../catalog/plugin-package.js";
 import { ApiError } from "../errors.js";
@@ -56,9 +57,15 @@ import { ExtensionRegistry } from "./registry.js";
  *   until expiry) aborts the run at its next step. "Done" is a `bootstrap_runs` row for the
  *   manifest's sha256 (written with the audit `bootstrap.completed` only when every entry
  *   succeeded; otherwise the next start runs it again, which is idempotent).
+ * - Two passes per start: the first runs before the extensions load (no object store yet), the
+ *   second after them. A `builtin` entry (not required, but builtin in the catalog) is deferred by
+ *   the first pass (`deferBuiltin`: skipped, not a failure; the run is then not recorded and the
+ *   start runs the second pass), so it may ship skills and templates. A required entry is imported
+ *   by the first pass and must succeed; a builtin one that fails is logged like an optional one.
  * - Only entries new to the manifest are installed (Ruling 5): an optional entry that the last
- *   completed run already handled and that is not installed now (an enterprise admin uninstalled
- *   it) stays uninstalled -> `kept`. A required entry is always installed.
+ *   completed run already handled and that is not installed now (a super admin uninstalled
+ *   it) stays uninstalled -> `kept`. A required or builtin entry is always installed (a
+ *   declarative one imported again when its catalog item is gone).
  * - Per entry, by the installed state of its extension:
  *   - not installed (and new, or required): imported into the catalog (source `bootstrap`, ref
  *     `bootstrap:<name>@<version>`, like a marketplace import), installed, approved (snapshot
@@ -66,8 +73,8 @@ import { ExtensionRegistry } from "./registry.js";
  *     and enabled -> `installed`;
  *   - installed from `bootstrap` at a lower version: upgraded the same way (core's release vouched
  *     for the version, so new permissions are pre-approved and audited), keeping the desired state
- *     an enterprise admin chose (a disabled optional plugin stays disabled) -> `upgraded`;
- *   - installed at a higher version, or from another source (an enterprise admin upgraded it), or
+ *     a super admin chose (a disabled optional plugin stays disabled) -> `upgraded`;
+ *   - installed at a higher version, or from another source (a super admin upgraded it), or
  *     the name is config-declared (`declared`: config wins, no install record is created):
  *     untouched, never downgraded -> `kept`;
  *   - a declarative plugin (no extension): imported into the catalog only -> `imported` (`kept`
@@ -83,22 +90,38 @@ import { ExtensionRegistry } from "./registry.js";
  * A failed entry does not stop the others; the run then throws {@link BootstrapFailedError} naming
  * them. The packages are kept in PG (`blob_store = 'pg'`), so installing an extension never needs
  * the object store (object-store-s3 is itself a bootstrap plugin) and the directory and npm are
- * never needed again; a declarative plugin's catalog files do need the object store.
+ * never needed again. A plugin's icons and setup guide files are kept in PG too (`catalog_files`),
+ * so they never need it either; its skills, connector templates and agent templates do (an entry
+ * shipping them fails while no object store runs; an optional one is retried after the extensions
+ * loaded, and a plugin that must be builtin and ships them is a `builtin` entry, which only the
+ * pass after the extensions load imports).
  */
 /** The bootstrap manifest that ships with the kernel package. */
 export const BOOTSTRAP_MANIFEST_FILE = fileURLToPath(new URL("../../bootstrap.json", import.meta.url));
-/** Some entries failed (the others were done); the run is not recorded as done. */
+/**
+ * Some entries failed or were deferred (the others were done); the run is not recorded as done.
+ */
 export class BootstrapFailedError extends Error {
     failures;
     results;
+    deferred;
+    packages;
     /**
      * @param results what the entries that did not fail did (pass them as `carry` to a later run in
      * the same start, so its record keeps `installed` instead of `kept`).
+     * @param deferred the builtin entries a first pass skipped (`deferBuiltin`): not failures, the
+     * later pass of the same start imports them.
+     * @param packages the packages this run obtained, by entry name (pass them as `packages` to the
+     * later pass of the same start, so nothing is downloaded twice).
      */
-    constructor(failures, results = []) {
-        super(`bootstrap failed for ${failures.map((f) => `${f.name}${f.required ? " (required)" : ""}: ${f.message}`).join("; ")}`);
+    constructor(failures, results = [], deferred = [], packages = new Map()) {
+        super(failures.length > 0
+            ? `bootstrap failed for ${failures.map((f) => `${f.name}${f.required ? " (required)" : ""}: ${f.message}`).join("; ")}`
+            : `bootstrap deferred the builtin plugins ${deferred.join(", ")} to the pass after the extensions load`);
         this.failures = failures;
         this.results = results;
+        this.deferred = deferred;
+        this.packages = packages;
         this.name = "BootstrapFailedError";
     }
     /** A required entry failed: the kernel must not serve without it. */
@@ -124,7 +147,8 @@ const integrityOf = (bytes) => `sha512-${createHash("sha512").update(bytes).dige
  * file there has that sha512, else (a `source: "npm"` entry) downloaded from the npm registry and
  * verified against the pin (the packument's `dist.integrity` is not consulted). Throws an
  * {@link ApiError} naming the plugin for the first entry it cannot obtain
- * (`bootstrap.missing_file`, `bootstrap.download_failed`, `bootstrap.integrity_mismatch`).
+ * (`bootstrap.missing_file`, `bootstrap.download_failed`, `bootstrap.integrity_mismatch`), except
+ * for the `soft` entries (recorded in `failed`, left out of the result).
  */
 export async function resolveBootstrapPackages(manifest, o) {
     const out = new Map();
@@ -137,11 +161,20 @@ export async function resolveBootstrapPackages(manifest, o) {
     const where = o.dir !== undefined ? o.dir : "the bootstrap directory (config bootstrap.dir)";
     for (const e of manifest.plugins) {
         signal.throwIfAborted();
-        const found = offline.get(e.integrity);
-        if (found !== undefined) {
-            out.set(e.name, found);
-            continue;
+        try {
+            out.set(e.name, await obtain(e));
         }
+        catch (err) {
+            if (signal.aborted || !(err instanceof ApiError) || o.soft?.(e) !== true)
+                throw err;
+            o.failed?.set(e.name, err);
+        }
+    }
+    return out;
+    async function obtain(e) {
+        const found = offline.get(e.integrity);
+        if (found !== undefined)
+            return found;
         if (e.source === "workspace") {
             throw new ApiError("bootstrap.missing_file", `Bootstrap plugin ${e.name} ${e.version}: no file in ${where} has its pinned sha512 (${e.integrity.slice(0, 19)}…), and a workspace entry cannot be downloaded; put its package tgz (pnpm pack-plugin ${e.path}) in that directory`);
         }
@@ -149,7 +182,7 @@ export async function resolveBootstrapPackages(manifest, o) {
         const offlineHint = `to install offline, put the package tgz (npm pack ${e.npm}@${e.version}, any file name) in ${where}`;
         try {
             const r = await fetchPackage({ registry: npmRegistry, ...(npmToken !== undefined && { token: npmToken }), maxBytes }, e.npm, e.version, signal, { expectedIntegrity: e.integrity });
-            out.set(e.name, r.bytes);
+            return r.bytes;
         }
         catch (err) {
             if (signal.aborted)
@@ -165,7 +198,6 @@ export async function resolveBootstrapPackages(manifest, o) {
             throw new ApiError("bootstrap.download_failed", `Bootstrap plugin ${e.name} ${e.version}: cannot download ${e.npm}@${e.version} from ${registry} (${reason}); ${offlineHint}, or set packages.npmRegistry to a reachable mirror`);
         }
     }
-    return out;
 }
 /** The registry's origin, for messages (never its credentials or path). */
 function registryOrigin(registry) {
@@ -294,19 +326,47 @@ let BootstrapService = class BootstrapService {
             const done = await recorded();
             if (done)
                 return done;
-            // Every package is obtained and checked before the first write
-            const files = await resolveBootstrapPackages(o.manifest, {
+            const deferBuiltin = o.deferBuiltin === true;
+            const isDeferred = (e) => deferBuiltin && e.builtin === true;
+            // Every package is obtained and checked before the first write (a deferred entry's by the
+            // later pass). The first pass refuses to write anything when one is missing or tampered;
+            // the later pass only fails that entry unless it is required.
+            const files = new Map();
+            const fetchFailed = new Map();
+            const toObtain = [];
+            for (const e of o.manifest.plugins) {
+                if (isDeferred(e))
+                    continue;
+                const kept = o.packages?.get(e.name);
+                if (kept !== undefined && integrityOf(kept) === e.integrity)
+                    files.set(e.name, kept);
+                else
+                    toObtain.push(e);
+            }
+            const obtained = await resolveBootstrapPackages({ ...o.manifest, plugins: toObtain }, {
                 ...(o.dir !== undefined && { dir: o.dir }),
                 config: this.config(),
                 signal,
                 log: this.log,
+                ...(!deferBuiltin && { soft: (e) => !e.required, failed: fetchFailed }),
             });
+            for (const [name, bytes] of obtained)
+                files.set(name, bytes);
             const handled = await this.lastRunNames();
             const results = [];
             const failures = [];
+            const deferred = [];
             for (const e of o.manifest.plugins) {
                 signal.throwIfAborted();
+                if (isDeferred(e)) {
+                    deferred.push(e.name);
+                    continue;
+                }
+                await this.warnIfHeld(e);
                 try {
+                    const fetchErr = fetchFailed.get(e.name);
+                    if (fetchErr !== undefined)
+                        throw fetchErr;
                     const r = await this.entry(e, files.get(e.name), handled, o.imports);
                     results.push(carried(r, o.carry));
                 }
@@ -315,6 +375,7 @@ let BootstrapService = class BootstrapService {
                         plugin: e.name,
                         version: e.version,
                         required: e.required,
+                        ...(e.builtin === true && { builtin: true }),
                         err,
                     });
                     failures.push({
@@ -326,14 +387,32 @@ let BootstrapService = class BootstrapService {
                 }
             }
             results.push(...(await this.clearRemoved(o.manifest)));
-            if (failures.length > 0)
-                throw new BootstrapFailedError(failures, results);
+            if (failures.length > 0 || deferred.length > 0) {
+                throw new BootstrapFailedError(failures, results, deferred, files);
+            }
             signal.throwIfAborted();
             await this.recordDone(manifestSha256, results);
             this.log.info("bootstrap completed", { manifestSha256, results });
             return { manifestSha256, results };
         });
     }
+    /**
+     * A pin whose plugin name an org holds (a live org-owned catalog item): the bootstrap takes no
+     * name over (ruling P3-28), so the entry fails; this warning tells the super admin why and
+     * which org holds it (final review M4).
+     */
+    async warnIfHeld(e) {
+        const holder = await otherNameOwner(this.db, e.name, null);
+        if (holder?.kind !== "org")
+            return;
+        this.log.warn("bootstrap: the plugin name is held by an organization; the entry cannot take it over until the organization renames or deletes its plugin", {
+            plugin: e.name,
+            version: e.version,
+            required: e.required,
+            ownerOrgId: holder.orgId,
+            ownerOrg: holder.name,
+        });
+    }
     /** The `bootstrap_runs` row and the `bootstrap.completed` audit, in one transaction. */
     async recordDone(manifestSha256, results) {
         await this.db
@@ -399,10 +478,15 @@ let BootstrapService = class BootstrapService {
         const ref = `bootstrap:${e.name}@${e.version}`;
         // Not new to the manifest: an optional entry left out on purpose stays out (Ruling 5)
         const isNew = handled === undefined || !handled.has(e.name);
+        // Required and builtin entries are builtin in the catalog and put back when missing
+        const builtin = e.required || e.builtin === true;
         if (!pkg.manifest.extension) {
-            if (!isNew)
+            await this.markBuiltin(e.name, builtin);
+            if (!isNew && !(builtin && !(await this.hasLiveItem(e.name)))) {
                 return { name: e.name, action: "kept", version: e.version };
+            }
             const imported = await this.importOnly(e, bytes, ref, imports);
+            await this.markBuiltin(e.name, builtin);
             return { name: e.name, action: imported ? "imported" : "kept", version: e.version };
         }
         if (this.registry.declared().has(e.name)) {
@@ -414,20 +498,21 @@ let BootstrapService = class BootstrapService {
             .select(["version", "source", "required", "desired_state", "sha256"])
             .where("name", "=", e.name)
             .executeTakeFirst();
-        if (!row && !isNew && !e.required) {
+        if (!row && !isNew && !builtin) {
             this.log.info("bootstrap: an optional plugin that is not installed stays uninstalled", {
                 plugin: e.name,
             });
             return { name: e.name, action: "kept", version: e.version };
         }
         let result;
+        let leftDisabled;
         if (!row) {
-            await this.deploy(e, bytes, ref, true, imports);
+            leftDisabled = await this.deploy(e, bytes, ref, true, imports);
             result = { name: e.name, action: "installed", version: e.version };
         }
         else if (row.source === "bootstrap" && isLower(row.version, e.version)) {
             // The desired state the admin chose is kept; a required plugin is enabled below anyway
-            await this.deploy(e, bytes, ref, row.desired_state === "enabled", imports);
+            leftDisabled = await this.deploy(e, bytes, ref, row.desired_state === "enabled", imports);
             result = { name: e.name, action: "upgraded", version: e.version };
         }
         else {
@@ -449,9 +534,57 @@ let BootstrapService = class BootstrapService {
         }
         // A required install must run on the deployment (an org cannot use it otherwise)
         if (e.required && row?.desired_state === "disabled") {
-            await this.ops.enable(e.name, null);
+            leftDisabled = await this.enableOrWarn(e);
         }
-        return result;
+        await this.markBuiltin(e.name, builtin);
+        return leftDisabled === undefined ? result : { ...result, leftDisabled };
+    }
+    /** Whether a live (not deleted) platform catalog item has this name. */
+    async hasLiveItem(name) {
+        const row = await this.db
+            .selectFrom("catalog_items")
+            .select("id")
+            .where("name", "=", name)
+            .where("owner_org_id", "is", null)
+            .where("deleted_at", "is", null)
+            .executeTakeFirst();
+        return row !== undefined;
+    }
+    /**
+     * The catalog item of a bootstrap entry follows `required` / `builtin`: such an entry is builtin,
+     * offered to every org (scope `all`, which an org admin cannot switch off) and not disabled
+     * (migration 0075 could leave a required plugin disabled); an entry that stops being required or
+     * builtin is no longer builtin and keeps scope `all` (the admin may change it from then on).
+     * Only the platform item: an org-owned item of the same name (the entry then fails with
+     * `plugin.name_taken`) is never touched.
+     */
+    async markBuiltin(name, builtin) {
+        const touch = { updated_at: sql `now()` };
+        if (builtin) {
+            await this.db
+                .updateTable("catalog_items")
+                .set({
+                builtin: true,
+                scope: "all",
+                disabled: false,
+                scope_version: sql `scope_version + 1`,
+                ...touch,
+            })
+                .where("name", "=", name)
+                .where("owner_org_id", "is", null)
+                .where("deleted_at", "is", null)
+                .where((eb) => eb.or([eb("builtin", "=", false), eb("scope", "<>", "all"), eb("disabled", "=", true)]))
+                .execute();
+            return;
+        }
+        await this.db
+            .updateTable("catalog_items")
+            .set({ builtin: false, ...touch })
+            .where("name", "=", name)
+            .where("owner_org_id", "is", null)
+            .where("deleted_at", "is", null)
+            .where("builtin", "=", true)
+            .execute();
     }
     /** A declarative plugin: catalog only. Returns false when that version is already imported. */
     async importOnly(e, bytes, ref, imports) {
@@ -461,10 +594,7 @@ let BootstrapService = class BootstrapService {
                 ref,
                 integrity: e.integrity,
             });
-            await imports.confirm(null, stagingId, {
-                reviewHash: review.reviewHash,
-                deployExtension: false,
-            });
+            await imports.confirm(null, stagingId, { reviewHash: review.reviewHash });
             return true;
         }
         catch (err) {
@@ -474,7 +604,7 @@ let BootstrapService = class BootstrapService {
         }
     }
     /**
-     * Imports, approves, installs and enables (one review, confirmed with `deployExtension`). When
+     * Imports, approves, installs and enables (one review; its confirm deploys the extension). When
      * the catalog already has this version (an earlier run stopped after importing, or the same
      * package came from a marketplace), the extension is deployed from the package store instead.
      */
@@ -489,19 +619,25 @@ let BootstrapService = class BootstrapService {
         }
         catch (err) {
             if (err instanceof ApiError && err.code === "catalog.version_exists") {
-                await this.deployFromStore(e, bytes, ref, enable);
-                return;
+                return this.deployFromStore(e, bytes, ref, enable);
             }
             throw err;
         }
         const r = await imports.confirm(null, staged.stagingId, {
             reviewHash: staged.review.reviewHash,
-            deployExtension: true,
             enable,
         });
         if (r.deploy?.result === "failed") {
             throw new ApiError((r.deploy.code ?? "internal"), r.deploy.message ?? `installing extension ${e.name} failed`);
         }
+        if (r.deploy?.singleProvider !== undefined) {
+            return this.leftDisabled(e, {
+                code: r.deploy.code,
+                message: r.deploy.message,
+                singleProvider: r.deploy.singleProvider,
+            });
+        }
+        return undefined;
     }
     /** The extension of a catalog version already imported: ingest, approve, install (, enable). */
     async deployFromStore(e, bytes, ref, enable) {
@@ -521,11 +657,42 @@ let BootstrapService = class BootstrapService {
             .selectFrom("catalog_items")
             .select("id")
             .where("name", "=", e.name)
+            .where("owner_org_id", "is", null)
             .where("deleted_at", "is", null)
             .executeTakeFirst();
-        await this.ops.install(e.name, review.sha256, null, undefined, item ? { catalogItemId: item.id } : {});
-        if (enable)
-            await this.ops.enable(e.name, null);
+        const installed = await this.ops.install(e.name, review.sha256, null, undefined, item ? { catalogItemId: item.id } : {});
+        // An upgrade newly providing a held single-provider point is left disabled by the install
+        if (installed.leftDisabled !== undefined)
+            return this.leftDisabled(e, installed.leftDisabled);
+        return enable ? this.enableOrWarn(e) : undefined;
+    }
+    /**
+     * Enables a bootstrap extension unless another enabled extension provides one of its
+     * single-provider extension points (see {@link leftDisabled}).
+     */
+    async enableOrWarn(e) {
+        const r = await this.ops.enableUnlessOccupied(e.name, null);
+        return r.enabled ? undefined : this.leftDisabled(e, r.note);
+    }
+    /**
+     * A bootstrap extension left disabled because another enabled extension holds a single-provider
+     * extension point it provides. An optional preinstall (a sandbox while the super admin runs
+     * another one) stays disabled with a warning, and the entry's result says so. A required entry
+     * fails (thrown, so the run is not recorded done, `capybara bootstrap` exits 1 and
+     * `capybara start` refuses to serve): the deployment cannot run without it, and only the super
+     * admin can free the point, by disabling the other provider and running the bootstrap again.
+     */
+    leftDisabled(e, note) {
+        const block = note.singleProvider;
+        if (e.required) {
+            const other = block.enabled.name;
+            throw new ApiError(note.code, `Required plugin ${e.name} provides ${block.extensionPoint}, which ${other} already provides; disable ${other} and run the bootstrap again`, [block]);
+        }
+        this.log.warn(`bootstrap: the plugin is installed disabled; ${note.message}`, {
+            plugin: e.name,
+            required: e.required,
+        });
+        return note;
     }
     /** The permission snapshot of a stored package (source `bootstrap`), under the approve lock. */
     async approveStored(e, set, sha256) {
@@ -552,6 +719,18 @@ let BootstrapService = class BootstrapService {
         if (names.length > 0)
             q = q.where("name", "not in", names);
         const rows = await q.returning(["name", "version"]).execute();
+        for (const r of rows)
+            await this.markBuiltin(r.name, false);
+        // A declarative plugin has no install record: clear builtin by catalog name
+        let items = this.db
+            .updateTable("catalog_items")
+            .set({ builtin: false, updated_at: sql `now()` })
+            .where("builtin", "=", true)
+            .where("owner_org_id", "is", null)
+            .where("deleted_at", "is", null);
+        if (names.length > 0)
+            items = items.where("name", "not in", names);
+        await items.execute();
         return rows.map((r) => ({ name: r.name, action: "required_cleared", version: r.version }));
     }
 };

package/dist/extensions/cli.d.ts

@@ -54,6 +54,18 @@ export interface ExtensionCli {
     publishChanged(plugin: string): Promise<boolean>;
     close(): Promise<void>;
 }
+/**
+ * The effective deployment config (the startup config `fileValue` completed by the `stored` PG
+ * fields) parsed as the host's load gate does: overridable fields may stay empty (spec A §5.4a),
+ * hidden and read-only ones must be complete.
+ */
+export declare function parseDeploymentConfig(schema: z.ZodTypeAny, stored: Record<string, unknown>, fileValue: unknown): {
+    ok: true;
+    value: unknown;
+} | {
+    ok: false;
+    issues: ConfigIssue[];
+};
 /**
  * The CLI's extension management context (C18, F-Q): a Nest application context with
  * the extensions module over the database and a lazy Redis connection used only for publishing

package/dist/extensions/cli.js

@@ -13,7 +13,17 @@ import { ExtensionsModule } from "./extensions.module.js";
 import { ExtensionHost } from "./host.js";
 import { ExtensionInstalls } from "./installs.js";
 import { PLUGINS_CHANGED_TOPIC } from "./lifecycle-topics.js";
+import { parseLoadGate } from "./org-levels.js";
 import { ExtensionPackageError, extensionPackageApiError, permissionSetOfPackage, readExtensionPackage, } from "./package.js";
+/**
+ * The effective deployment config (the startup config `fileValue` completed by the `stored` PG
+ * fields) parsed as the host's load gate does: overridable fields may stay empty (spec A §5.4a),
+ * hidden and read-only ones must be complete.
+ */
+export function parseDeploymentConfig(schema, stored, fileValue) {
+    const r = parseLoadGate(schema, mergeDeploymentConfig(stored, fileValue, schemaFields(schema).map((f) => f.path)));
+    return r.success ? { ok: true, value: r.data } : { ok: false, issues: toIssues(r.error) };
+}
 /**
  * The CLI's extension management context (C18, F-Q): a Nest application context with
  * the extensions module over the database and a lazy Redis connection used only for publishing
@@ -44,8 +54,7 @@ export async function openExtensionCli(config, log, opts = {}) {
         const stored = await readStoredDeploymentConfig(db.db, keyring, name, {
             secretPaths: secretPathsOf(schemaFields(schema)),
         });
-        const r = schema.safeParse(mergeDeploymentConfig(stored, config.extensionConfig[name], schemaFields(schema).map((f) => f.path)));
-        return r.success ? { ok: true, value: r.data } : { ok: false, issues: toIssues(r.error) };
+        return parseDeploymentConfig(schema, stored, config.extensionConfig[name]);
     };
     const configIssues = new Map();
     const deploymentConfigs = new Map();

package/dist/extensions/config-hash.d.ts

@@ -0,0 +1,10 @@
+import type { core } from "zod";
+/**
+ * 插件部署配置（校验后）中非密钥部分的摘要：先把 schema 里所有 secret 叶子（`configFields` 可达路径，
+ * 加载时 `assertSecretsReachable` 已保证密钥都在这些路径上）换成固定占位值，再取 sha256(键排序 JSON) 前 16 位十六进制。
+ * 给需要「配置变了就失效」的缓存键用（如模型列表）。密钥不参与摘要：不加盐的短摘要写进 Redis 键名后，
+ * 低熵密钥可被离线猜测、泄露的密钥可被确认；代价是轮换密钥不会让缓存失效（缓存内容本来就不该依赖密钥）。
+ * 没有部署配置 schema 时无从得知哪些是密钥，摘要不按配置区分。同一份配置在各副本上得到同一摘要。
+ * 函数自己按 schema 遮蔽，调用方不必（也不能忘记）先打码。
+ */
+export declare function deploymentConfigHash(schema: core.$ZodType | undefined, config: unknown): string;

package/dist/extensions/config-hash.js

@@ -0,0 +1,38 @@
+import { createHash } from "node:crypto";
+import { configFields, getPath, setPath } from "../config/fields.js";
+/** 键排序后的 JSON（对象键顺序不影响结果）；undefined 字段与 JSON.stringify 一样省略。 */
+const canonicalJson = (v) => {
+    if (Array.isArray(v))
+        return `[${v.map((x) => (x === undefined ? "null" : canonicalJson(x))).join(",")}]`;
+    if (v !== null && typeof v === "object") {
+        const entries = Object.entries(v)
+            .filter(([, x]) => x !== undefined)
+            .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0));
+        return `{${entries.map(([k, x]) => `${JSON.stringify(k)}:${canonicalJson(x)}`).join(",")}}`;
+    }
+    return JSON.stringify(v) ?? "null";
+};
+/** 遮蔽 secret 字段后参与摘要的固定占位值。 */
+const SECRET_PLACEHOLDER = "<secret>";
+/**
+ * 插件部署配置（校验后）中非密钥部分的摘要：先把 schema 里所有 secret 叶子（`configFields` 可达路径，
+ * 加载时 `assertSecretsReachable` 已保证密钥都在这些路径上）换成固定占位值，再取 sha256(键排序 JSON) 前 16 位十六进制。
+ * 给需要「配置变了就失效」的缓存键用（如模型列表）。密钥不参与摘要：不加盐的短摘要写进 Redis 键名后，
+ * 低熵密钥可被离线猜测、泄露的密钥可被确认；代价是轮换密钥不会让缓存失效（缓存内容本来就不该依赖密钥）。
+ * 没有部署配置 schema 时无从得知哪些是密钥，摘要不按配置区分。同一份配置在各副本上得到同一摘要。
+ * 函数自己按 schema 遮蔽，调用方不必（也不能忘记）先打码。
+ */
+export function deploymentConfigHash(schema, config) {
+    let redacted = null;
+    if (schema) {
+        redacted = structuredClone(config);
+        if (redacted !== null && typeof redacted === "object") {
+            for (const f of configFields(schema)) {
+                if (f.meta?.secret && getPath(redacted, f.path) !== undefined) {
+                    setPath(redacted, f.path, SECRET_PLACEHOLDER);
+                }
+            }
+        }
+    }
+    return createHash("sha256").update(canonicalJson(redacted)).digest("hex").slice(0, 16);
+}

package/dist/extensions/config-issues.d.ts

@@ -1,7 +1,19 @@
 import type { z } from "zod";
 /** 校验失败的单条原因：只含路径与按 issue 类型生成的说明，不回显字段值。 */
 export interface ConfigIssue {
+    /** The path joined with dots (`""` = the root); ambiguous when a key contains a dot. */
     path: string;
+    /** The zod path unjoined (record keys such as endpoint names may contain dots). */
+    segments: (string | number)[];
     message: string;
+    /**
+     * A custom issue whose `params.ui` names a key of the schema's root `x-ui.messages`: the form
+     * shows that localized message (spec §4.4). Never zod's own custom text.
+     */
+    messageKey?: string;
 }
-export declare function toIssues(error: z.ZodError): ConfigIssue[];
+/**
+ * The issues of a failed config parse. `messages` is the root `x-ui.messages` of the schema's
+ * form JSON Schema (`configMessages`): custom issues naming one of its keys get `messageKey`.
+ */
+export declare function toIssues(error: z.ZodError, messages?: Record<string, unknown>): ConfigIssue[];

package/dist/extensions/config-issues.js

@@ -23,9 +23,26 @@ function issueMessage(i) {
             return "invalid value";
     }
 }
-export function toIssues(error) {
-    return error.issues.map((i) => ({
-        path: i.path.map(String).join("."),
-        message: issueMessage(i),
-    }));
+/** The `params.ui` of a custom issue when it names one of `messages` (own keys only). */
+function messageKeyOf(i, messages) {
+    if (i.code !== "custom" || messages === undefined)
+        return undefined;
+    const key = i.params?.ui;
+    return typeof key === "string" && Object.hasOwn(messages, key) ? key : undefined;
+}
+/**
+ * The issues of a failed config parse. `messages` is the root `x-ui.messages` of the schema's
+ * form JSON Schema (`configMessages`): custom issues naming one of its keys get `messageKey`.
+ */
+export function toIssues(error, messages) {
+    return error.issues.map((i) => {
+        const segments = i.path.map((s) => (typeof s === "number" ? s : String(s)));
+        const messageKey = messageKeyOf(i, messages);
+        return {
+            path: segments.join("."),
+            segments,
+            message: issueMessage(i),
+            ...(messageKey !== undefined && { messageKey }),
+        };
+    });
 }

package/dist/extensions/config-json-schema.d.ts

@@ -1,9 +1,45 @@
-import { z } from "zod";
-export type JsonSchema = Record<string, unknown>;
 /**
- * 把插件配置 schema 转成 JSON Schema（供界面渲染表单）：
- * - `secret()` 字段带 `"x-secret": true`（去掉 zod 附带的 `secret` 元数据键）；
- * - 无法表达的类型为 `{ "x-unsupported": true }`，不抛错；
- * - 以输入侧形态输出（含 default），不带 `$schema`。
+ * Config schema → JSON Schema for forms. The conversion (and the secret scrub) lives in the SDK
+ * (`configJsonSchema`, extension config forms spec §4.1) so the packer, the checks and the kernel
+ * share one implementation; the kernel keeps no copy.
  */
-export declare function configToJsonSchema(schema: z.ZodType): JsonSchema;
+import { type ConfigUiProblem, type JsonSchema } from "@capybara-hq/plugin-sdk";
+import type { z } from "zod";
+export { configJsonSchema as configToJsonSchema, type JsonSchema } from "@capybara-hq/plugin-sdk";
+/** The config level a schema belongs to (which hints `validateConfigUi` allows). */
+export type ConfigLevel = "deployment" | "org" | "connection";
+/** A config schema as served to forms, with the problems of its hints (empty = kept). */
+export interface ConfigFormSchema {
+    /** Shared by every caller: clone it before handing it out or changing it. */
+    readonly schema: JsonSchema;
+    readonly problems: ConfigUiProblem[];
+}
+/**
+ * Removes every `x-ui` from a JSON Schema in place (a property named `x-ui` is kept, and so are
+ * values: `default`, `const`, `enum` and `examples` are left as they are).
+ */
+export declare function stripConfigUi(node: unknown): void;
+/**
+ * Validates the hints of a JSON Schema at a level and strips every `x-ui` when there is any
+ * problem (in place): invalid hints never reach a form, and never fail a load (spec §4.1).
+ */
+export declare function checkConfigUi(schema: JsonSchema, level: ConfigLevel): ConfigUiProblem[];
+/** A config schema's form JSON Schema ({@link checkConfigUi} applied), cached per schema object. */
+export declare function configFormSchema(schema: z.ZodTypeAny, level: ConfigLevel): ConfigFormSchema;
+/**
+ * {@link configFormSchema} that never throws, for every caller that serves a form schema or reads
+ * its messages (deployment, org, connection, issues). A hint conversion that throws (a hand-made
+ * package, e.g. hints that won't serialize as JSON) drops the hints: the plain schema with every
+ * `x-ui` stripped, else `null` when even the plain conversion fails. `onFallback` runs once per
+ * schema object and level on this replica (the caller's one warning); later calls reuse the result.
+ */
+export declare function safeConfigFormSchema(schema: z.ZodTypeAny, level: ConfigLevel, onFallback: (err: unknown, fallback: "plain" | "none") => void): ConfigFormSchema | null;
+/**
+ * The secret record paths some `x-ui.secrets[].path` of a form schema names (spec §4.3), anywhere in
+ * the schema. Read from a checked schema: one whose hints were invalid was stripped and names none.
+ */
+export declare function hintedSecretPaths(node: unknown, out?: Set<string>): Set<string>;
+/** The root `x-ui.messages` of a form schema (the localized texts of custom issues), if any. */
+export declare function configMessages(schema: JsonSchema | null | undefined): Record<string, unknown> | undefined;
+/** A short text of hint problems for a status detail or a log (the first few). */
+export declare function describeConfigUiProblems(level: ConfigLevel, problems: ConfigUiProblem[]): string;