@timurproko/a1 0.2.7-dev.1252 → 0.2.7-dev.1264

package/dist/features/owned-ui/settings-app.js

@@ -1,6 +1,9 @@
-import { DIALOG_BACK_SHORTCUT_HINT, DIALOG_CLOSE_SHORTCUT_HINT } from "../../contracts/presentation/index.js";
-import { GLOBAL_SCOPE, LineInput, PLAIN_THEME, ShortcutRegistry, assertNoShortcutConflicts, blockJumpTarget, configureDialogChoiceCapacity, configureDialogTextRows, configureDialogWidth, numericValues, RAIL_COLUMNS, renderCenteredDialogOverlay, renderDialogPanel, renderSteppedDialogPanel, renderEmptyState, renderGroupHeader, renderListRow, renderNote, renderShortcutHintsWithClose, menuRowAt, regionAt, renderValueMenu, withScrollbarRail, stepperEnds, steppedValue, truncateToWidth, valueColumnFor, valueMenuFrame, blockRowSpan, displayWidth, handleLineInputKey, humanizeLabel, humanizeTitle, indexOfKey, layoutList, moveSelection, rowKey, scrollForSelection, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, ScrollbarRails, scrollbarWheelRows, selectableIndexes, } from "../../ui/components/index.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT } from "../../contracts/presentation/index.js";
+import { GLOBAL_SCOPE, LineInput, PLAIN_THEME, ShortcutRegistry, assertNoShortcutConflicts, blockJumpTarget, configureDialogChoiceCapacity, configureDialogTextRows, configureDialogWidth, numericValues, RAIL_COLUMNS, renderCenteredDialogOverlay, renderDialogPanel, renderEmptyState, renderGroupHeader, renderListRow, renderNote, renderShortcutHintsWithClose, menuRowAt, regionAt, renderValueMenu, withScrollbarRail, stepperEnds, steppedValue, truncateToWidth, valueColumnFor, valueMenuFrame, blockRowSpan, displayWidth, humanizeLabel, humanizeTitle, indexOfKey, layoutList, moveSelection, rowKey, scrollForSelection, scrollbarGeometry, scrollbarWheelRows, selectableIndexes, } from "../../ui/components/index.js";
+import { SettingsScrollRail } from "./settings-scroll-rail.js";
+import { SettingsEdits, replaceRecord, sameRecord } from "./settings-edits.js";
 import { SETTINGS_APP_ID } from "./settings-route.js";
+import { dialogWindow, modelDialogKey, modelDialogLines } from "./settings-model-dialog.js";
 export { SETTINGS_APP_ID, SETTINGS_ROUTE } from "./settings-route.js";
 const SCOPE = SETTINGS_APP_ID;
 const SETTINGS_TOP_RULE_ROWS = 1;
@@ -11,14 +14,7 @@ const SETTINGS_STATUS_ROWS = 1;
 const SETTINGS_CONTENT_INSET = 1;
 /** The panel a setting with parts opens: its own keys, its own hint. */
 const DIALOG_SCOPE = `${SETTINGS_APP_ID}-parts`;
-const MODEL_SCOPE = `${SETTINGS_APP_ID}-models`;
-const MODEL_LEVEL_SCOPE = `${SETTINGS_APP_ID}-model-levels`;
 const SCROLLBAR_TOP_INSET = 0;
-/** Identity of the settings list rail in the shared rail state. */
-const RAIL_KEY = "settings";
-// Compatibility: the transcript rail stays lit this long after a scroll, and repaints just after.
-const SCROLL_LINGER_MS = 900;
-const SCROLL_LINGER_REPAINT_MS = 925;
 /** What a structured value offers instead of printing itself. */
 const CONFIGURE = "configure";
 export const SETTINGS_SHORTCUTS = new ShortcutRegistry();
@@ -48,17 +44,6 @@ SETTINGS_SHORTCUTS.declare({
     hint: { keys: DIALOG_CLOSE_SHORTCUT_HINT.key, does: DIALOG_CLOSE_SHORTCUT_HINT.action },
 }, "close");
 assertNoShortcutConflicts(SETTINGS_SHORTCUTS.assemble());
