@agi-fans/dsh-tui 0.17.0 → 0.18.0

package/lib/runtime/provider-local.js

@@ -35,13 +35,14 @@ import { applyTranscriptSearchEvent, createTranscriptSearch, searchBlockIndexes,
 import { nextRevealStep, revealStreamingAssistant, streamingAssistantKey, streamingAssistantUnits, } from "../views/streaming-reveal.js";
 import { flushPending, parseKeys } from "../input/keys.js";
 import { MainScreenRenderer } from "../chrome/main-screen-renderer.js";
-import { colorDisabledByEnv, detectTrueColor, parseThemeName } from "../chrome/theme.js";
+import { colorDisabledByEnv, detectTrueColor } from "../chrome/theme.js";
 import { renderTool } from "../chrome/tool-renderers.js";
-import { TUI_SETTINGS_NAMESPACE, TuiSettingsSchema } from "../session/tui-settings.js";
+import { TUI_SETTINGS_ENTRY, TUI_SETTINGS_FIELDS } from "../session/tui-settings.js";
 import { defaultStatusBarConfig, resolveStatusBarConfig } from "../chrome/status-config.js";
 import { HistoryStore } from "../session/history-store.js";
 import { loadKeybindings } from "../input/keybindings-config.js";
 import { editExternally } from "../input/external-editor.js";
+import z from '@deepseek-ai/schemastery';
 import { movePromptSelection, filteredPromptOptions, selectedPromptAnswer, selectedFilteredPromptAnswer, togglePromptSelection, } from "../views/prompt-selector.js";
 import { refreshProjectContext, resolveProjectContext } from "../session/project-context.js";
 import { pickWelcomeTips } from "../chrome/welcome-tips.js";
@@ -89,6 +90,17 @@ function windowTitleText(title) {
     return [...cleaned].slice(0, WINDOW_TITLE_MAX).join('');
 }
 export const name = 'omdsh-tui';
+/**
+ * Row schema. The durable preferences ride as volatile fields, so a settings
+ * form edit commits into their references and reaches this fiber through
+ * `loader/volatile-update` without remounting the terminal provider.
+ */
+export const Config = z.object({
+    model: z.string(),
+    historyPath: z.string(),
+    keybindingsPath: z.string(),
+    ...TUI_SETTINGS_FIELDS,
+});
 /**
  * Local terminal presentation service.
  */
@@ -645,7 +657,7 @@ export class LocalTui {
     #syncTrueColor() {
         this.#trueColor = this.#colors && detectTrueColor();
     }
-    /** Apply prefs loaded from the settings document (does not persist). */
+    /** Apply prefs loaded from this entry's config (does not persist). */
     applyStoredPrefs(prefs) {
         this.#applyPrefs(prefs, { persist: false, forceToolsSync: true });
         if (this.#settings !== null)
@@ -653,6 +665,29 @@ export class LocalTui {
         if (this.#tty)
             this.#render();
     }
+    /** Currently applied preferences; sibling rows read these instead of the config references. */
+    prefs() {
+        return {
+            theme: this.#themeName,
+            colors: this.#colors,
+            motion: this.#motion,
+            terminalProgress: this.#terminalProgress,
+            expandTools: this.#expandTools,
+            checkUpdates: this.#checkUpdates,
+            startupChangelog: this.#startupChangelog,
+            notifications: this.#notificationPolicy,
+            notificationThreshold: this.#notificationThreshold,
+            statusBar: {
+                ...this.#statusBar,
+                groups: [...this.#statusBar.groups],
+                ...(this.#statusBar.order === undefined ? {} : { order: [...this.#statusBar.order] }),
+                ...(this.#statusBar.meta === undefined ? {} : { meta: [...this.#statusBar.meta] }),
+                ...(this.#statusBar.metaOrder === undefined ? {} : { metaOrder: [...this.#statusBar.metaOrder] }),
+                ...(this.#statusBar.colors === undefined ? {} : { colors: { ...this.#statusBar.colors } }),
+                ...(this.#statusBar.sides === undefined ? {} : { sides: { ...this.#statusBar.sides } }),
+            },
+        };
+    }
     /** Called after a live `/settings` change. */
     setPrefsPersist(persist) {
         this.#persistPrefs = persist;
@@ -675,7 +710,7 @@ export class LocalTui {
             this.#agentBehavior = undefined;
             this.#agentBehaviorPending = false;
             if (this.#settings !== null)
-                this.#settings = createSettings(this.#prefs());
+                this.#settings = createSettings(this.prefs());
             if (this.#tty && !this.#disposed)
                 this.#render();
         };
@@ -1620,28 +1655,6 @@ export class LocalTui {
         this.#agentHub = createAgentHub({ agents });
         this.#render();
     }
-    #prefs() {
-        return {
-            theme: this.#themeName,
-            colors: this.#colors,
-            motion: this.#motion,
-            terminalProgress: this.#terminalProgress,
-            expandTools: this.#expandTools,
-            checkUpdates: this.#checkUpdates,
-            startupChangelog: this.#startupChangelog,
-            notifications: this.#notificationPolicy,
-            notificationThreshold: this.#notificationThreshold,
-            statusBar: {
-                ...this.#statusBar,
-                groups: [...this.#statusBar.groups],
-                ...(this.#statusBar.order === undefined ? {} : { order: [...this.#statusBar.order] }),
-                ...(this.#statusBar.meta === undefined ? {} : { meta: [...this.#statusBar.meta] }),
-                ...(this.#statusBar.metaOrder === undefined ? {} : { metaOrder: [...this.#statusBar.metaOrder] }),
-                ...(this.#statusBar.colors === undefined ? {} : { colors: { ...this.#statusBar.colors } }),
-                ...(this.#statusBar.sides === undefined ? {} : { sides: { ...this.#statusBar.sides } }),
-            },
-        };
-    }
     #applyPrefs(prefs, options) {
         const previousMotion = this.#motion;
         const expandChanged = prefs.expandTools !== this.#expandTools;
@@ -2324,7 +2337,7 @@ export class LocalTui {
         }
         this.#search = null;
         this.#ac = null;
-        this.#settings = createSettings(this.#prefs(), undefined, this.#agentBehavior);
+        this.#settings = createSettings(this.prefs(), undefined, this.#agentBehavior);
         this.#render();
     }
     #notice(text) {
@@ -2521,7 +2534,7 @@ export function apply(ctx, config) {
             return () => { process.stdout.removeListener('resize', listener); };
         },
     };
-    const tui = new LocalTui(term, config.model, config.colors, parseThemeName(config.theme), copyToClipboard, {
+    const tui = new LocalTui(term, config.model, config.colors.get(), config.theme.get(), copyToClipboard, {
         deferInitialRender: true,
         terminalProfile,
         alternateScreenOverlays: terminalProfile === 'direct',
@@ -2531,11 +2544,41 @@ export function apply(ctx, config) {
     });
     ctx.provide(TUI_SERVICE, tui);
     ctx.effect(() => () => { tui.dispose(); });
+    // Preferences are this entry's own volatile config: the initial read applies
+    // them without persisting, a committed form edit dispatches a volatile update
+    // to this fiber only, and an in-app `/settings` change writes back through the
+    // settings service, which persists the edit into the active profile patch.
+    const storedPrefs = () => {
+        const prefs = {
+            theme: config.theme.get(),
+            colors: resolveColors(config.colors.get(), term.output.isTTY === true),
+            motion: config.motion.get(),
+            terminalProgress: config.terminalProgress.get(),
+            expandTools: config.expandTools.get(),
+            checkUpdates: config.checkUpdates.get(),
+            startupChangelog: config.startupChangelog.get(),
+            notifications: config.notifications.get(),
+            notificationThreshold: config.notificationThreshold.get(),
+        };
+        const statusBar = config.statusBar.get();
+        // The reference holds a frozen snapshot; the provider keeps a mutable copy.
+        if (statusBar !== undefined)
+            prefs.statusBar = structuredClone(statusBar);
+        const statusPreset = config.statusPreset.get();
+        if (statusPreset !== undefined)
+            prefs.statusPreset = statusPreset;
+        return prefs;
+    };
+    tui.applyStoredPrefs(storedPrefs());
+    ctx.on('loader/volatile-update', () => { tui.applyStoredPrefs(storedPrefs()); });
+    // Persistence needs the settings service; without one the provider still runs
+    // and an in-app change stays session-local, as it did before.
     ctx.inject(['settings'], (settingsCtx) => {
-        const scope = settingsCtx.settings.register(TUI_SETTINGS_NAMESPACE, TuiSettingsSchema, { base: { theme: parseThemeName(config.theme), colors: resolveColors(config.colors, term.output.isTTY === true), expandTools: false } });
-        tui.applyStoredPrefs(scope.get());
-        tui.setPrefsPersist((prefs) => { void scope.update(prefs); });
-        scope.watch((next) => { tui.applyStoredPrefs(next); });
+        tui.setPrefsPersist((prefs) => {
+            const ops = Object.entries(prefs).map(([key, value]) => ({ op: 'set', path: [key], value }));
+            void settingsCtx.settings.mutate(TUI_SETTINGS_ENTRY, ops)
+                .catch((error) => { settingsCtx.logger.warn(error); });
+        });
     });
 }
 //# sourceMappingURL=provider-local.js.map