@pellux/goodvibes-tui 1.16.0 → 1.17.0

package/src/input/settings-modal-types.ts

@@ -1,11 +1,12 @@
 import type { ConfigSetting } from '@pellux/goodvibes-sdk/platform/config';
 import type { ProviderAuthFreshness, ProviderAuthRoute } from '@/runtime/index.ts';
-import type { FeatureFlag, FlagState } from '@/runtime/index.ts';
+import type { FeatureFlag, FeatureSetting, FlagState } from '@/runtime/index.ts';
 
 export type SettingsCategory =
   | 'display'
   | 'ui'
   | 'provider'
+  | 'pricing'
   | 'subscriptions'
   | 'behavior'
   | 'storage'
@@ -43,8 +44,8 @@ export type SettingsCategory =
   | 'integrations'
   | 'policy'
   | 'notifications'
-  | 'flags'
   | 'release'
+  | 'update'
   | 'danger';
 
 export type SettingsFocusPane = 'categories' | 'settings';
@@ -54,12 +55,12 @@ export const SETTINGS_CATEGORY_GROUPS: ReadonlyArray<{
   readonly categories: readonly SettingsCategory[];
 }> = [
   { label: 'Interface', categories: ['display', 'ui', 'behavior', 'notifications', 'permissions', 'policy', 'security'] },
-  { label: 'AI Routing', categories: ['provider', 'subscriptions', 'helper', 'tools', 'tts'] },
+  { label: 'AI Routing', categories: ['provider', 'pricing', 'subscriptions', 'helper', 'tools', 'tts'] },
   { label: 'Service & Network', categories: ['service', 'daemon', 'network', 'controlPlane', 'httpListener', 'web', 'relay'] },
   { label: 'Surfaces & Cloud', categories: ['surfaces', 'integrations', 'mcp', 'cloudflare'] },
   { label: 'Automation', categories: ['batch', 'automation', 'checkin', 'watchers', 'orchestration', 'planner', 'wrfc'] },
   { label: 'Runtime & Data', categories: ['storage', 'atRest', 'sandbox', 'fetch', 'agents', 'runtime', 'cache', 'telemetry', 'diagnostics', 'learning'] },
-  { label: 'Advanced', categories: ['flags', 'release', 'danger'] },
+  { label: 'Advanced', categories: ['release', 'update', 'danger'] },
 ];
 
 export const SETTINGS_CATEGORIES: SettingsCategory[] = SETTINGS_CATEGORY_GROUPS.flatMap(group => group.categories);
@@ -74,34 +75,40 @@ export interface SettingEntry {
   sourceLabel?: string;
   lockReason?: string;
   /**
-   * Present when this row is a feature-unit toggle header (a feature flag
-   * rendered as one unit with its config keys beneath it). The row's
-   * setting.key is `featureFlags.<id>` and setting.type is 'boolean'; toggling
-   * routes to the feature-flag manager, not a plain config write.
+   * Present when this row is a feature-unit header (a platform capability
+   * rendered as one unit with the settings that tune it beneath). The row IS
+   * the real config row for the feature's enablement key — boolean headers
+   * toggle and enum headers cycle their mode choices through the ordinary
+   * settings write path (a plain config write; the settings bridge keeps the
+   * runtime gate in sync).
    */
   flag?: FlagEntry;
   /**
-   * Present when this row is a config sub-option OWNED by a feature unit — the
-   * id of the owning flag. Drives the indented rendering beneath its header and
-   * marks the row as claimed so it does not double-list as an orphan.
+   * Present when this row is a settings sub-option OWNED by a feature unit —
+   * the id of the owning feature. Drives the indented rendering beneath its
+   * header and marks the row as claimed so it does not double-list as an
+   * orphan.
    */
   ownerFlagId?: string;
 }
 
 export interface FlagEntry {
+  /** The per-feature settings metadata (domain, enablement shape, settings keys, real description). */
+  feature: FeatureSetting;
+  /** The internal gate declaration (kill state/reason live here). */
   flag: FeatureFlag;
   /** Live effective state as the runtime currently sees it. */
   state: FlagState;
   /**
    * Last known config-layer (persisted) value. Equals `state` unless a
-   * startup-gated flag was toggled this session — then it holds the value that
-   * will take effect on the next launch.
+   * startup-gated feature was changed this session — then it holds the value
+   * that will take effect on the next launch.
    */
   persistedState: FlagState;
   /**
-   * True when a startup-gated flag's persisted value differs from its effective
-   * state, i.e. a restart is required before the change takes effect. Sourced
-   * from FeatureFlagManager.getAll(), never guessed.
+   * True when a startup-gated feature's persisted value differs from its
+   * effective state, i.e. a restart is required before the change takes
+   * effect. Sourced from FeatureFlagManager.getAll(), never guessed.
    */
   pendingRestart: boolean;
 }