-const MODEL_SHORTCUTS = new ShortcutRegistry();
-MODEL_SHORTCUTS.declare({ key: "edit", scope: MODEL_SCOPE, description: "Search models", section: "Choose", hint: { keys: "Type", does: "search" } }, "edit-filter");
-MODEL_SHORTCUTS.declare({ key: "up", scope: MODEL_SCOPE, description: "Previous model", section: "Choose" }, "previous");
-MODEL_SHORTCUTS.declare({ key: "down", scope: MODEL_SCOPE, description: "Next model", section: "Choose" }, "next");
-MODEL_SHORTCUTS.declare({ key: "enter", scope: MODEL_SCOPE, description: "Select model", section: "Choose", hint: { keys: "Enter", does: "select" } }, "select");
-MODEL_SHORTCUTS.declare({ key: "escape", scope: MODEL_SCOPE, description: "Close selector", section: "Choose", hint: { keys: DIALOG_CLOSE_SHORTCUT_HINT.key, does: DIALOG_CLOSE_SHORTCUT_HINT.action } }, "close");
-MODEL_SHORTCUTS.declare({ key: "up", scope: MODEL_LEVEL_SCOPE, description: "Previous level", section: "Choose", hint: { keys: "↑↓", does: "navigate" } }, "previous");
-MODEL_SHORTCUTS.declare({ key: "down", scope: MODEL_LEVEL_SCOPE, description: "Next level", section: "Choose", hint: { keys: "↑↓", does: "navigate" } }, "next");
-MODEL_SHORTCUTS.declare({ key: "enter", scope: MODEL_LEVEL_SCOPE, description: "Select level", section: "Choose", hint: { keys: "Enter", does: "select" } }, "select");
-MODEL_SHORTCUTS.declare({ key: "escape", scope: MODEL_LEVEL_SCOPE, description: "Return to models", section: "Choose", hint: { keys: DIALOG_BACK_SHORTCUT_HINT.key, does: DIALOG_BACK_SHORTCUT_HINT.action } }, "back");
-assertNoShortcutConflicts(MODEL_SHORTCUTS.assemble());
 const KEYS = {
     "\u001b[A": "up",
     "\u001b[B": "down",
@@ -96,12 +81,7 @@ export class SettingsApp {
     #menu = null;
     #structured = null;
     // Invariant: pending values remain visible until the source reflects them.
-    #pending = new Map();
-    #undoHistory = [];
-    #editSequence = 0;
-    #undoRequests = 0;
-    #undoActive = false;
-    #closed = false;
+    #edits;
     #bodyTopForFrame = SETTINGS_TOP_RULE_ROWS + SETTINGS_TITLE_ROWS;
     #bodyHeightForFrame = 0;
     #panelTopForFrame = 0;
@@ -110,16 +90,12 @@ export class SettingsApp {
     #frameRows = [];
     #menuFrame = null;
     // Invariant: rail hover and drag live in the shared keyed state, as the transcript's do.
-    #rails = new ScrollbarRails();
+    #rail = new SettingsScrollRail();
     // Rationale: the rail as drawn in the last frame, or null when nothing can be pointed at.
-    #railFrame = null;
-    // Invariant: a scroll lights the rail until this time; the timer repaints once it has passed.
-    #activeUntil = 0;
-    #activityTimer;
-    #renderedScroll;
     #options;
     constructor(session, options) {
         this.#session = session;
+        this.#edits = new SettingsEdits(session, () => this.#structured);
         this.#options = {
             dialogPanel: options.dialogPanel ?? null,
         };
@@ -131,17 +107,14 @@ export class SettingsApp {
         };
     }
     onActivate(host) {
-        this.#closed = false;
+        this.#edits.open();
         void this.#session.load().then(() => host.requestRender());
     }
     onClose(_host) {
-        this.#closed = true;
-        this.#undoHistory.length = 0;
-        this.#undoRequests = 0;
+        this.#edits.close();
         this.#search.input?.setFocused(false);
         this.#search.input = null;
-        this.#clearActivityTimer();
-        this.#rails.clear();
+        this.#rail.dispose();
     }
     render(rect, host) {
         const theme = host.theme ?? PLAIN_THEME;
@@ -174,11 +147,7 @@ export class SettingsApp {
         this.#panelTopForFrame = topRows + contentHeight + dividerRows;
         this.#scroll = layout.scroll;
         const now = Date.now();
-        // Rationale: every way of scrolling ends in this frame, so a moved list is noticed here
-        // once rather than at each wheel, drag, key, and search branch.
-        if (this.#renderedScroll !== undefined && this.#renderedScroll !== layout.scroll)
-            this.#noteScrollActivity(host, now);
-        this.#renderedScroll = layout.scroll;
+        this.#rail.noteRenderedScroll(layout.scroll, now, () => host.requestRender());
         // Invariant: auto and always keep the rail columns while the list fits, so a revealed
         // rail never reflows the rows; hidden gives the columns back to the rows.
         const appearance = this.#scrollbarAppearance();
@@ -191,22 +160,10 @@ export class SettingsApp {
             scroll: layout.scroll,
             trackHeight: Math.max(0, titleRows + bodyHeight - SCROLLBAR_TOP_INSET),
         });
-        const presentation = scrollbarPresentation({
-            geometry,
-            appearance,
-            style: this.#scrollbarStyle(),
-            hovered: this.#rails.isHovered(RAIL_KEY),
-            dragging: this.#rails.isDragging(RAIL_KEY),
-            activeUntil: this.#activeUntil,
-            now,
-        });
-        this.#railFrame = reservesRail && geometry !== null
-            ? {
-                rail: { key: RAIL_KEY, column: rect.width, rowStart: topRows + SCROLLBAR_TOP_INSET, trackHeight: geometry.trackHeight },
-                geometry,
-                page: layout.visible,
-            }
-            : null;
+        const presentation = this.#rail.presentation({ geometry, appearance, style: this.#scrollbarStyle(), now });
+        this.#rail.setFrame(reservesRail && geometry !== null
+            ? { rail: { column: rect.width, rowStart: topRows + SCROLLBAR_TOP_INSET, trackHeight: geometry.trackHeight }, geometry, page: layout.visible }
+            : null);
         const body = [];
         this.#frameRows = [];
         if (rows.length === 0) {
@@ -275,7 +232,7 @@ export class SettingsApp {
                 const row = rows[selected];
                 if (row?.kind === "element" && (row.value.structured || isDefaultModelEntry(row.value)))
                     this.#openStructured(row.value);
-                else if (row?.kind === "element" && typeof this.#shownValue(row.value) === "number")
+                else if (row?.kind === "element" && typeof this.#edits.shown(row.value) === "number")
                     this.#cycle(rows, selected, 1);
                 else
                     this.#openMenu(rows, selected, true);
@@ -313,7 +270,7 @@ export class SettingsApp {
                 this.#cycle(rows, selected, action === "next-value" ? 1 : -1);
                 return { consumed: true };
             case "undo":
-                this.#undo();
+                this.#edits.undo();
                 return { consumed: true };
             default:
                 return { consumed: false };
@@ -355,7 +312,7 @@ export class SettingsApp {
             const value = menu.choices[overRow];
             this.#closeMenu(menu);
             if (value !== undefined)
-                this.#apply(menu.entry, value);
+                this.#edits.apply(menu.entry, value);
             return { consumed: true };
         }
         if (event.kind === "wheel-up" || event.kind === "wheel-down") {
@@ -380,7 +337,14 @@ export class SettingsApp {
             // cannot change its selection or act on the Settings list behind it.
             return { consumed: true, render: false };
         }
-        const rail = this.#railPointer(event);
+        const rail = this.#rail.pointer(event, this.#scroll);
+        if (rail.scroll !== undefined)
+            this.#scroll = rail.scroll;
+        // Invariant: the rail is not a row: pointing at it lights nothing in the list.
+        if (rail.overRail) {
+            this.#hoverKey = null;
+            this.#hoverRegion = "label";
+        }
         if (rail.owned)
             return { consumed: true };
         const row = this.#frameRows.find(candidate => candidate.screenRow === event.row - 1);
@@ -410,52 +374,6 @@ export class SettingsApp {
         const changed = previousKey !== this.#hoverKey || previousRegion !== this.#hoverRegion || rail.changed;
         return { consumed: event.kind !== "motion", render: changed };
     }
-    // Rationale: the rail takes its share of a pointer report first: hover, a thumb drag, or a
-    // track page. Owned means the list must not see the report; changed means the rail looks different.
-    #railPointer(event) {
-        const frame = this.#railFrame;
-        const wasHovered = this.#rails.isHovered(RAIL_KEY);
-        if (frame === null) {
-            this.#rails.clear();
-            return { owned: false, changed: wasHovered };
-        }
-        const pointer = { column: event.column, row: event.row - 1 };
-        if (this.#rails.isDragging(RAIL_KEY)) {
-            // Invariant: a drag keeps the pointer wherever it goes until the button comes up.
-            if (event.kind === "release")
-                this.#rails.endDrag();
-            else {
-                const target = this.#rails.dragTo(frame.rail, frame.geometry, pointer);
-                if (target !== null)
-                    this.#scroll = target;
-            }
-            return { owned: true, changed: true };
-        }
-        const over = this.#rails.notePointer([frame.rail], pointer) !== null;
-        if (!over)
-            return { owned: false, changed: wasHovered };
-        // Invariant: the rail is not a row: pointing at it lights nothing in the list.
-        this.#hoverKey = null;
-        this.#hoverRegion = "label";
-        if (event.kind === "press" && !this.#rails.beginDrag(frame.rail, frame.geometry, pointer)) {
-            this.#scroll = scrollForTrackPage(frame.geometry, pointer.row - frame.rail.rowStart, this.#scroll, frame.page);
-        }
-        return { owned: true, changed: true };
-    }
-    #noteScrollActivity(host, now) {
-        this.#activeUntil = Math.max(this.#activeUntil, now + SCROLL_LINGER_MS);
-        this.#clearActivityTimer();
-        this.#activityTimer = setTimeout(() => {
-            this.#activityTimer = undefined;
-            host.requestRender();
-        }, SCROLL_LINGER_REPAINT_MS);
-        this.#activityTimer.unref?.();
-    }
-    #clearActivityTimer() {
-        if (this.#activityTimer !== undefined)
-            clearTimeout(this.#activityTimer);
-        this.#activityTimer = undefined;
-    }
     #openMenu(rows, selected, selectCurrent = false) {
         const row = rows[selected];
         if (row === undefined || row.kind !== "element")
@@ -465,7 +383,7 @@ export class SettingsApp {
             this.#openStructured(entry);
             return;
         }
-        const shown = this.#shownValue(entry);
+        const shown = this.#edits.shown(entry);
         // Rationale: a number is stepped, not picked from a list: it has its own two controls,
         // and pointing at it is not a request for anything else.
         if (typeof shown === "number")
@@ -522,7 +440,7 @@ export class SettingsApp {
         // thing under the pointer, so it stops looking like it.
         this.#hoverKey = null;
         this.#hoverRegion = "label";
-        this.#rails.clear();
+        this.#rail.clear();
         const currentDefault = typeof entry.rawValue === "string" ? entry.rawValue : null;
         this.#structured = {
             entry,
@@ -541,8 +459,14 @@ export class SettingsApp {
         const open = this.#structured;
         if (open === null)
             return { consumed: false };
-        if (open.modelDialog !== null)
-            return this.#modelDialogKey(open, data);
+        if (open.modelDialog !== null) {
+            return modelDialogKey(open, data, KEYS[data] ?? data, {
+                session: this.#session,
+                close: () => { this.#structured = null; },
+                reopen: reopened => { this.#structured = reopened; },
+                save: (edit, previous, forward) => { this.#saveStructured(edit, previous, forward); },
+            });
+        }
         switch (SETTINGS_SHORTCUTS.resolve(KEYS[data] ?? data, DIALOG_SCOPE)) {
             case "close":
                 this.#structured = null;
@@ -557,120 +481,12 @@ export class SettingsApp {
                 this.#toggleFlag(open.index);
                 return { consumed: true };
             case "undo":
-                this.#undo();
+                this.#edits.undo();
                 return { consumed: true };
             default:
                 return { consumed: true, render: false };
         }
     }
-    #modelDialogKey(open, data) {
-        const key = KEYS[data] ?? data;
-        if (open.modelDialog === "default") {
-            const flags = this.#filteredModelFlags(open);
-            const action = MODEL_SHORTCUTS.resolve(key, MODEL_SCOPE) ?? "edit-filter";
-            if (action === "close") {
-                this.#structured = null;
-                return { consumed: true };
-            }
-            if (action === "previous" || action === "next") {
-                open.index = Math.min(Math.max(0, flags.length - 1), Math.max(0, open.index + (action === "next" ? 1 : -1)));
-                return { consumed: true };
-            }
-            if (action === "select") {
-                const selected = flags[open.index];
-                if (selected === undefined)
-                    return { consumed: true, render: false };
-                open.error = null;
-                this.#structured = null;
-                void this.#session.change(open.entry.backend, open.entry.id, selected.key).then(outcome => {
-                    const failure = changeFailure(outcome);
-                    if (failure !== null) {
-                        open.error = `Could not save: ${failure}`;
-                        this.#structured = open;
-                    }
-                });
-                return { consumed: true };
-            }
-            if (open.filter === null)
-                return { consumed: true, render: false };
-            handleLineInputKey(open.filter, data);
-            open.index = 0;
-            return { consumed: true };
-        }
-        if (open.step === "model") {
-            const flags = this.#filteredModelFlags(open);
-            const action = MODEL_SHORTCUTS.resolve(key, MODEL_SCOPE) ?? "edit-filter";
-            if (action === "close") {
-                this.#structured = null;
-                return { consumed: true };
-            }
-            if (action === "previous" || action === "next") {
-                open.index = Math.min(Math.max(0, flags.length - 1), Math.max(0, open.index + (action === "next" ? 1 : -1)));
-                return { consumed: true };
-            }
-            if (action === "select") {
-                const selected = flags[open.index];
-                if (selected === undefined)
-                    return { consumed: true, render: false };
-                open.modelIndex = open.index;
-                open.modelKey = selected.key;
-                open.step = "level";
-                const options = this.#modelLevelOptions(open, selected);
-                const current = structuredValue(open.entry, open.record)[selected.key];
-                open.index = Math.max(0, options.findIndex(option => option.value === current));
-                return { consumed: true };
-            }
-            const input = open.filter;
-            if (input === null)
-                return { consumed: true, render: false };
-            handleLineInputKey(input, data);
-            open.index = 0;
-            return { consumed: true };
-        }
-        const selected = open.entry.flags.find(flag => flag.key === open.modelKey);
-        const choices = selected === undefined ? [] : this.#modelLevelOptions(open, selected);
-        const action = MODEL_SHORTCUTS.resolve(key, MODEL_LEVEL_SCOPE);
-        if (action === "back") {
-            open.step = "model";
-            open.modelKey = null;
-            open.index = open.modelIndex;
-            return { consumed: true };
-        }
-        if (action === "previous" || action === "next") {
-            open.index = Math.min(Math.max(0, choices.length - 1), Math.max(0, open.index + (action === "next" ? 1 : -1)));
-            return { consumed: true };
-        }
-        if (action === "select") {
-            const choice = choices[open.index];
-            if (selected === undefined || choice === undefined)
-                return { consumed: true, render: false };
-            const previous = { ...open.record };
-            open.record[selected.key] = choice.value;
-            const forward = { ...open.record };
-            this.#saveStructured(open, previous, forward);
-            open.step = "model";
-            open.modelKey = null;
-            open.index = open.modelIndex;
-            return { consumed: true };
-        }
-        return { consumed: true, render: false };
-    }
-    #filteredModelFlags(open) {
-        const needle = open.filter?.value.trim().toLowerCase() ?? "";
-        return open.entry.flags.filter(flag => needle.length === 0
-            || (flag.label ?? humanizeLabel(flag.key)).toLowerCase().includes(needle)
-            || flag.description.toLowerCase().includes(needle)
-            || flag.key.toLowerCase().includes(needle));
-    }
-    #modelLevelOptions(open, selected) {
-        const fallback = String(selected.fallback);
-        const supported = (selected.choices ?? [])
-            .filter(choice => choice !== fallback)
-            .map(choice => ({ value: choice, label: choice, description: thinkingLevelDescription(choice) }));
-        return structuredValue(open.entry, open.record)[selected.key] === undefined
-            ? supported
-            : [...supported, { value: fallback, label: "(clear override)", description: "Revert to global default" }];
-    }
     #toggleFlag(index) {
         const open = this.#structured;
         const flag = open?.flags[index];
@@ -689,14 +505,8 @@ export class SettingsApp {
         this.#saveStructured(open, previous, forward);
     }
     #saveStructured(open, previous, forward) {
-        const sequence = ++this.#editSequence;
-        void this.#session.changeStructured(open.entry.backend, open.entry.id, structuredValue(open.entry, forward)).then(outcome => {
-            const failure = changeFailure(outcome);
-            if (failure === null) {
-                this.#recordUndo({ kind: "structured", sequence, entry: open.entry, previous, forward });
-                return;
-            }
-            // Concurrency: only roll back the dialog if no later press has moved the record on.
+        // Concurrency: only roll back the dialog if no later press has moved the record on.
+        this.#edits.saveStructured(open.entry, previous, forward, () => {
             if (this.#structured === open && sameRecord(open.record, forward))
                 replaceRecord(open.record, previous);
         });
@@ -708,7 +518,7 @@ export class SettingsApp {
         const key = KEYS[data] ?? data;
         if (SETTINGS_SHORTCUTS.resolve(key, SCOPE) === "undo") {
             this.#closeMenu(menu);
-            this.#undo();
+            this.#edits.undo();
             return { consumed: true };
         }
         if (key === "escape") {
@@ -725,7 +535,7 @@ export class SettingsApp {
             const value = menu.choices[menu.index];
             this.#closeMenu(menu);
             if (value !== undefined)
-                this.#apply(menu.entry, value);
+                this.#edits.apply(menu.entry, value);
         }
         return { consumed: true };
     }
@@ -785,13 +595,13 @@ export class SettingsApp {
         const entry = row.value;
         if (!entry.editable)
             return;
-        const shown = this.#shownValue(entry);
+        const shown = this.#edits.shown(entry);
         if (typeof shown === "number") {
             // Rationale: at the end of the range there is nothing to say: the arrow already reads
             // as unavailable, so a message would only repeat it.
             const next = steppedValue(rangeOf(entry), shown, delta);
             if (next !== null)
-                this.#apply(entry, next);
+                this.#edits.apply(entry, next);
             return;
         }
         const choices = entry.choices;
@@ -802,82 +612,7 @@ export class SettingsApp {
             ? (delta > 0 ? 0 : choices.length - 1)
             : (current + delta + choices.length) % choices.length];
         if (next !== undefined)
-            this.#apply(entry, next);
-    }
-    #apply(entry, value) {
-        const key = `${entry.backend}:${entry.id}`;
-        const previous = this.#shownValue(entry);
-        const sequence = ++this.#editSequence;
-        // Invariant: shown immediately so the row never lags a keypress, and so the next press
-        // steps from here rather than from a value the source has not caught up to.
-        this.#pending.set(key, value);
-        void this.#session.change(entry.backend, entry.id, value).then(outcome => {
-            const failure = changeFailure(outcome);
-            if (failure !== null) {
-                if (this.#pending.get(key) === value)
-                    this.#pending.delete(key);
-                return;
-            }
-            if (previous !== null && previous !== value)
-                this.#recordUndo({ kind: "scalar", sequence, entry, previous });
-            // Concurrency: a later press may have moved on; only the last request clears itself.
-            if (this.#pending.get(key) === value)
-                this.#pending.delete(key);
-        });
-    }
-    #shownValue(entry) {
-        return this.#pending.get(`${entry.backend}:${entry.id}`) ?? entry.value;
-    }
-    #recordUndo(record) {
-        if (this.#closed)
-            return;
-        const after = this.#undoHistory.findIndex(candidate => candidate.sequence > record.sequence);
-        if (after < 0)
-            this.#undoHistory.push(record);
-        else
-            this.#undoHistory.splice(after, 0, record);
-    }
-    #undo() {
-        this.#undoRequests++;
-        this.#drainUndo();
-    }
-    #drainUndo() {
-        if (this.#undoActive || this.#undoRequests === 0)
-            return;
-        const record = this.#undoHistory.pop();
-        if (record === undefined) {
-            this.#undoRequests = 0;
-            return;
-        }
-        this.#undoRequests--;
-        this.#undoActive = true;
-        if (record.kind === "scalar") {
-            const key = `${record.entry.backend}:${record.entry.id}`;
-            this.#pending.set(key, record.previous);
-            void this.#session.change(record.entry.backend, record.entry.id, record.previous).then(outcome => {
-                if (this.#pending.get(key) === record.previous)
-                    this.#pending.delete(key);
-                this.#finishUndo(record, outcome);
-            });
-            return;
-        }
-        const open = this.#structured;
-        if (open !== null && sameEntry(open.entry, record.entry))
-            replaceRecord(open.record, record.previous);
-        void this.#session.changeStructured(record.entry.backend, record.entry.id, structuredValue(record.entry, record.previous)).then(outcome => {
-            const failure = changeFailure(outcome);
-            if (failure !== null && this.#structured === open && open !== null && sameRecord(open.record, record.previous)) {
-                replaceRecord(open.record, record.forward);
-            }
-            this.#finishUndo(record, outcome);
-        });
-    }
-    #finishUndo(record, outcome) {
-        const failure = changeFailure(outcome);
-        if (failure !== null)
-            this.#recordUndo(record);
-        this.#undoActive = false;
-        this.#drainUndo();
+            this.#edits.apply(entry, next);
     }
     #scrollbarSpeed() {
         const value = this.#scrollSetting("scrollbarSpeed");
