@celilo/cli 0.3.24 → 0.3.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celilo/cli",
-  "version": "0.3.24",
+  "version": "0.3.26",
   "description": "Celilo — home lab orchestration CLI",
   "type": "module",
   "bin": {

package/src/cli/commands/system-update.ts

@@ -159,9 +159,13 @@ async function buildSnapshots(
  * - `health` calls `runModuleHealthCheck`.
  * - `snapshotCeliloDb` calls `createSystemStateBackup`.
  */
-function buildOps(registry: RegistryClient): OrchestratorOps {
+function buildOps(registry: RegistryClient, wasDeployed: Set<string>): OrchestratorOps {
   return {
     backup: async (moduleId, _updateId) => {
+      // IMPORTED modules don't have running state to back up; skip
+      // silently. The orchestrator already gates on `!noBackup`, so
+      // this is the second layer (per-module rather than system-wide).
+      if (!wasDeployed.has(moduleId)) return { ok: true };
       const db = getDb();
       const mod = db.select().from(modules).where(eq(modules.id, moduleId)).get();
       if (!mod) return { ok: false, error: `module ${moduleId} not found` };
@@ -202,6 +206,12 @@ function buildOps(registry: RegistryClient): OrchestratorOps {
       }
     },
     deploy: async (id) => {
+      // IMPORTED modules weren't deployed before this run; we just
+      // refreshed their source files via `upgrade`. Don't try to
+      // deploy them here — that would surprise the operator who
+      // hasn't asked for a deploy. They'll get a `module deploy <id>`
+      // todo finding from the audit on the next run.
+      if (!wasDeployed.has(id)) return { ok: true };
       const db = getDb();
       // The deploy interview runs through the bus; if config is
       // missing the deploy hangs waiting for a responder. system-update
@@ -211,6 +221,19 @@ function buildOps(registry: RegistryClient): OrchestratorOps {
       return result.success ? { ok: true } : { ok: false, error: result.error };
     },
     health: async (id) => {
+      // Same gating as deploy: there's no live deployment to health-
+      // check for an IMPORTED module that we just refreshed. Return
+      // pass with a "not deployed" detail so the orchestrator's
+      // module-step record doesn't say "health: skipped" (which would
+      // imply a check ran and skipped its assertions).
+      if (!wasDeployed.has(id)) {
+        // The orchestrator's HealthStatus type uses 'healthy' /
+        // 'degraded' / 'unhealthy' / 'error' / 'no-checks'. There's
+        // no "skipped" — closest meaningful value for "we didn't
+        // run the check on purpose" is 'no-checks' (semantically:
+        // "the module didn't have any health checks to run").
+        return { status: 'no-checks', detail: 'not deployed; health check skipped' };
+      }
       // We can call the existing health-runner directly today — that's
       // already a clean service.
       const db = getDb();
@@ -249,17 +272,20 @@ function formatResult(result: SystemUpdateResult): string {
   );
   lines.push(`  backups: ${result.backupsCreated ? 'created' : 'skipped'}`);
 
-  // Surface audit findings inline. DRIFT means "something is drifting
-  // but it didn't block the update" — without listing the findings the
-  // operator has no idea what; they'd have to run `celilo system audit`
-  // as a follow-up. Show them here so it's a single round-trip.
-  // BLOCKED also gets the listing (the orchestrator already short-
-  // circuited to skip the run, but the operator still needs to know
-  // why — formatResult is the friendly path for that too).
+  // Surface audit findings inline. Three severity tiers:
+  //   blocked → ✗   gates the run (orchestrator short-circuits)
+  //   drift   → ▸   informational; the system moved away from a
+  //                 desired state, but the run still proceeded
+  //   todo    → ➤   next-step reminders (e.g. "you imported X but
+  //                 haven't deployed it yet"); never escalates the
+  //                 verdict.
+  // Each tier renders separately so operators can scan for what
+  // needs attention vs. what's just a friendly nudge.
   if (result.audit.findings.length > 0) {
     lines.push('');
-    const drift = result.audit.findings.filter((f) => f.severity === 'drift');
     const blocked = result.audit.findings.filter((f) => f.severity === 'blocked');
+    const drift = result.audit.findings.filter((f) => f.severity === 'drift');
+    const todo = result.audit.findings.filter((f) => f.severity === 'todo');
     if (blocked.length > 0) {
       lines.push(`  BLOCKED (${blocked.length}):`);
       for (const f of blocked) {
@@ -274,6 +300,13 @@ function formatResult(result: SystemUpdateResult): string {
         if (f.remediation) lines.push(`        → ${f.remediation}`);
       }
     }
+    if (todo.length > 0) {
+      lines.push(`  Todos (${todo.length}, next-step reminders):`);
+      for (const f of todo) {
+        lines.push(`    ➤ [${f.category}] ${f.subject}: ${f.message}`);
+        if (f.remediation) lines.push(`        → ${f.remediation}`);
+      }
+    }
   }
 
   if (result.modules.length > 0) {
@@ -303,12 +336,28 @@ export async function handleSystemUpdate(
 
   const db = getDb();
   const installed = db.select().from(modules).all();
-  const deployedModules = installed.filter((m) => ['INSTALLED', 'VERIFIED'].includes(m.state));
+  // Include IMPORTED modules in the upgrade scope so a fresh
+  // `module import <name>` followed (later, possibly weeks later) by
+  // `system update` actually picks up registry-side updates for
+  // not-yet-deployed modules. The deploy and health steps are gated
+  // on prior state in buildOps so we don't deploy something the
+  // operator hasn't asked us to deploy.
+  // INSTALLED + VERIFIED + IMPORTED is the upgrade-eligible set;
+  // ERROR / DEPLOYING / GENERATING / UNINSTALLING are skipped (the
+  // operator needs to handle those manually first).
+  const upgradeEligibleStates = new Set(['INSTALLED', 'VERIFIED', 'IMPORTED']);
+  const upgradableModules = installed.filter((m) => upgradeEligibleStates.has(m.state));
+  // Track which modules were already deployed BEFORE this run.
+  // Anything else gets the upgrade only — no deploy / health / backup
+  // attempts (those would be no-ops at best, surprising at worst).
+  const wasDeployed = new Set(
+    installed.filter((m) => ['INSTALLED', 'VERIFIED'].includes(m.state)).map((m) => m.id),
+  );
   const registry = new RegistryClient();
 
   // Build the dep graph from installed manifests.
-  const graph = buildModuleGraph(deployedModules.map((m) => m.manifestData as ModuleManifest));
-  const snapshots = await buildSnapshots(db, deployedModules, registry);
+  const graph = buildModuleGraph(upgradableModules.map((m) => m.manifestData as ModuleManifest));
+  const snapshots = await buildSnapshots(db, upgradableModules, registry);
 
   // Build audit deps. (Mostly mirrors system-audit.ts; could be refactored
   // into a shared helper in Phase 5.)
@@ -351,13 +400,13 @@ export async function handleSystemUpdate(
       db,
     },
     capabilityAbi: {
-      modules: deployedModules.map((m) => ({
+      modules: upgradableModules.map((m) => ({
         id: m.id,
         manifest: m.manifestData as ModuleManifest,
       })),
     },
     terraformPlan: {
-      modules: deployedModules.map((m) => ({
+      modules: upgradableModules.map((m) => ({
         id: m.id,
         terraformDir: existsSync(join(m.sourcePath, 'generated', 'terraform'))
           ? join(m.sourcePath, 'generated', 'terraform')
@@ -366,7 +415,7 @@ export async function handleSystemUpdate(
       run: async () => ({ exitCode: 0, stdout: '', stderr: '' }),
     },
     moduleVersions: {
-      installed: deployedModules.map((m) => ({ id: m.id, version: m.version })),
+      installed: upgradableModules.map((m) => ({ id: m.id, version: m.version })),
       fetcher: async (id: string) => {
         const entries = await registry.getIndex(id);
         const top = registry.latestVersion(entries);
@@ -374,7 +423,7 @@ export async function handleSystemUpdate(
       },
     },
     moduleConfigs: {
-      modules: deployedModules.map((m) => ({
+      modules: upgradableModules.map((m) => ({
         id: m.id,
         manifest: m.manifestData as ModuleManifest,
         configs: configsByModule.get(m.id) ?? {},
@@ -382,7 +431,7 @@ export async function handleSystemUpdate(
     },
     health: { results: healthResults },
     backups: {
-      modules: deployedModules.map((m) => ({
+      modules: upgradableModules.map((m) => ({
         id: m.id,
         manifest: m.manifestData as ModuleManifest,
         lastSuccessfulBackupAt: latestBackupByModule.get(m.id) ?? null,
@@ -415,7 +464,7 @@ export async function handleSystemUpdate(
       updateId: crypto.randomUUID(),
       audit,
       willSelfUpdate: false, // computed at run time; the dry-run preview is best-effort
-      modules: deployedModules
+      modules: upgradableModules
         .filter((m) => {
           const snap = snapshots.get(m.id);
           return snap?.latestVersion && snap.latestVersion !== snap.installedVersion;
@@ -482,7 +531,7 @@ Then re-run system update.`,
     }
   }
 
-  const ops = buildOps(registry);
+  const ops = buildOps(registry, wasDeployed);
 
   const result = await runSystemUpdate({
     audit: auditDeps,

package/src/cli/tui/icons.ts

@@ -9,6 +9,7 @@ export interface SeverityVisual {
 export const SEVERITY_VISUALS: Record<DriftSeverity, SeverityVisual> = {
   blocked: { icon: '×', color: 'red', label: 'BLOCKED' },
   drift: { icon: '▲', color: 'yellow', label: 'DRIFT' },
+  todo: { icon: '➤', color: 'gray', label: 'TODO' },
 };
 
 export const VERDICT_VISUALS: Record<AuditVerdict, SeverityVisual> = {
@@ -17,6 +18,11 @@ export const VERDICT_VISUALS: Record<AuditVerdict, SeverityVisual> = {
   READY: { icon: '✓', color: 'green', label: 'READY' },
 };
 
+// Lower rank = higher priority (sorts first when listing). todo is
+// the lowest priority — operators can scan past them when triaging
+// what actually needs attention.
 export function severityRank(s: DriftSeverity): number {
-  return s === 'blocked' ? 0 : 1;
+  if (s === 'blocked') return 0;
+  if (s === 'drift') return 1;
+  return 2; // todo
 }

package/src/manifest/schema.ts

@@ -112,6 +112,17 @@ export const SecretDeclareSchema = z.object({
   // generic; namecheap wants 'Domain' / 'Password'.
   key_label: z.string().optional(),
   value_label: z.string().optional(),
+  // For `type: string-map` only: optional regex applied to each entered
+  // key. The responder rejects mismatches and re-prompts. Use for
+  // domain-shape validation (apex-only), hostname/email shape, etc.
+  // Pair with key_pattern_message to give the operator the rule in
+  // plain English when they hit it.
+  key_pattern: z.string().optional(),
+  key_pattern_message: z.string().optional(),
+  // Same idea for value validation. Less commonly useful for secrets
+  // (passwords vary), but provided for symmetry.
+  value_pattern: z.string().optional(),
+  value_pattern_message: z.string().optional(),
 });
 
 /**

package/src/services/audit/types.test.ts

@@ -17,6 +17,14 @@ const blocked: DriftFinding = {
   subject: 'lunacycle',
 };
 
+const todo: DriftFinding = {
+  category: 'undeployed_modules',
+  severity: 'todo',
+  code: 'module_undeployed',
+  message: 'namecheap: imported but not deployed (state: IMPORTED)',
+  subject: 'namecheap',
+};
+
 describe('computeVerdict', () => {
   test('READY when no findings', () => {
     expect(computeVerdict([])).toBe('READY');
@@ -33,4 +41,22 @@ describe('computeVerdict', () => {
   test('BLOCKED takes precedence regardless of order', () => {
     expect(computeVerdict([blocked, drift])).toBe('BLOCKED');
   });
+
+  // Pinning down the new severity tier: todo findings are
+  // informational reminders and never escalate the verdict beyond
+  // READY. The whole point of this severity level is to let
+  // categories like undeployed_modules and unconfigured_modules
+  // surface a TODO list without making `system update` look like
+  // it has unfinished work.
+  test('READY when only todo-severity findings', () => {
+    expect(computeVerdict([todo, { ...todo, subject: 'caddy' }])).toBe('READY');
+  });
+
+  test('DRIFT when both drift and todo findings exist (drift wins)', () => {
+    expect(computeVerdict([todo, drift])).toBe('DRIFT');
+  });
+
+  test('BLOCKED still wins over todos', () => {
+    expect(computeVerdict([todo, drift, blocked])).toBe('BLOCKED');
+  });
 });

package/src/services/audit/types.ts

@@ -3,14 +3,22 @@
  *
  * `runAudit` returns a `SystemAuditReport` aggregating findings from
  * each drift category. Each finding has a category (one of
- * `DriftCategory`), a severity (`drift` or `blocked`), a stable
+ * `DriftCategory`), a severity (`todo`, `drift`, or `blocked`), a stable
  * machine-readable code, and a human-readable message + suggested
  * remediation.
  *
  * The overall verdict is computed from the findings:
  * - any `blocked` finding → BLOCKED
  * - any `drift` finding (no blocked) → DRIFT
- * - no findings → READY
+ * - only `todo` findings (or none) → READY
+ *
+ * `todo` exists because some categories surface "next-step reminders"
+ * rather than actual divergence — `unconfigured_modules` and
+ * `undeployed_modules` are the canonical examples. The operator
+ * imported a module and hasn't gotten around to configuring/deploying;
+ * that's a TODO list, not a drifted system. Calling it DRIFT
+ * overloaded the term and made `system update` look like it had
+ * unfinished work even when it didn't.
  */
 
 export type DriftCategory =
@@ -29,7 +37,7 @@ export type DriftCategory =
   | 'services_reachable'
   | 'machines_reachable';
 
-export type DriftSeverity = 'drift' | 'blocked';
+export type DriftSeverity = 'todo' | 'drift' | 'blocked';
 
 export type AuditVerdict = 'READY' | 'DRIFT' | 'BLOCKED';
 
@@ -81,10 +89,12 @@ export interface SystemAuditReport {
 }
 
 /**
- * Compute the overall verdict from a set of findings.
+ * Compute the overall verdict from a set of findings. `todo` findings
+ * never escalate beyond READY — they're informational reminders, not
+ * a signal that the system has moved away from a desired state.
  */
 export function computeVerdict(findings: DriftFinding[]): AuditVerdict {
   if (findings.some((f) => f.severity === 'blocked')) return 'BLOCKED';
-  if (findings.length > 0) return 'DRIFT';
+  if (findings.some((f) => f.severity === 'drift')) return 'DRIFT';
   return 'READY';
 }

package/src/services/audit/unconfigured-modules.test.ts

@@ -9,7 +9,7 @@ describe('auditUnconfiguredModules', () => {
     expect(result).toHaveLength(1);
     expect(result[0]).toMatchObject({
       category: 'unconfigured_modules',
-      severity: 'drift',
+      severity: 'todo',
       code: 'module_unconfigured',
       actionable: false,
       subject: 'authentik',

package/src/services/audit/unconfigured-modules.ts

@@ -41,9 +41,13 @@ export async function auditUnconfiguredModules(
     if (ALREADY_DEPLOYED.has(m.state)) continue;
     if (m.configCount > 0) continue;
 
+    // todo: same reasoning as undeployed_modules — never running the
+    // configuration interview is a next-step reminder, not divergence
+    // from a desired state. Won't escalate the audit verdict beyond
+    // READY.
     findings.push({
       category: 'unconfigured_modules',
-      severity: 'drift',
+      severity: 'todo',
       code: 'module_unconfigured',
       message: `${m.id}: never configured (no config rows in DB)`,
       details: [

package/src/services/audit/undeployed-modules.test.ts

@@ -19,7 +19,7 @@ describe('auditUndeployedModules', () => {
     expect(result).toHaveLength(1);
     expect(result[0]).toMatchObject({
       category: 'undeployed_modules',
-      severity: 'drift',
+      severity: 'todo',
       code: 'module_undeployed',
       remediation: 'celilo module deploy authentik',
       actionable: true,

package/src/services/audit/undeployed-modules.ts

@@ -57,9 +57,15 @@ export async function auditUndeployedModules(
       continue;
     }
 
+    // todo: this is a next-step reminder, not a divergence from a
+    // desired state. The operator imported the module and hasn't
+    // deployed yet — that's a TODO list, not "the system has drifted".
+    // ERROR-state modules (handled above) DO stay severity=blocked
+    // because the operator's prior intent was to deploy, the deploy
+    // failed, and the system is now stuck pending intervention.
     findings.push({
       category: 'undeployed_modules',
-      severity: 'drift',
+      severity: 'todo',
       code: 'module_undeployed',
       message: `${m.id}: imported but not deployed (state: ${m.state})`,
       remediation: `celilo module deploy ${m.id}`,

package/src/services/bus-interview.ts

@@ -87,6 +87,16 @@ export interface SecretRequiredPayload {
    */
   key_label?: string;
   value_label?: string;
+  /**
+   * For `type: string-map` only — optional regex applied to each
+   * entered key/value. Mismatches are rejected at input time and the
+   * prompt re-fires. Pair with the `_message` variants for a
+   * plain-English explanation when the operator hits one.
+   */
+  key_pattern?: string;
+  key_pattern_message?: string;
+  value_pattern?: string;
+  value_pattern_message?: string;
 }
 
 export interface SecretAck {

package/src/services/config-interview.ts

@@ -70,6 +70,10 @@ interface SecretDeclareLike {
   description?: string;
   key_label?: string;
   value_label?: string;
+  key_pattern?: string;
+  key_pattern_message?: string;
+  value_pattern?: string;
+  value_pattern_message?: string;
   generate?: { method: string; length: number; encoding: string };
 }
 
@@ -89,6 +93,11 @@ function coerceSecretDeclare(entry: unknown): SecretDeclareLike | null {
   if (typeof e.description === 'string') out.description = e.description;
   if (typeof e.key_label === 'string') out.key_label = e.key_label;
   if (typeof e.value_label === 'string') out.value_label = e.value_label;
+  if (typeof e.key_pattern === 'string') out.key_pattern = e.key_pattern;
+  if (typeof e.key_pattern_message === 'string') out.key_pattern_message = e.key_pattern_message;
+  if (typeof e.value_pattern === 'string') out.value_pattern = e.value_pattern;
+  if (typeof e.value_pattern_message === 'string')
+    out.value_pattern_message = e.value_pattern_message;
   if (typeof e.generate === 'object' && e.generate !== null) {
     const g = e.generate as Record<string, unknown>;
     if (
@@ -129,6 +138,10 @@ export async function findMissingSecrets(
       type: secret.type,
       key_label: secret.key_label,
       value_label: secret.value_label,
+      key_pattern: secret.key_pattern,
+      key_pattern_message: secret.key_pattern_message,
+      value_pattern: secret.value_pattern,
+      value_pattern_message: secret.value_pattern_message,
       generate: secret.generate,
     });
   }
@@ -161,6 +174,11 @@ export interface MissingVariable {
   /** For `type: string-map` only — labels shown in the add-loop prompt. */
   key_label?: string;
   value_label?: string;
+  /** For `type: string-map` only — optional regex validation per entry. */
+  key_pattern?: string;
+  key_pattern_message?: string;
+  value_pattern?: string;
+  value_pattern_message?: string;
 }
 
 export interface InterviewResult {
@@ -735,6 +753,10 @@ export async function interviewForMissingSecrets(
               : undefined,
           key_label: variable.key_label,
           value_label: variable.value_label,
+          key_pattern: variable.key_pattern,
+          key_pattern_message: variable.key_pattern_message,
+          value_pattern: variable.value_pattern,
+          value_pattern_message: variable.value_pattern_message,
         };
         await busInterview<SecretAck>(EVENT_TYPES.secretRequired(moduleId, variable.name), payload);
         log.success(`Saved ${variable.name}`);

package/src/services/deploy-validation.test.ts

@@ -260,4 +260,36 @@ describe('findMissingSecrets (shared)', () => {
     );
     expect(missing.map((m) => m.name)).toEqual(['still_missing']);
   });
+
+  test('passes through key_pattern / value_pattern + their messages', async () => {
+    // The terminal-responder reads these off the bus payload to apply
+    // input-time regex validation. Without manifest → MissingVariable
+    // propagation, the responder never sees them and operators end
+    // up entering invalid keys (e.g. 'www.lunacycle.net' instead of
+    // the apex 'lunacycle.net').
+    const missing = await findMissingSecrets(
+      'testmod',
+      {
+        secrets: {
+          declares: [
+            {
+              name: 'ddns_passwords',
+              type: 'string-map',
+              required: true,
+              key_pattern: '^[a-z0-9-]+\\.[a-z]{2,}$',
+              key_pattern_message: 'apex domain only — drop the www.',
+              value_pattern: '^.{8,}$',
+              value_pattern_message: 'min 8 chars',
+            },
+          ],
+        },
+      },
+      db,
+    );
+    expect(missing).toHaveLength(1);
+    expect(missing[0].key_pattern).toBe('^[a-z0-9-]+\\.[a-z]{2,}$');
+    expect(missing[0].key_pattern_message).toBe('apex domain only — drop the www.');
+    expect(missing[0].value_pattern).toBe('^.{8,}$');
+    expect(missing[0].value_pattern_message).toBe('min 8 chars');
+  });
 });

package/src/services/deploy-validation.ts

@@ -33,6 +33,10 @@ export interface ValidationResult {
     /** For `type: string-map` only — labels shown in the add-loop prompt. */
     key_label?: string;
     value_label?: string;
+    key_pattern?: string;
+    key_pattern_message?: string;
+    value_pattern?: string;
+    value_pattern_message?: string;
   }>;
 }
 
@@ -390,6 +394,10 @@ export async function findMissingRequiredVariables(
     generate?: { method: string; length: number; encoding: string };
     key_label?: string;
     value_label?: string;
+    key_pattern?: string;
+    key_pattern_message?: string;
+    value_pattern?: string;
+    value_pattern_message?: string;
   }>
 > {
   const missing: Array<{
@@ -403,6 +411,10 @@ export async function findMissingRequiredVariables(
     generate?: { method: string; length: number; encoding: string };
     key_label?: string;
     value_label?: string;
+    key_pattern?: string;
+    key_pattern_message?: string;
+    value_pattern?: string;
+    value_pattern_message?: string;
   }> = [];
 
   // Check declared variables (user config, capability, system, infrastructure)
@@ -466,6 +478,10 @@ export async function findMissingRequiredVariables(
       generate: s.generate,
       key_label: s.key_label,
       value_label: s.value_label,
+      key_pattern: s.key_pattern,
+      key_pattern_message: s.key_pattern_message,
+      value_pattern: s.value_pattern,
+      value_pattern_message: s.value_pattern_message,
     });
   }
 

package/src/services/terminal-responder.ts

@@ -397,6 +397,21 @@ async function promptForStringMap(payload: SecretRequiredPayload): Promise<strin
     `Add ${keyLabel.toLowerCase()} → ${valueLabel.toLowerCase()} entries one at a time. Press Enter on an empty ${keyLabel.toLowerCase()} when done.`,
   );
 
+  // Compile the optional regex validators once. An invalid regex (i.e.
+  // a typo in the manifest) gets surfaced once here; we treat it as
+  // "no validation" rather than wedging the whole interview.
+  const keyRegex = compileMaybeRegex(
+    payload.key_pattern,
+    `${payload.module}.${payload.key} key_pattern`,
+  );
+  const valueRegex = compileMaybeRegex(
+    payload.value_pattern,
+    `${payload.module}.${payload.key} value_pattern`,
+  );
+  const keyPatternMessage = payload.key_pattern_message ?? `must match: ${payload.key_pattern}`;
+  const valuePatternMessage =
+    payload.value_pattern_message ?? `must match: ${payload.value_pattern}`;
+
   const collected: Record<string, string> = {};
 
   while (true) {
@@ -405,7 +420,14 @@ async function promptForStringMap(payload: SecretRequiredPayload): Promise<strin
 
     const key = await promptText({
       message: keyMessage,
-      validate: () => undefined, // empty = finish
+      // promptText empties + falsy returns terminate the loop, so
+      // validate has to allow empty input. Apply the key regex only
+      // to non-empty values so the operator can still finish the loop.
+      validate: (val) => {
+        if (!val || val.trim() === '') return undefined;
+        if (keyRegex && !keyRegex.test(val.trim())) return keyPatternMessage;
+        return undefined;
+      },
     });
     if (key === undefined) {
       // User cancelled (Ctrl-C). Return undefined so the responder
@@ -429,7 +451,11 @@ async function promptForStringMap(payload: SecretRequiredPayload): Promise<strin
 
     const value = await promptPassword({
       message: `${valueLabel} for '${trimmedKey}':`,
-      validate: (val) => (!val || val.trim() === '' ? 'Required' : undefined),
+      validate: (val) => {
+        if (!val || val.trim() === '') return 'Required';
+        if (valueRegex && !valueRegex.test(val)) return valuePatternMessage;
+        return undefined;
+      },
     });
     if (value === undefined) {
       // User cancelled mid-entry; abort the whole interview.
@@ -443,6 +469,23 @@ async function promptForStringMap(payload: SecretRequiredPayload): Promise<strin
   return JSON.stringify(collected);
 }
 
+/**
+ * Compile a regex pattern from manifest config, returning null on
+ * empty or invalid input. A bad regex emits a one-time warning and
+ * disables that validation rather than crashing the interview.
+ */
+function compileMaybeRegex(pattern: string | undefined, label: string): RegExp | null {
+  if (!pattern) return null;
+  try {
+    return new RegExp(pattern);
+  } catch (err) {
+    log.warn(
+      `${label}: invalid regex '${pattern}' — ${err instanceof Error ? err.message : String(err)}. Skipping validation.`,
+    );
+    return null;
+  }
+}
+
 /**
  * Short hint shown in the prompt for non-string types so the operator
  * isn't guessing what shape we want. Returns null for plain strings —