@agi-fans/dsh-tui 0.23.0 → 0.24.0

package/lib/runtime/provider-local.js

@@ -414,6 +414,9 @@ export class LocalTui {
     #mermaidMode = 'auto';
     /** Transcript collapses every thought to one line; Ctrl+T flips it. */
     #hideThinking = true;
+    #showFileChanges = true;
+    #workspaceReview;
+    #workspacePress;
     #mouseInteraction = 'auto';
     #tmuxMouseEnabled;
     #disclosurePress;
@@ -439,6 +442,8 @@ export class LocalTui {
      */
     #transientStatus;
     #transientTimer = null;
+    /** Idle submissions also pass through the inbox, but are not queue gestures. */
+    #directInputIds = new Set();
     /** Aborts the live Shell card, so Ctrl+C interrupts the command it belongs to. */
     #shellAbort;
     /** Turn scopes whose tools stay detailed as new calls arrive during inspection. */
@@ -596,6 +601,7 @@ export class LocalTui {
                 // live window so it stays anchored at the bottom.
                 this.#selection.clear();
                 this.#mouseActionPress = undefined;
+                this.#workspacePress = undefined;
                 this.#jumpPress = undefined;
                 this.#disclosurePress = undefined;
                 const repaint = () => {
@@ -680,9 +686,23 @@ export class LocalTui {
             this.#retryDeadline = Date.now() + event.data.delayMs;
         if (event.type === 'llm/retry-started' || event.type === 'turn/end')
             this.#retryDeadline = undefined;
-        const claimedHumanInput = event.type === 'agent/inbox/spliced' && event.data.outcome !== 'canceled'
-            && event.data.inserted.length === 0 && (event.data.target === 'next-step' ? this.#state.nextStepInbox : this.#state.nextTurnInbox)
-            .slice(event.data.start, event.data.start + (event.data.removedCount ?? 0)).some(message => message.source.kind === 'user');
+        let claimedHumanInput = false;
+        if (event.type === 'agent/inbox/spliced') {
+            const inbox = event.data.target === 'next-step' ? this.#state.nextStepInbox : this.#state.nextTurnInbox;
+            const removed = inbox.slice(event.data.start, event.data.start + (event.data.removedCount ?? 0));
+            claimedHumanInput = event.data.outcome !== 'canceled' && event.data.inserted.length === 0
+                && removed.some(message => message.source.kind === 'user' && !this.#directInputIds.has(message.id));
+            for (const message of removed)
+                this.#directInputIds.delete(message.id);
+            if (event.data.target === 'next-turn' && this.#state.status === 'idle'
+                && !inbox.some(message => message.source.kind === 'user')) {
+                const first = event.data.inserted.find(message => message.source.kind === 'user');
+                if (first !== undefined)
+                    this.#directInputIds.add(first.id);
+            }
+        }
+        else if (event.type === 'session/end-seed')
+            this.#directInputIds.clear();
         this.#state = applyEvent(this.#state, event, presentation, workspace);
         if (claimedHumanInput && this.#tty && event.type === 'agent/inbox/spliced') {
             this.#showTransientStatus(event.data.target === 'next-step' ? 'Steer taken for the next step' : 'Queue taken for the next turn');
@@ -843,6 +863,7 @@ export class LocalTui {
             && this.#inspected?.writable === inspected?.writable)
             return;
         if (this.#inspected?.id !== inspected?.id) {
+            this.#workspacePress = undefined;
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
         }
@@ -870,6 +891,7 @@ export class LocalTui {
     async reviewFiles(request) {
         if (!this.#tty || this.#disposed || request.signal.aborted)
             return;
+        this.#workspacePress = undefined;
         this.#flushPasteBurst(true);
         this.#pasteBurst.clear();
         this.#finishPrompt(null);
@@ -1204,7 +1226,8 @@ export class LocalTui {
         const browserState = promptBrowserState(request);
         request = localizePrompt(request, resolveUiLanguage(this.#uiLanguage));
         // Background approvals take the terminal from a user-opened file reader.
-        if (this.#fileReviewAbort !== undefined && request.signal !== this.#fileReviewAbort.signal)
+        if (this.#fileReviewAbort !== undefined && request.signal !== this.#fileReviewAbort.signal
+            && request.signal !== this.#fileBrowser?.request.signal)
             this.#fileReviewAbort.abort();
         if (this.#disposed || request.signal?.aborted === true)
             return Promise.resolve(null);
@@ -1235,6 +1258,7 @@ export class LocalTui {
         this.#promptChoicePress = undefined;
         this.#disclosurePress = undefined;
         this.#mouseActionPress = undefined;
+        this.#workspacePress = undefined;
         this.#jumpPress = undefined;
         this.#wheelGesture = IDLE_WHEEL;
         const savedInput = this.#editor.snapshot();
@@ -1325,6 +1349,7 @@ export class LocalTui {
         });
     }
     replaceSession(events, presentations, status = 'idle', reason = 'open') {
+        this.#workspacePress = undefined;
         if (reason !== 'refresh') {
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
@@ -1332,6 +1357,14 @@ export class LocalTui {
         }
         this.#trajectory = null;
         const state = replayEvents(events, presentations);
+        if (reason === 'refresh') {
+            const pendingIds = new Set(state.nextTurnInbox.map(message => message.id));
+            for (const id of this.#directInputIds)
+                if (!pendingIds.has(id))
+                    this.#directInputIds.delete(id);
+        }
+        else
+            this.#directInputIds.clear();
         // A notice does not turn a blank session into a document that /new needs
         // to separate. Refreshes are the same document.
         const boundary = reason === 'open' || (reason === 'new' && this.#state.blocks.some(block => block.kind !== 'notice'));
@@ -1348,6 +1381,7 @@ export class LocalTui {
     }
     setSession(info) {
         if (info.id !== this.#sessionId) {
+            this.#workspacePress = undefined;
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
         }
@@ -1432,6 +1466,7 @@ export class LocalTui {
             mathMode: this.#mathMode,
             mermaidMode: this.#mermaidMode,
             hideThinking: this.#hideThinking,
+            showFileChanges: this.#showFileChanges,
             editor: this.#externalEditor,
             terminalTitle: this.#terminalTitle,
             terminalState: this.#terminalState,
@@ -1719,6 +1754,15 @@ export class LocalTui {
         return pending.queued.length === 0 && pending.sending.size === 0
             && this.#state.nextTurnInbox.length === 0 && !this.#state.nextStepInbox.some(message => message.source.kind === 'user');
     }
+    setWorkspaceReviewHandler(handler) {
+        this.#workspaceReview = handler;
+        return () => {
+            if (this.#workspaceReview === handler) {
+                this.#workspaceReview = undefined;
+                this.#workspacePress = undefined;
+            }
+        };
+    }
     setGoalHandler(handler) {
         this.#goalHandler = handler;
         this.#syncSettingsActions();
@@ -2137,6 +2181,7 @@ export class LocalTui {
                 mathMode: this.#mathMode,
                 mermaidMode: this.#mermaidMode,
                 hideThinking: true,
+                showFileChanges: this.#showFileChanges,
                 height: this.#term.height(),
                 model: this.#model,
                 ...(this.#reasoningEffort === undefined ? {} : { reasoningEffort: this.#reasoningEffort }),
@@ -2262,7 +2307,8 @@ export class LocalTui {
         return Math.max(1, this.#scrollBudget > 2 ? this.#scrollBudget - 2 : 1);
     }
     #scrollBy(delta) {
-        if (this.#follow && delta > 0)
+        this.#workspacePress = undefined;
+        if (this.#follow && (delta > 0 || this.#maxStart === 0))
             return;
         if (delta === 0 && this.#maxStart === 0)
             return;
@@ -2325,6 +2371,7 @@ export class LocalTui {
         enabled = enabled && this.#mouseInteraction !== 'native'
             && (this.#mouseInteraction === 'tui' || this.#tmuxMouseEnabled !== false);
         if (!enabled) {
+            this.#workspacePress = undefined;
             this.#mouseActionPress = undefined;
             this.#selection.clear();
             this.#jumpPress = undefined;
@@ -2665,6 +2712,18 @@ export class LocalTui {
             return { row, column: tool.actionColumn, width: tool.key.startsWith('output:') ? 6 : 5, key: tool.key, action: 'tool', block: tool.block };
         return undefined;
     }
+    #fileRegionAt(row) {
+        const document = this.#renderer.documentRowAt(row);
+        const frame = this.#fileActionFrame;
+        const source = frame?.documentRows;
+        const region = document === undefined ? undefined : frame?.transcript?.fileRegions?.find(region => document >= region.start && document < region.end);
+        const expected = document === undefined || source === undefined || source === null ? undefined
+            : frame?.lines[source.frameStart + document - source.documentStart];
+        const actual = this.#renderer.viewport()[row];
+        // Committed native history can differ from the live document after a reflow.
+        return expected !== undefined && actual !== undefined
+            && stripAnsi(sanitizeDisplayLine(expected)).trimEnd() === stripAnsi(actual).trimEnd() ? region : undefined;
+    }
     #handleMouse(event) {
         if (!this.#mouseTracking || this.#paste || this.#pasteInFlight > 0)
             return;
@@ -2741,6 +2800,7 @@ export class LocalTui {
             const target = this.#mouseActionAt(event.row, event.column);
             if (event.action === 'release') {
                 this.#mouseActionPress = undefined;
+                this.#workspacePress = undefined;
                 if (event.button === 'left' && !event.shift && target?.key === pressedAction.key && target.row === pressedAction.row && target.column === pressedAction.column) {
                     if (target.action === 'copy')
                         void this.#copySelection(true);
@@ -2771,21 +2831,14 @@ export class LocalTui {
         }
         const inside = (target) => event.row === target.row && event.column >= target.column && event.column < target.column + target.width;
         if (event.button === 'right') {
+            this.#workspacePress = undefined;
             this.#disclosurePress = undefined;
             if (event.action === 'press') {
                 if (this.#selection.active)
                     void this.#copySelection(true);
                 else {
-                    const document = this.#renderer.documentRowAt(event.row);
-                    const frame = this.#fileActionFrame;
-                    const source = frame?.documentRows;
-                    const region = document === undefined ? undefined : frame?.transcript?.fileRegions?.find(region => document >= region.start && document < region.end);
-                    const expected = document === undefined || source === undefined || source === null ? undefined
-                        : frame?.lines[source.frameStart + document - source.documentStart];
-                    const actual = this.#renderer.viewport()[event.row];
-                    // Native-history snapshots may differ from the current document. Do
-                    // not reinterpret their old text as another file after a reflow.
-                    if (region !== undefined && expected !== undefined && actual !== undefined && stripAnsi(sanitizeDisplayLine(expected)).trimEnd() === stripAnsi(actual).trimEnd()) {
+                    const region = this.#fileRegionAt(event.row);
+                    if (region !== undefined) {
                         const block = this.#state.blocks[region.block];
                         const action = block === undefined ? undefined : blockFileAction(block);
                         if (action !== undefined)
@@ -2796,6 +2849,10 @@ export class LocalTui {
             return;
         }
         if (event.action === 'press') {
+            const region = !event.shift && this.#workspaceReview !== undefined ? this.#fileRegionAt(event.row) : undefined;
+            const source = region === undefined ? undefined : this.#state.blocks[region.block];
+            this.#workspacePress = source?.kind === 'workspace' && region !== undefined
+                ? { row: event.row, column: event.column, block: region.block, source, ...(region.file === undefined ? {} : { file: region.file }) } : undefined;
             const disclosure = event.shift ? undefined : this.#disclosureAt(event.row, event.column);
             this.#disclosurePress = disclosure === undefined ? undefined : { target: disclosure, row: event.row, column: event.column };
             const target = this.#jumpToLatest;
@@ -2817,6 +2874,9 @@ export class LocalTui {
             }
         }
         else if (event.action === 'drag') {
+            const pressed = this.#workspacePress;
+            if (pressed !== undefined && (event.shift || event.row !== pressed.row || Math.abs(event.column - pressed.column) > 1))
+                this.#workspacePress = undefined;
             // Motion confined to the empty gutter is click jitter. Once it leaves,
             // selection owns the gesture even if the pointer returns to the arrow.
             if (event.shift || this.#pressedDisclosureAt(event.row, event.column) === undefined) {
@@ -2825,6 +2885,15 @@ export class LocalTui {
             }
         }
         else {
+            const pressed = this.#workspacePress;
+            this.#workspacePress = undefined;
+            const region = pressed === undefined ? undefined : this.#fileRegionAt(event.row);
+            if (!event.shift && pressed !== undefined && event.row === pressed.row && Math.abs(event.column - pressed.column) <= 1
+                && region?.block === pressed.block && region.file === pressed.file && this.#state.blocks[pressed.block] === pressed.source) {
+                this.#selection.clear();
+                this.#openWorkspaceReview(pressed.source, pressed.file);
+                return;
+            }
             const target = this.#pressedDisclosureAt(event.row, event.column);
             this.#disclosurePress = undefined;
             if (!event.shift && target !== undefined) {
@@ -3017,6 +3086,20 @@ export class LocalTui {
                 this.#fileReviewAbort = undefined;
         }
     }
+    #openWorkspaceReview(block, file) {
+        const handler = this.#workspaceReview;
+        const sessionId = this.#inspected?.id ?? this.#sessionId;
+        if (handler === undefined || sessionId === undefined || block.kind !== 'workspace' || !this.#tty || this.#disposed
+            || this.#prompt !== null || this.#fileReviewAbort !== undefined)
+            return;
+        const abort = new AbortController();
+        this.#fileReviewAbort = abort;
+        void handler({ sessionId, turn: block.turn, ...(file === undefined ? {} : { file }), signal: abort.signal })
+            .catch(error => { if (!abort.signal.aborted && !this.#disposed)
+            this.notice(error instanceof Error ? error.message : String(error), { level: 'error' }); })
+            .finally(() => { if (this.#fileReviewAbort === abort)
+            this.#fileReviewAbort = undefined; });
+    }
     #openFileAction(action, initial) {
         if (!this.#tty || this.#disposed || this.#prompt !== null || this.#fileReviewAbort !== undefined)
             return;
@@ -3068,6 +3151,7 @@ export class LocalTui {
         this.#jumpPress = undefined;
         this.#disclosurePress = undefined;
         this.#mouseActionPress = undefined;
+        this.#workspacePress = undefined;
         if (this.#keyTest !== undefined && this.#prompt?.request.signal === this.#keyTest.signal
             && (event.type === 'text' || event.type === 'paste-start' || event.type === 'paste-end' || event.type === 'key' && !['escape', 'ctrl+c'].includes(event.id))) {
             this.#keyTest.observe(event);
@@ -3898,6 +3982,7 @@ export class LocalTui {
         const previous = options.persist ? this.prefs() : undefined;
         const version = this.#prefsVersion;
         const previousMotion = this.#motion;
+        this.#workspacePress = undefined;
         this.#uiLanguage = prefs.uiLanguage ?? 'auto';
         if (this.#prompt !== null)
             this.#prompt = { ...this.#prompt, request: localizePrompt(this.#prompt.sourceRequest, resolveUiLanguage(this.#uiLanguage)) };
@@ -3916,6 +4001,7 @@ export class LocalTui {
         this.#mathMode = prefs.mathMode ?? 'auto';
         this.#mermaidMode = prefs.mermaidMode ?? 'auto';
         this.#hideThinking = prefs.hideThinking !== false;
+        this.#showFileChanges = prefs.showFileChanges !== false;
         this.#mouseInteraction = prefs.mouseInteraction ?? 'auto';
         this.#checkUpdates = prefs.checkUpdates ?? true;
         this.#startupChangelog = prefs.startupChangelog ?? 'summary';
@@ -4899,17 +4985,17 @@ export class LocalTui {
     }
     #settingsActions() {
         const runtimeActions = [
-            { id: 'command:model', behavior: 'Session + Profile · Choose scope in Model', group: 'Models', label: 'Model and reasoning', description: 'Open /model; changes the current selection and saves the default route.', value: [this.#model, this.#reasoningEffort].filter(Boolean).join(' · '), values: [], action: 'model' },
-            { id: 'command:permission', behavior: 'Current session · Applies now', group: 'General', label: 'Current session access', description: 'Changes only this session. Default access controls future sessions.', value: this.#sessionControls?.permission ?? 'Choose', values: [], action: 'permission' },
-            { id: 'command:agent', behavior: 'Current session · Before the first prompt', group: 'Agent presets', label: 'Current session preset', description: 'Choose before the first prompt; does not change the new-session default.', value: this.#sessionControls?.agentPreset === undefined ? 'Choose' : formatAgentPreset(this.#sessionControls.agentPreset), values: [], action: 'agent' },
-            { id: 'command:login', behavior: 'Provider credentials', group: 'Models', label: 'Provider credentials', description: 'Sign in or configure a provider. Does not change the selected model.', value: 'Configure', values: [], action: 'login' },
-            { id: 'command:logout', behavior: 'Provider credentials', group: 'Models', label: 'Sign out', description: 'Remove saved provider credentials; environment credentials remain available.', value: 'Choose provider', values: [], action: 'logout' },
-            { id: 'command:plugins', group: 'Plugins', label: 'Manage plugins', description: 'Inspect installed entries, enable bundles, discover plugins or start Creator.', value: 'Open', values: [], action: 'plugins' },
+            { id: 'command:model', behavior: 'Session + Profile · Choose scope in Model', group: 'Models', subgroup: 'Model selection', label: 'Model and reasoning', description: 'Choose the current model and reasoning effort. Save as the default or use for this session.', value: [this.#model, this.#reasoningEffort].filter(Boolean).join(' · '), values: [], action: 'model' },
+            { id: 'command:permission', behavior: 'Current session · Applies now', group: 'General', subgroup: 'Session controls', label: 'Current session access', description: 'Changes only this session. Default access controls future sessions.', value: this.#sessionControls?.permission ?? 'Choose', values: [], action: 'permission' },
+            { id: 'command:agent', behavior: 'Current session · Before the first prompt', group: 'Agent presets', subgroup: 'Current session', label: 'Current session preset', description: 'Choose before the first prompt; does not change the new-session default.', value: this.#sessionControls?.agentPreset === undefined ? 'Choose' : formatAgentPreset(this.#sessionControls.agentPreset), values: [], action: 'agent' },
+            { id: 'command:login', behavior: 'Accounts and API keys', group: 'Models', subgroup: 'Accounts and API keys', label: 'Sign in / add API key', description: 'Sign in to a provider account or save an API key.', keywords: ['Provider credentials', 'login', 'API key', 'OAuth'], value: 'Choose provider', values: [], action: 'login' },
+            { id: 'command:logout', behavior: 'Accounts and API keys', group: 'Models', subgroup: 'Accounts and API keys', label: 'Sign out / remove key', description: 'Choose a provider or account to sign out or remove locally saved credentials.', keywords: ['logout', 'credentials'], value: 'Choose provider', values: [], action: 'logout' },
+            { id: 'command:plugins', group: 'Plugins', subgroup: 'Plugin management', label: 'Manage plugins', description: 'Inspect installed entries, enable bundles, discover plugins or start Creator.', value: 'Open', values: [], action: 'plugins' },
         ].filter(item => this.#runtimeCommands.some(command => command.name === item.action));
         const customBindings = Object.entries(this.#keybindings).filter(([key, action]) => DEFAULT_KEYBINDINGS[key] !== action).length;
         return [
             ...runtimeActions,
-            ...(this.#goalHandler === undefined ? [] : [{ id: 'action:goal', behavior: 'Current session · Applies now', group: 'General', label: 'Current goal', description: 'Edit, pause, resume or clear this session’s goal.', value: 'Open', values: [], action: 'manage-goal' }]),
+            ...(this.#goalHandler === undefined ? [] : [{ id: 'action:goal', behavior: 'Current session · Applies now', group: 'General', subgroup: 'Session controls', label: 'Current goal', description: 'Edit, pause, resume or clear this session’s goal.', value: 'Open', values: [], action: 'manage-goal' }]),
             ...(this.#keybindingsPath === undefined ? [] : [{
                     id: 'action:keybindings',
                     label: 'Keybindings',
@@ -5828,6 +5914,7 @@ export class LocalTui {
             toolsExpanded: this.#toolsExpanded,
             expandedOutputs: this.#expandedOutputs,
             hideThinking: true,
+            showFileChanges: this.#showFileChanges,
             expandedTools: this.#detailedToolIds(),
             expandedReasoning: this.#visibleReasoning(),
             ...(this.#openedGroups === undefined ? {} : { openedGroups: this.#openedGroups }),
@@ -5938,6 +6025,7 @@ export function apply(ctx, config) {
             motion: config.motion.get(),
             mathMode: config.mathMode.get(),
             mermaidMode: config.mermaidMode.get(),
+            showFileChanges: config.showFileChanges.get(),
             editor: config.editor.get(),
             terminalTitle: config.terminalTitle.get(),
             terminalState: config.terminalState.get(),