package/src/input/settings-modal.ts

@@ -5,9 +5,12 @@
  *   - Active category (Tab to cycle)
  *   - Selected setting index within category (↑↓)
  *   - Editing mode for inline string/number input
- *   - Feature flags tab with runtime toggle support
+ *   - Feature-unit headers (each capability's real enablement row in its domain)
  *
- * Saves changes via configManager.set(key, value) or featureFlagManager methods.
+ * Every save is a plain configManager.set(key, value) on a domain settings
+ * key; the SDK settings bridge keeps the runtime gate manager in sync, and
+ * this modal re-reads the manager after enablement writes so pending-restart
+ * markers are shown honestly at the point of change.
  *
  * Data assembly delegates to settings-modal-data.ts (buildSettingGroups, etc.).
  * Mutation logic delegates to settings-modal-mutations.ts (applySettingValue, etc.).
@@ -41,7 +44,6 @@ import {
 } from './settings-modal-types.ts';
 import {
   buildSettingGroups,
-  buildFlagEntries,
   buildMcpEntries,
   buildSubscriptionEntries,
   buildNetworkFilteredItems,
@@ -51,9 +53,10 @@ import {
 import { getSettingLabel } from '../renderer/settings-modal-helpers.ts';
 import {
   applySettingValue,
-  applyFlagState,
+  syncFlagEntryFromManager,
   type SettingAppliedCallback,
 } from './settings-modal-mutations.ts';
+import { featureEnablementWrite, isFeatureValueEnabled } from '../runtime/feature-settings.ts';
 import {
   activateSelected as _activateSelected,
   handleSubscriptionLogoutKey as _handleSubscriptionLogoutKey,
@@ -117,6 +120,13 @@ export class SettingsModal {
 
   /** Current value of the inline edit buffer. */
   public editBuffer = '';
+  /**
+   * Scroll offset (in wrapped lines) of the documentation pane for the
+   * selected row. The renderer clamps it to the pane's real content height
+   * and shows honest more-above/below markers — long feature documentation
+   * scrolls, it never clips. Reset whenever the selection changes.
+   */
+  public contextScroll = 0;
   /** Server awaiting explicit allow-all confirmation, if any. */
   public mcpAllowAllConfirmationTarget: string | null = null;
   /**
@@ -140,8 +150,6 @@ export class SettingsModal {
   /** Settings grouped by category. */
   public groups: Map<SettingsCategory, SettingEntry[]> = new Map();
 
-  /** Feature flag entries (populated when flags tab is active). */
-  public flagEntries: FlagEntry[] = [];
   /** MCP server trust entries (populated when mcp tab is active). */
   public mcpEntries: McpEntry[] = [];
   /** Provider subscription entries (populated when subscriptions tab is active). */
@@ -207,7 +215,6 @@ export class SettingsModal {
     this.mcpRegistry = mcpRegistry ?? null;
     this.onSettingApplied = options?.onSettingApplied ?? null;
     this.groups = buildSettingGroups(configManager, featureFlagManager);
-    this.flagEntries = buildFlagEntries(featureFlagManager);
     this.mcpEntries = buildMcpEntries(this.mcpRegistry);
     this.subscriptionEntries = buildSubscriptionEntries(subscriptionManager, serviceRegistry);
     this.categoryIndex = 0;
@@ -225,9 +232,15 @@ export class SettingsModal {
     this.searchQuery = '';
     this.searchResults = [];
     this.searchFocused = false;
+    this.contextScroll = 0;
     this.active = true;
   }
 
+  /** Scroll the documentation pane by `delta` wrapped lines (renderer clamps the top end). */
+  scrollContext(delta: number): void {
+    this.contextScroll = Math.max(0, this.contextScroll + delta);
+  }
+
   close(): void {
     this.active = false;
     this.editingMode = false;
@@ -242,6 +255,7 @@ export class SettingsModal {
     this.searchQuery = '';
     this.searchResults = [];
     this.searchFocused = false;
+    this.contextScroll = 0;
     this.serviceRegistry = null;
     this.secretsManager = null;
     this.onSettingApplied = null;
@@ -266,6 +280,7 @@ export class SettingsModal {
   setSearchQuery(query: string): void {
     this.searchQuery = query;
     this.searchFocused = true;
+    this.contextScroll = 0;
     if (query.trim().length === 0) {
       this.searchResults = [];
     } else {
@@ -286,6 +301,7 @@ export class SettingsModal {
     if (this.editingMode) return;
     this.categoryIndex = (this.categoryIndex + 1) % SETTINGS_CATEGORIES.length;
     this.selectedIndex = 0;
+    this.contextScroll = 0;
     this.subscriptionLogoutConfirmationTarget = null;
     this._reloadTabEntries();
   }
@@ -295,6 +311,7 @@ export class SettingsModal {
     if (this.editingMode) return;
     this.categoryIndex = (this.categoryIndex - 1 + SETTINGS_CATEGORIES.length) % SETTINGS_CATEGORIES.length;
     this.selectedIndex = 0;
+    this.contextScroll = 0;
     this.subscriptionLogoutConfirmationTarget = null;
     this._reloadTabEntries();
   }
@@ -326,6 +343,7 @@ export class SettingsModal {
 
   moveUp(): void {
     if (this.editingMode) return;
+    this.contextScroll = 0;
     if (this.searchFocused) {
       if (this.searchResults.length > 0) {
         this.selectedIndex = (this.selectedIndex - 1 + this.searchResults.length) % this.searchResults.length;
@@ -334,9 +352,7 @@ export class SettingsModal {
     }
     const items = this._currentItems();
     if (items.length === 0) {
-      if (this.currentCategory === 'flags' && this.flagEntries.length > 0) {
-        this.selectedIndex = (this.selectedIndex - 1 + this.flagEntries.length) % this.flagEntries.length;
-      } else if (this.currentCategory === 'mcp' && this.mcpEntries.length > 0) {
+      if (this.currentCategory === 'mcp' && this.mcpEntries.length > 0) {
         this.selectedIndex = (this.selectedIndex - 1 + this.mcpEntries.length) % this.mcpEntries.length;
       } else if (this.currentCategory === 'subscriptions' && this.subscriptionEntries.length > 0) {
         this.selectedIndex = (this.selectedIndex - 1 + this.subscriptionEntries.length) % this.subscriptionEntries.length;
@@ -350,6 +366,7 @@ export class SettingsModal {
 
   moveDown(): void {
     if (this.editingMode) return;
+    this.contextScroll = 0;
     if (this.searchFocused) {
       if (this.searchResults.length > 0) {
         this.selectedIndex = (this.selectedIndex + 1) % this.searchResults.length;
@@ -358,9 +375,7 @@ export class SettingsModal {
     }
     const items = this._currentItems();
     if (items.length === 0) {
-      if (this.currentCategory === 'flags' && this.flagEntries.length > 0) {
-        this.selectedIndex = (this.selectedIndex + 1) % this.flagEntries.length;
-      } else if (this.currentCategory === 'mcp' && this.mcpEntries.length > 0) {
+      if (this.currentCategory === 'mcp' && this.mcpEntries.length > 0) {
         this.selectedIndex = (this.selectedIndex + 1) % this.mcpEntries.length;
       } else if (this.currentCategory === 'subscriptions' && this.subscriptionEntries.length > 0) {
         this.selectedIndex = (this.selectedIndex + 1) % this.subscriptionEntries.length;
@@ -414,6 +429,7 @@ export class SettingsModal {
   selectTarget(target?: string): void {
     const normalized = target?.trim();
     if (!normalized) return;
+    this.contextScroll = 0;
 
     const categoryIndex = SETTINGS_CATEGORIES.indexOf(normalized as SettingsCategory);
     if (categoryIndex >= 0) {
@@ -493,38 +509,21 @@ export class SettingsModal {
   }
 
   /**
-   * Toggle the currently selected feature flag.
-   *
-   * Killed flags cannot be toggled. Non-runtimeToggleable flags toggle in config
-   * only (require restart). runtimeToggleable flags toggle immediately.
+   * Toggle the currently selected feature unit through its real domain
+   * settings key: boolean/constant enablements flip the key, enum enablements
+   * jump between the feature's stock active mode and its off mode. Killed
+   * features cannot be toggled; constant capabilities with no off position
+   * (non-boolean keys) are left to their domain settings.
    */
   toggleSelectedFlag(): void {
     const entry = this.getSelected();
     if (!entry?.flag) return;
     if (entry.flag.state === 'killed') return;
-    this._toggleFlagValue(entry.setting.key as ConfigKey, entry.flag.state !== 'enabled');
-  }
-
-  /**
-   * Toggle the feature flag behind a `featureFlags.<id>` header row. Finds the
-   * header entry, applies the desired state through the flag manager (runtime +
-   * persisted override), and refreshes the header row's value/default marker in
-   * place. Killed flags and no-op toggles are ignored.
-   */
-  private _toggleFlagValue(key: ConfigKey, value: unknown): void {
-    if (!this.featureFlagManager || !this.configManager) return;
-    let target: SettingEntry | null = null;
-    for (const entries of this.groups.values()) {
-      const candidate = entries.find((e) => e.setting.key === key && e.flag);
-      if (candidate) { target = candidate; break; }
-    }
-    if (!target?.flag) return;
-    if (target.flag.state === 'killed') return;
-    const desired = value ? 'enabled' : 'disabled';
-    if (target.flag.state === desired) return;
-    applyFlagState(target.flag, desired, this.featureFlagManager, this.configManager);
-    target.currentValue = target.flag.state === 'enabled';
-    target.isDefault = target.flag.state === target.flag.flag.defaultState;
+    const feature = entry.flag.feature;
+    const currentlyOn = isFeatureValueEnabled(feature, entry.currentValue);
+    const write = featureEnablementWrite(feature.id, !currentlyOn);
+    if (!write) return;
+    this._setValue(write.key, write.value);
   }
 
   /**
@@ -586,6 +585,18 @@ export class SettingsModal {
       }
     }
 
+    if (setting.type === 'object') {
+      // Object-typed keys (e.g. pricing.modelPrices) edit as JSON; the
+      // schema's validate() below still rules on the parsed shape.
+      try {
+        parsed = JSON.parse(this.editBuffer);
+      } catch {
+        this.editingMode = false;
+        this.editBuffer = '';
+        return false;
+      }
+    }
+
     if (setting.validate && !setting.validate(parsed)) {
       this.editingMode = false;
       this.editBuffer = '';
@@ -685,11 +696,9 @@ export class SettingsModal {
 
   // ── Private helpers ────────────────────────────────────────────────────────────────
 
-  /** Reload flag/mcp/subscription entries when the active tab changes. */
+  /** Reload mcp/subscription entries when the active tab changes. */
   private _reloadTabEntries(): void {
-    if (this.currentCategory === 'flags') {
-      this.flagEntries = buildFlagEntries(this.featureFlagManager);
-    } else if (this.currentCategory === 'mcp') {
+    if (this.currentCategory === 'mcp') {
       this.mcpEntries = buildMcpEntries(this.mcpRegistry);
     } else if (this.currentCategory === 'subscriptions') {
       this.subscriptionEntries = buildSubscriptionEntries(this.subscriptionManager, this.serviceRegistry);
@@ -698,8 +707,8 @@ export class SettingsModal {
 
   /**
    * Returns [] for the mcp/subscriptions categories (which render their own
-   * entry types). The 'flags' category now flows through the normal group path
-   * — it holds the no-config feature-unit toggles (Advanced Features).
+   * entry types). Every other category flows through the normal group path,
+   * feature-unit headers included.
    */
   private _currentItems(): SettingEntry[] {
     if (
@@ -716,15 +725,6 @@ export class SettingsModal {
   private _setValue(key: ConfigKey, value: unknown): void {
     if (!this.configManager) return;
 
-    // Feature-unit toggle headers write to `featureFlags.<id>`; route those to
-    // the feature-flag manager (runtime toggle + persisted override) instead of
-    // a plain config write. Reset/adjust/activate all funnel a boolean value
-    // here (true = enabled), so this is the single flag-toggle chokepoint.
-    if (typeof key === 'string' && key.startsWith('featureFlags.')) {
-      this._toggleFlagValue(key, value);
-      return;
-    }
-
     const callback: SettingAppliedCallback | null = this.onSettingApplied
       ? (change) => this.onSettingApplied!(change)
       : null;
@@ -740,6 +740,13 @@ export class SettingsModal {
       },
     });
 
+    // Feature-unit headers write plain domain keys; the SDK settings bridge
+    // has already applied the change to the gate manager (live flip for
+    // runtime-toggleable features, pending-restart marker for startup-gated
+    // ones). Re-read the manager for every header bound to this key so the
+    // rows and the context pane show the honest state at the point of change.
+    this._syncFeatureHeadersForKey(key);
+
     if (result.restartDomain !== null) {
       this.lastSaveTriggeredRestart = result.restartDomain;
     }
@@ -749,4 +756,16 @@ export class SettingsModal {
     // No-op (result.changed === false, effectMessage === null): leave lastSettingEffectMessage untouched.
   }
 
+  /** Refresh live/persisted/pending state for every feature header bound to `key`. */
+  private _syncFeatureHeadersForKey(key: ConfigKey): void {
+    if (!this.featureFlagManager) return;
+    for (const entries of this.groups.values()) {
+      for (const entry of entries) {
+        if (entry.flag && entry.flag.feature.enablement.key === key) {
+          syncFlagEntryFromManager(entry.flag, this.featureFlagManager);
+        }
+      }
+    }
+  }
+
 }

package/src/main.ts

@@ -13,6 +13,7 @@ import { FileUndoManager } from '@pellux/goodvibes-sdk/platform/state';
 import { PermissionManager } from '@pellux/goodvibes-sdk/platform/permissions';
 import { AcpManager } from '@pellux/goodvibes-sdk/platform/acp';
 import { PermissionPromptUI, buildPendingPermissionExtras } from './permissions/prompt.ts';
+import { handleBrokerApprovalChange, buildFixSessionAffordance, buildFixSessionErrorNotice, handleFixSessionAttachKey, refreshFixSessionsFromApprovals } from './permissions/broker-approval-card.ts';
 import { CommandRegistry } from './input/command-registry.ts';
 import type { CommandContext } from './input/command-registry.ts';
 import { renderProcessIndicator } from './renderer/process-indicator.ts';
@@ -32,8 +33,10 @@ import { logger } from '@pellux/goodvibes-sdk/platform/utils';
 import { registerBuiltinPanels } from './panels/builtin-panels.ts';
 import { bootstrapRuntime } from './runtime/bootstrap.ts';
 import type { BootstrapContext } from './runtime/bootstrap.ts';
+import { selfUpdateAtLaunch } from './cli/launch-auto-update.ts';
 import { buildSharedOrchestratorCoreServices, refreshMemoryRecallSnapshot } from './runtime/orchestrator-core-services.ts';
-import type { HITLMode } from '@pellux/goodvibes-sdk/platform/state';
+import { createSessionContinuityHintsBuilder } from './runtime/session-continuity-hints.ts';
+import { resolveWebSurfaceUrl } from '@pellux/goodvibes-sdk/platform/runtime/feature-announcements';
 import { readLastSessionPointer, writeRecoveryFile } from '@/runtime/index.ts';
 import { handleBlockingShellInput, type PendingPermissionState } from './shell/blocking-input.ts';
 import { createPersistRecoverySnapshot, createRecoveryFileOps, createReopenRecoveryPanels, handleErrorAffordanceKey, resolveStartupRecoveryInfo } from './shell/recovery-input-helpers.ts';
@@ -43,7 +46,7 @@ import { buildPersistedSessionContext, formatReturnContextForDisplay, getReturnC
 import { summarizeError } from '@pellux/goodvibes-sdk/platform/utils';
 import { prepareShellCliRuntime } from './cli/entrypoint.ts';
 import { applyInitialTuiCliState } from './cli/tui-startup.ts';
-import { applyRuntimeConfigDefault, applyRuntimeConfigValue } from './cli/config-overrides.ts';
+import { applyConfiguredHitlMode, applyRuntimeConfigValue, applyTuiRuntimeConfigDefaults } from './cli/config-overrides.ts';
 import { renderToolCallBlock } from './renderer/tool-call.ts';
 import { wireSpokenTurnRuntime } from './audio/spoken-turn-wiring.ts';
 import { attachSpokenTurnModelRouting, createSpokenTurnInputOptions } from './audio/spoken-turn-model-routing.ts';
@@ -79,6 +82,10 @@ async function main() {
     homeDirectory: homedir(),
   }, 'goodvibes');
 
+  // Launch-time self-update, before any bootstrap or terminal mode change; on
+  // an installed update this restarts onto the swapped binary and never returns.
+  const launchUpdateLines = await selfUpdateAtLaunch({ configManager, stdout });
+
   const ctx: BootstrapContext = await bootstrapRuntime(stdout, {
     configManager,
     workingDir: bootstrapWorkingDir,
@@ -102,7 +109,7 @@ async function main() {
     agentStatusIntervalRef,
     orchestratorRefs,
     setRenderRequest,
-    permissionPromptRef,
+    permissionPromptRef, trustPromptRef,
     _writeLastSessionPointer: writeLastSessionPointer,
     systemMessageRouter,
   } = ctx;
@@ -111,7 +118,7 @@ async function main() {
   const { approvalBroker, agentManager, modeManager, processManager, providerRegistry, secretsManager, subscriptionManager } = ctx.services;
   conversation.setSessionMemoryStore(ctx.services.sessionMemoryStore);
   conversation.setSessionLineageTracker(ctx.services.sessionLineageTracker);
-  // Shared payload (single source of truth, includes wo805's memoryRegistry —
+  // Shared payload (single source of truth, includes the memoryRegistry —
   // see orchestrator-core-services.ts) plus this site's favoritesStore.
   orchestrator.setCoreServices({
     ...buildSharedOrchestratorCoreServices({ services: ctx.services, configManager, providerRegistry }),
@@ -120,49 +127,37 @@ async function main() {
   ctx.services.wrfcController.setPlanManager(ctx.services.planManager);
   let activeConversationWidth = stdout.columns || 80;
   conversation.setWidthProvider(() => activeConversationWidth);
-  {
-    const hitlMode = configManager.get('behavior.hitlMode') as HITLMode | undefined;
-    if (hitlMode && (hitlMode === 'quiet' || hitlMode === 'balanced' || hitlMode === 'operator')) {
-      modeManager.setHITLMode(hitlMode);
-    }
-  }
+  // Persisted HITL mode + TUI-side config defaults (doc'd at their definitions).
+  applyConfiguredHitlMode(configManager, modeManager);
+  applyTuiRuntimeConfigDefaults(configManager);
 
-  // TUI default: show token speed ON (SDK schema default is false). applyRuntimeConfigDefault
-  // reads the global + project settings files and only applies the default in-memory when the
-  // key is absent from both (e.g. a new install); an explicit user value is respected. No disk write.
-  applyRuntimeConfigDefault(configManager, 'display.showTokenSpeed', true);
+  // Re-surface pre-TUI launch-update lines in-session (the alt screen wipes stdout).
+  for (const line of launchUpdateLines) systemMessageRouter.high(`[Update] ${line}`);
 
   const panelManager = ctx.services.panelManager;
-  const buildSessionContinuityHints = () => {
-    const sessionSnapshot = uiServices.readModels.session.getSnapshot();
-    const tasksSnapshot = uiServices.readModels.tasks.getSnapshot();
-    const remoteSnapshot = uiServices.readModels.remote.getSnapshot();
-    const worktreeSnapshot = uiServices.readModels.worktrees.getSnapshot();
-    return {
-      pendingApprovals: sessionSnapshot.pendingApproval ? 1 : 0,
-      activeTasks: tasksSnapshot.tasks.filter((task) => task.status === 'running' || task.status === 'queued').length,
-      blockedTasks: tasksSnapshot.tasks.filter((task) => task.status === 'blocked').length,
-      remoteContracts: remoteSnapshot.contracts.length,
-      remoteRunners: remoteSnapshot.contracts.slice(0, 4).map((contract) => contract.runnerId),
-      worktreeCount: worktreeSnapshot.records.length,
-      worktreePaths: worktreeSnapshot.records.slice(0, 3).map((record) => record.path),
-      openPanels: panelManager.getAllOpen().map((panel) => panel.id),
-    };
-  };
+  const buildSessionContinuityHints = createSessionContinuityHintsBuilder({ readModels: uiServices.readModels, panelManager });
 
   let pendingPermission: PendingPermissionState | null = null;
-  approvalBroker.subscribe((approval) => {
-    if (!pendingPermission) return;
-    if (pendingPermission.callId !== approval.callId) return;
-    if (approval.status === 'pending' || approval.status === 'claimed') return;
-    pendingPermission = null;
-    render();
+  // One-key jump/attach to a spawned CI fix-session: the affordance ARMS the id; the next 'j' runs the resume so the user never retypes it.
+  let fixSessionAttachArmed: string | null = null;
+  const attachToFixSession = (fixSessionId: string) => { void commandContext.executeCommand?.('session', ['resume', fixSessionId]); };
+  const onFixSessionStarted = buildFixSessionAffordance({
+    notify: (message) => { systemMessageRouter.high(message); render(); },
+    arm: (fixSessionId) => { fixSessionAttachArmed = fixSessionId; },
   });
+  // A failed fix-session spawn stamps an error instead of a dead id: render it honestly, no jump armed.
+  const onFixSessionError = buildFixSessionErrorNotice((message) => { systemMessageRouter.high(message); render(); });
+  commandContext.armFixSessionAttach = onFixSessionStarted;
+  approvalBroker.subscribe((approval) => handleBrokerApprovalChange({
+    approval, broker: approvalBroker, render, onFixSessionStarted, onFixSessionError,
+    getPending: () => pendingPermission,
+    setPending: (next) => { pendingPermission = next; },
+  }));
+  refreshFixSessionsFromApprovals(() => approvalBroker.listApprovals(), onFixSessionStarted, onFixSessionError); // catch pre-subscription stamps
 
   let scrollTop = 0;
   let scrollLocked = true;
-  // Cached from the overlay-aware clamp the renderer computes (conversation-layout) each
-  // frame so scroll() clamps against exactly what is displayed, not a footer estimate.
+  // Cached from the overlay-aware clamp the renderer computes (conversation-layout) each frame so scroll() clamps against exactly what is displayed, not a footer estimate.
   let lastMaxScroll: number | null = null;
   // Stream and tool-timer state; mutated by wireStreamEventMetrics handlers, read during render.
   const streamMetrics: StreamMetrics = {
@@ -185,8 +180,7 @@ async function main() {
     const currentModel = providerRegistry.getCurrentModel();
     const contextWindow = providerRegistry.getContextWindowForModel(currentModel);
     const rows = stdout.rows || 24;
-    // Compact threshold must match buildShellFooter's `compact: height < 30` posture below,
-    // else estimateShellFooterHeight's cached-height fast path answers with the wrong mode.
+    // Compact threshold must match buildShellFooter's `compact: height < 30` posture below, else estimateShellFooterHeight's cached-height fast path answers with the wrong mode.
     return rows - 2 - estimateShellFooterHeight(promptLines, contextWindow, rows < 30);
   };
 
@@ -414,7 +408,7 @@ async function main() {
   input.setConversationManager(conversation);
   input.setContentWidth(getPromptContentWidth());
   input.filePicker.setOnUpdate(() => render());
-  // W6.1 retirement: agentDetailModal/processModal setOnRefresh wiring removed —
+  // retirement: agentDetailModal/processModal setOnRefresh wiring removed —
   // those modals were deleted (Fleet subsumes the live process tree via F2).
 
   // Model picker callback is handled in bootstrap.ts — do not duplicate here.
@@ -501,6 +495,7 @@ async function main() {
       hitlMode: modeManager.getHITLMode(),
       // Cross-surface spine posture segment (adopted-daemon mode only).
       sessionSpineStatus: (() => { const s = uiServices.platform.externalServices?.inspect(); return s?.sessionSpineActive && s.sessionSpineStatus && s.sessionSpineStatus !== 'unknown' ? s.sessionSpineStatus : undefined; })(), runningAgentCount, runningProcessCount,
+      webSurfaceUrl: configManager.get('web.enabled') ? resolveWebSurfaceUrl(configManager) : undefined,
       // Composer must not read as focused while the panel/process indicator owns keyboard focus.
       promptFocused: !input.panelFocused && !input.indicatorFocused,
       indicatorFocused: input.indicatorFocused,
@@ -547,7 +542,7 @@ async function main() {
     // Calculate how many rows are consumed by overlays (thinking, permissions, queue, file picker)
     let overlayRows = 0;
     if (orchestrator.isThinking) overlayRows += 2; // spinner + blank
-    if (pendingPermission) overlayRows += PermissionPromptUI.getPromptHeight(pendingPermission, pendingPermission.hunkState, pendingPermission.detailsExpanded, pendingPermission.requestedBy);
+    if (pendingPermission) overlayRows += PermissionPromptUI.getPromptHeight(pendingPermission, pendingPermission.hunkState, pendingPermission.detailsExpanded, pendingPermission.requestedBy, PermissionPromptUI.promptViewState(pendingPermission, conversationWidth, approvalBroker));
     overlayRows += orchestrator.messageQueue.length * 3; // queued messages
     // File picker and model picker overlay rows computed from actual rendered line count below
     // Selection modal overlay rows are computed from actual rendered line count below
@@ -597,7 +592,7 @@ async function main() {
     }
 
     if (pendingPermission) {
-      viewport.push(...PermissionPromptUI.createPromptLines(conversationWidth, pendingPermission, pendingPermission.hunkState, pendingPermission.detailsExpanded, pendingPermission.requestedBy));
+      viewport.push(...PermissionPromptUI.createPromptLines(conversationWidth, pendingPermission, pendingPermission.hunkState, pendingPermission.detailsExpanded, pendingPermission.requestedBy, PermissionPromptUI.promptViewState(pendingPermission, conversationWidth, approvalBroker)));
     }
 
     orchestrator.messageQueue.forEach(msg => {
@@ -643,8 +638,8 @@ async function main() {
       panelWidth: panelComposite.panelWidth,
     });
   };
-  const renderScheduler = createRenderScheduler(renderNow, undefined, () => lifecycle.isTerminalRestored()); // WO-208 coalescer; no frames after terminal restore
-  const render = (): void => renderScheduler.schedule(); // captured direct writes → activity log + quiet /debug counter, not repeated transcript lines (UX-B 1a)
+  const renderScheduler = createRenderScheduler(renderNow, undefined, () => lifecycle.isTerminalRestored()); // coalescer; no frames after terminal restore
+  const render = (): void => renderScheduler.schedule(); // captured direct writes → activity log + quiet /debug counter, not repeated transcript lines (1a)
   const terminalOutputGuard = installTuiTerminalOutputGuard({ stdout, stderr: process.stderr, onCapture: (total) => { commandContext.session.runtime.terminalWritesIntercepted = total; render(); } });
 
   setRenderRequest(() => renderScheduler.flushNow()); // bootstrap's 16ms coalescer composites via the (restore-gated) scheduler
@@ -669,7 +664,7 @@ async function main() {
     homeDirectory,
     getConfiguredProviderIds: ctx._getConfiguredProviderIds,
     getPinned: ctx._getPinned,
-    render,
+    render, trustPromptRef,
   });
 
   const { refreshGit, unsubs: turnUnsubs } = wireTurnEventHandlers({
@@ -731,7 +726,7 @@ async function main() {
   stdin.resume();
   stdin.setEncoding('utf8');
   allowTerminalWrite(() => stdout.write((cli.flags.noAltScreen ? '' : ALT_SCREEN_ENTER) + CLEAR_SCREEN + CURSOR_HIDE + MOUSE_ENABLE + KEYBOARD_EXT_ENABLE + PASTE_ENABLE + FOCUS_ENABLE));
-  // DEBT-2: forced dark/light applies before first paint; auto (TTY only) fires the
+  // forced dark/light applies before first paint; auto (TTY only) fires the
   // OSC 11 probe and repaints once if light wins. filterInput strips the reply from stdin.
   const themeProbe = installBackgroundThemeProbe({ configManager, isTTY: Boolean(stdout.isTTY), env: process.env, writeQuery: (b) => allowTerminalWrite(() => stdout.write(b)), requestRepaint: () => { compositor.resetDiff(); render(); } });
 
@@ -752,12 +747,17 @@ async function main() {
     if (blocking.handled) {
       return;
     }
-
     // One-key retry affordance: armed after a user-visible TURN_ERROR; any key other than r/m dismisses it and routes normally.
     if (errorAffordanceActive) {
       errorAffordanceActive = false;
       if (handleErrorAffordanceKey(data, { retryArmed: retryCtx !== null, retry: retryTurn, openModelPicker: () => commandContext.openModelPicker?.(), render })) return;
     }
+    // One-key jump to a spawned CI fix-session: 'j' attaches, any other key dismisses and routes normally.
+    if (fixSessionAttachArmed !== null) {
+      const armedFixSessionId = fixSessionAttachArmed;
+      fixSessionAttachArmed = null;
+      if (handleFixSessionAttachKey(data, { armedFixSessionId, attach: attachToFixSession, render })) return;
+    }
 
     input.feed(data);
   });

package/src/panels/agent-inspector-shared.ts

@@ -8,7 +8,7 @@ export type AgentInspectorEntryKind = 'user' | 'assistant' | 'tool_call' | 'tool
 // ---------------------------------------------------------------------------
 // Shared agent status / stall constants
 // Used by the Fleet panel's agent views and read-model consumers (formerly also
-// AgentDetailModal, which was retired in W6.1).
+// AgentDetailModal, which was retired in).
 // ---------------------------------------------------------------------------
 
 /** Terminal statuses — cancel not offered; stall check skipped. */
@@ -127,7 +127,7 @@ export function agentKindStyle(kind: AgentInspectorEntryKind, colors: Record<str
 }
 
 // ---------------------------------------------------------------------------
-// Inspector filter modes (ported from the merged agent-logs console — WO-110)
+// Inspector filter modes (ported from the merged agent-logs console —)
 // ---------------------------------------------------------------------------
 
 export type AgentInspectorFilterType = 'all' | 'assistant' | 'tool' | 'error';
@@ -188,7 +188,7 @@ interface AgentUsageLike {
 
 /**
  * True when a usage object carries actual reported token data rather than
- * being present-but-empty. W0.9: the SDK's AgentRecord.usage is initialised
+ * being present-but-empty.: the SDK's AgentRecord.usage is initialised
  * to an all-zero object at agent spawn (platform/tools/agent/manager.ts) and
  * — in the currently pinned SDK version — is never updated past that, so a
  * plain truthiness check on `rec.usage` treats every agent, including ones
@@ -256,7 +256,7 @@ export function buildWrfcCostSegments(
 }
 
 // ---------------------------------------------------------------------------
-// Agent lifecycle event subscriptions (ported from agent-logs — WO-110)
+// Agent lifecycle event subscriptions (ported from agent-logs —)
 // ---------------------------------------------------------------------------
 
 export interface AgentActivityHooks {

package/src/panels/base-panel.ts

@@ -227,10 +227,10 @@ export abstract class BasePanel implements Panel {
     return consumed;
   }
 
-  /** R2: Mark this panel dirty — it will be re-rendered on the next compositor frame. */
+  /** Mark this panel dirty — it will be re-rendered on the next compositor frame. */
   public invalidate(): void { this.needsRender = true; }
 
-  /** R2: Called by the compositor after a successful render to clear the dirty flag. */
+  /** Called by the compositor after a successful render to clear the dirty flag. */
   public markRendered(): void { this.needsRender = false; }
 
   protected markDirty(): void {