@pellux/goodvibes-tui 0.19.27 → 0.19.29

package/src/renderer/onboarding/onboarding-wizard.ts

@@ -26,7 +26,6 @@ type RenderedFieldRow =
       readonly kind: 'field';
       readonly field: OnboardingWizardFieldDefinition;
       readonly absoluteIndex: number;
-      readonly line: 0 | 1;
     };
 
 function clamp(value: number, min: number, max: number): number {
@@ -61,6 +60,12 @@ function modeLabel(mode: OnboardingWizardController['mode']): string {
   return 'New setup';
 }
 
+function changedScreensLabel(wizard: OnboardingWizardController): string {
+  if (wizard.dirtyStepCount === 0) return 'no changes';
+  if (wizard.dirtyStepCount === 1) return '1 changed screen';
+  return `${wizard.dirtyStepCount} changed screens`;
+}
+
 function stepGlyph(
   wizard: OnboardingWizardController,
   step: OnboardingWizardStepDefinition,
@@ -95,7 +100,11 @@ function fieldBadgeTone(
     return wizard.getFieldValue(field) ? UI_TONES.state.good : UI_TONES.fg.muted;
   }
   if (field.kind === 'radio') return UI_TONES.state.active;
-  if (field.kind === 'masked') return UI_TONES.state.warn;
+  if (field.kind === 'text' || field.kind === 'masked') {
+    const missingRequired = wizard.getFieldValueLabel(field) === 'Missing';
+    if (missingRequired) return UI_TONES.state.warn;
+    if (field.kind === 'masked') return UI_TONES.state.warn;
+  }
   return UI_TONES.fg.secondary;
 }
 
@@ -116,8 +125,7 @@ function buildFieldRows(
 
   fieldWindow.fields.forEach((field, index) => {
     const absoluteIndex = fieldWindow.start + index;
-    rows.push({ kind: 'field', field, absoluteIndex, line: 0 });
-    rows.push({ kind: 'field', field, absoluteIndex, line: 1 });
+    rows.push({ kind: 'field', field, absoluteIndex });
   });
 
   if (fieldWindow.end < fieldWindow.total) {
@@ -155,6 +163,48 @@ function fieldHint(
   return field.hint;
 }
 
+function fieldRowPrefix(
+  wizard: OnboardingWizardController,
+  field: OnboardingWizardFieldDefinition,
+  selected: boolean,
+): string {
+  if (selected) return `${OVERLAY_GLYPHS.selected} `;
+  if (wizard.isFieldDirty(field.id)) return '◇ ';
+  if (field.kind === 'checklist') return (wizard.getFieldValue(field) as boolean) ? '✓ ' : '□ ';
+  if (field.kind === 'acknowledgement') return (wizard.getFieldValue(field) as boolean) ? '✓ ' : '□ ';
+  if (field.kind === 'action') return '▶ ';
+  if (field.kind === 'radio') return '◉ ';
+  return '  ';
+}
+
+function selectedFieldText(wizard: OnboardingWizardController): {
+  readonly title: string;
+  readonly hint: string;
+} {
+  if (wizard.isEditingTextField() && wizard.editingFieldId !== null) {
+    const editingField = wizard.getFieldById(wizard.editingFieldId);
+    if (editingField) {
+      return {
+        title: `Editing: ${editingField.label}`,
+        hint: fieldHint(wizard, editingField, true),
+      };
+    }
+  }
+
+  const field = wizard.getSelectedField();
+  if (!field) {
+    return {
+      title: 'Selected: none',
+      hint: 'No selectable row is active on this screen.',
+    };
+  }
+
+  return {
+    title: `Selected: ${field.label} [${wizard.getFieldValueLabel(field)}]`,
+    hint: fieldHint(wizard, field, true),
+  };
+}
+
 function renderFieldRow(
   line: Line,
   wizard: OnboardingWizardController,
@@ -178,38 +228,36 @@ function renderFieldRow(
   const fieldBg = selected ? DEFAULT_OVERLAY_PALETTE.selectedBg : UI_TONES.bg.base;
   fillRange(line, startX, width, fieldBg);
 
-  if (fieldRow.line === 0) {
-    const badge = truncateDisplay(`[${wizard.getFieldValueLabel(field)}]`, Math.max(8, Math.floor(width * 0.38)));
-    const badgeWidth = getDisplayWidth(badge);
-    const prefix = selected ? `${OVERLAY_GLYPHS.selected} ` : wizard.isFieldDirty(field.id) ? '◇ ' : '  ';
-    const labelWidth = Math.max(0, width - badgeWidth - 4);
-
-    putOverlayText(line, startX + 1, labelWidth, truncateDisplay(`${prefix}${field.label}`, labelWidth), {
-      fg: UI_TONES.fg.primary,
-      bg: fieldBg,
-      bold: selected,
-    });
-    putOverlayText(line, startX + width - badgeWidth - 1, badgeWidth, badge, {
-      fg: fieldBadgeTone(wizard, field),
-      bg: fieldBg,
-      bold: selected,
-    });
-    return;
-  }
+  const badge = truncateDisplay(`[${wizard.getFieldValueLabel(field)}]`, Math.max(8, Math.floor(width * 0.34)));
+  const badgeWidth = getDisplayWidth(badge);
+  const labelWidth = Math.max(0, width - badgeWidth - 4);
+  const prefix = fieldRowPrefix(wizard, field, selected);
 
-  putOverlayText(line, startX + 3, Math.max(0, width - 4), truncateDisplay(fieldHint(wizard, field, selected), Math.max(0, width - 4)), {
-    fg: selected ? UI_TONES.fg.secondary : UI_TONES.fg.muted,
+  putOverlayText(line, startX + 1, labelWidth, truncateDisplay(`${prefix}${field.label}`, labelWidth), {
+    fg: UI_TONES.fg.primary,
+    bg: fieldBg,
+    bold: selected,
+  });
+  putOverlayText(line, startX + width - badgeWidth - 1, badgeWidth, badge, {
+    fg: fieldBadgeTone(wizard, field),
     bg: fieldBg,
-    dim: !selected,
+    bold: selected,
   });
 }
 
 function footerText(wizard: OnboardingWizardController): string {
   if (wizard.isEditingTextField()) {
-    return '[Enter] Save  [Esc] Cancel  [Backspace] Delete  [Type] Edit value';
+    return '[Enter] Save value  [Esc] Cancel edit  [Backspace] Delete char  [Del/Ctrl+U] Clear value';
   }
 
-  return '[Tab/Shift+Tab] Step  [↑↓/j/k] Move  [Enter/Space] Toggle/Open  [1-9] Jump  [Esc] Close';
+  return '[Enter] Toggle/open  [Esc] Close  [Tab/Shift+Tab] Screen  [↑↓] Move  [Del/Ctrl+U] Clear input';
+}
+
+function controlsText(wizard: OnboardingWizardController): string {
+  if (wizard.isEditingTextField()) {
+    return 'Controls: Enter saves this value, Esc cancels editing, Backspace deletes one character, Delete or Ctrl+U clears the field.';
+  }
+  return 'Controls: Enter or Space changes the selected row; Delete or Ctrl+U clears selected text inputs; Tab/Shift+Tab changes screens; arrows move.';
 }
 
 function renderWideLayout(
@@ -229,18 +277,18 @@ function renderWideLayout(
   const summaryBg = UI_TONES.bg.summary;
   const innerLeft = layout.margin + 1;
   const availableInner = layout.innerWidth - 2;
-  const leftWidthBase = layout.innerWidth >= 108 ? 22 : 18;
-  const rightWidthBase = layout.innerWidth >= 108 ? 30 : 24;
-  const minCenterWidth = 34;
-  let leftWidth = Math.min(leftWidthBase, Math.max(16, availableInner - minCenterWidth - 12));
-  let rightWidth = Math.min(rightWidthBase, Math.max(20, availableInner - minCenterWidth - leftWidth));
+  const leftWidthBase = layout.innerWidth >= 150 ? 32 : layout.innerWidth >= 108 ? 28 : 24;
+  const rightWidthBase = layout.innerWidth >= 150 ? 34 : layout.innerWidth >= 108 ? 32 : 24;
+  const minCenterWidth = layout.innerWidth >= 120 ? 48 : 40;
+  let leftWidth = Math.min(leftWidthBase, Math.max(20, availableInner - minCenterWidth - 12));
+  let rightWidth = Math.min(rightWidthBase, Math.max(22, availableInner - minCenterWidth - leftWidth));
   let centerWidth = layout.innerWidth - leftWidth - rightWidth - 2;
 
   if (centerWidth < minCenterWidth) {
     const deficit = minCenterWidth - centerWidth;
-    const leftCut = Math.min(Math.max(0, leftWidth - 16), Math.ceil(deficit / 2));
+    const leftCut = Math.min(Math.max(0, leftWidth - 20), Math.ceil(deficit / 2));
     leftWidth -= leftCut;
-    rightWidth -= Math.min(Math.max(0, rightWidth - 20), deficit - leftCut);
+    rightWidth -= Math.min(Math.max(0, rightWidth - 22), deficit - leftCut);
     centerWidth = layout.innerWidth - leftWidth - rightWidth - 2;
   }
 
@@ -252,12 +300,13 @@ function renderWideLayout(
   const descriptionLines = wrapText(currentStep.description, Math.max(18, centerWidth - 2)).slice(0, 2);
   const summaryLines = [
     currentStep.summaryTitle,
-    ...currentStep.summaryLines,
+    ...currentStep.summaryLines.slice(0, 2),
     `Fields ${wizard.getCompletedFieldCount(wizard.stepIndex)}/${wizard.getStepFieldCount(wizard.stepIndex)} complete`,
-    `Dirty steps ${wizard.dirtyStepCount}`,
-    `Pending picker ${wizard.pendingModelPickerTarget ?? 'none'}`,
+    changedScreensLabel(wizard),
   ];
-  const fieldRows = buildFieldRows(wizard, visibleFields, Math.max(0, bodyRows - 3));
+  const fieldStartRow = 6;
+  const selectedText = selectedFieldText(wizard);
+  const fieldRows = buildFieldRows(wizard, visibleFields, Math.max(0, bodyRows - fieldStartRow));
 
   const topLine = createOverlayFilledBorderLine(
     width,
@@ -273,7 +322,7 @@ function renderWideLayout(
     bg: headerBg,
     bold: true,
   });
-  const meta = `${modeLabel(wizard.mode)}  ${wizard.stepIndex + 1}/${wizard.steps.length}  dirty ${wizard.dirtyStepCount}`;
+  const meta = `${modeLabel(wizard.mode)}  ${wizard.stepIndex + 1}/${wizard.steps.length}  ${changedScreensLabel(wizard)}`;
   putOverlayText(topLine, Math.max(layout.margin + 2, layout.margin + layout.width - getDisplayWidth(meta) - 3), layout.width - 4, meta, {
     fg: UI_TONES.fg.secondary,
     bg: headerBg,
@@ -296,7 +345,7 @@ function renderWideLayout(
     bg: headerBg,
     bold: true,
   });
-  putOverlayText(headerLine, rightStart + 1, rightWidth - 2, 'Summary Rail', {
+  putOverlayText(headerLine, rightStart + 1, rightWidth - 2, 'Summary', {
     fg: UI_TONES.fg.secondary,
     bg: summaryBg,
     bold: true,
@@ -333,28 +382,45 @@ function renderWideLayout(
         bg: bodyBg,
       });
     } else if (row === 2) {
-      const status = fitDisplay(
-        `Fields ${wizard.getCompletedFieldCount(wizard.stepIndex)}/${wizard.getStepFieldCount(wizard.stepIndex)} complete • ${modeLabel(wizard.mode)}`,
-        centerWidth - 2,
-      );
-      putOverlayText(line, centerStart + 1, centerWidth - 2, descriptionLines[1] ?? status, {
+      putOverlayText(line, centerStart + 1, centerWidth - 2, descriptionLines[1] ?? '', {
         fg: UI_TONES.fg.secondary,
         bg: bodyBg,
       });
+    } else if (row === 3) {
+      fillRange(line, centerStart, centerWidth, railBg);
+      putOverlayText(line, centerStart + 1, centerWidth - 2, truncateDisplay(controlsText(wizard), centerWidth - 2), {
+        fg: UI_TONES.state.info,
+        bg: railBg,
+      });
+    } else if (row === 4) {
+      fillRange(line, centerStart, centerWidth, DEFAULT_OVERLAY_PALETTE.selectedBg);
+      putOverlayText(line, centerStart + 1, centerWidth - 2, truncateDisplay(`Focus: ${selectedText.title.replace(/^Selected: /, '')}`, centerWidth - 2), {
+        fg: UI_TONES.fg.primary,
+        bg: DEFAULT_OVERLAY_PALETTE.selectedBg,
+        bold: true,
+      });
+    } else if (row === 5) {
+      fillRange(line, centerStart, centerWidth, DEFAULT_OVERLAY_PALETTE.selectedBg);
+      putOverlayText(line, centerStart + 1, centerWidth - 2, truncateDisplay(selectedText.hint, centerWidth - 2), {
+        fg: UI_TONES.fg.secondary,
+        bg: DEFAULT_OVERLAY_PALETTE.selectedBg,
+      });
     } else {
-      renderFieldRow(line, wizard, fieldRows[row - 3] ?? { kind: 'empty' }, centerStart, centerWidth);
+      renderFieldRow(line, wizard, fieldRows[row - fieldStartRow] ?? { kind: 'empty' }, centerStart, centerWidth);
     }
 
     const step = wizard.steps[row] ?? null;
     if (step) {
       const stepState = stepGlyph(wizard, step, row);
       const completion = `${wizard.getCompletedFieldCount(row)}/${wizard.getStepFieldCount(row)}`;
-      putOverlayText(line, leftStart + 1, leftWidth - 2, truncateDisplay(`${stepState.glyph} ${row + 1}. ${step.shortLabel}`, leftWidth - 2), {
+      const completionWidth = getDisplayWidth(completion);
+      const stepLabelWidth = Math.max(0, leftWidth - completionWidth - 4);
+      putOverlayText(line, leftStart + 1, stepLabelWidth, truncateDisplay(`${stepState.glyph} ${row + 1}. ${step.shortLabel}`, stepLabelWidth), {
         fg: stepState.fg,
         bg: railBg,
         bold: row === wizard.stepIndex,
       });
-      putOverlayText(line, Math.max(leftStart + 1, leftStart + leftWidth - getDisplayWidth(completion) - 2), leftWidth - 2, completion, {
+      putOverlayText(line, Math.max(leftStart + 1, leftStart + leftWidth - completionWidth - 2), completionWidth, completion, {
         fg: wizard.isStepDirty(row) ? UI_TONES.state.warn : UI_TONES.fg.muted,
         bg: railBg,
       });
@@ -418,7 +484,9 @@ function renderCollapsedLayout(
   const innerStart = layout.margin + 1;
   const innerWidth = layout.innerWidth;
   const descriptionLines = wrapText(currentStep.description, Math.max(14, innerWidth - 2)).slice(0, 2);
-  const fieldRows = buildFieldRows(wizard, visibleFields, Math.max(0, bodyRows - 3));
+  const fieldStartRow = 6;
+  const selectedText = selectedFieldText(wizard);
+  const fieldRows = buildFieldRows(wizard, visibleFields, Math.max(0, bodyRows - fieldStartRow));
 
   const topLine = createOverlayFilledBorderLine(
     width,
@@ -434,7 +502,7 @@ function renderCollapsedLayout(
     bg: headerBg,
     bold: true,
   });
-  const meta = `${wizard.stepIndex + 1}/${wizard.steps.length} • dirty ${wizard.dirtyStepCount}`;
+  const meta = `${wizard.stepIndex + 1}/${wizard.steps.length} • ${changedScreensLabel(wizard)}`;
   putOverlayText(topLine, Math.max(layout.margin + 2, layout.margin + layout.width - getDisplayWidth(meta) - 3), layout.width - 4, meta, {
     fg: UI_TONES.fg.secondary,
     bg: headerBg,
@@ -476,16 +544,31 @@ function renderCollapsedLayout(
         bg: bodyBg,
       });
     } else if (row === 2) {
-      const compactMeta = fitDisplay(
-        `${currentStep.summaryTitle} • ${wizard.getCompletedFieldCount(wizard.stepIndex)}/${wizard.getStepFieldCount(wizard.stepIndex)} complete`,
-        innerWidth - 2,
-      );
-      putOverlayText(line, innerStart + 1, innerWidth - 2, descriptionLines[1] ?? compactMeta, {
+      putOverlayText(line, innerStart + 1, innerWidth - 2, descriptionLines[1] ?? '', {
         fg: UI_TONES.fg.secondary,
         bg: bodyBg,
       });
+    } else if (row === 3) {
+      fillRange(line, innerStart, innerWidth, UI_TONES.bg.section);
+      putOverlayText(line, innerStart + 1, innerWidth - 2, truncateDisplay(controlsText(wizard), innerWidth - 2), {
+        fg: UI_TONES.state.info,
+        bg: UI_TONES.bg.section,
+      });
+    } else if (row === 4) {
+      fillRange(line, innerStart, innerWidth, DEFAULT_OVERLAY_PALETTE.selectedBg);
+      putOverlayText(line, innerStart + 1, innerWidth - 2, truncateDisplay(`Focus: ${selectedText.title.replace(/^Selected: /, '')}`, innerWidth - 2), {
+        fg: UI_TONES.fg.primary,
+        bg: DEFAULT_OVERLAY_PALETTE.selectedBg,
+        bold: true,
+      });
+    } else if (row === 5) {
+      fillRange(line, innerStart, innerWidth, DEFAULT_OVERLAY_PALETTE.selectedBg);
+      putOverlayText(line, innerStart + 1, innerWidth - 2, truncateDisplay(selectedText.hint, innerWidth - 2), {
+        fg: UI_TONES.fg.secondary,
+        bg: DEFAULT_OVERLAY_PALETTE.selectedBg,
+      });
     } else {
-      renderFieldRow(line, wizard, fieldRows[row - 3] ?? { kind: 'empty' }, innerStart, innerWidth);
+      renderFieldRow(line, wizard, fieldRows[row - fieldStartRow] ?? { kind: 'empty' }, innerStart, innerWidth);
     }
 
     lines.push(line);
@@ -525,7 +608,8 @@ export function renderOnboardingWizard(
   width: number,
   viewportHeight: number,
 ): Line[] {
-  const layout = createOverlayBoxLayout(width, 0, width);
+  const margin = width >= 64 ? 1 : 0;
+  const layout = createOverlayBoxLayout(width, margin, Math.max(20, width - margin * 2));
   const collapsed = layout.innerWidth < 86;
   return collapsed
     ? renderCollapsedLayout(wizard, width, viewportHeight, layout)

package/src/renderer/settings-modal-helpers.ts

@@ -75,6 +75,7 @@ export const CATEGORY_LABELS: Record<(typeof SETTINGS_CATEGORIES)[number], strin
   permissions: 'Permissions',
   mcp: 'MCP',
   sandbox: 'Sandbox',
+  surfaces: 'Surfaces',
   danger: 'Danger',
   tools: 'Tools',
   flags: 'Flags',
@@ -129,6 +130,14 @@ export const SETTING_LABELS: Partial<Record<string, string>> = {
   'web.port': 'Web Port',
   'web.publicBaseUrl': 'Web Public Base URL',
   'web.staticAssetsDir': 'Web Static Assets Dir',
+  'surfaces.ntfy.enabled': 'ntfy Enabled',
+  'surfaces.ntfy.baseUrl': 'ntfy Base URL',
+  'surfaces.ntfy.topic': 'ntfy Default Delivery Topic',
+  'surfaces.ntfy.chatTopic': 'ntfy Chat Topic',
+  'surfaces.ntfy.agentTopic': 'ntfy Agent Topic',
+  'surfaces.ntfy.remoteTopic': 'ntfy Daemon-Only Remote Topic',
+  'surfaces.ntfy.token': 'ntfy Token',
+  'surfaces.ntfy.defaultPriority': 'ntfy Default Priority',
 };
 
 export function getSettingLabel(entry: SettingEntry): string {

package/src/renderer/settings-modal.ts

@@ -64,6 +64,7 @@ export function renderSettingsModal(
   const isUiTab = SETTINGS_CATEGORIES[modal.categoryIndex] === 'ui';
   const isToolsTab = SETTINGS_CATEGORIES[modal.categoryIndex] === 'tools';
   const isNetworkTab = SETTINGS_CATEGORIES[modal.categoryIndex] === 'network';
+  const isSurfacesTab = SETTINGS_CATEGORIES[modal.categoryIndex] === 'surfaces';
   let persistentHelpers: import('./modal-factory.ts').ModalHelperRow[] | undefined;
   sections.push({
     type: 'text',
@@ -79,6 +80,8 @@ export function renderSettingsModal(
             ? 'Feature flags control staged or experimental behavior. Some changes may require restart.'
             : isToolsTab
               ? 'Configure tool LLM routing and helper model. Provider and model fields are optional — empty means use the active provider.'
+              : isSurfacesTab
+                ? 'Configure external app surfaces. Toggle each Enabled setting to auto-start that surface when the service starts.'
               : isNetworkTab
                 ? 'Configure control-plane and HTTP-listener binding. hostMode local/network use preset hosts; custom enables the host field. Changes trigger auto-restart.'
                 : 'Browse and adjust operator-facing runtime settings by category.',

package/src/runtime/bootstrap.ts

@@ -370,6 +370,20 @@ export async function bootstrapRuntime(
     };
   };
 
+  const waitForConfigDrivenRestarts = async (handle: ExternalServicesHandle): Promise<void> => {
+    const waitForRestart = async (service: unknown): Promise<void> => {
+      const maybeRestarting = service as { waitForRestart?: unknown } | null;
+      if (typeof maybeRestarting?.waitForRestart === 'function') {
+        await maybeRestarting.waitForRestart();
+      }
+    };
+
+    await Promise.all([
+      waitForRestart(handle.daemonServer),
+      waitForRestart(handle.httpListener),
+    ]);
+  };
+
   let externalServices: ExternalServicesHandle = {
     daemonServer: null,
     httpListener: null,
@@ -401,6 +415,7 @@ export async function bootstrapRuntime(
           // A failed previous startup should not prevent a restart attempt.
         }
       }
+      await waitForConfigDrivenRestarts(externalServices);
       await externalServices.stop();
       const previousBindings = externalServiceBindings;
       externalServiceBindings = readExternalServiceBindings();

package/src/runtime/onboarding/apply.ts

@@ -2,12 +2,7 @@ import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from '
 import { dirname } from 'node:path';
 import { isSecretRefInput } from '@pellux/goodvibes-sdk/platform/config/secret-refs';
 import { CONFIG_SCHEMA, DEFAULT_CONFIG } from '../../config/index.ts';
-import {
-  clearOnboardingCompletionMarker,
-  getOnboardingCompletionMarkerPath,
-  readOnboardingCompletionMarker,
-  writeOnboardingCompletionMarker,
-} from './markers.ts';
+import type { FeatureFlagConfigKey } from '../surface-feature-flags.ts';
 import {
   getOnboardingRuntimeStatePath,
   readOnboardingRuntimeState,
@@ -27,11 +22,6 @@ function getNow(deps: Pick<OnboardingApplyDependencies, 'clock'>): number {
   return deps.clock?.() ?? Date.now();
 }
 
-function normalizeCompletionSource(source: string): 'wizard' | 'command' | 'import' | 'unknown' {
-  if (source === 'wizard' || source === 'command' || source === 'import') return source;
-  return 'unknown';
-}
-
 function isPlainObject(value: unknown): value is Record<string, unknown> {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -144,11 +134,39 @@ function isMalformedGoodVibesSecretReferenceValue(value: string): boolean {
   return normalized.startsWith('goodvibes://') && !isGoodVibesSecretReferenceValue(normalized);
 }
 
+function isFeatureFlagConfigKey(key: string): key is FeatureFlagConfigKey {
+  return key === 'featureFlags' || key.startsWith('featureFlags.');
+}
+
+function validateFeatureFlagConfigValue(operation: Extract<OnboardingApplyOperation, { kind: 'set-config' }>): boolean {
+  if (!isFeatureFlagConfigKey(operation.key)) return false;
+
+  if (operation.key === 'featureFlags') {
+    if (!isPlainObject(operation.value)) throw new Error('featureFlags expects an object value.');
+    for (const [flagId, state] of Object.entries(operation.value)) {
+      if (flagId.trim().length === 0) throw new Error('featureFlags cannot contain an empty feature id.');
+      if (state !== 'enabled' && state !== 'disabled') {
+        throw new Error(`featureFlags.${flagId} expects enabled or disabled.`);
+      }
+    }
+    return true;
+  }
+
+  const flagId = operation.key.slice('featureFlags.'.length);
+  if (flagId.trim().length === 0) throw new Error('featureFlags requires a feature id.');
+  if (operation.value !== 'enabled' && operation.value !== 'disabled') {
+    throw new Error(`Config key ${operation.key} expects enabled or disabled.`);
+  }
+  return true;
+}
+
 function validateConfigValue(operation: Extract<OnboardingApplyOperation, { kind: 'set-config' }>): void {
   if (typeof operation.value === 'string' && isMalformedGoodVibesSecretReferenceValue(operation.value)) {
     throw new Error(`Config key ${operation.key} only accepts goodvibes://secrets/... secret references.`);
   }
 
+  if (validateFeatureFlagConfigValue(operation)) return;
+
   const schema = CONFIG_SCHEMA.find((entry) => entry.key === operation.key);
   if (!schema) {
     const defaultValue = operation.key.split('.').reduce<unknown>((cursor, part) => (
@@ -215,9 +233,6 @@ function validateAuthOperation(
   if (existing && !requiredRoles.every((role) => existing.roles.includes(role))) {
     throw new Error(`Existing local auth user ${username} is missing required role(s): ${requiredRoles.join(', ')}.`);
   }
-  if (existing && operation.retireBootstrapCredential) {
-    throw new Error('Replacing a bootstrap credential requires a new local admin username.');
-  }
 }
 
 function validateAcknowledgementOperation(
@@ -234,17 +249,6 @@ function validateAcknowledgementOperation(
   }
 }
 
-function validateCompletionMarkerOperation(
-  deps: OnboardingApplyDependencies,
-  operation: Extract<OnboardingApplyOperation, { kind: 'set-completion-marker' }>,
-): void {
-  const marker = readOnboardingCompletionMarker(deps.shellPaths, operation.scope);
-  if (marker.parseError && !operation.completed) return;
-  if (marker.parseError) {
-    throw new Error(`Existing ${operation.scope} onboarding marker could not be parsed: ${marker.parseError}`);
-  }
-}
-
 function applyConfigOperation(
   deps: OnboardingApplyDependencies,
   operation: Extract<OnboardingApplyOperation, { kind: 'set-config' }>,
@@ -264,7 +268,7 @@ function applyConfigOperation(
     };
   }
 
-  deps.config.setDynamic(operation.key, operation.value);
+  deps.config.setDynamic(operation.key as never, operation.value);
   return {
     kind: operation.kind,
     summary: `Updated ${operation.key} in global onboarding settings.`,
@@ -300,7 +304,9 @@ function applyAuthOperation(
     ? parseBootstrapCredential(readFileSync(before.bootstrapCredentialPath, 'utf-8'))
     : null;
 
-  if (!existing) {
+  if (existing) {
+    auth.rotatePassword(username, operation.password);
+  } else {
     auth.addUser(username, operation.password, operation.roles ?? ['admin']);
   }
 
@@ -318,7 +324,7 @@ function applyAuthOperation(
   return {
     kind: operation.kind,
     summary: existing
-      ? `Verified local auth user ${username}.`
+      ? `Updated local auth user ${username}.`
       : `Created local auth user ${username}.`,
   };
 }
@@ -413,9 +419,9 @@ async function buildRollbackAction(
       );
     }
 
-    const previous = deps.config.get(operation.key);
+    const previous = deps.config.get(operation.key as never);
     return () => {
-      deps.config.setDynamic(operation.key, previous);
+      deps.config.setDynamic(operation.key as never, previous);
     };
   }
 
@@ -433,9 +439,8 @@ async function buildRollbackAction(
     );
   }
 
-  return snapshotFileRollback(
-    getOnboardingCompletionMarkerPath(deps.shellPaths, operation.scope),
-  );
+  const neverOperation: never = operation;
+  throw new Error(`Unsupported onboarding operation: ${JSON.stringify(neverOperation)}`);
 }
 
 function applyAcknowledgementOperation(
@@ -458,35 +463,6 @@ function applyAcknowledgementOperation(
   };
 }
 
-function applyCompletionMarkerOperation(
-  deps: OnboardingApplyDependencies,
-  request: OnboardingApplyRequest,
-  operation: Extract<OnboardingApplyOperation, { kind: 'set-completion-marker' }>,
-): OnboardingAppliedOperation {
-  if (!operation.completed) {
-    clearOnboardingCompletionMarker(deps.shellPaths, operation.scope);
-    return {
-      kind: operation.kind,
-      summary: `Cleared ${operation.scope} onboarding completion marker.`,
-    };
-  }
-
-  const updatedAt = getNow(deps);
-  writeOnboardingCompletionMarker(deps.shellPaths, {
-    scope: operation.scope,
-    completedAt: operation.payload?.completedAt,
-    updatedAt: operation.payload?.updatedAt ?? updatedAt,
-    source: operation.payload?.source ?? normalizeCompletionSource(request.source),
-    mode: operation.payload?.mode ?? request.mode,
-    workspaceRoot: operation.payload?.workspaceRoot,
-  });
-
-  return {
-    kind: operation.kind,
-    summary: `Wrote ${operation.scope} onboarding completion marker.`,
-  };
-}
-
 function orderApplyOperations(
   operations: readonly OnboardingApplyOperation[],
 ): readonly OnboardingApplyOperation[] {
@@ -499,7 +475,7 @@ function orderApplyOperations(
     operation.kind === 'set-config' && operation.key !== 'storage.secretPolicy'
   ));
   const finalOperations = operations.filter((operation) => (
-    operation.kind === 'acknowledge' || operation.kind === 'set-completion-marker'
+    operation.kind === 'acknowledge'
   ));
 
   return [
@@ -543,7 +519,8 @@ function prevalidateApplyRequest(
         continue;
       }
 
-      validateCompletionMarkerOperation(deps, operation);
+      const neverOperation: never = operation;
+      throw new Error(`Unsupported onboarding operation: ${JSON.stringify(neverOperation)}`);
     } catch (error) {
       errors.push({
         kind: operation.kind,
@@ -560,22 +537,9 @@ function getVerificationFailureKind(itemId: string): OnboardingApplyOperation['k
   if (itemId.startsWith('secret:')) return 'set-secret';
   if (itemId.startsWith('auth:')) return 'ensure-auth-user';
   if (itemId.startsWith('acknowledge:')) return 'acknowledge';
-  if (itemId.startsWith('marker:')) return 'set-completion-marker';
   return 'set-config';
 }
 
-function splitCompletionMarkerOperations(
-  operations: readonly OnboardingApplyOperation[],
-): {
-  readonly preMarkerOperations: readonly OnboardingApplyOperation[];
-  readonly markerOperations: readonly OnboardingApplyOperation[];
-} {
-  return {
-    preMarkerOperations: operations.filter((operation) => operation.kind !== 'set-completion-marker'),
-    markerOperations: operations.filter((operation) => operation.kind === 'set-completion-marker'),
-  };
-}
-
 export async function applyOnboardingRequest(
   deps: OnboardingApplyDependencies,
   request: OnboardingApplyRequest,
@@ -593,7 +557,6 @@ export async function applyOnboardingRequest(
   }
 
   const orderedOperations = orderApplyOperations(request.operations);
-  const { preMarkerOperations, markerOperations } = splitCompletionMarkerOperations(orderedOperations);
   const rollbacks: RollbackAction[] = [];
 
   const applyOperations = async (operations: readonly OnboardingApplyOperation[]): Promise<boolean> => {
@@ -625,8 +588,8 @@ export async function applyOnboardingRequest(
           continue;
         }
 
-        applied.push(applyCompletionMarkerOperation(deps, request, operation));
-        rollbacks.push(rollback);
+        const neverOperation: never = operation;
+        throw new Error(`Unsupported onboarding operation: ${JSON.stringify(neverOperation)}`);
       } catch (error) {
         const rollbackErrors = await runRollbacks([...rollbacks, rollback]);
         applied.length = 0;
@@ -660,19 +623,11 @@ export async function applyOnboardingRequest(
     return false;
   };
 
-  if (!await applyOperations(preMarkerOperations)) {
-    return { ok: false, applied, skipped, errors };
-  }
-
-  if (!await verifyOrRollback(preMarkerOperations)) {
-    return { ok: false, applied, skipped, errors };
-  }
-
-  if (!await applyOperations(markerOperations)) {
+  if (!await applyOperations(orderedOperations)) {
     return { ok: false, applied, skipped, errors };
   }
 
-  if (!await verifyOrRollback(request.operations)) {
+  if (!await verifyOrRollback(orderedOperations)) {
     return { ok: false, applied, skipped, errors };
   }