@bevel-software/platform-core-backend 0.15.1 → 0.19.0

package/dist/modules/settings/deployment-settings.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment-settings.service.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/deployment-settings.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAU1D;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;IACtC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,+DAA+D;IAC/D,QAAQ,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACxC;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAAI,OAAO,MAAM,KAAG,MAAM,GAAG,IAQ5D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,EAAE,UAAU,EAoKrC,CAAC;AAEF,oFAAoF;AACpF,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,EAAE,aAAa,CAAC;IACtB,+EAA+E;IAC/E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,qBAAa,yBAAyB;IAMlC,OAAO,CAAC,QAAQ,CAAC,EAAE;IALrB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiC;IACtD,OAAO,CAAC,MAAM,CAA6B;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;gBAGzB,EAAE,EAAE,QAAQ,EAC7B,aAAa,EAAE,MAAM,EACrB,IAAI,GAAE,UAAU,EAAkB;IAQpC,IAAI,WAAW,IAAI,UAAU,EAAE,CAE9B;IAED,+EAA+E;IACzE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B3B;;;OAGG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQ5B;;;OAGG;IACH,eAAe,IAAI;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;IAQtF,0FAA0F;IAC1F,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;IAOpC;;;;OAIG;IACH,QAAQ,IAAI,eAAe,EAAE;IAgB7B;;;;;;;;OAQG;IACG,IAAI,CACR,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC/B,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,OAAO,CAAC;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,CAAC;IAkGxC,kEAAkE;IAC5D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAU5B;;;;;OAKG;IACH,eAAe,IAAI,IAAI;IAMvB,4DAA4D;IACtD,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIxC;AAED,mFAAmF;AACnF,qBAAa,uBAAwB,SAAQ,KAAK;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;gBAAhC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;CAItD"}
+{"version":3,"file":"deployment-settings.service.d.ts","sourceRoot":"","sources":["../../../src/modules/settings/deployment-settings.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/settings/deployment-settings.service.js

@@ -1,7 +1,12 @@
 import { eq, inArray } from 'drizzle-orm';
+import { logger } from '../../shared/logging.js';
+const log = logger('settings');
 import { deploymentSettings } from '../database/core-schema.js';
-import { DEFAULT_KB_LAYOUT, validateBranchModel, validateKbLayout, validateKbRootName, } from '@bevel-software/platform-shared';
+import { DEFAULT_KB_LAYOUT, validateAgentsFileName, validateBranchModel, validateKbLayout, validateKbRootName, } from '@bevel-software/platform-shared';
+import { createHmac } from 'node:crypto';
 import { TokenCrypto } from '../../shared/token-crypto.js';
+import { assertKbDirNameFree } from '../kb-fs/repo-path.js';
+import { normalizeIssuerUrl } from './oidc-check.js';
 /**
  * The one rule for what a KB remote may look like, shared by the setting below
  * and the connection test — which must apply it BEFORE handing the value to
@@ -17,7 +22,15 @@ export const validateHttpsRemote = (value) => {
     catch {
         return 'Enter a full URL, e.g. https://github.com/acme/knowledge-base.git';
     }
-    return parsed.protocol === 'https:' ? null : 'The URL must start with https://';
+    if (parsed.protocol !== 'https:')
+        return 'The URL must start with https://';
+    // Userinfo would ride into git's argv on every call, visible in process
+    // listings — the KB startup refuses such a URL, so saving one only defers the
+    // failure to the next boot.
+    if (parsed.username || parsed.password) {
+        return 'Remove the username and token from the URL — enter the token in its own field.';
+    }
+    return null;
 };
 /**
  * The core catalogue. Order is the order the setup screen renders them in.
@@ -60,32 +73,68 @@ export const CORE_SETTINGS = [
     /**
      * The KB layout: the three root folders a deployment may rename so hexis can
      * read a repository laid out by someone else (`skills/` and `plugins/` in
-     * lowercase, say). Restart-to-apply like the branch model — the names are
-     * applied once at boot through `configureKbLayout` and served to the browser
-     * once by `/api/config`. Each has a default, so an unset field means the
-     * default, not an unconfigured deployment. Checked as a trio in `save`: the
-     * three must differ, and one field alone cannot see the other two.
+     * lowercase, say), and the file name of the managed agent guide.
+     * Restart-to-apply like the branch model — the names are applied once at boot
+     * through `configureKbLayout` and served to the browser once by
+     * `/api/config`. Each has a default, so an unset field means the default, not
+     * an unconfigured deployment. Checked as a QUARTET in `save`: the four must
+     * differ, and one field alone cannot see the other three.
+     *
+     * NO `envVar`, on any of the four. Layout is deployment configuration that is
+     * entered once in the app; the three that used to be environment-driven are
+     * imported into their saved setting on the first boot after the upgrade
+     * ({@link DeploymentSettingsService.importLegacyLayoutEnv}) so nothing
+     * silently reverts to the defaults.
      */
     {
         key: 'knowledgeBaseDir',
-        envVar: 'KB_KNOWLEDGE_BASE_DIR',
         section: 'knowledge-base',
         validate: validateKbRootName,
         restartToApply: true,
+        unsetMeans: DEFAULT_KB_LAYOUT.knowledgeBaseDir,
     },
     {
         key: 'skillsDir',
-        envVar: 'KB_SKILLS_DIR',
         section: 'knowledge-base',
         validate: validateKbRootName,
         restartToApply: true,
+        unsetMeans: DEFAULT_KB_LAYOUT.skillsDir,
     },
     {
         key: 'pluginsDir',
-        envVar: 'KB_PLUGINS_DIR',
         section: 'knowledge-base',
         validate: validateKbRootName,
         restartToApply: true,
+        unsetMeans: DEFAULT_KB_LAYOUT.pluginsDir,
+    },
+    {
+        /**
+         * The managed agent guide's file name. Its own validator says what a guide
+         * may be called; the quartet check in `plan` is what keeps it clear of the
+         * three folder names it is saved beside.
+         */
+        key: 'agentsFile',
+        section: 'knowledge-base',
+        validate: (v) => validateAgentsFileName(v),
+        restartToApply: true,
+        unsetMeans: DEFAULT_KB_LAYOUT.agentsFile,
+    },
+    {
+        /**
+         * Whether to keep the platform's one-sentence pointer in a customer's own
+         * `AGENTS.md` — the admin's consent to the only text the platform ever adds
+         * to a file it does not own. On unless it is explicitly turned off, because
+         * a renamed guide nothing points at is a guide no coding agent will find.
+         *
+         * Restart-to-apply like the name it belongs to: the check runs once per
+         * start, in the KB startup phase.
+         */
+        key: 'agentsFileLink',
+        section: 'knowledge-base',
+        validate: (v) => (v === 'true' || v === 'false' ? null : 'Use "true" or "false".'),
+        restartToApply: true,
+        // On unless explicitly turned off — the reading `resolveAgentsFileLink` applies.
+        unsetMeans: 'true',
     },
     /**
      * The branch model. Both are restart-to-apply and could not be otherwise:
@@ -128,8 +177,9 @@ export const CORE_SETTINGS = [
         validate: (v) => v.trim().length >= 16 ? null : 'Use at least 16 characters — a random string is best.',
     },
     /**
-     * Single sign-on. Restart-to-apply because the provider is built once at boot
-     * and pushed into the auth plugin array the server mounts from.
+     * Single sign-on. Applies without a restart: the OIDC provider is mounted
+     * once at boot but reads these on every probe and sign-in, advertising
+     * itself only while issuer, client id and secret are all set.
      */
     {
         key: 'oidcIssuerUrl',
@@ -143,32 +193,27 @@ export const CORE_SETTINGS = [
                 return 'Enter the issuer URL, e.g. https://login.microsoftonline.com/<tenant>/v2.0';
             }
         },
-        restartToApply: true,
     },
     {
         key: 'oidcClientId',
         envVar: 'OIDC_CLIENT_ID',
         section: 'sign-in',
-        restartToApply: true,
     },
     {
         key: 'oidcClientSecret',
         envVar: 'OIDC_CLIENT_SECRET',
         section: 'sign-in',
         secret: true,
-        restartToApply: true,
     },
     {
         key: 'oidcScopes',
         envVar: 'OIDC_SCOPES',
         section: 'sign-in',
-        restartToApply: true,
     },
     {
         key: 'oidcProviderLabel',
         envVar: 'OIDC_PROVIDER_LABEL',
         section: 'sign-in',
-        restartToApply: true,
     },
     {
         // Belongs with SSO because SSO is what makes it load-bearing: sign-in
@@ -180,6 +225,31 @@ export const CORE_SETTINGS = [
         restartToApply: true,
     },
 ];
+/**
+ * The environment variables the KB layout USED to be read from, and the
+ * settings they now live in. Referenced only by
+ * {@link DeploymentSettingsService.importLegacyLayoutEnv} — nothing else may
+ * read them, or they would be back to being a second source of truth. The
+ * guide's file name is deliberately absent: it never had a variable, so there
+ * is nothing to import.
+ */
+export const LEGACY_LAYOUT_ENV_VARS = Object.freeze({
+    knowledgeBaseDir: 'KB_KNOWLEDGE_BASE_DIR',
+    skillsDir: 'KB_SKILLS_DIR',
+    pluginsDir: 'KB_PLUGINS_DIR',
+});
+/**
+ * The rows holding verification records: ONE PER SET OF VALUES, keyed
+ * `oidcVerification:<fingerprint>`. Not settings — nobody types them — so they
+ * have no catalogue entry, are never described or loaded, and `prune` leaves
+ * them be.
+ *
+ * A row per fingerprint rather than one shared row is what makes concurrent
+ * writers safe without a lock: a sign-in finishing through a provider built
+ * from OLD values records those old values under their own key, and can never
+ * overwrite what a save (or another replica) recorded about the new ones.
+ */
+const OIDC_VERIFICATION_PREFIX = 'oidcVerification:';
 /**
  * Deployment settings, resolved ENVIRONMENT-FIRST.
  *
@@ -192,6 +262,14 @@ export const CORE_SETTINGS = [
  *  - and "why is it not using my env var" never becomes a question, because
  *    the answer is always "it is".
  *
+ * ONE EXCEPTION, and it is a setting-by-setting one rather than a hole in the
+ * rule: a definition with no {@link SettingDef.envVar} has no variable to be
+ * outranked by. That is the knowledge-base layout — the three root folders and
+ * the agent guide's file name — which is deployment configuration entered once
+ * in the app. The three variables it used to read are imported into their saved
+ * settings on the first boot after the upgrade ({@link
+ * DeploymentSettingsService.importLegacyLayoutEnv}) and ignored after that.
+ *
  * Values are cached in memory after {@link load}. Reads happen on every clone
  * and every git call, and a database round-trip there would be a tax on the
  * hot path for data that changes about twice in a deployment's life.
@@ -203,6 +281,10 @@ export const CORE_SETTINGS = [
  * deployment that has nothing to serve until it is. Nobody is mid-session on a
  * second replica at that moment.
  *
+ * The single sign-on settings are the first to bend that: they apply live, so
+ * on a multi-replica deployment an OIDC change reaches only the replica that
+ * served the save until the others restart.
+ *
  * It stops being acceptable the moment a setting is something an operator
  * changes on a live multi-replica deployment. Adding one means adding
  * invalidation with it — the event bus already carries user-scoped and
@@ -211,11 +293,13 @@ export const CORE_SETTINGS = [
  */
 export class DeploymentSettingsService {
     db;
+    secretsEncKey;
     defs = new Map();
     stored = new Map();
     crypto;
     constructor(db, secretsEncKey, defs = CORE_SETTINGS) {
         this.db = db;
+        this.secretsEncKey = secretsEncKey;
         for (const def of defs)
             this.defs.set(def.key, def);
         // No key configured means secrets cannot be stored — surfaced when someone
@@ -234,7 +318,7 @@ export class DeploymentSettingsService {
                 continue; // a setting this build no longer has
             if (row.encrypted) {
                 if (!this.crypto) {
-                    console.warn(`[settings] "${row.key}" is stored encrypted but SECRETS_ENC_KEY is unset — ignoring it.`);
+                    log.warn(`"${row.key}" is stored encrypted but SECRETS_ENC_KEY is unset — ignoring it.`);
                     continue;
                 }
                 try {
@@ -244,7 +328,7 @@ export class DeploymentSettingsService {
                     // A rotated or mistyped key. Loud, and skipped rather than fatal:
                     // one unreadable setting must not stop the server from booting into
                     // the screen where it can be fixed.
-                    console.error(`[settings] could not decrypt "${row.key}" — is SECRETS_ENC_KEY correct?`);
+                    log.error(`could not decrypt "${row.key}" — is SECRETS_ENC_KEY correct?`);
                 }
                 continue;
             }
@@ -260,7 +344,7 @@ export class DeploymentSettingsService {
         const def = this.defs.get(key);
         if (!def)
             return '';
-        const fromEnv = (process.env[def.envVar] ?? '').trim();
+        const fromEnv = def.envVar ? (process.env[def.envVar] ?? '').trim() : '';
         if (fromEnv)
             return fromEnv;
         return (this.stored.get(key) ?? '').trim();
@@ -274,14 +358,79 @@ export class DeploymentSettingsService {
             knowledgeBaseDir: this.resolve('knowledgeBaseDir') || DEFAULT_KB_LAYOUT.knowledgeBaseDir,
             skillsDir: this.resolve('skillsDir') || DEFAULT_KB_LAYOUT.skillsDir,
             pluginsDir: this.resolve('pluginsDir') || DEFAULT_KB_LAYOUT.pluginsDir,
+            agentsFile: this.resolve('agentsFile') || DEFAULT_KB_LAYOUT.agentsFile,
         };
     }
+    /**
+     * Whether the platform should keep its pointer sentence in a customer-owned
+     * `AGENTS.md`. On unless the admin turned it off — an unset setting is a
+     * deployment that never saw the checkbox, and the sentence is what makes a
+     * renamed guide findable at all.
+     */
+    resolveAgentsFileLink() {
+        return this.resolve('agentsFileLink') !== 'false';
+    }
+    /**
+     * Import the retired layout environment variables into their saved settings,
+     * ONCE, on a deployment that still sets them.
+     *
+     * The three roots were environment-first until this release. Simply dropping
+     * the variables would put such a deployment back on `KnowledgeBase/`,
+     * `Skills/` and `Plugins/` at its next boot — against a repository laid out
+     * under other names, which is a knowledge base that scaffolds three empty
+     * folders and imports nothing. So on the first boot after the upgrade each
+     * still-set variable's value becomes the saved setting, and the log says the
+     * variable can be removed.
+     *
+     * Only where nothing is saved. A saved value is the admin's own answer,
+     * entered in the app, and it wins — with a warning, because a variable that
+     * no longer does anything is exactly the kind of thing someone later reads
+     * as the reason for a name. Equal values say nothing: there is nothing to
+     * tell anyone about.
+     *
+     * Called before `configureKbLayout`, so the boot that imports also RUNS on
+     * the imported names rather than on the defaults.
+     */
+    async importLegacyLayoutEnv() {
+        for (const [key, envVar] of Object.entries(LEGACY_LAYOUT_ENV_VARS)) {
+            const fromEnv = (process.env[envVar] ?? '').trim();
+            if (!fromEnv)
+                continue;
+            const saved = (this.stored.get(key) ?? '').trim();
+            if (saved) {
+                if (saved !== fromEnv) {
+                    log.warn(`${envVar} is ignored — the saved setting ("${saved}") wins. Remove the variable.`);
+                }
+                continue;
+            }
+            // Validated like any save: a variable holding something no folder may be
+            // called is a misconfiguration, and importing it would move the failure
+            // to the first write into a folder nobody can name.
+            const problem = validateKbRootName(fromEnv);
+            if (problem) {
+                log.warn(`${envVar} ("${fromEnv}") is not a usable folder name (${problem}) — not imported.`);
+                continue;
+            }
+            await this.db
+                .insert(deploymentSettings)
+                .values({ key, value: fromEnv, encrypted: false, updatedBy: null })
+                .onConflictDoUpdate({
+                target: deploymentSettings.key,
+                set: { value: fromEnv, encrypted: false, updatedBy: null, updatedAt: new Date() },
+            });
+            this.stored.set(key, fromEnv);
+            log.info(`Imported ${envVar} ("${fromEnv}") into the saved setting — the variable can be removed.`);
+        }
+    }
     /** Where {@link resolve} got its answer — what the setup screen labels the field with. */
     sourceOf(key) {
         const def = this.defs.get(key);
         if (!def)
             return 'unset';
-        if ((process.env[def.envVar] ?? '').trim())
+        // A setting with no variable can never read `env`, whatever the process
+        // environment happens to hold — which is what makes the layout fields
+        // editable in the app on a deployment that still sets the old variables.
+        if (def.envVar && (process.env[def.envVar] ?? '').trim())
             return 'env';
         return (this.stored.get(key) ?? '').trim() ? 'stored' : 'unset';
     }
@@ -295,7 +444,7 @@ export class DeploymentSettingsService {
             const source = this.sourceOf(def.key);
             const base = {
                 key: def.key,
-                envVar: def.envVar,
+                ...(def.envVar ? { envVar: def.envVar } : {}),
                 section: def.section,
                 source,
                 configured: source !== 'unset',
@@ -313,8 +462,55 @@ export class DeploymentSettingsService {
      * A setting whose environment variable is set is REFUSED rather than silently
      * stored, because storing it would write a row that can never take effect and
      * leave the screen implying otherwise.
+     *
+     * `restartRequired` is this service's view: some restart-to-apply setting
+     * changed. It cannot know what the caller then applies to the running
+     * process, so `restartKeys` names the settings behind it — the setup route
+     * leaves out the folder names and the branch model when the save that
+     * completes setup has just applied them, and reports only what remains.
      */
     async save(entries, updatedBy) {
+        const toWrite = this.plan(entries);
+        /** The settings this save changed that a running server cannot pick up. */
+        const restartKeys = [];
+        for (const { key, value, def } of toWrite) {
+            // Compared against the EFFECTIVE value: a setting that was unset was
+            // already running on whatever its readers make of "unset" — the layout
+            // roots on their defaults, the pointer consent on — so saving that same
+            // answer changes nothing a restart would pick up.
+            const effective = this.resolve(key) || def.unsetMeans || '';
+            if (def.restartToApply && effective !== value)
+                restartKeys.push(key);
+            const encrypted = def.secret === true;
+            const stored = encrypted ? this.crypto.encrypt(value) : value;
+            await this.db
+                .insert(deploymentSettings)
+                .values({ key, value: stored, encrypted, updatedBy })
+                .onConflictDoUpdate({
+                target: deploymentSettings.key,
+                set: { value: stored, encrypted, updatedBy, updatedAt: new Date() },
+            });
+            this.stored.set(key, value);
+        }
+        // The git token is consumed through the environment (the credential helper
+        // reads `$GITHUB_TOKEN` at call time, so it never appears in argv). Putting
+        // it there is what makes a token saved here work without a restart.
+        this.syncGitTokenEnv();
+        return { restartRequired: restartKeys.length > 0, restartKeys };
+    }
+    /**
+     * What {@link resolve} would answer for each key AFTER saving `entries` —
+     * validated by exactly the rules `save` applies, and throwing the same
+     * {@link SettingsValidationError}, but writing nothing. It is how a caller
+     * checks the values a save would put in effect (the repository connection)
+     * before letting the save happen.
+     */
+    resolveAfter(entries) {
+        const toWrite = this.plan(entries);
+        return (key) => toWrite.find((w) => w.key === key)?.value ?? this.resolve(key);
+    }
+    /** Validate a batch and return the writes it amounts to; throws on any problem. */
+    plan(entries) {
         const problems = {};
         const toWrite = [];
         for (const [key, raw] of Object.entries(entries)) {
@@ -361,16 +557,19 @@ export class DeploymentSettingsService {
             if (problem)
                 problems.protectedBranches = problem;
         }
-        // The layout trio is the other cross-field rule: three names that must
-        // differ. Judged on the layout this save WOULD produce, with the default
-        // standing in for anything neither written nor stored.
-        const layoutKeys = ['knowledgeBaseDir', 'skillsDir', 'pluginsDir'];
+        // The layout quartet is the other cross-field rule: three folder names and
+        // a guide file name that must all differ. Judged on the layout this save
+        // WOULD produce, with the default standing in for anything neither written
+        // nor stored — so renaming the plugins folder to what the guide is already
+        // called is refused whichever of the two the save names.
+        const layoutKeys = ['knowledgeBaseDir', 'skillsDir', 'pluginsDir', 'agentsFile'];
         if (toWrite.some((w) => layoutKeys.includes(w.key))) {
             const effective = (key) => toWrite.find((w) => w.key === key)?.value || this.resolve(key) || DEFAULT_KB_LAYOUT[key];
             const problem = validateKbLayout({
                 knowledgeBaseDir: effective('knowledgeBaseDir'),
                 skillsDir: effective('skillsDir'),
                 pluginsDir: effective('pluginsDir'),
+                agentsFile: effective('agentsFile'),
             });
             // Against the field being written — the first one in the batch — since
             // any of the three could be the one that collides.
@@ -379,32 +578,37 @@ export class DeploymentSettingsService {
                 problems[first.key] = problem;
             }
         }
+        // The checkout folder and the layout are the third cross-field rule: the
+        // folder the repository is cloned into may not share a name with any of
+        // the repository's own roots, or every path under that root would be read
+        // as the checkout itself (see `assertKbDirNameFree`). Judged on what this
+        // save would put in effect, like the two rules above, and here rather than
+        // only at boot because setup applies a saved layout to the running process
+        // without a restart — a save that gets through would take effect at once.
+        const collisionKeys = ['kbDirName', ...layoutKeys];
+        if (toWrite.some((w) => collisionKeys.includes(w.key))) {
+            const effective = (key) => toWrite.find((w) => w.key === key)?.value ||
+                this.resolve(key) ||
+                (key === 'kbDirName' ? 'knowledge-base' : DEFAULT_KB_LAYOUT[key]);
+            try {
+                assertKbDirNameFree(effective('kbDirName'), {
+                    knowledgeBaseDir: effective('knowledgeBaseDir'),
+                    skillsDir: effective('skillsDir'),
+                    pluginsDir: effective('pluginsDir'),
+                    agentsFile: effective('agentsFile'),
+                });
+            }
+            catch (err) {
+                // Against the field this save is writing — the checkout name when that
+                // is what moved, else the first layout field in the batch — since
+                // either side of the collision could be the one the operator typed.
+                const first = toWrite.find((w) => collisionKeys.includes(w.key));
+                problems[first.key] = err instanceof Error ? err.message : String(err);
+            }
+        }
         if (Object.keys(problems).length > 0)
             throw new SettingsValidationError(problems);
-        let restartRequired = false;
-        for (const { key, value, def } of toWrite) {
-            // Compared against the EFFECTIVE value: a layout root that was unset
-            // was already running on its default, so saving that default changes
-            // nothing a restart would pick up.
-            const effective = this.resolve(key) || DEFAULT_KB_LAYOUT[key] || '';
-            if (def.restartToApply && effective !== value)
-                restartRequired = true;
-            const encrypted = def.secret === true;
-            const stored = encrypted ? this.crypto.encrypt(value) : value;
-            await this.db
-                .insert(deploymentSettings)
-                .values({ key, value: stored, encrypted, updatedBy })
-                .onConflictDoUpdate({
-                target: deploymentSettings.key,
-                set: { value: stored, encrypted, updatedBy, updatedAt: new Date() },
-            });
-            this.stored.set(key, value);
-        }
-        // The git token is consumed through the environment (the credential helper
-        // reads `$GITHUB_TOKEN` at call time, so it never appears in argv). Putting
-        // it there is what makes a token saved here work without a restart.
-        this.syncGitTokenEnv();
-        return { restartRequired };
+        return toWrite;
     }
     /** Drop stored rows for settings this build no longer defines. */
     async prune() {
@@ -412,7 +616,9 @@ export class DeploymentSettingsService {
         if (known.length === 0)
             return;
         const rows = await this.db.select({ key: deploymentSettings.key }).from(deploymentSettings);
-        const orphans = rows.map((r) => r.key).filter((k) => !known.includes(k));
+        const orphans = rows
+            .map((r) => r.key)
+            .filter((k) => !known.includes(k) && !k.startsWith(OIDC_VERIFICATION_PREFIX));
         if (orphans.length > 0) {
             await this.db.delete(deploymentSettings).where(inArray(deploymentSettings.key, orphans));
         }
@@ -430,6 +636,97 @@ export class DeploymentSettingsService {
         if (token)
             process.env.GITHUB_TOKEN = token;
     }
+    /** The single sign-on values in effect, issuer normalized the way the provider uses it. */
+    resolveOidcCredentials() {
+        return {
+            issuerUrl: normalizeIssuerUrl(this.resolve('oidcIssuerUrl')),
+            clientId: this.resolve('oidcClientId'),
+            clientSecret: this.resolve('oidcClientSecret'),
+        };
+    }
+    /**
+     * Whether the single sign-on configuration IN EFFECT is verified.
+     *
+     * The record names the values it was made about by a keyed digest, so it
+     * speaks only for those: a changed issuer, application id or secret —
+     * through a save or through the environment — reads as unverified until it
+     * is proven again, with nothing to remember to reset. The secret itself is
+     * never stored here, and a digest keyed with the secrets key cannot be
+     * checked against a guess without that key.
+     *
+     * WHICH IS WHY THERE IS NO RECORD WITHOUT THAT KEY: keyed with a public
+     * constant, the digest of a public issuer and application id would let
+     * anyone who can read `deployment_settings` (a backup, a replica, a dump)
+     * confirm guesses of the secret offline. A salt stored beside it would be
+     * read along with it. So with SECRETS_ENC_KEY unset nothing is recorded and
+     * a configured deployment reads `unrecordable`.
+     *
+     * Read from the database, not the in-memory cache: unlike the settings, this
+     * changes on a live deployment (every first sign-in), and a sign-in on one
+     * replica must show as Verified on the others.
+     */
+    async oidcVerification() {
+        const current = this.resolveOidcCredentials();
+        if (!current.issuerUrl || !current.clientId || !current.clientSecret)
+            return 'not-configured';
+        if (!this.secretsEncKey)
+            return 'unrecordable';
+        return this.oidcVerificationOf(current);
+    }
+    /** What is recorded about one set of single sign-on values — `unverified` when nothing is. */
+    async oidcVerificationOf(credentials) {
+        if (!this.secretsEncKey)
+            return 'unverified';
+        const key = this.oidcVerificationKey(credentials);
+        const rows = await this.db
+            .select({ key: deploymentSettings.key, value: deploymentSettings.value })
+            .from(deploymentSettings)
+            .where(eq(deploymentSettings.key, key));
+        return rows.some((row) => row.key === key && row.value === 'verified') ? 'verified' : 'unverified';
+    }
+    /**
+     * Record what is known about one set of single sign-on values.
+     *
+     * ONLY EVER UPGRADES, atomically: `verified` overwrites, `unverified` only
+     * fills an empty slot. The same values cannot stop being proven by an
+     * inconclusive answer — an overlapping check that could not reach the token
+     * endpoint says nothing against the sign-in that worked.
+     *
+     * Records about values no longer in effect are left in place rather than
+     * swept: they are inert (nothing reads a key the current values do not hash
+     * to), and a sweep racing a save on another replica could delete the record
+     * of the values that end up in effect.
+     */
+    async recordOidcVerification(state, credentials) {
+        // No secrets key, no record: see oidcVerification().
+        if (!this.secretsEncKey)
+            return;
+        const key = this.oidcVerificationKey(credentials);
+        const insert = this.db
+            .insert(deploymentSettings)
+            .values({ key, value: state, encrypted: false, updatedBy: null });
+        if (state === 'unverified') {
+            await insert.onConflictDoNothing({ target: deploymentSettings.key });
+            return;
+        }
+        await insert.onConflictDoUpdate({
+            target: deploymentSettings.key,
+            set: { value: state, encrypted: false, updatedBy: null, updatedAt: new Date() },
+        });
+    }
+    oidcVerificationKey(credentials) {
+        // JSON-encoded, so no issuer, id or secret containing the separator can
+        // make two different tuples hash alike.
+        const tuple = JSON.stringify([
+            normalizeIssuerUrl(credentials.issuerUrl),
+            credentials.clientId,
+            credentials.clientSecret,
+        ]);
+        const fingerprint = createHmac('sha256', `hexis-oidc-verification:${this.secretsEncKey}`)
+            .update(tuple)
+            .digest('hex');
+        return `${OIDC_VERIFICATION_PREFIX}${fingerprint}`;
+    }
     /** Remove one stored row (used by tests and by `prune`). */
     async clear(key) {
         await this.db.delete(deploymentSettings).where(eq(deploymentSettings.key, key));