@@ -895,7 +630,7 @@ export class SettingsApp {
         const entry = this.#session.sections()
             .flatMap(section => section.entries)
             .find(candidate => candidate.backend === "a1" && candidate.id === id);
-        return entry === undefined ? this.#session.value(id) : this.#shownValue(entry);
+        return entry === undefined ? this.#session.value(id) : this.#edits.shown(entry);
     }
     #jump(rows, target) {
         this.#select(rows, target);
@@ -967,7 +702,7 @@ export class SettingsApp {
     }
     #viewRow(entry) {
         const key = `${entry.backend}:${entry.id}`;
-        const shown = this.#shownValue(entry);
+        const shown = this.#edits.shown(entry);
         const value = entry.structured || isDefaultModelEntry(entry)
             ? CONFIGURE
             : shown === null
@@ -993,7 +728,7 @@ export class SettingsApp {
             ...(menu.entry.id === "accentColor" ? {
                 previews: menu.choices.map(choice => theme.accentPreview?.(String(choice), "■") ?? ""),
             } : {}),
-            current: this.#shownValue(menu.entry) === null ? null : displaySettingValue(menu.entry, this.#shownValue(menu.entry)),
+            current: this.#edits.shown(menu.entry) === null ? null : displaySettingValue(menu.entry, this.#edits.shown(menu.entry)),
             index: menu.index,
         };
         const frame = valueMenuFrame(state, {
@@ -1010,7 +745,7 @@ export class SettingsApp {
     }
     #dialogLines(open, width, height, theme) {
         if (open.modelDialog !== null)
-            return this.#modelDialogLines(open, width, height, theme);
+            return modelDialogLines(open, width, height, theme);
         const rows = open.flags.map(key => {
             const declared = open.entry.flags.find(flag => flag.key === key);
             return {
@@ -1023,64 +758,6 @@ export class SettingsApp {
         const visible = dialogWindow(rows, open.index, configureDialogChoiceCapacity(height, false, configureDialogTextRows(rows[open.index]?.description ?? "", width)));
         return renderDialogPanel({ title: labelOf(open.entry), rows: visible.rows, index: visible.index, hint: SETTINGS_SHORTCUTS.hintEntries(DIALOG_SCOPE) }, width, theme);
     }
-    #modelDialogLines(open, width, height, theme) {
-        if (open.modelDialog === "default") {
-            const flags = this.#filteredModelFlags(open);
-            const current = typeof open.entry.rawValue === "string" ? open.entry.rawValue : null;
-            const rows = flags.length === 0
-                ? [{ label: "No models found", value: "" }]
-                : flags.map(flag => ({
-                    ...modelLabelParts(flag.label ?? humanizeLabel(flag.key)),
-                    ...(flag.key === current ? { successSuffix: "✓" } : {}),
-                    value: "",
-                }));
-            const description = open.error ?? "Select the model used for new sessions";
-            const visible = dialogWindow(rows, open.index, configureDialogChoiceCapacity(height, true, configureDialogTextRows(description, width)));
-            return renderSteppedDialogPanel({
-                title: "Default Model", description, input: open.filter ?? new LineInput(""),
-                rows: visible.rows, index: visible.index, hint: MODEL_SHORTCUTS.hintEntries(MODEL_SCOPE),
-            }, width, theme);
-        }
-        if (open.step === "model") {
-            const flags = this.#filteredModelFlags(open);
-            const stored = structuredValue(open.entry, open.record);
-            const allRows = flags.length === 0
-                ? [{ label: "No models found", value: "" }]
-                : flags.map(flag => ({
-                    ...modelLabelParts(flag.label ?? humanizeLabel(flag.key)),
-                    value: stored[flag.key] === undefined ? "" : String(stored[flag.key]),
-                }));
-            const description = "Select a model to configure";
-            const visible = dialogWindow(allRows, open.index, configureDialogChoiceCapacity(height, true, configureDialogTextRows(description, width)));
-            return renderSteppedDialogPanel({
-                title: "Thinking Level",
-                step: 1,
-                steps: 2,
-                description,
-                ...(open.filter === null ? {} : { input: open.filter }),
-                rows: visible.rows,
-                index: visible.index,
-                hint: MODEL_SHORTCUTS.hintEntries(MODEL_SCOPE),
-            }, width, theme);
-        }
-        const selected = open.entry.flags.find(flag => flag.key === open.modelKey);
-        const current = selected === undefined ? undefined : structuredValue(open.entry, open.record)[selected.key];
-        const allRows = (selected === undefined ? [] : this.#modelLevelOptions(open, selected)).map(choice => ({
-            label: choice.value === current ? `✓ ${choice.label}` : choice.label,
-            value: choice.description,
-        }));
-        const description = `Select default thinking level for ${selected?.label ?? open.modelKey ?? "model"}`;
-        const visible = dialogWindow(allRows, open.index, configureDialogChoiceCapacity(height, false, configureDialogTextRows(description, width)));
-        return renderSteppedDialogPanel({
-            title: "Thinking Level",
-            step: 2,
-            steps: 2,
-            description,
-            rows: visible.rows,
-            index: visible.index,
-            hint: MODEL_SHORTCUTS.hintEntries(MODEL_LEVEL_SCOPE),
-        }, width, theme);
-    }
     #footerLines(width, theme) {
         // Rationale: standing guidance is more useful than transient feedback; failures still
         // roll back without displacing the Settings interaction contract.
@@ -1132,59 +809,6 @@ function orderDefaultModelBeforeThinking(entries, sectionId) {
     ordered.splice(thinking < 0 ? ordered.length : thinking, 0, defaultModel);
     return ordered;
 }
-function modelLabelParts(label) {
-    const match = /^(.*?)(\s+\[[^\]]+\])$/u.exec(label);
-    return match === null ? { label } : { label: match[1] ?? label, labelSuffix: match[2] ?? "" };
-}
-function dialogWindow(rows, index, maximum) {
-    if (rows.length <= maximum)
-        return { rows, index: Math.min(Math.max(0, rows.length - 1), Math.max(0, index)) };
-    const start = Math.min(rows.length - maximum, Math.max(0, index - Math.floor(maximum / 2)));
-    return { rows: rows.slice(start, start + maximum), index: index - start };
-}
-function thinkingLevelDescription(level) {
-    switch (level) {
-        case "default": return "global default";
-        case "off": return "No reasoning";
-        case "minimal": return "Very brief reasoning (~1k tokens)";
-        case "low": return "Light reasoning (~2k tokens)";
-        case "medium": return "Moderate reasoning (~8k tokens)";
-        case "high": return "Deep reasoning (~16k tokens)";
-        case "xhigh": return "Extra-high reasoning (~32k tokens)";
-        case "max": return "Maximum reasoning";
-        default: return "";
-    }
-}
-function structuredValue(entry, record) {
-    // Invariant: a choice part at its fallback is unset, so the engine's default applies.
-    return Object.fromEntries(Object.entries(record).filter(([key, value]) => {
-        const part = entry.flags.find(candidate => candidate.key === key);
-        return part?.choices === undefined || value !== part.fallback;
-    }));
-}
-function sameEntry(left, right) {
-    return left.backend === right.backend && left.id === right.id;
-}
-function sameRecord(left, right) {
-    const leftEntries = Object.entries(left);
-    const rightEntries = Object.entries(right);
-    return leftEntries.length === rightEntries.length
-        && leftEntries.every(([key, value]) => right[key] === value);
-}
-function replaceRecord(target, source) {
-    for (const key of Object.keys(target))
-        delete target[key];
-    Object.assign(target, source);
-}
-function changeFailure(outcome) {
-    if (outcome.failure !== null)
-        return outcome.failure;
-    if (outcome.status === "failed")
-        return "the effect failed";
-    if (outcome.status === "unavailable")
-        return outcome.limitationReason ?? "the setting is unavailable";
-    return outcome.limitationReason;
-}
 function isDefaultModelEntry(entry) {
     return entry.backend === "agent" && entry.id === "defaultModel";
 }