@agi-fans/dsh-tui 0.12.0 → 0.13.0

package/lib/runtime/provider-local.js

@@ -10,7 +10,7 @@
  * printing of settled blocks.
  * @module @agi-fans/dsh-tui
  */
-import { TerminalNotificationController, terminalNotificationSequence } from "./terminal-notifications.js";
+import { TerminalNotificationController, terminalNotificationSequence, terminalProgressSequence, } from "./terminal-notifications.js";
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -28,6 +28,7 @@ import { applySettingsEvent, createSettings, } from "../views/settings-list.js";
 import { appendTrajectoryEvent, applyTrajectoryEvent, createTrajectory, } from "../views/trajectory.js";
 import { applyAgentHubEvent, createAgentHub, updateAgentHub, } from "../views/agent-hub.js";
 import { applyEvent, blockLines, initialTranscript, replayEvents, renderView, TRANSCRIPT_FAST_SCROLL, } from "../views/event-views.js";
+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 { createTheme, detectTrueColor, parseThemeName } from "../chrome/theme.js";
@@ -45,6 +46,8 @@ import { imageMarker, imagePathCandidates, probeImageDimensions, stripComposerIm
 import { APP_NAME, APP_VERSION } from "../session/package-metadata.js";
 const DOUBLE_CTRL_C_MS = 500;
 const DOUBLE_ESCAPE_MS = 500;
+const STREAMING_REVEAL_MS = 1000 / 30;
+const TERMINAL_PROGRESS_KEEPALIVE_MS = 1_000;
 function shortenPath(cwd) {
     const home = homedir();
     if (cwd === home)
@@ -97,6 +100,7 @@ export class LocalTui {
     #resumeHintRequested = false;
     #lastSigintTime = 0;
     #lastEscapeTime = 0;
+    #inspectEscapeFenceUntil = 0;
     #interrupts = new Set();
     #queueEdits = new Set();
     #rewinds = new Set();
@@ -124,6 +128,8 @@ export class LocalTui {
     #branch;
     #spinner = 0;
     #tick = null;
+    #revealTick = null;
+    #reveal;
     #loopTick = null;
     #scrollStart = 0;
     #maxStart = 0;
@@ -131,6 +137,10 @@ export class LocalTui {
     #follow = true;
     #focusBlock;
     #expandTools = false;
+    #motion = 'full';
+    #terminalProgress = false;
+    #terminalProgressActive = false;
+    #terminalProgressTick = null;
     #checkUpdates = true;
     #startupChangelog = 'summary';
     #notifications = new TerminalNotificationController();
@@ -170,6 +180,10 @@ export class LocalTui {
     #validateImageDraft;
     #autocompleteDebounceMs;
     #persistPrefs = null;
+    #agentBehavior;
+    #updateAgentBehavior;
+    #offAgentBehaviorWatch;
+    #agentBehaviorPending = false;
     /**
      * @param term - terminal surface (injectable for tests).
      * @param model - model label for the status line.
@@ -246,12 +260,20 @@ export class LocalTui {
     }
     event(event, presentation) {
         this.#state = applyEvent(this.#state, event, presentation);
-        this.#emitNotification(this.#notifications.event({ type: event.type, ...('reason' in event && typeof event.reason === 'string' ? { reason: event.reason } : {}) }));
+        this.#emitNotification(this.#notifications.event({
+            type: event.type,
+            time: event.time,
+            ...(event.type === 'turn/end' ? { reason: event.data.reason.kind } : {}),
+        }));
         if (this.#trajectory !== null)
             this.#trajectory = appendTrajectoryEvent(this.#trajectory, event);
+        const smoothStream = this.#syncStreamingReveal(event);
         this.#syncTick();
         if (this.#tty) {
-            if (event.type === 'assistant/chunk' && this.#streamRenderMs > 0) {
+            if (smoothStream) {
+                // The 30 fps reveal clock owns presentation for textual deltas.
+            }
+            else if (event.type === 'assistant/chunk' && this.#streamRenderMs > 0) {
                 this.#scheduleStreamRender();
             }
             else {
@@ -313,8 +335,10 @@ export class LocalTui {
     }
     setInspectedSubagent(inspected) {
         this.#inspected = inspected === undefined ? undefined : { ...inspected };
-        if (inspected !== undefined)
+        if (inspected !== undefined) {
+            this.#inspectEscapeFenceUntil = 0;
             this.#subagentLauncherFocused = false;
+        }
         this.#syncTick();
         if (this.#tty)
             this.#render();
@@ -441,6 +465,8 @@ export class LocalTui {
             };
         if (!this.#tty)
             return;
+        if (this.#reveal !== undefined && this.#motion !== 'off')
+            return;
         if (this.#streamRenderMs > 0 && this.#busy())
             this.#scheduleStreamRender();
         else
@@ -448,8 +474,11 @@ export class LocalTui {
     }
     /** Apply prefs loaded from the settings document (does not persist). */
     applyStoredPrefs(prefs) {
+        const previousMotion = this.#motion;
         this.#themeName = prefs.theme;
         this.#colors = prefs.colors;
+        this.#motion = prefs.motion ?? 'full';
+        this.#terminalProgress = prefs.terminalProgress ?? false;
         this.#expandTools = prefs.expandTools;
         this.#checkUpdates = prefs.checkUpdates ?? true;
         this.#startupChangelog = prefs.startupChangelog ?? 'summary';
@@ -458,6 +487,11 @@ export class LocalTui {
         this.#configureNotifications();
         this.#statusBar = resolveStatusBarConfig(prefs.statusBar, prefs.statusPreset);
         this.#toolsExpanded = prefs.expandTools;
+        if (previousMotion !== this.#motion) {
+            this.#stopRevealTick();
+            this.#reveal = undefined;
+        }
+        this.#syncTick();
         if (this.#settings !== null)
             this.#settings = { ...this.#settings, prefs };
         if (this.#tty)
@@ -467,6 +501,29 @@ export class LocalTui {
     setPrefsPersist(persist) {
         this.#persistPrefs = persist;
     }
+    bindAgentBehaviorSettings(binding) {
+        if (this.#updateAgentBehavior !== undefined) {
+            throw new Error('omdsh-tui: Agent behavior settings are already bound');
+        }
+        let active = true;
+        this.#updateAgentBehavior = next => binding.update(next);
+        this.#applyStoredAgentBehavior(binding.get());
+        this.#offAgentBehaviorWatch = binding.watch(next => { this.#applyStoredAgentBehavior(next); });
+        return () => {
+            if (!active)
+                return;
+            active = false;
+            this.#offAgentBehaviorWatch?.();
+            this.#offAgentBehaviorWatch = undefined;
+            this.#updateAgentBehavior = undefined;
+            this.#agentBehavior = undefined;
+            this.#agentBehaviorPending = false;
+            if (this.#settings !== null)
+                this.#settings = createSettings(this.#prefs());
+            if (this.#tty && !this.#disposed)
+                this.#render();
+        };
+    }
     readInput() {
         if (this.#pending !== null)
             return Promise.reject(new Error('omdsh-tui: input read already in flight'));
@@ -581,6 +638,8 @@ export class LocalTui {
             clearInterval(this.#tick);
             this.#tick = null;
         }
+        this.#stopRevealTick();
+        this.#setTerminalProgress(false);
         if (this.#loopTick !== null) {
             clearInterval(this.#loopTick);
             this.#loopTick = null;
@@ -609,6 +668,8 @@ export class LocalTui {
         this.#autocompleteTimer = null;
         this.#autocompleteAbort = null;
         this.#lineReader?.close();
+        this.#offAgentBehaviorWatch?.();
+        this.#offAgentBehaviorWatch = undefined;
         this.#pending?.resolve(null);
         this.#pending = null;
         this.#finishPrompt(null);
@@ -686,7 +747,9 @@ export class LocalTui {
     #syncTick() {
         if (!this.#tty)
             return;
-        if (this.#busy()) {
+        const busy = this.#busy();
+        this.#setTerminalProgress(this.#terminalProgress && busy);
+        if (busy && this.#motion !== 'off') {
             if (this.#tick === null) {
                 this.#tick = setInterval(() => {
                     this.#spinner += 1;
@@ -699,6 +762,74 @@ export class LocalTui {
             this.#tick = null;
         }
     }
+    #syncStreamingReveal(event) {
+        const textualDelta = event.type === 'assistant/chunk'
+            && (event.data.chunk.type === 'text-delta' || event.data.chunk.type === 'reasoning-delta');
+        const key = streamingAssistantKey(this.#state);
+        if (!textualDelta || this.#motion === 'off' || key === undefined) {
+            this.#stopRevealTick();
+            this.#reveal = undefined;
+            return false;
+        }
+        if (this.#reveal?.key !== key)
+            this.#reveal = { key, revealed: 0 };
+        this.#startRevealTick();
+        return true;
+    }
+    #startRevealTick() {
+        if (!this.#tty || this.#revealTick !== null)
+            return;
+        this.#revealTick = setInterval(() => {
+            const reveal = this.#reveal;
+            if (reveal === undefined || streamingAssistantKey(this.#state) !== reveal.key) {
+                this.#stopRevealTick();
+                this.#reveal = undefined;
+                return;
+            }
+            const total = streamingAssistantUnits(this.#state);
+            const backlog = Math.max(0, total - reveal.revealed);
+            if (backlog === 0) {
+                this.#stopRevealTick();
+                return;
+            }
+            reveal.revealed = Math.min(total, reveal.revealed + nextRevealStep(backlog));
+            this.#render();
+            if (reveal.revealed >= total)
+                this.#stopRevealTick();
+        }, STREAMING_REVEAL_MS);
+        this.#revealTick.unref?.();
+    }
+    #stopRevealTick() {
+        if (this.#revealTick === null)
+            return;
+        clearInterval(this.#revealTick);
+        this.#revealTick = null;
+    }
+    #setTerminalProgress(active) {
+        if (!this.#tty)
+            return;
+        if (active) {
+            if (this.#terminalProgressActive)
+                return;
+            this.#terminalProgressActive = true;
+            this.#term.output.write(terminalProgressSequence(true));
+            this.#terminalProgressTick = setInterval(() => {
+                if (!this.#disposed && this.#terminalProgressActive) {
+                    this.#term.output.write(terminalProgressSequence(true));
+                }
+            }, TERMINAL_PROGRESS_KEEPALIVE_MS);
+            this.#terminalProgressTick.unref?.();
+            return;
+        }
+        if (this.#terminalProgressTick !== null) {
+            clearInterval(this.#terminalProgressTick);
+            this.#terminalProgressTick = null;
+        }
+        if (!this.#terminalProgressActive)
+            return;
+        this.#terminalProgressActive = false;
+        this.#term.output.write(terminalProgressSequence(false));
+    }
     #syncLoopTick() {
         if (!this.#tty)
             return;
@@ -720,8 +851,11 @@ export class LocalTui {
         if (this.#deferInitialRender)
             return;
         const width = this.#term.width();
+        const renderState = this.#reveal === undefined
+            ? this.#state
+            : revealStreamingAssistant(this.#state, this.#reveal.revealed);
         const frame = this.#tty
-            ? renderView(this.#state, {
+            ? renderView(renderState, {
                 width,
                 height: this.#term.height(),
                 model: this.#model,
@@ -738,6 +872,7 @@ export class LocalTui {
                 version: APP_VERSION,
                 appName: APP_NAME,
                 spinnerFrame: this.#spinner,
+                motion: this.#motion,
                 trueColor: this.#trueColor,
                 themeName: this.#themeName,
                 scrollStart: this.#follow ? Number.POSITIVE_INFINITY : this.#scrollStart,
@@ -1063,8 +1198,17 @@ export class LocalTui {
             this.#pasteBuf = '';
             return;
         }
-        if (event.type !== 'key' || event.id !== 'escape')
+        const isEscape = event.type === 'key' && event.id === 'escape';
+        if (!isEscape) {
             this.#lastEscapeTime = 0;
+            this.#inspectEscapeFenceUntil = 0;
+        }
+        else if (this.#inspected === undefined && Date.now() < this.#inspectEscapeFenceUntil) {
+            return;
+        }
+        else if (this.#inspected === undefined) {
+            this.#inspectEscapeFenceUntil = 0;
+        }
         if (this.#handlePrompt(event))
             return;
         if (this.#trajectory !== null) {
@@ -1460,6 +1604,9 @@ export class LocalTui {
     #closeInspect() {
         if (this.#inspected === undefined)
             return;
+        // Keep one exit gesture inside the inspector even when repeated Escape
+        // bytes are decoded after the parent view has already been restored.
+        this.#inspectEscapeFenceUntil = Date.now() + DOUBLE_ESCAPE_MS;
         for (const listener of this.#inspectCloses)
             listener();
     }
@@ -1483,6 +1630,8 @@ export class LocalTui {
         return {
             theme: this.#themeName,
             colors: this.#colors,
+            motion: this.#motion,
+            terminalProgress: this.#terminalProgress,
             expandTools: this.#expandTools,
             checkUpdates: this.#checkUpdates,
             startupChangelog: this.#startupChangelog,
@@ -1503,6 +1652,9 @@ export class LocalTui {
         const expandChanged = prefs.expandTools !== this.#expandTools;
         this.#themeName = prefs.theme;
         this.#colors = prefs.colors;
+        const previousMotion = this.#motion;
+        this.#motion = prefs.motion ?? 'full';
+        this.#terminalProgress = prefs.terminalProgress ?? false;
         this.#expandTools = prefs.expandTools;
         this.#checkUpdates = prefs.checkUpdates ?? true;
         this.#startupChangelog = prefs.startupChangelog ?? 'summary';
@@ -1512,8 +1664,41 @@ export class LocalTui {
         this.#statusBar = resolveStatusBarConfig(prefs.statusBar, prefs.statusPreset);
         if (expandChanged)
             this.#toolsExpanded = prefs.expandTools;
+        if (previousMotion !== this.#motion) {
+            this.#stopRevealTick();
+            this.#reveal = undefined;
+        }
+        this.#syncTick();
         this.#persistPrefs?.(prefs);
     }
+    #applyStoredAgentBehavior(next) {
+        this.#agentBehavior = { language: next.language };
+        if (this.#settings !== null) {
+            this.#settings = { ...this.#settings, agent: { ...this.#agentBehavior } };
+        }
+        if (this.#tty && !this.#disposed)
+            this.#render();
+    }
+    async #commitAgentBehavior(next) {
+        const update = this.#updateAgentBehavior;
+        if (update === undefined)
+            return;
+        try {
+            await update(next);
+            this.#applyStoredAgentBehavior(next);
+        }
+        catch (error) {
+            if (this.#settings !== null && this.#agentBehavior !== undefined) {
+                this.#settings = { ...this.#settings, agent: { ...this.#agentBehavior } };
+            }
+            this.notice(`Could not save Agent language: ${error instanceof Error ? error.message : String(error)}`, { level: 'error' });
+        }
+        finally {
+            this.#agentBehaviorPending = false;
+            if (this.#tty && !this.#disposed)
+                this.#render();
+        }
+    }
     #applySettings(event) {
         if (this.#settings === null)
             return;
@@ -1524,6 +1709,15 @@ export class LocalTui {
             return;
         }
         if (command.kind === 'apply') {
+            if (command.domain === 'agent') {
+                if (this.#agentBehaviorPending || command.state.agent === undefined)
+                    return;
+                this.#agentBehaviorPending = true;
+                this.#settings = command.state;
+                this.#render();
+                void this.#commitAgentBehavior(command.state.agent);
+                return;
+            }
             this.#settings = command.state;
             this.#applyPrefs(command.state.prefs);
             this.#render();
@@ -2091,7 +2285,7 @@ export class LocalTui {
         }
         this.#search = null;
         this.#ac = null;
-        this.#settings = createSettings(this.#prefs());
+        this.#settings = createSettings(this.#prefs(), undefined, this.#agentBehavior);
         this.#render();
     }
     #notice(text) {