dsh-ssh-tui 0.5.6 → 0.5.8

package/lib/tui.js

@@ -25,12 +25,12 @@ import { StringDecoder } from 'node:string_decoder';
 import { credentialRef } from '@deepseek-ai/dsh-credentials';
 import { createUserMessage, errorChain, ReasoningEffortId } from '@deepseek-ai/dsh-llm';
 import { SessionId } from '@deepseek-ai/dsh-session';
-import { commandAcceptsAttachments, forEachSessionEvent, isAssistantStreamEvent, listenHostEvent, sessionEventType, sessionEvents, settingsNamespace, streamChunkOf, } from './dsh-compat.js';
+import { commandAcceptsAttachments, forEachSessionEventAsync, isAssistantStreamEvent, isTokenDeltaChunk, listenHostEvent, REPLAY_YIELD_EVERY, sessionEventType, sessionEvents, settingsNamespace, streamChunkOf, streamFirstTokenTime, streamFrameAttemptId, streamFrameOwner, } from './dsh-compat.js';
 import { classifyApprovalDetailed, commandForApprovalRequest, isApprovalStatusArg, parseAutoApprovalMode } from './auto-approval.js';
 import { buildReviewUserMessage, parseReviewOutput, reviewSystemPrompt } from './approval-reviewer.js';
 import { loadProviderCatalog, mergeProviderEntries } from './provider-catalog.js';
 import { formatFooterCwd, formatSessionTime, listResumableSessions } from './session-list.js';
-import { detachFromSshSession, DisplayHost, sessionSockPath } from './display-sock.js';
+import { detachFromSshSession, DisplayHost, resolveDshHome, sessionSockPath } from './display-sock.js';
 import { applySavedLocale, getLocale, localeDisplayName, localeFromTag, setLocale, t, UI_LOCALE_NAMESPACE, } from './i18n/index.js';
 import { defaultReasoningEffort } from './reasoning.js';
 import { checkForPluginUpdate, installPluginLatest } from './update-check.js';
