dsh-ssh-tui 0.7.0-rc.2 → 0.7.0

package/lib/tui.js

@@ -60,14 +60,14 @@ import { clipAnsiToWidth, hrefAtColumn, osc52Clipboard, paintedLinkHits, cursorV
 import { clampSelection, offsetAfterColumn, offsetAtColumn, selectionSpans, selectionText, } from './selection.js';
 import { captureHangupSignals, advancePaintedRows, composePaintFrame, composePaintOutput, frameByteBudget, detectSshSession, formatLinkQualityChip, HANGUP_CANCEL_TIMEOUT_MS, ignoreFurtherHangupSignals, isEscapePrefix, isHangupErrno, linkQualityOf, parseCursorPositionReply, PICKER_WINDOW, pickerWindowStart, probeTerminalRttMs, releaseHangupSignals, resolvePaintIntervalMs, toolBodyLineLimit, waitUntilIdleOrTimeout, } from './paint.js';
 import { TerminalInputGuard } from './terminal-input.js';
-import { contextPressureAlertText, contextPressureRingColor, contextPressureView, formatContextPressureRing, describeProviderRoute, fitFooterChips, fitFooterStatusLine, footerActivity, footerHealthChip, footerIdentityParts, footerStatsGroups, formatContextPressureChip, formatStatusReport, formatTokens, parseContextPressure, promptPressureTokens, providerUsesLocalOAuth, shouldIdleAutoCompact, } from './footer.js';
-import { COMMAND_CODE_CREDITS_URL, COMMAND_CODE_SUBSCRIPTIONS_URL, COMMAND_CODE_USAGE_URL, commandCodePeriodStart, commandCodeSourceFor, crossedQuotaThresholds, DEEPSEEK_PUBLIC_BASE_URL, formatAccountBalance, formatFooterBalance, formatQuotaSnapshot, joinUrl, OPENAI_COMPAT_BALANCE_PATHS, OPENCODE_GO_USAGE_URL, OPENCODE_ZEN_BASE_URL, openCodeApiErrorMessage, openCodeSourceFor, parseCommandCodeQuota, parseDeepSeekBalance, parseOpenAiCompatibleBalance, parseOpenCodeGoQuota, parseSuperGrokBilling, quotaAlertText, quotaRefreshEverySteps, reasoningEffortsForDefault, SUPERGROK_BILLING_URL, tightestQuotaWindow, } from './quota.js';
-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 { contextPressureAlertText, contextPressureRingColor, contextPressureView, formatContextPressureRing, describeProviderRoute, fitFooterChips, fitFooterStatusLine, footerActivity, footerHealthChip, footerIdentityParts, footerStatsGroups, formatContextPressureChip, providerHasQuotaSurface, formatStatusReport, shortQuotaPlanName, formatTokens, parseContextPressure, promptPressureTokens, providerUsesLocalOAuth, shouldIdleAutoCompact, } from './footer.js';
+import { COMMAND_CODE_CREDITS_URL, COMMAND_CODE_SUBSCRIPTIONS_URL, COMMAND_CODE_USAGE_URL, commandCodePeriodStart, commandCodeSourceFor, crossedQuotaThresholds, DEEPSEEK_PUBLIC_BASE_URL, formatAccountBalance, formatFooterBalance, formatQuotaSnapshot, joinUrl, OPENAI_COMPAT_BALANCE_PATHS, OPENCODE_GO_USAGE_URL, OPENCODE_ZEN_BASE_URL, openCodeApiErrorMessage, openCodeSourceFor, parseCommandCodeQuota, parseDeepSeekBalance, parseOpenAiCompatibleBalance, parseOpenCodeGoQuota, parseSuperGrokBilling, preferredQuotaWindow, quotaAlertText, quotaRefreshEverySteps, reasoningEffortsForDefault, SUPERGROK_BILLING_URL, tightestQuotaWindow, } from './quota.js';
+import { appendSubagentLog, applyTurnEndToPlan, cardCategoryLabel, cardCategoryOf, compactionHeaderText, formatCompactCommandError, isPromptInjectionMessage, matchTranscriptRows, parseFindQuery, parsePlanTodos, planCloseNudgeText, planMarkdownFromArgs, planDockNote, planIsLive, planTitleFromMarkdown, planTurnLeftOpen, promptInjectionSources, promptInjectionTitle, subagentHeaderText, todoItemKind, todoProgressLabel, TODO_STATUS_MARK, } from './plan.js';
 import { buildToolHeader, compactEditPath, compactFailureLines, compactFileStats, compactToolBursts, countDiffAddDel, countDiffLines, countOutputLines, diffMetaDiffs, diffStatToken, formatModelList, HIDDEN_TOOL_NAMES, parseExitStatus, planReviewOf, presentToolCall, READ_TOOL_NAMES, SHELL_TOOL_NAMES, toolBodyFitsWorkspace, toolBodyLines, toolTitle, 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, 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 { commandCodePeriodStart, commandCodeSourceFor, crossedQuotaThresholds, formatAccountBalance, formatFooterBalance, formatOpenCodeGoUsage, formatQuotaSnapshot, formatQuotaStatusLine, joinUrl, openCodeSourceFor, parseCommandCodeQuota, parseDeepSeekBalance, parseOpenAiCompatibleBalance, parseOpenCodeGoQuota, parseSuperGrokBilling, quotaAlertText, quotaRefreshEverySteps, quotaRefreshEveryTurns, remainingPercentFromUsed, tightestQuotaWindow, } from './quota.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, formatQuotaUnknown, formatStatusReport, providerHasQuotaSurface, quotaWindowTag, shortModelName, shortQuotaPlanName, formatTokens, formatTokensPerSecond, parseContextPressure, promptPressureTokens, providerShortCode, providerUsesLocalOAuth, shouldIdleAutoCompact, subagentRouteLabel, } from './footer.js';
+export { commandCodePeriodStart, commandCodeSourceFor, crossedQuotaThresholds, formatAccountBalance, formatFooterBalance, formatOpenCodeGoUsage, formatQuotaSnapshot, formatQuotaStatusLine, joinUrl, openCodeSourceFor, parseCommandCodeQuota, parseDeepSeekBalance, parseOpenAiCompatibleBalance, parseOpenCodeGoQuota, parseSuperGrokBilling, preferredQuotaWindow, quotaAlertText, quotaRefreshEverySteps, quotaRefreshEveryTurns, remainingPercentFromUsed, tightestQuotaWindow, } from './quota.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';
@@ -229,6 +229,12 @@ const DEFAULT_IDLE_EXIT_MS = 60 * 1000;
 const CTRL_C_EXIT_WINDOW_MS = 2000;
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 const SUBAGENT_DEFAULT_EFFORT_LABEL = () => t('footer.effortDefault');
+/**
+ * How often to ask again while the footer still has no quota reading. A quota
+ * API that was down at boot is usually up seconds later, and the widget shows
+ * `?%` until then; once a reading lands, the normal step/idle cadence takes over.
+ */
+const QUOTA_RETRY_MS = 15_000;
 const RESERVED_BOTTOM_LINES = 3; // input line + stats line + status line
 const IS_WINDOWS = process.platform === 'win32';
 function dshHomeDir() {
@@ -680,6 +686,13 @@ export class SshTui {
     quotaAlerted = new Set();
     quotaStepsSinceRefresh = 0;
     quotaRefreshInFlight = false;
+    /**
+     * While the first reading is missing, ask again on this cadence instead of
+     * waiting for the next step: a quota API that was down at boot is usually up a
+     * few seconds later, and until then the footer shows `?%`.
+     */
+    quotaRetryMs = QUOTA_RETRY_MS;
+    quotaRetryTimer;
     contextPressure;
     contextAlertLevel;
     idleCompactInFlight = false;
@@ -821,7 +834,8 @@ export class SshTui {
             this.markDirty();
         });
         void this.refreshQuota({ reason: 'start', announce: false }).catch(() => {
-            // Start-up quota is silent; /usage and threshold alerts still report.
+            // Start-up quota is silent; /usage and threshold alerts still report. The
+            // retry keeps asking, so the footer's `?%` turns into a reading by itself.
         });
         void this.notifyPluginUpdate().catch(() => {
             // Update check is best-effort and never blocks the TUI.
@@ -1355,6 +1369,7 @@ export class SshTui {
         this.exiting = true;
         this.clearDetachedIdleTimer();
         this.clearIdleExitTimer();
+        this.clearQuotaRetry();
         const dialog = this.dialog;
         const queued = this.dialogQueue.splice(0);
         this.dialog = undefined;
@@ -2062,7 +2077,12 @@ export class SshTui {
             existing.archived = false;
             if (patch.todos !== undefined || patch.active !== undefined || patch.pending !== undefined) {
                 existing.turnLeftOpen = false;
-                this.planNudgePending = false;
+                // A patch that leaves items open keeps this episode's reminder spent;
+                // only a list that is fully closed lets a later one ask again.
+                if (!planTurnLeftOpen(existing)) {
+                    existing.nudged = false;
+                    this.planNudgePending = false;
+                }
             }
             if (!planIsLive(existing)) {
                 existing.archived = true;
@@ -2109,6 +2129,12 @@ export class SshTui {
         const plan = this.findLivePlanRow();
         if (plan === undefined || plan.turnLeftOpen !== true)
             return;
+        // One reminder per open list. The answer to a reminder is a `todo_write`,
+        // and a patch that leaves an item open used to re-arm this — so every turn
+        // end produced another reminder and another model turn, forever.
+        if (plan.nudged === true)
+            return;
+        plan.nudged = true;
         this.planNudgePending = true;
         const text = planCloseNudgeText(plan);
         const queued = t('plan.nudgeQueued');
@@ -2124,7 +2150,14 @@ export class SshTui {
             this.agent.followup(message);
         }
         catch (error) {
+            // The reminder never reached the model: drop the queued notice that
+            // announced it (it would otherwise read as "already asked", here and in a
+            // resumed transcript) and let a later turn end try again.
             this.planNudgePending = false;
+            plan.nudged = false;
+            const queuedAt = this.rows.findLastIndex(row => row.kind === 'system' && row.text === queued);
+            if (queuedAt >= 0)
+                this.rows.splice(queuedAt, 1);
             this.pushRow({ kind: 'error', text: t('plan.nudgeFailed', { error: errorChain(error) }) });
         }
     }
@@ -3217,7 +3250,9 @@ export class SshTui {
         const liveGoal = this.rows.findLast((row) => row.kind === 'goal');
         const current = this.selectionRef?.current;
         const provider = this.currentProviderId();
-        const quotaWindow = this.quotaSnapshot === undefined ? undefined : tightestQuotaWindow(this.quotaSnapshot);
+        // The footer shows the finest window the provider reports (5-hour first),
+        // not the tightest percent: that is the number a working session hits first.
+        const quotaWindow = this.quotaSnapshot === undefined ? undefined : preferredQuotaWindow(this.quotaSnapshot);
         const balanceText = this.balanceSnapshot !== undefined && this.balanceSnapshot.provider === provider
             ? formatFooterBalance(this.balanceSnapshot)
             : undefined;
@@ -3253,8 +3288,15 @@ export class SshTui {
             // looking at a wide terminal read that as "额度条没了". The strip keeps
             // the loss order for the groups it does own.
             ...(quotaWindow === undefined || this.quotaSnapshot === undefined || this.quotaSnapshot.provider !== provider
-                ? {}
-                : { quotaCode: this.quotaSnapshot.plan, quotaPercent: quotaWindow.remainingPercent }),
+                // No reading for this provider: show the empty bar with a `?` rather
+                // than a number nobody measured. A balance-only provider (DeepSeek)
+                // shows nothing here; its balance line is the reading.
+                ? (this.hasQuotaSurface(provider) ? { quotaUnknown: true } : {})
+                : {
+                    quotaCode: shortQuotaPlanName(this.quotaSnapshot),
+                    quotaPercent: quotaWindow.remainingPercent,
+                    quotaPeriod: quotaWindow.period,
+                }),
             ...(this.contextPressure === undefined
                 ? {}
                 : { contextChip: formatContextPressureChip(this.contextPressure, false) }),
@@ -4103,6 +4145,13 @@ export class SshTui {
                         const alreadyShown = last?.kind === 'system' && last.text === summary;
                         if (summary !== '' && !alreadyShown)
                             this.pushRow({ kind: 'system', text: summary });
+                        // Replaying a resumed session: the reminder in the log belongs to
+                        // the open list that is being rebuilt, so mark it as spent.
+                        if (summary === t('plan.nudgeQueued')) {
+                            const resumed = this.findLivePlanRow();
+                            if (resumed !== undefined)
+                                resumed.nudged = true;
+                        }
                         if (!this.replaying)
                             this.beginWait();
                     }
@@ -6646,16 +6695,45 @@ export class SshTui {
         }
         this.markDirty();
     }
+    /** Stop the first-reading retry; the normal cadence owns the refresh now. */
+    clearQuotaRetry() {
+        if (this.quotaRetryTimer !== undefined)
+            clearTimeout(this.quotaRetryTimer);
+        this.quotaRetryTimer = undefined;
+    }
+    /** Ask again soon, but only while the footer still has nothing to show. */
+    armQuotaRetry(provider) {
+        if (this.disposed || this.quotaRetryTimer !== undefined)
+            return;
+        if (!this.hasQuotaSurface(provider))
+            return;
+        if (this.quotaSnapshot !== undefined && this.quotaSnapshot.provider === provider)
+            return;
+        this.quotaRetryTimer = setTimeout(() => {
+            this.quotaRetryTimer = undefined;
+            void this.refreshQuota({ reason: 'start', announce: false }).catch(() => { });
+        }, this.quotaRetryMs);
+    }
+    /**
+     * Whether this provider has a quota surface at all. `false` means the footer
+     * shows no quota widget — a balance line covers DeepSeek, and a provider with
+     * neither gets nothing.
+     */
+    hasQuotaSurface(provider) {
+        const llmPiAi = this.ctx.get('settings')?.get(settingsNamespace('llm-pi-ai'));
+        return providerHasQuotaSurface(provider, llmPiAi);
+    }
     async refreshQuota(options) {
         if (this.quotaRefreshInFlight && options.reason !== 'command')
             return this.quotaSnapshot;
         this.quotaRefreshInFlight = true;
+        const provider = this.currentProviderId();
         try {
-            const provider = this.currentProviderId();
             const snapshot = await this.fetchQuotaSnapshot(provider);
             if (snapshot !== undefined) {
                 this.balanceSnapshot = undefined;
                 this.applyQuotaSnapshot(snapshot, options.announce);
+                this.clearQuotaRetry();
                 return snapshot;
             }
             try {
@@ -6689,6 +6767,11 @@ export class SshTui {
         }
         finally {
             this.quotaRefreshInFlight = false;
+            // One place covers every outcome: a successful reading clears the retry
+            // (and this check then sees a snapshot for the provider), while a throw,
+            // an empty reply or another provider's snapshot keeps it asking.
+            if (this.quotaSnapshot === undefined || this.quotaSnapshot.provider !== provider)
+                this.armQuotaRetry(provider);
         }
     }
     async fetchAccountBalance(provider) {