@@ -47,10 +47,10 @@ import { crossedQuotaThresholds, DEEPSEEK_PUBLIC_BASE_URL, formatAccountBalance,
 import { appendSubagentLog, applyTurnEndToPlan, cardCategoryLabel, cardCategoryOf, compactionHeaderText, formatCompactCommandError, isPromptInjectionMessage, matchTranscriptRows, parseFindQuery, parsePlanTodos, planCloseNudgeText, planMarkdownFromArgs, planDockNote, planIsLive, planTitleFromMarkdown, promptInjectionSources, promptInjectionTitle, subagentHeaderText, todoItemKind, todoProgressLabel, TODO_STATUS_MARK, } from './plan.js';
 import { buildToolHeader, canMergeToolCall, compactEditPath, compactToolBursts, countDiffAddDel, countDiffLines, countOutputLines, diffMetaDiffs, diffStatToken, formatModelList, HIDDEN_TOOL_NAMES, parseExitStatus, planReviewOf, presentToolCall, READ_TOOL_NAMES, SHELL_TOOL_NAMES, toolBodyFitsWorkspace, toolBodyLines, toolTitle, TOOL_FLIP_MS, wrappedToolBodyLineCount, } from './tool-present.js';
 export { clipAnsiToWidth, cursorVisualPosition, displayWidth, foldInputView, hrefAtColumn, osc52Clipboard, osc8Enabled, paintedLinkHits, fmtElapsedCompact, padAnsiToWidth, padToWidth, renderMarkdownLines, repeatToWidth, shimmerText, truncateToWidth, visibleWidth, waitCardCopy, waitSummaryFromReasoning, wrapWaitDetails, } from './term-text.js';
-export { captureHangupSignals, composePaintOutput, detectSshSession, formatLinkQualityChip, ignoreFurtherHangupSignals, isEscapePrefix, isHangupErrno, linkQualityOf, linkSignalPips, paintIntervalForRtt, paintLinkLabel, parseCursorPositionReply, pickerWindowStart, probeTerminalRttMs, releaseHangupSignals, resolvePaintIntervalMs, waitUntilIdleOrTimeout, writeBootSplash, } from './paint.js';
-export { CONTEXT_IDLE_COMPACT_RATIO, CONTEXT_PRESSURE_DANGER_RATIO, CONTEXT_PRESSURE_WARN_RATIO, CONTEXT_RING_EMPTY, CONTEXT_RING_SEGMENTS, contextPressureAlertText, contextPressureRingColor, contextPressureUsedTokens, contextPressureView, describeProviderRoute, dropFooterQuotaPlanName, fitFooterStatsLine, fitFooterStatusLine, footerActivity, footerIdentityParts, footerStatsGroups, formatContextPressureChip, formatContextPressureRing, formatContextPressureStatusLine, formatDuration, formatFooterQuota, formatQuotaBar, formatStatusReport, formatTokens, formatTokensPerSecond, parseContextPressure, promptPressureTokens, providerShortCode, providerUsesLocalOAuth, shouldIdleAutoCompact, } from './footer.js';
+export { captureHangupSignals, composePaintOutput, detectSshSession, formatLinkQualityChip, ignoreFurtherHangupSignals, isEscapePrefix, findCursorPositionReply, isHangupErrno, linkQualityOf, linkSignalPips, paintIntervalForRtt, paintLinkLabel, parseCursorPositionReply, pickerWindowStart, probeTerminalRttMs, releaseHangupSignals, resolvePaintIntervalMs, waitUntilIdleOrTimeout, writeBootSplash, } from './paint.js';
+export { CONTEXT_IDLE_COMPACT_RATIO, CONTEXT_PRESSURE_DANGER_RATIO, CONTEXT_PRESSURE_WARN_RATIO, CONTEXT_RING_EMPTY, CONTEXT_RING_SEGMENTS, contextPressureAlertText, contextPressureRingColor, contextPressureUsedTokens, contextPressureView, describeProviderRoute, dropFooterQuotaPlanName, fitFooterStatsLine, fitFooterStatusLine, footerActivity, footerIdentityParts, footerStatsGroups, formatContextPressureChip, formatContextPressureRing, formatContextPressureStatusLine, formatDuration, formatFooterQuota, formatQuotaBar, formatStatusReport, formatTokens, formatTokensPerSecond, parseContextPressure, promptPressureTokens, providerShortCode, providerUsesLocalOAuth, shouldIdleAutoCompact, subagentRouteLabel, } from './footer.js';
 export { crossedQuotaThresholds, formatAccountBalance, formatFooterBalance, formatOpenCodeGoUsage, formatQuotaSnapshot, formatQuotaStatusLine, joinUrl, openCodeSourceFor, parseDeepSeekBalance, parseOpenAiCompatibleBalance, parseOpenCodeGoQuota, parseSuperGrokBilling, quotaAlertText, quotaRefreshEverySteps, quotaRefreshEveryTurns, remainingPercentFromUsed, tightestQuotaWindow, } from './quota.js';
-export { commandAcceptsAttachments, forEachSessionEvent, isAssistantStreamEvent, listPersistenceHeaders, inspectPersistenceSession, sessionEventType, sessionEvents, settingsNamespace, streamChunkOf, } from './dsh-compat.js';
+export { commandAcceptsAttachments, forEachSessionEvent, isAssistantStreamEvent, isTokenDeltaChunk, listPersistenceHeaders, inspectPersistenceSession, sessionEventType, sessionEvents, settingsNamespace, streamChunkOf, streamFirstTokenTime, streamFrameAttemptId, streamFrameOwner, } from './dsh-compat.js';
 export { applyTurnEndToPlan, askSummary, cardCategoryOf, compactionHeaderText, formatCompactCommandError, isPromptInjectionMessage, matchTranscriptRows, parseFindQuery, parsePlanTodos, planCloseNudgeText, planDockNote, planIsLive, planTitleFromMarkdown, planTurnLeftOpen, promptInjectionSources, promptInjectionTitle, subagentHeaderText, todoProgressLabel, todoSummary, } from './plan.js';
 export { buildToolHeader, canMergeToolCall, compactEditPath, compactToolBursts, compactToolGroups, countDiffAddDel, countDiffLines, countOutputLines, diffMetaDiffs, diffStatToken, friendlyJsonLines, parseExitStatus, presentToolCall, READ_TOOL_NAMES, renderToolDiff, toolBodyFitsWorkspace, toolBodyLines, toolStateColor, toolStateLabel, wrappedToolBodyLineCount, } from './tool-present.js';
 function discoverProviderModels(llm, request, signal) {
@@ -146,7 +146,7 @@ const RESERVED_BOTTOM_LINES = 3; // input line + stats line + status line
 const MAX_TRANSCRIPT_ROWS = 5000;
 const IS_WINDOWS = process.platform === 'win32';
 function dshHomeDir() {
-    return process.env.DSH_HOME ?? join(homedir(), '.dsh');
+    return resolveDshHome();
 }
 function displayDshPath(file) {
     const home = dshHomeDir();
@@ -446,6 +446,10 @@ export class SshTui {
         usage: { inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 },
     };
     openStepStats;
+    /** Attempt whose live `start` frame opened the current token stream. */
+    liveStreamOwner;
+    /** Live events parked while the (yielding) history replay holds the floor. */
+    replayQueue;
     pendingToolTimes = new Map();
     usageByStep = new Map();
     lastStatsTurn = null;
@@ -871,16 +875,29 @@ export class SshTui {
         this.paintIntervalMs = resolvePaintIntervalMs(undefined, {}, { ssh: true, rttMs: rtt });
         this.markDirty();
     }
-    /** Replay the durable session log so a resumed session renders its history. */
-    replayHistory() {
+    /**
+     * Replay the durable session log so a resumed session renders its history.
+     * Chunked on purpose: a synchronous walk of a long log froze the TUI on the
+     * pre-replay frame, so the relay's RTT frame could not be applied and the
+     * footer sat on `SSH ○○○○` for the whole load.
+     */
+    async replayHistory() {
+        const parked = [];
+        this.replayQueue = parked;
         this.replaying = true;
         try {
-            forEachSessionEvent(this.agent.session, (event) => {
-                this.handleSessionEvent(this.agent.session, event);
-            });
+            await forEachSessionEventAsync(this.agent.session, (event) => {
+                this.applySessionEvent(this.agent.session, event);
+            }, REPLAY_YIELD_EVERY, () => this.disposed);
         }
         finally {
             this.replaying = false;
+            this.replayQueue = undefined;
+        }
+        for (const item of parked) {
+            if (this.disposed)
+                return;
+            this.applySessionEvent(item.session, item.event);
         }
         this.streaming = undefined;
         this.streamingReasoning = undefined;
@@ -2589,7 +2606,8 @@ export class SshTui {
             provider,
             parentModel,
             subModel: sub.model,
-            subDiffers: sub.model !== parentModel,
+            ...(sub.provider === undefined ? {} : { subProvider: sub.provider }),
+            ...(sub.reasoningEffort === undefined ? {} : { subEffort: String(sub.reasoningEffort) }),
             ...(quotaWindow === undefined || this.quotaSnapshot === undefined || this.quotaSnapshot.provider !== provider
                 ? {}
                 : { quotaCode: this.quotaSnapshot.plan, quotaPercent: quotaWindow.remainingPercent }),
@@ -2879,20 +2897,20 @@ export class SshTui {
      * row. 0.1.2 hosts append `assistant/chunk`; 0.1.5 emits the same chunk
      * on `agent/assistant-stream` and never writes it to the log.
      */
-    applyStreamChunk(streamed) {
+    applyStreamChunk(streamed, statsOnly = false) {
         const { chunk } = streamed;
         const open = this.openStepStats;
         if (open !== null && open !== undefined
             && open.turn === streamed.turn && open.step === streamed.step) {
-            if (open.firstTokenTime === null
-                && chunk.type === 'text-delta'
-                && chunk.text !== '') {
+            if (open.firstTokenTime === null && isTokenDeltaChunk(chunk)) {
                 this.openStepStats = { ...open, firstTokenTime: streamed.time };
             }
         }
-        if (chunk.type === 'usage' && chunk.usage !== undefined) {
+        if (chunk.type === 'usage' && chunk.usage !== undefined && streamed.stepKnown) {
             this.recordUsage(streamed.turn, streamed.step, chunk.usage);
         }
+        if (statsOnly)
+            return;
         if (chunk.type === 'text-delta') {
             this.streaming ??= { text: '', reasoning: '' };
             this.streaming.text += chunk.text ?? '';
@@ -2924,7 +2942,23 @@ export class SshTui {
             return;
         this.lastActivity = Date.now();
         this.refreshContextPressure();
-        const streamed = streamChunkOf(payload.frame);
+        const owner = streamFrameOwner(payload.frame);
+        if (owner !== undefined) {
+            // Live chunk frames carry no turn/step: remember the attempt's step here
+            // or every chunk is attributed to step 0 and the stats never match.
+            this.liveStreamOwner = owner;
+            return;
+        }
+        if (payload.frame?.type === 'end') {
+            this.liveStreamOwner = undefined;
+            return;
+        }
+        const attemptId = streamFrameAttemptId(payload.frame);
+        const current = this.liveStreamOwner;
+        const fallback = current !== undefined && (attemptId === undefined || attemptId === current.attemptId)
+            ? current
+            : this.openStepStats;
+        const streamed = streamChunkOf(payload.frame, fallback);
         if (streamed !== undefined)
             this.applyStreamChunk(streamed);
     };
@@ -2953,14 +2987,30 @@ export class SshTui {
         };
     };
     handleSessionEvent = (session, event) => {
+        if (this.replayQueue !== undefined) {
+            // The replay yields between chunks, so live events can arrive mid-load.
+            // Folding them now would interleave newer events under older history;
+            // park them and drain in arrival order once the walk is done.
+            this.replayQueue.push({ session, event });
+            return;
+        }
+        this.applySessionEvent(session, event);
+    };
+    applySessionEvent(session, event) {
         if (session.id !== this.agent.id) {
             if (this.subagentSessions.has(session.id))
                 this.handleSubagentSessionEvent(session.id, event);
             return;
         }
         this.lastActivity = Date.now();
-        if (this.replaying && isAssistantStreamEvent(event))
+        if (this.replaying && isAssistantStreamEvent(event)) {
+            // Replay skips the in-progress row, but durable chunks still carry the
+            // timing the footer needs: a resumed session must keep TTFT and tok/s.
+            const streamed = streamChunkOf(event);
+            if (streamed !== undefined)
+                this.applyStreamChunk(streamed, true);
             return;
+        }
         if (!this.replaying)
             this.refreshContextPressure();
         const eventType = sessionEventType(event);
@@ -3021,12 +3071,19 @@ export class SshTui {
                 const open = this.openStepStats;
                 if (open !== undefined && open.turn === event.data.turn && open.step === event.data.step) {
                     this.stats.llmMs += Math.max(0, event.time - open.startTime);
-                    if (open.firstTokenTime !== null) {
-                        this.stats.ttftMs += Math.max(0, open.firstTokenTime - open.startTime);
+                    // The settlement's own packed stream is authoritative: a retried
+                    // step keeps the failed attempt's first token in the live latch, and
+                    // spanning both attempts reported a rate ~20x off. 0.1.2 has no
+                    // `stream` and still relies on the replayed `assistant/chunk` events
+                    // (or the live latch) instead.
+                    const firstTokenTime = streamFirstTokenTime(event.data.stream)
+                        ?? open.firstTokenTime;
+                    if (firstTokenTime !== null && firstTokenTime !== undefined && Number.isFinite(firstTokenTime)) {
+                        this.stats.ttftMs += Math.max(0, firstTokenTime - open.startTime);
                         this.stats.ttftSteps += 1;
                         const outputTokens = event.data.usage?.outputTokens;
                         if (typeof outputTokens === 'number' && Number.isFinite(outputTokens) && outputTokens >= 0) {
-                            this.stats.decodeMs += Math.max(0, event.time - open.firstTokenTime);
+                            this.stats.decodeMs += Math.max(0, event.time - firstTokenTime);
                             this.stats.decodeTokens += outputTokens;
                         }
                     }
@@ -3256,7 +3313,7 @@ export class SshTui {
                 this.handleExtensionEvent(event);
                 break;
         }
-    };
+    }
     handleStatus = ({ agent, status }) => {
         if (agent !== this.agent)
             return;
@@ -7150,7 +7207,9 @@ export function mountTui(ctx, config) {
         stopWaiting();
         controller = new SshTui(ctx, agent, config);
         controller.start();
-        controller.replayHistory();
+        // Not awaited: the first frames paint while the (chunked) replay fills the
+        // transcript, and relay RTT/resize frames keep flowing during the load.
+        void controller.replayHistory();
     };
     const fail = (failedSessionId, error) => {
         if (settled || failedSessionId !== sessionId)