dsh-ssh-tui 0.7.2 → 0.7.4

package/lib/tui.js

@@ -22,11 +22,11 @@ import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { createRequire } from 'node:module';
 import { StringDecoder } from 'node:string_decoder';
-import { METADATA_FILE, readPresetMetadata } from '@deepseek-ai/dsh-agent-presets';
+import { METADATA_FILE, readPresetMetadata } from './preset-compat.js';
 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, forEachSessionEventAsync, isAssistantStreamEvent, isTokenDeltaChunk, listenHostEvent, REPLAY_YIELD_EVERY, sessionEventType, sessionEvents, settingsNamespace, streamChunkOf, streamFirstTokenTime, streamFrameAttemptId, streamFrameOwner, } from './dsh-compat.js';
+import { commandAcceptsAttachments, forEachSessionEventAsync, hostSettingsGeneration, isTokenDeltaChunk, listenHostEvent, readSettingsSection, REPLAY_YIELD_EVERY, sessionEvents, settingsNamespace, streamChunkOf, streamFirstTokenTime, streamFrameAttemptId, streamFrameOwner, toolResultFailed, TUI_SOURCE_KIND, } 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';
@@ -41,27 +41,30 @@ import { keymapReport, resolveKeymap } from './keymap.js';
 import { presetLabel, profileFromArgv } from './preset-label.js';
 import { flattenGroups, groupPresets, optionMatches } from './preset-picker.js';
 import { isRefusal, planCopy, planDelete, planMetadata, presetDirectory, } from './preset-authoring.js';
-import { ensureRosterRows, planDuplicateRepair, planRosterRepair, rosterPatchPath, writePatchWithBackup, ROSTER_ROWS, } from './preset-rows.js';
+import { ensureRosterRows, planDuplicateRepair, planRosterRepair, formsRowsDeclared, rosterPatchPath, rosterRows, writePatchWithBackup, ALL_ROSTER_ROWS, } from './preset-rows.js';
 import { SessionStatsTracker, statsRowOf } from './stats.js';
 import { QUESTION_OPTION_KEYS, applyQuestionFilter, backspaceQuestionFilter, clearQuestionFilter, typeQuestionFilter, visibleQuestionIndexes, confirmAnswer, inspectClosesOn, moveQuestionCursor, optionsLength, questionOptionIndex, questionSubmit, selectQuestionOptionByKey, } from './dialogs.js';
 import { commandSuggestions, localizedCommands } from './commands.js';
 import { archiveStalePlans, boundTranscriptRows, findLivePlanRow, findMergeableToolRow, findToolRowByCallId, mergeToolCard, planShouldDefaultExpand, windowTranscript, } from './rows.js';
 import { detachFromSshSession, DisplayHost, isTuiHostProcess, resolveDshHome, sessionSockPath } from './display-sock.js';
+import { displayHomePath, envFileName, hostHasOwnConsole, IS_WINDOWS, restrictPathToUser, usesSigwinch, } from './platform.js';
+import { bracketedPasteSequence, mouseDisableSequence, mouseEnableSequence, terminalCapabilities, } from './terminal-caps.js';
 import { sameSessionRoute, sessionRouteInput } from './session-route.js';
 import { GATEWAY_PROTOCOL_SUFFIX, GATEWAY_PROTOCOL_ENDPOINT, GATEWAY_PROTOCOL_PREFERENCE, advertisedProtocols, baseProviderIdOf, declaredProtocol, gatewayModelTable, gatewayServesModel, siblingProviderId, splitModelsByProtocol, } from './gateway-protocol.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';
 import { ROUTE_MEMORY_NAMESPACE, parseRouteMemory, rememberedRouteFor, upsertRememberedRoute, } from './route-memory.js';
-import { AGENT_DEFAULT_MODEL_SETTINGS_NAMESPACE } from '@deepseek-ai/dsh-agent-default-model';
 import { DEFAULT_SUBAGENT_MODEL, SUBAGENT_SETTINGS_NAMESPACE, defaultSubagentModelForProvider, subagentModelMatchesProvider, subagentProviderDiffers, subagentSettingsValue, } from './subagent-model.js';
 import { resolveFreshSuperGrokToken } from './supergrok-token.js';
 import { copyTextFromRow, copyTextFromTranscript } from './copy-text.js';
 import { displayToolName, subagentCourtesyName } from './job-label.js';
+import { clearWaitingMarker, notifyCommand, notifyTargetCommand, notifyTargetLabel, parseNotifyTarget, runNotify, writeWaitingMarker, } from './question-wait.js';
+import { changesFileLine, changesHeader, changesRemainderLine, changesSummaryVisible, renderChangesDiff, workspaceChangesOf, } from './workspace-changes.js';
 import { UserQuestionError, } from '@deepseek-ai/dsh-user-questions';
 import { clipAnsiToWidth, hrefAtColumn, osc52Clipboard, paintedLinkHits, cursorVisualPosition, displayWidth, foldInputView, fmtElapsedCompact, highlightAnsiNeedle, searchContains, lastCodePoints, padToWidth, sliceCodePoints, paintSegmentedLine, renderMarkdownLines, repeatToWidth, sanitizeTerminalText, shimmerText, stripAnsi, truncate, truncateToWidth, waitCardCopy, wrap, wrapSegmented, wrapWaitDetails, } from './term-text.js';
 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 { captureHangupSignals, advancePaintedRows, composePaintFrame, composePaintOutput, frameByteBudget, detectSshSession, formatLinkQualityChip, HANGUP_CANCEL_TIMEOUT_MS, ignoreFurtherHangupSignals, isEscapePrefix, isHangupErrno, linkQualityOf, parseCursorPositionReply, PICKER_WINDOW, pickerWindowStart, probeTerminalRttMs, releaseHangupSignals, resolvePaintIntervalMs, toolBodyLineLimit, waitUntilIdleOrTimeout, RTT_HISTORY, medianRtt, } from './paint.js';
 import { TerminalInputGuard } from './terminal-input.js';
 import { contextPressureAlertText, contextPressureRingColor, contextPressureView, formatContextPressureRing, describeProviderRoute, fitFooterChips, fitFooterStatusLine, footerActivity, footerHealthChip, footerIdentityParts, footerSubagentForeign, paintFooterSubagentChip, 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';
@@ -71,11 +74,11 @@ export { clipAnsiToWidth, cursorVisualPosition, displayWidth, foldInputView, hre
 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, footerSubagentForeign, paintFooterSubagentChip, 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 { commandAcceptsAttachments, forEachSessionEvent, isTokenDeltaChunk, listPersistenceHeaders, inspectPersistenceSession, 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, buildSubagentHeader, clipSubagentActivity, describeSubagentFailure, subagentChipSummary, subagentDisplayName, subagentInspectLines, subagentRowFromSpawnTool, foldSubagentUserLog, 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) {
-    return llm.discoverModels(settingsNamespace('llm-pi-ai'), { ...request, signal }, signal);
+    return llm.discoverModels(settingsNamespace('llm-pi-ai'), request, signal);
 }
 /**
  * Ask a gateway which routes each of its models answers (`supported_endpoints`
@@ -111,11 +114,7 @@ async function fetchModelEndpoints(baseURL, apiKey, signal) {
         return undefined;
     }
 }
-function installUserQuestionAnswerer(ctx, questions, ask) {
-    const provider = questions;
-    if (typeof provider.registerProvider === 'function') {
-        return provider.registerProvider({ ask });
-    }
+function installUserQuestionAnswerer(ctx, ask) {
     return ctx.on('user-questions/request', async (request, next) => {
         try {
             return await ask(request);
@@ -128,6 +127,16 @@ function installUserQuestionAnswerer(ctx, questions, ask) {
     });
 }
 const ROUTE_MEMORY_NS = ROUTE_MEMORY_NAMESPACE;
+/**
+ * The `agent-default-model` settings entry `/model` falls back to writing.
+ *
+ * 0.1.5 exports this id as `AGENT_DEFAULT_MODEL_SETTINGS_NAMESPACE`; 0.1.7
+ * removed the export and let the profile own entry ids, which keeps the name the
+ * legacy `settings.yaml` section is imported under. Inlined so one build runs
+ * against either host — the primary path, `agentDefaultModel.saveSelection`,
+ * is the same call on both.
+ */
+const AGENT_DEFAULT_MODEL_NS = settingsNamespace('agent-default-model');
 /**
  * The window llm-pi-ai falls back to when neither a model entry nor the
  * installed catalog sizes a model. The wizard pre-fills it only so a route
@@ -308,7 +317,6 @@ const SUBAGENT_DEFAULT_EFFORT_LABEL = () => t('footer.effortDefault');
  */
 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() {
     return resolveDshHome();
 }
@@ -331,23 +339,9 @@ function hostDshVersion() {
     return 'unknown';
 }
 function displayDshPath(file) {
-    const home = dshHomeDir();
-    if (IS_WINDOWS) {
-        const profile = process.env.USERPROFILE;
-        if (profile !== undefined && home.toLowerCase().startsWith(profile.toLowerCase())) {
-            const rest = home.slice(profile.length);
-            return `%USERPROFILE%${rest}\\${file}`.replaceAll('/', '\\');
-        }
-        return `${home}\\${file}`.replaceAll('/', '\\');
-    }
-    const userHome = homedir();
-    if (home === userHome)
-        return `~/.dsh/${file}`;
-    if (home.startsWith(`${userHome}/`))
-        return `~/${home.slice(userHome.length + 1)}/${file}`;
-    return join(home, file);
+    return displayHomePath(dshHomeDir(), file);
 }
-const DSH_ENV_FILE = join(dshHomeDir(), IS_WINDOWS ? 'env.cmd' : 'env.sh');
+const DSH_ENV_FILE = join(dshHomeDir(), envFileName());
 const DEEPSEEK_LOGO_VARIANTS = [
     {
         width: 52,
@@ -453,6 +447,25 @@ const DEEPSEEK_LOGO_VARIANTS = [
         ],
     },
 ];
+/**
+ * What marks the row the card cursor is on.
+ *
+ * The card headers spell `▶ ` themselves; a reply is drawn by the markdown
+ * renderer, so its marker is prepended and its width is measured from this
+ * string (three cells, or two once the ASCII fallback has rewritten it).
+ */
+const REPLY_FOCUS_MARKER = '▶ ';
+/**
+ * The text an inspect overlay hands to the copy key: what the overlay shows.
+ *
+ * The overlays are the one place the copy key can be pressed without leaving
+ * them (a dialog covers the input line), so the body on screen is what "copy"
+ * means there — not the card row that opened it, which for a changes card is a
+ * file list and for a tool card a summary the reader has already scrolled past.
+ */
+function inspectCopyText(lines) {
+    return lines.map(line => line.text).join('\n').replace(/\s+$/u, '');
+}
 export function parseDisconnectPolicy(raw) {
     const id = raw.trim().toLowerCase();
     if (id === 'pause' || id === 'cancel' || id === '暂停')
@@ -634,6 +647,7 @@ export class SshTui {
     relayRows;
     onHangup;
     onReattach;
+    onDetach;
     renderTimer;
     decoder = new StringDecoder('utf8');
     color;
@@ -654,6 +668,14 @@ export class SshTui {
     /** Last route reported to the launcher; a repaint must not report it again. */
     lastSessionRoute;
     useAlternateScreen;
+    /**
+     * What the terminal in front of us can do. Read from the environment at
+     * construction (see `terminal-caps.ts`): the mouse, bracketed paste and the
+     * alternate screen are only claimed where the terminal has them.
+     */
+    terminalCaps;
+    /** The OSC 52 caveat is worth saying once, not after every copy. */
+    osc52HintShown = false;
     agentGone = false;
     onboarding;
     commandSuggestions = [];
@@ -728,6 +750,15 @@ export class SshTui {
     inputGuard = new TerminalInputGuard(text => this.handleInputText(text));
     thinkingStartedAt;
     waitStartedAt;
+    /**
+     * Whether the running turn produced anything a person can read: reply text or
+     * a tool card. A turn that ends with thinking only is the upstream returning
+     * an empty stop, and painting 完成 for it reads as a finished answer — see
+     * the hint at `turn/end`.
+     */
+    turnSawOutput = false;
+    /** Whether the turn produced thinking, which the empty-stop hint names. */
+    turnSawReasoning = false;
     completionSignaled = false;
     replaying = false;
     /** Display-line budget for the first paint after resume; 0 = full transcript. */
@@ -781,10 +812,22 @@ export class SshTui {
     detachedDeniedCount = 0;
     /** Questions waiting for a display right now — their cards do not exist yet. */
     queuedQuestions = 0;
+    /** When the current detached wait began, so the reconnect can say how long. */
+    questionWaitSince;
     paintIntervalMs;
     paintLink = 'local';
+    /**
+     * Whether this process runs inside an SSH session, from the sshd environment.
+     *
+     * Distinct from `paintLink`, which `applyProbedRtt` pins to `'ssh'` for any
+     * relayed frame — a local window included. Only this flag says the capability
+     * table described a remote tty rather than the terminal the bytes reach.
+     */
+    sshSession = false;
     paintProbed = false;
     paintRttMs;
+    /** The last few measured round-trips; the chip and the budget use their median. */
+    paintRttHistory = [];
     sessionTitle = '';
     llmRetry;
     quotaSnapshot;
@@ -833,6 +876,7 @@ export class SshTui {
         this.onRouteSettled = config.onRouteSettled;
         this.onHangup = config.onHangup;
         this.onReattach = config.onReattach;
+        this.onDetach = config.onDetach;
         this.headlessDisplay = config.headlessDisplay === true;
         // Line mode: no frames at all, one appended line per event. The alternate
         // screen is what makes a screen reader and a `tee` lose events, so it stays
@@ -842,9 +886,15 @@ export class SshTui {
         this.disconnectPolicy = config.disconnectPolicy ?? this.readDisconnectPolicy();
         this.presetId = config.presetId ?? 'standard';
         this.presetName = presetLabel(this.presetId, config.presetName, config.presetTrust);
-        this.useAlternateScreen = !this.lineMode
-            && process.env.DSH_TUI_NO_ALT_SCREEN !== '1' && process.env.DSH_TUI_NO_ALT_SCREEN !== 'true';
-        this.paintLink = detectSshSession() ? 'ssh' : 'local';
+        this.terminalCaps = config.terminalCaps ?? terminalCapabilities();
+        this.useAlternateScreen = !this.lineMode && this.terminalCaps.alternateScreen;
+        // Whether this process is inside an SSH session, kept apart from
+        // `paintLink`: that one also becomes `'ssh'` whenever the launcher relayed
+        // the frame (see `applyProbedRtt`), which is true for a purely local window
+        // too. This field answers the narrower question the clipboard caveat needs —
+        // "is the terminal the capability table described the one the bytes reach".
+        this.sshSession = detectSshSession();
+        this.paintLink = this.sshSession ? 'ssh' : 'local';
         this.paintIntervalMs = resolvePaintIntervalMs(config.paintIntervalMs, process.env, {
             ssh: this.paintLink === 'ssh',
         });
@@ -861,7 +911,13 @@ export class SshTui {
         }
         this.refreshRosterHealth();
         if (this.rosterMissing) {
-            this.pushRow({ kind: 'system', text: t('mode.bootMissing') });
+            // The missing thing differs by host line: a roster the profile can mount,
+            // or the agent-plane rows a 0.1.7 terminal profile owns. The advice has to
+            // match what `/mode fix` will actually write.
+            this.pushRow({
+                kind: 'system',
+                text: t(this.settingsGeneration === 'forms' ? 'mode.bootFormsMissing' : 'mode.bootMissing'),
+            });
         }
         if (config.cwdNotice !== undefined && config.cwdNotice !== '') {
             this.pushRow({ kind: /进入|Entered/u.test(config.cwdNotice) ? 'system' : 'error', text: config.cwdNotice });
@@ -869,6 +925,14 @@ export class SshTui {
         if (config.restoredRoute !== undefined) {
             this.pushRow({ kind: 'system', text: sessionRouteNotice(config.restoredRoute) });
         }
+        // Windows only, and only on the fallback path: with no PowerShell there is
+        // no hidden console, so the Host is a direct child and closing the window
+        // ends the session's compute. Say it at boot rather than let the user find
+        // out by closing the window mid-turn. A bootstrapped Windows Host and every
+        // POSIX Host keep running, so neither says anything.
+        if (isTuiHostProcess() && !hostHasOwnConsole()) {
+            this.pushRow({ kind: 'system', text: t('boot.directHost') });
+        }
         for (const notice of config.launchNotices ?? []) {
             this.pushRow({ kind: notice.kind, text: notice.text });
         }
@@ -898,7 +962,7 @@ export class SshTui {
         process.stdin.setRawMode(true);
         process.stdin.resume();
         process.stdout.on('resize', this.onDirectResize);
-        if (process.platform !== 'win32') {
+        if (usesSigwinch()) {
             process.on('SIGWINCH', this.onDirectResize);
         }
         process.stdin.prependListener('end', this.handleHangupStream);
@@ -912,7 +976,7 @@ export class SshTui {
             this.bootBackgroundTasks();
             return;
         }
-        this.write(`${this.useAlternateScreen ? '\x1b[?1049h' : ''}\x1b[?1000h\x1b[?1002h\x1b[?1006h\x1b[?2004h\x1b[?25l`);
+        this.write(this.enterScreenSequence());
         this.render();
         this.updateTerminalTitle();
         void this.calibratePaintInterval().finally(() => {
@@ -923,11 +987,22 @@ export class SshTui {
         });
         this.bootBackgroundTasks();
     }
+    /**
+     * Take over the screen: alternate screen where it is safe, then the input
+     * modes the terminal actually supports, then hide the cursor.
+     *
+     * Joining the parts here (rather than at each call site) is what keeps
+     * `start`, a reattach and a teardown from drifting apart — the reattach path
+     * used to duplicate this string verbatim.
+     */
+    enterScreenSequence() {
+        return `${this.useAlternateScreen ? '\x1b[?1049h' : ''}${mouseEnableSequence(this.terminalCaps)}${bracketedPasteSequence(this.terminalCaps, true)}\x1b[?25l`;
+    }
     bindAgentEvents() {
         this.disposers.push(this.ctx.on('session/event', this.handleSessionEvent), listenHostEvent(this.ctx, 'agent/assistant-stream', this.handleAssistantStream), this.ctx.on('agent/status', this.handleStatus), this.ctx.on('agent/error', this.handleError), this.ctx.on('agent/disposed', this.handleDisposed), this.ctx.on('agent/inbox/claimed', this.handleInboxClaimed), this.ctx.on('agent/inbox/discarded', this.handleInboxDiscarded), this.ctx.on('agent/request', this.handleAgentRequest), this.ctx.on('subagent/start', this.handleSubagentStart), this.ctx.on('subagent/end', this.handleSubagentEnd), this.ctx.on('approval/request', this.handleApproval));
         const questions = this.ctx.get('userQuestions');
         if (questions !== undefined) {
-            this.userQuestionDisposer = installUserQuestionAnswerer(this.ctx, questions, this.handleUserQuestions);
+            this.userQuestionDisposer = installUserQuestionAnswerer(this.ctx, this.handleUserQuestions);
         }
     }
     bootBackgroundTasks() {
@@ -988,7 +1063,7 @@ export class SshTui {
                 return;
             this.pushRow({ kind: 'system', text: t('update.installing', { latest: info.latest }) });
             this.markDirty();
-            const result = await installPluginLatest(info.profile);
+            const result = await installPluginLatest(info.profile, info.latest);
             if (this.disposed)
                 return;
             if (result.ok) {
@@ -1008,7 +1083,7 @@ export class SshTui {
         }
     }
     readSkippedUpdate() {
-        const raw = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        const raw = readSettingsSection(this.ctx, UI_LOCALE_NAMESPACE);
         if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
             return undefined;
         const skip = raw.skipUpdate;
@@ -1021,14 +1096,14 @@ export class SshTui {
         const settings = this.ctx.get('settings');
         if (settings === undefined)
             return;
-        const raw = settings.get(UI_LOCALE_NAMESPACE);
+        const raw = readSettingsSection(this.ctx, UI_LOCALE_NAMESPACE);
         const previous = raw !== null && typeof raw === 'object' && !Array.isArray(raw)
             ? raw
             : {};
         await settings.replace(UI_LOCALE_NAMESPACE, { ...previous, ...patch });
     }
     readWorkspaceView() {
-        const raw = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        const raw = readSettingsSection(this.ctx, UI_LOCALE_NAMESPACE);
         if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
             return 'detailed';
         return parseWorkspaceView(String(raw.view ?? '')) ?? 'detailed';
@@ -1037,7 +1112,7 @@ export class SshTui {
         const env = parseDisconnectPolicy(process.env.DSH_TUI_DISCONNECT ?? '');
         if (env !== undefined)
             return env;
-        const raw = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        const raw = readSettingsSection(this.ctx, UI_LOCALE_NAMESPACE);
         if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
             return 'pause';
         return parseDisconnectPolicy(String(raw.disconnect ?? '')) ?? 'pause';
@@ -1046,7 +1121,7 @@ export class SshTui {
         const env = parseAutoApprovalMode(process.env.DSH_TUI_AUTO_APPROVAL ?? '');
         if (env !== undefined)
             return env;
-        const raw = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        const raw = readSettingsSection(this.ctx, UI_LOCALE_NAMESPACE);
         if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
             return 'off';
         return parseAutoApprovalMode(String(raw.autoApproval ?? '')) ?? 'off';
@@ -1086,7 +1161,7 @@ export class SshTui {
         const raw = Number.parseInt(process.env.DSH_TUI_IDLE_EXIT_MS ?? '', 10);
         if (Number.isFinite(raw) && raw >= 0)
             return raw;
-        const saved = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        const saved = readSettingsSection(this.ctx, UI_LOCALE_NAMESPACE);
         if (saved !== null && typeof saved === 'object' && !Array.isArray(saved)) {
             const value = saved.idleExit;
             if (typeof value === 'number' && Number.isFinite(value) && value >= 0)
@@ -1510,7 +1585,11 @@ export class SshTui {
             try {
                 process.stdout.write('\x1b]0;\x07');
                 process.stdout.write('\x1b[0m\x1b[2J\x1b[3J\x1b[H');
-                process.stdout.write(`\x1b[?1000l\x1b[?1002l\x1b[?1006l\x1b[?2004l\x1b[?25h${this.useAlternateScreen ? '\x1b[?1049l' : ''}`);
+                // Leave the alternate screen unconditionally, the way every mouse mode is
+                // disabled: `?1049l` on a terminal that never entered is ignored, while
+                // *skipping* it after a reattach whose relay classified the terminal
+                // differently leaves the user stuck in a screen they cannot scroll.
+                process.stdout.write(`${mouseDisableSequence()}${bracketedPasteSequence(this.terminalCaps, false)}\x1b[?25h\x1b[?1049l`);
             }
             catch (error) {
                 if (!isHangupErrno(error)) {
@@ -1611,10 +1690,7 @@ export class SshTui {
     }
     /** Routing facts for the doctor's self-consistency check. */
     doctorRouting() {
-        const settings = this.ctx.get('settings');
-        if (settings === undefined)
-            return undefined;
-        const section = settings.get(settingsNamespace('llm-pi-ai'));
+        const section = readSettingsSection(this.ctx, settingsNamespace('llm-pi-ai'));
         const providers = section?.providers ?? {};
         const provider = this.currentProvider();
         const models = Array.isArray(providers[provider]?.models) ? providers[provider]?.models ?? [] : [];
@@ -1640,6 +1716,7 @@ export class SshTui {
                 roster: this.ctx.get('agentPresets') !== undefined,
                 codeRuntime: this.hasHostService('codeRuntime'),
             },
+            generation: hostSettingsGeneration(this.ctx),
             anchors: [process.argv[1], this.ctx.baseUrl],
             ...(routing === undefined ? {} : { routing }),
         });
@@ -1660,11 +1737,11 @@ export class SshTui {
     /** `/fix <row>`: repair one named roster row of the profile patch. */
     async runFixCommand(arg) {
         const name = arg.trim().toLowerCase();
-        const row = ROSTER_ROWS.find(candidate => candidate.id === name || candidate.name.toLowerCase() === name);
+        const row = ALL_ROSTER_ROWS.find(candidate => candidate.id === name || (candidate.name ?? '').toLowerCase() === name);
         if (row === undefined) {
             this.pushRow({
                 kind: 'error',
-                text: t('doctor.fix.unknownRow', { row: arg.trim(), rows: ROSTER_ROWS.map(candidate => candidate.id).join(', ') }),
+                text: t('doctor.fix.unknownRow', { row: arg.trim(), rows: ALL_ROSTER_ROWS.map(candidate => candidate.id).join(', ') }),
             });
             this.markDirty();
             return;
@@ -1683,7 +1760,7 @@ export class SshTui {
         const duplicates = facts.patch.readable ? planDuplicateRepair(text) : undefined;
         if (duplicates !== undefined)
             text = duplicates.text;
-        const roster = planRosterRepair(text, rows);
+        const roster = planRosterRepair(text, rows, facts.generation ?? 'legacy');
         if (roster !== undefined)
             text = roster.text;
         const added = roster?.added ?? [];
@@ -1768,6 +1845,11 @@ export class SshTui {
             return true;
         if (this.compactionRunning())
             return true;
+        // A question queued for an answer that has not come. The turn itself has
+        // settled, so nothing else here counts it, and the idle exit would otherwise
+        // kill the Host while it is the only thing still holding that question.
+        if (this.queuedQuestions > 0)
+            return true;
         return false;
     }
     /**
@@ -1804,6 +1886,13 @@ export class SshTui {
         this.reattachedDuringHangup = false;
         ignoreFurtherHangupSignals();
         this.detachDisplay();
+        // Say "no display" now rather than after the cancel/flush below. The lock's
+        // `attached` is what a resume reads to decide that another window is on this
+        // session, and for the whole cancel window it was still set while the window
+        // was already gone — so a reconnect inside that window was refused as
+        // "already attached". A reattach during this hangup patches it back (and the
+        // writes are serialized launcher-side, so the last one wins).
+        await this.onDetach?.();
         const busy = this.isBusyForHangupKeepalive();
         const pauseTurn = this.disconnectPolicy !== 'continue';
         if (pauseTurn && this.agent.status === 'running') {
@@ -1828,6 +1917,11 @@ export class SshTui {
             return;
         }
         const keepHost = this.displayHost !== undefined && busy;
+        if (!keepHost) {
+            // The Host is about to exit, and a marker left behind would keep saying a
+            // question is waiting after the process that held it is gone.
+            void clearWaitingMarker(String(this.agent.id));
+        }
         if (keepHost) {
             this.hangingUp = false;
             // A relay that arrived while this hangup was unwinding set
@@ -2017,6 +2111,9 @@ export class SshTui {
             parts.push(t('attach.awayDetached', { count: detached }));
         if (waiting > 0)
             parts.push(t('attach.awayWaiting', { count: waiting }));
+        if (waiting > 0 && this.questionWaitSince !== undefined) {
+            parts.push(t('attach.questionWaited', { waited: formatShortDuration(Date.now() - this.questionWaitSince) }));
+        }
         if (parts.length === 0)
             return;
         this.pushRow({
@@ -2066,7 +2163,7 @@ export class SshTui {
             void this.onReattach?.();
             return;
         }
-        this.write(`${this.useAlternateScreen ? '\x1b[?1049h' : ''}\x1b[?1000h\x1b[?1002h\x1b[?1006h\x1b[?2004h\x1b[?25l`);
+        this.write(this.enterScreenSequence());
         this.forceFullPaint = true;
         this.dirty = true;
         // The user is back: say so, with how many times this Host has been
@@ -2080,18 +2177,38 @@ export class SshTui {
     currentDisconnectPolicy() {
         return this.disconnectPolicy;
     }
+    /** The paint cadence in force right now: the link tier the footer shows. */
+    currentPaintIntervalMs() {
+        return this.paintIntervalMs;
+    }
     applyProbedRtt(rttMs) {
         const envOverride = Number.parseInt(process.env.DSH_TUI_PAINT_MS ?? '', 10);
         this.paintLink = 'ssh';
-        // A reattach whose probe missed its window reports "unknown"; the link has
-        // not changed, so dropping a measurement we already have just blanks the
-        // footer chip to four hollow circles. Keep it (the next attach re-measures).
-        if (rttMs === undefined && this.paintProbed && this.paintRttMs !== undefined)
-            return;
-        this.paintProbed = rttMs !== undefined;
-        this.paintRttMs = rttMs;
+        if (rttMs !== undefined) {
+            // The relay re-measures the link on its own cadence, so this is called
+            // again and again over one session. The reported round-trip is the median
+            // of the last few measurements: a single burst that reads like a
+            // 2-second link must not pin the footer chip — and with it the paint
+            // cadence and the per-frame byte budget — while two measurements that
+            // agree move it at once. That is the fix for a link that was red from the
+            // first second to the last: the first measurement is taken while the
+            // session is still booting, and it used to be the only one ever taken.
+            this.paintRttHistory.push(rttMs);
+            if (this.paintRttHistory.length > RTT_HISTORY)
+                this.paintRttHistory.shift();
+            this.paintProbed = true;
+            this.paintRttMs = medianRtt(this.paintRttHistory);
+        }
+        else if (!this.paintProbed) {
+            // A probe that missed its window reports "unknown". A link that was never
+            // measured (a pipe, a terminal that does not answer DSR) stays unknown and
+            // keeps the unprobed wording; one that has a measurement keeps its number
+            // rather than blanking the chip to four hollow circles after every
+            // auto-reconnect.
+            this.paintRttMs = undefined;
+        }
         if (!(Number.isFinite(envOverride) && envOverride > 0)) {
-            this.paintIntervalMs = resolvePaintIntervalMs(undefined, {}, { ssh: true, rttMs });
+            this.paintIntervalMs = resolvePaintIntervalMs(undefined, {}, { ssh: true, rttMs: this.paintRttMs });
             if (!this.lineMode)
                 this.startRenderTimer();
         }
@@ -2168,7 +2285,8 @@ export class SshTui {
                 || row.kind === 'plan'
                 || row.kind === 'question'
                 || row.kind === 'goal'
-                || row.kind === 'compaction');
+                || row.kind === 'compaction'
+                || row.kind === 'changes');
             for (const burst of compactToolBursts(this.rows)) {
                 const callAnchor = burst.groups.calls.at(-1);
                 const editAnchor = burst.groups.edits.at(-1);
@@ -2186,13 +2304,35 @@ export class SshTui {
             || row.kind === 'question'
             || row.kind === 'goal'
             || row.kind === 'compaction'
-            || row.kind === 'prompt');
+            || row.kind === 'prompt'
+            || row.kind === 'changes');
         if (this.streaming !== undefined && this.streaming.reasoning !== '') {
             this.streamingReasoning ??= { kind: 'streaming-reasoning', expanded: false };
             rows.push(this.streamingReasoning);
         }
         return rows;
     }
+    /**
+     * Everything the card cursor walks, in transcript order: the collapsible
+     * cards plus the model replies.
+     *
+     * Built from the two lists rather than from the rows alone, because one of the
+     * collapsible entries is synthetic: the live thinking block exists only while a
+     * turn streams and is never a member of `this.rows`. Filtering the rows (the
+     * first version of this) silently dropped it out of the cursor walk — ↑ on a
+     * turn that had only streamed thinking did nothing, and Enter could no longer
+     * expand the card being written. It belongs at the end, which is where it is
+     * painted, so anything not in the rows is appended.
+     */
+    focusRing() {
+        const collapsible = this.collapsibleRows();
+        const ring = this.rows.filter(row => row.kind === 'assistant' || collapsible.includes(row));
+        const known = new Set(this.rows);
+        for (const row of collapsible)
+            if (!known.has(row))
+                ring.push(row);
+        return ring;
+    }
     spinnerFrame(periodMs = 120) {
         return SPINNER[Math.floor(Date.now() / periodMs) % SPINNER.length] ?? '⠋';
     }
@@ -2330,7 +2470,7 @@ export class SshTui {
         // instruction that used to paint as `❯ …`.
         const message = createUserMessage({
             content: [{ type: 'text', text }],
-            source: { kind: 'plugin', plugin: 'dsh-ssh-tui', form: 'notice', summary: queued },
+            source: { kind: TUI_SOURCE_KIND, form: 'notice', summary: queued },
         });
         try {
             this.agent.followup(message);
@@ -2375,7 +2515,7 @@ export class SshTui {
         const note = planDockNote(plan);
         lines.push(this.styleLine('plan-dock', padToWidth(`   ${note}`, width)));
         if (plan.planMarkdown !== undefined && plan.planMarkdown !== '') {
-            const markdown = renderMarkdownLines(plan.planMarkdown, inner, this.color);
+            const markdown = renderMarkdownLines(plan.planMarkdown, inner, this.color, this.terminalCaps.osc8);
             const budget = Math.max(4, Math.min(12, markdown.length));
             for (const line of markdown.slice(0, budget)) {
                 lines.push(`${clipAnsiToWidth(`  ${line}`, width)}\x1b[0m`);
@@ -2541,7 +2681,10 @@ export class SshTui {
         if (dialog === undefined || dialog.kind !== 'inspect')
             return;
         const header = this.styleLine('system', truncateToWidth(dialog.title, width));
-        const hint = this.styleLine('system', truncateToWidth(t('tool.inspectHint'), width));
+        // A copy from inside the overlay replaces the key legend for the rest of the
+        // visit: the notice row it also pushes is behind this screen, and a copy the
+        // reader cannot confirm is the one thing worse than no copy at all.
+        const hint = this.styleLine('system', truncateToWidth(dialog.notice ?? t('tool.inspectHint'), width));
         const divider = this.styleLine('system', repeatToWidth('─', width));
         const bodyBudget = Math.max(1, height - 4);
         const rendered = [];
@@ -2618,6 +2761,7 @@ export class SshTui {
             title,
             lines,
             offset: 0,
+            copyText: inspectCopyText(lines),
         });
     }
     openSubagentInspect(row) {
@@ -2625,6 +2769,8 @@ export class SshTui {
         if (dialog?.kind === 'inspect' && dialog.subagentSessionId === this.subagentInspectId(row)) {
             dialog.title = t('sub.inspectTitle', { title: subagentDisplayName(row) });
             dialog.lines = subagentInspectLines(row);
+            dialog.copyText = inspectCopyText(dialog.lines);
+            dialog.notice = undefined;
             this.markDirty();
             return;
         }
@@ -2638,8 +2784,36 @@ export class SshTui {
             lines,
             offset: 0,
             subagentSessionId: this.subagentInspectId(row),
+            copyText: inspectCopyText(lines),
         });
     }
+    /**
+     * Read one reply full-screen.
+     *
+     * What Enter does on a selected reply: a reply has no body to fold away, and
+     * the transcript wraps it to the window — which for a long answer with tables
+     * or code blocks is not how it reads. The overlay is the same surface the tool
+     * cards use, and the copy key works inside it, so "read it, then copy it"
+     * needs no trip back through the timeline.
+     */
+    openReplyInspect(row) {
+        // Line mode has no scroller, and `echoInspectToLog` would append the reply
+        // to the log a second time — it is already there, in full. Nothing to open.
+        if (this.lineMode)
+            return;
+        // `- 2`, matching `paintInspectOverlay`, which re-wraps every body line at
+        // `width - 2` inside a two-space indent: rendered wider, long table and code
+        // rows were re-wrapped mid-cell at narrow widths.
+        const width = Math.max(20, this.screenColumns() - 2);
+        // Plain: `styleLine` strips escapes, so a coloured render would lose its
+        // styling anyway — and the overlay's own frame supplies the base style.
+        const lines = renderMarkdownLines(row.text, width, false, false)
+            .map(line => ({ kind: 'assistant', text: line }));
+        const title = t('reply.inspectTitle', { lines: lines.length });
+        if (this.echoInspectToLog(title, lines))
+            return;
+        this.openDialog({ kind: 'inspect', title, lines, offset: 0, copyText: row.text });
+    }
     /**
      * Line mode has no framed scroller, so an inspect body goes into the log.
      *
@@ -2684,9 +2858,27 @@ export class SshTui {
             addDisplay(this.selectLine(styled, focused), row);
         }
     }
-    /** Move the expand/collapse focus among reasoning and tool rows. */
-    moveCollapsibleFocus(delta) {
-        const rows = this.collapsibleRows();
+    /**
+     * Which file line of an expanded changes card the screen cursor is on.
+     *
+     * The card paints its header, then one row per file, and `selectableLines`
+     * holds exactly the viewport. The cursor sits on the input row unless the
+     * reader scrolled, so the file is how many painted rows above the cursor the
+     * card's header is. A cursor on the header, the remainder line, or the prompt
+     * falls back to the first file, which is the only defensible guess.
+     */
+    changesFileIndex(row) {
+        const painted = this.selectableLines.findIndex(line => line.ref === row);
+        if (painted < 0)
+            return 0;
+        const index = this.lastPaintCursorRow - 1 - (this.lastTranscriptStart + painted);
+        if (index < 1 || index > row.files.length)
+            return 0;
+        return index - 1;
+    }
+    /** Move the card cursor among the cards and the replies. */
+    moveFocus(delta) {
+        const rows = this.focusRing();
         if (rows.length === 0)
             return;
         if (this.focusedRow === null) {
@@ -2704,13 +2896,23 @@ export class SshTui {
     }
     /** Toggle the focused block; without focus, toggle the most recent one. */
     toggleCollapsible() {
+        const focused = this.focusedRow;
+        // A reply has no body to fold away, so Enter reads it full-screen instead.
+        // Falling through to the lookup below would be worse than doing nothing:
+        // a reply is not in `collapsibleRows()`, and the fallback is "the newest
+        // card" — Enter on a selected reply would expand a card the reader never
+        // picked.
+        if (focused !== null && focused.kind === 'assistant') {
+            this.openReplyInspect(focused);
+            return;
+        }
         const rows = this.collapsibleRows();
         if (rows.length === 0)
             return;
-        const focused = this.focusedRow !== null && rows.includes(this.focusedRow)
-            ? this.focusedRow
+        const inRing = focused !== null && rows.includes(focused)
+            ? focused
             : undefined;
-        const target = focused ?? rows[rows.length - 1];
+        const target = inRing ?? rows[rows.length - 1];
         if (target === undefined)
             return;
         this.toggleCard(target);
@@ -2731,6 +2933,14 @@ export class SshTui {
         return !toolBodyFitsWorkspace(wrappedToolBodyLineCount(body, width), this.workspaceRowsFor(width, height));
     }
     toggleCard(target) {
+        // A changes card opens its file list first; the next Enter reads the file
+        // the cursor is on. With one file there is nothing to choose, so that Enter
+        // opens it directly.
+        if (target.kind === 'changes' && target.expanded && target.files.length > 0) {
+            this.focusedRow = target;
+            this.openChangesInspect(target, target.files.length === 1 ? 0 : this.changesFileIndex(target));
+            return;
+        }
         if (target.kind === 'subagent') {
             this.focusedRow = target;
             this.openSubagentInspect(target);
@@ -2755,11 +2965,14 @@ export class SshTui {
         const rows = this.collapsibleRows();
         if (rows.length === 0)
             return;
+        // Ctrl+R acts on the cards; a selected reply is not one, and it must survive
+        // the sweep either way (it was not collapsed, so it must not be deselected).
+        const selected = this.focusedRow?.kind === 'assistant' ? this.focusedRow : undefined;
         const allExpanded = rows.every(row => row.expanded);
         if (allExpanded) {
             for (const row of rows)
                 row.expanded = false;
-            this.focusedRow = null;
+            this.focusedRow = selected ?? null;
         }
         else {
             const width = Math.max(10, this.screenColumns());
@@ -2775,7 +2988,7 @@ export class SshTui {
                 }
                 row.expanded = true;
             }
-            this.focusedRow = rows[rows.length - 1] ?? null;
+            this.focusedRow = selected ?? rows[rows.length - 1] ?? null;
         }
         this.forceFullPaint = true;
         this.markDirty();
@@ -2839,6 +3052,14 @@ export class SshTui {
             this.focusedRow = row;
             this.forceFullPaint = true;
         }
+        else if (row.kind === 'assistant') {
+            // A reply has nothing to expand, but revealing it must leave it selected:
+            // Alt+4 and `/find 回复` land here, and clearing the focus (which is what
+            // this branch used to do) meant `/copy` afterwards only worked by falling
+            // back to "the latest reply" — silently, and only when it happened to be
+            // the same row.
+            this.focusedRow = row;
+        }
         else {
             this.focusedRow = null;
         }
@@ -2937,14 +3158,39 @@ export class SshTui {
         }
         const display = [];
         const displayRefs = [];
+        // Cells at the start of each painted line that are chrome rather than text.
+        // Only the focus marker has any, and the drag-selection needs to know how
+        // many so a copy off the selected row does not paste the marker.
+        const displayGutters = [];
         const searchHit = this.searchHits[this.searchIndex];
-        const addDisplay = (line, ref) => {
+        const addDisplay = (line, ref, gutter = 0) => {
             display.push(clipAnsiToWidth(line, width));
             displayRefs.push(ref);
+            displayGutters.push(gutter);
         };
         const pushRow = (kind, text, ref) => {
             if (kind === 'assistant') {
-                for (const line of renderMarkdownLines(text, width, this.color)) {
+                const focused = ref !== undefined && this.focusedRow === ref;
+                // The same string the card headers use, so the ASCII fallback rewrites
+                // both alike, and the width comes from it rather than from a constant
+                // (in ASCII `▶` becomes `> `, and the marker is still three cells).
+                const marker = sanitizeTerminalText(REPLY_FOCUS_MARKER);
+                const gutter = displayWidth(marker);
+                // A focused reply is rendered three cells narrower so the marker cannot
+                // eat its last characters: painted at full width and then prefixed, the
+                // tail of every one of its lines was clipped away silently (the card
+                // headers avoid this by truncating to the same kind of margin).
+                const inner = focused ? Math.max(1, width - gutter) : width;
+                let placed = false;
+                for (const line of renderMarkdownLines(text, inner, this.color, this.terminalCaps.osc8)) {
+                    // The marker goes on the first line that has something on it: a reply
+                    // starting with a blank line would otherwise carry a marker all by
+                    // itself, with the reader's selection nowhere near its text.
+                    if (focused && !placed && stripAnsi(line).trim() !== '') {
+                        addDisplay(`${marker}${line}`, ref, gutter);
+                        placed = true;
+                        continue;
+                    }
                     addDisplay(line, ref);
                 }
                 return;
@@ -3087,7 +3333,7 @@ export class SshTui {
                 if (row.expanded) {
                     addDisplay(this.styleLine('plan-dock', `   ${planDockNote({ ...row, active: false, pending: false })}`), row);
                     if (row.planMarkdown !== undefined && row.planMarkdown !== '') {
-                        for (const line of renderMarkdownLines(row.planMarkdown, Math.max(1, width - 2), this.color).slice(0, 8)) {
+                        for (const line of renderMarkdownLines(row.planMarkdown, Math.max(1, width - 2), this.color, this.terminalCaps.osc8).slice(0, 8)) {
                             addDisplay(`  ${line}`, row);
                         }
                     }
@@ -3125,7 +3371,7 @@ export class SshTui {
                     }
                     if (row.detail !== undefined && row.detail !== '') {
                         if (row.intent === 'plan-review') {
-                            for (const line of renderMarkdownLines(row.detail, Math.max(1, width - 2), this.color)) {
+                            for (const line of renderMarkdownLines(row.detail, Math.max(1, width - 2), this.color, this.terminalCaps.osc8)) {
                                 addDisplay(`  ${line}`, row);
                             }
                         }
@@ -3161,6 +3407,18 @@ export class SshTui {
                 }
                 continue;
             }
+            if (row.kind === 'changes') {
+                const header = `${row.header}${row.expanded ? '' : t('card.expand')}`;
+                this.paintCollapsibleHeader(addDisplay, row, 'tool', header, width);
+                if (row.expanded) {
+                    for (const file of row.files) {
+                        addDisplay(this.styleLine('tool-result', `    ${file}`), row);
+                    }
+                    if (row.more !== undefined)
+                        addDisplay(this.styleLine('system', `    ${row.more}`), row);
+                }
+                continue;
+            }
             if (row.kind === 'compaction') {
                 const running = row.status === 'running';
                 const spinner = running ? ` ${this.spinnerFrame()}` : '';
@@ -3408,7 +3666,7 @@ export class SshTui {
                     addDialog(t('dialog.planReview', { index: d.index + 1, total: d.total }) + (d.question.header === undefined ? '' : ` · ${d.question.header}`));
                     addDialog(d.question.question);
                     if (d.question.detail !== undefined && d.question.detail !== '') {
-                        for (const line of renderMarkdownLines(d.question.detail, Math.max(1, width - 2), this.color).slice(0, 16)) {
+                        for (const line of renderMarkdownLines(d.question.detail, Math.max(1, width - 2), this.color, this.terminalCaps.osc8).slice(0, 16)) {
                             dialogLines.push(this.styleLine('assistant', line));
                         }
                     }
@@ -3548,6 +3806,10 @@ export class SshTui {
         const start = window.start;
         const visible = window.visibleLines;
         const visibleRefs = window.visibleRefs;
+        // `padding` blank rows are unshifted when the transcript is shorter than the
+        // window, so the gutter of a visible line is read off the same offset the
+        // window itself used (negative before the transcript starts → 0).
+        const visibleGutters = visible.map((_, index) => displayGutters[start + index - window.padding] ?? 0);
         this.clickableRows.clear();
         this.paintedLinkHitsByRow.clear();
         this.transcriptTopScreenY = headerLines.length + 1;
@@ -3559,6 +3821,7 @@ export class SshTui {
             // Only a model reply is freely copyable; a tool card, a notice or the
             // chrome keeps its click behavior instead.
             copyable: visibleRefs[index]?.kind === 'assistant',
+            gutter: visibleGutters[index] ?? 0,
         }));
         for (let index = 0; index < visibleRefs.length; index++) {
             const ref = visibleRefs[index];
@@ -3670,7 +3933,7 @@ export class SshTui {
         // the session counters go before the operational signals. Quota and context
         // pressure are deliberately not here — they are on the identity line.
         const strip = [];
-        const health = footerHealthChip(this.rosterMissing, this.color);
+        const health = footerHealthChip(this.rosterMissing, this.color, this.settingsGeneration === 'forms' ? 'agent-plane' : 'roster');
         // Muted like the identity line, accent excepted: the pre-strip footer
         // painted the counters dim and only the ⚠'s own glyph yellow.
         if (health !== undefined)
@@ -3828,6 +4091,10 @@ export class SshTui {
     updateTerminalTitle() {
         if (this.exiting || this.lineMode)
             return;
+        // A console that has no title to set (the Linux virtual console) would take
+        // the escape as noise; the matrix says so, so honour it.
+        if (!this.terminalCaps.title)
+            return;
         const now = Date.now();
         // Completion wins over a still-running agent status: the turn/end event
         // lands before agent/status flips to idle, and the title must not stay
@@ -3936,13 +4203,7 @@ export class SshTui {
         if (service === undefined) {
             this.pushRow({
                 kind: 'error',
-                text: [
-                    t('preset.missingService'),
-                    t('mode.missingServiceHint', {
-                        profile: profileFromArgv(),
-                        patch: rosterPatchPath(resolveDshHome(), profileFromArgv()),
-                    }),
-                ].join('\n'),
+                text: this.missingPresetService(t('preset.missingService')),
             });
             this.markDirty();
             return;
@@ -4122,9 +4383,11 @@ export class SshTui {
         }
         const lines = [t('preset.showTitle', { id: preset.id, name: preset.name ?? preset.id })];
         lines.push(t('preset.showMeta', {
-            trust: preset.trust === 'user' ? t('preset.trustUser') : t('preset.trustSystem'),
+            trust: preset.trust === 'user'
+                ? t('preset.trustUser')
+                : preset.trust === undefined ? t('preset.trustManaged') : t('preset.trustSystem'),
             order: preset.order === undefined ? '—' : String(preset.order),
-            directory: presetDirectory(preset),
+            directory: presetDirectory(preset) ?? t('preset.directoryManaged'),
         }));
         if (preset.description !== undefined)
             lines.push(t('preset.showDescription', { description: preset.description }));
@@ -4189,7 +4452,7 @@ export class SshTui {
                 from: plan.from,
                 id: plan.id,
                 name: plan.name === undefined ? '' : ` · ${plan.name}`,
-                directory: presetDirectory(presets.find(candidate => candidate.id === plan.id) ?? presets[0]),
+                directory: presetDirectory(presets.find(candidate => candidate.id === plan.id) ?? presets[0]) ?? '',
             });
         });
     }
@@ -4212,7 +4475,8 @@ export class SshTui {
         }
         // Merge with what the preset publishes now, so editing one field never
         // drops the other and `order` survives.
-        const current = await readPresetMetadata(presetDirectory(preset));
+        const directory = presetDirectory(preset);
+        const current = directory === undefined ? {} : await readPresetMetadata(directory);
         const plan = planMetadata({ preset, current, patch });
         if (isRefusal(plan)) {
             this.pushPresetRefusal(plan);
@@ -4255,7 +4519,7 @@ export class SshTui {
             return;
         }
         const answer = await new Promise(resolve => {
-            this.openConfirm(t('preset.deleteConfirm', { id: plan.id }), t('preset.deleteHint', { directory: presetDirectory(preset) }), resolve);
+            this.openConfirm(t('preset.deleteConfirm', { id: plan.id }), t('preset.deleteHint', { directory: presetDirectory(preset) ?? t('preset.directoryManaged') }), resolve);
         });
         if (answer !== 'y') {
             this.pushRow({ kind: 'system', text: t('preset.deleteCancelled') });
@@ -4384,11 +4648,11 @@ export class SshTui {
         return `\x1b[7m${styled.replaceAll('\x1b[0m', '\x1b[0m\x1b[7m')}\x1b[27m`;
     }
     /**
-     * Fold one live or durable stream chunk into the in-progress assistant
-     * 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.
+     * Fold one live stream chunk into the in-progress assistant row. Hosts from
+     * 0.1.5 on emit the chunk on `agent/assistant-stream` and never write it to
+     * the log.
      */
-    applyStreamChunk(streamed, statsOnly = false) {
+    applyStreamChunk(streamed) {
         const { chunk } = streamed;
         if (isTokenDeltaChunk(chunk)) {
             this.statsTracker.noteFirstToken(streamed.turn, streamed.step, streamed.time);
@@ -4396,8 +4660,6 @@ export class SshTui {
         if (chunk.type === 'usage' && chunk.usage !== undefined && streamed.stepKnown) {
             this.statsTracker.recordUsage(streamed.turn, streamed.step, chunk.usage);
         }
-        if (statsOnly)
-            return;
         if (chunk.type === 'text-delta') {
             this.streaming ??= { text: '', reasoning: '' };
             this.streaming.text += chunk.text ?? '';
@@ -4414,9 +4676,9 @@ export class SshTui {
         }
     }
     /**
-     * 0.1.5 live tokens arrive as process-local `agent/assistant-stream`
-     * frames (start / chunk / end). Chunk frames carry the same
-     * `StreamChunk` the 0.1.2 log used to store as `assistant/chunk`.
+     * 0.1.5 and 0.1.7 live tokens arrive as process-local
+     * `agent/assistant-stream` frames (start / chunk / end). Chunk frames carry
+     * the same `StreamChunk` the settled `assistant/message` embeds in `stream`.
      */
     handleAssistantStream = (...args) => {
         const payload = args[0];
@@ -4505,21 +4767,13 @@ export class SshTui {
             return;
         }
         this.lastActivity = Date.now();
-        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);
-        if (eventType === 'assistant/chunk') {
-            const streamed = streamChunkOf(event);
-            if (streamed !== undefined)
-                this.applyStreamChunk(streamed);
+        // Before the switch, and by string: `workspace/changes` is not a key of the
+        // 0.1.5 `SessionEventMap`, so a `case` for it fails strict compilation on
+        // that tree. A Host without the service records nothing and this returns.
+        if (String(event.type) === 'workspace/changes') {
+            this.noteWorkspaceChanges(session.id, event.seq);
             return;
         }
         switch (event.type) {
@@ -4536,7 +4790,7 @@ export class SshTui {
                         if (!this.replaying)
                             this.beginWait();
                     }
-                    else if (sourceKind === 'plugin' && source.form === 'notice') {
+                    else if (source.form === 'notice') {
                         const summary = source.summary?.trim() ?? '';
                         // Body stays off the workspace (the model still received it).
                         const last = this.rows.at(-1);
@@ -4553,12 +4807,17 @@ export class SshTui {
                         if (!this.replaying)
                             this.beginWait();
                     }
+                    else if (source.form === 'snapshot') {
+                        // `form` is the ContextFormed discriminator every producer shares,
+                        // while `kind` is now per-producer (0.1.7 has no catch-all), so the
+                        // two content branches above key on the form: keying them on the
+                        // released `plugin` kind dropped a `time-context` snapshot — and
+                        // this plugin's own notices — into the raw-context row below.
+                        this.pushRow({ kind: 'system', text: text });
+                    }
                     else if (isPromptInjectionMessage(sourceKind, text, source.plugin)) {
                         this.pushPromptInjection(text, source.plugin);
                     }
-                    else if (sourceKind === 'plugin' && source.form === 'snapshot') {
-                        this.pushRow({ kind: 'system', text: text });
-                    }
                     else {
                         this.pushRow({ kind: 'system', text: t('prompt.contextPrefix', { text }) });
                     }
@@ -4579,8 +4838,7 @@ export class SshTui {
                     .join('');
                 // 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).
+                // both attempts reported a rate ~20x off.
                 this.statsTracker.settleMessage({
                     turn: event.data.turn,
                     step: event.data.step,
@@ -4600,7 +4858,10 @@ export class SshTui {
                 if (reasoning !== '') {
                     this.pushRow({ kind: 'reasoning', text: `${reasoning}${interruptedMark}`, expanded: reasoningExpanded });
                 }
+                if (reasoning !== '')
+                    this.turnSawReasoning = true;
                 if (text !== '') {
+                    this.turnSawOutput = true;
                     this.pushRow({ kind: 'assistant', text: `${text}${interruptedMark}` });
                 }
                 else if (interrupted && reasoning === '') {
@@ -4610,6 +4871,7 @@ export class SshTui {
                 break;
             }
             case 'tool/call': {
+                this.turnSawOutput = true;
                 this.openToolCalls.set(String(event.data.callId), event.data.name);
                 this.toolCallNames.set(String(event.data.callId), event.data.name);
                 this.statsTracker.noteToolStart(String(event.data.callId), event.time);
@@ -4694,7 +4956,7 @@ export class SshTui {
                         this.markDirty();
                         break;
                     }
-                    const failed = event.data.error !== undefined || event.data.message.content[0]?.isError === true;
+                    const failed = event.data.error !== undefined || toolResultFailed(event.data.message);
                     spawnCard.status = failed ? 'error' : 'ok';
                     spawnCard.endedAt = typeof event.time === 'number' ? event.time : Date.now();
                     if (output !== '') {
@@ -4725,7 +4987,7 @@ export class SshTui {
                         row.output = output;
                     }
                     const failed = event.data.error !== undefined
-                        || event.data.message.content[0]?.isError === true
+                        || toolResultFailed(event.data.message)
                         || (isShell && ((row.exitCode !== undefined && row.exitCode !== 0) || row.signal !== undefined));
                     row.status = failed ? 'error' : 'ok';
                     if (READ_TOOL_NAMES.has(row.name)) {
@@ -4793,6 +5055,8 @@ export class SshTui {
                 break;
             case 'turn/start':
                 this.stalledWarningShown = false;
+                this.turnSawOutput = false;
+                this.turnSawReasoning = false;
                 this.llmRetry = undefined;
                 this.status = `turn ${event.data.turn} running`;
                 // A turn is about to spend on this route: make sure the session's record
@@ -4831,6 +5095,17 @@ export class SshTui {
                 if (reason.kind === 'error') {
                     this.pushRow({ kind: 'error', text: t('turn.failed', { turn: event.data.turn, error: reason.error.message }) });
                 }
+                if (reason.kind === 'completed' && !this.replaying && !this.turnSawOutput) {
+                    // The provider ended the turn without an answer. Some gateways map a
+                    // Gemini/Claude reply that only contains a thought part onto
+                    // `reasoning_content` and then finish with stop and no content, so the
+                    // turn looks completed while nothing was said and the user is left to
+                    // guess that another Enter is what continues it. Say so instead.
+                    this.pushRow({
+                        kind: 'system',
+                        text: t(this.turnSawReasoning ? 'turn.emptyThinkingOnly' : 'turn.emptyReply'),
+                    });
+                }
                 const livePlan = this.findLivePlanRow();
                 if (livePlan !== undefined && reason.kind === 'completed') {
                     applyTurnEndToPlan(livePlan);
@@ -4916,6 +5191,100 @@ export class SshTui {
         this.status = 'disposed';
         this.markDirty();
     };
+    /**
+     * One `workspace/changes` event: the files a turn changed.
+     *
+     * The event carries only the turn number; the summary stays on the Host and
+     * is served by `workspaceChanges` for this event's own sequence, and only
+     * while the Session lives. A missing service (every 0.1.5 Host) or a summary
+     * that can no longer be opened (a log replayed after a restart) shows
+     * nothing — upstream's rule, so a card that cannot be read is never drawn.
+     * A later event for the same turn replaces the earlier summary in place.
+     */
+    noteWorkspaceChanges(sessionId, seq) {
+        if (typeof seq !== 'number')
+            return;
+        const service = workspaceChangesOf(this.ctx);
+        if (service === undefined)
+            return;
+        const summary = service.summary(String(sessionId), seq);
+        if (summary === undefined || !changesSummaryVisible(summary))
+            return;
+        const existing = this.rows.findLast((row) => row.kind === 'changes' && row.turn === summary.turn && row.sessionId === String(sessionId));
+        if (existing !== undefined) {
+            this.fillChangesCard(existing, summary, seq);
+        }
+        else {
+            const row = {
+                kind: 'changes',
+                turn: summary.turn,
+                seq,
+                sessionId: String(sessionId),
+                header: '',
+                files: [],
+                expanded: false,
+            };
+            this.fillChangesCard(row, summary, seq);
+            this.pushRow(row);
+        }
+        this.markDirty();
+    }
+    /** Copy one summary onto its card. Shared by the first event and its replacements. */
+    fillChangesCard(row, summary, seq) {
+        row.seq = seq;
+        row.header = changesHeader(summary);
+        row.files = summary.files.map(changesFileLine);
+        const more = changesRemainderLine(summary);
+        if (more === undefined)
+            delete row.more;
+        else
+            row.more = more;
+    }
+    /**
+     * Full view of one file on a changes card: its comparison, as the service
+     * computed it. Binary and oversized files have no lines, so the overlay
+     * carries the one-line explanation instead of an empty body.
+     */
+    openChangesInspect(row, index) {
+        const service = workspaceChangesOf(this.ctx);
+        const label = row.files[index] ?? row.header;
+        const title = t('changes.inspectTitle', { file: label });
+        if (service === undefined) {
+            this.openChangesInspectLines(title, [{ kind: 'tool-result', text: t('changes.unavailable') }]);
+            return;
+        }
+        const controller = new AbortController();
+        void service.diff(row.sessionId, row.seq, index, controller.signal)
+            .then(diff => {
+            const lines = renderChangesDiff(diff);
+            this.openChangesInspectLines(title, lines.length > 0
+                ? lines
+                : [{ kind: 'tool-result', text: t('changes.unavailable') }]);
+        })
+            .catch(() => {
+            this.openChangesInspectLines(title, [{ kind: 'tool-result', text: t('changes.unavailable') }]);
+        });
+    }
+    /** Open (or replace) the changes overlay, or echo it to the log in line mode. */
+    openChangesInspectLines(title, lines) {
+        if (this.echoInspectToLog(title, lines))
+            return;
+        const dialog = this.dialog;
+        if (dialog?.kind === 'inspect') {
+            dialog.title = title;
+            dialog.lines = lines;
+            dialog.offset = 0;
+            // The dialog may be a leftover from another overlay, and this path is
+            // asynchronous: a reply overlay opened while the diff was being read would
+            // keep its `copyText`, so the copy key would hand back the reply under a
+            // diff. Everything the previous body owned is replaced here.
+            dialog.copyText = inspectCopyText(lines);
+            dialog.notice = undefined;
+            this.markDirty();
+            return;
+        }
+        this.openDialog({ kind: 'inspect', title, lines, offset: 0, copyText: inspectCopyText(lines) });
+    }
     /** Plan-mode / command / team events that plugins merge into SessionEventMap. */
     handleExtensionEvent(event) {
         const type = String(event.type);
@@ -5418,8 +5787,6 @@ export class SshTui {
         const row = this.findSubagentRow(String(sessionId));
         if (row === undefined)
             return;
-        if (sessionEventType(event) === 'assistant/chunk')
-            return;
         switch (event.type) {
             case 'user/message': {
                 const text = collectText(event.data.content);
@@ -5450,7 +5817,7 @@ export class SshTui {
                 break;
             }
             case 'tool/result': {
-                const ok = event.data.error === undefined && event.data.message.content[0]?.isError !== true;
+                const ok = event.data.error === undefined && !toolResultFailed(event.data.message);
                 const callId = String(event.data.message.source.callId);
                 const sourceName = event.data.message.source.name;
                 const recorded = this.toolCallNames.get(callId)
@@ -5639,6 +6006,10 @@ export class SshTui {
             return;
         dialog.title = t('sub.inspectTitle', { title: subagentDisplayName(row) });
         dialog.lines = subagentInspectLines(row);
+        // The body grows while the child runs, and the copy text is that body: it
+        // has to move with it or the key hands back the log as it stood when the
+        // overlay opened.
+        dialog.copyText = inspectCopyText(dialog.lines);
     }
     // ── approval and questions ──────────────────────────────────────────────
     hasLiveDisplay() {
@@ -5648,6 +6019,64 @@ export class SshTui {
             return this.displayHost?.attached === true;
         return true;
     }
+    /**
+     * Tell the absent user that a question is waiting.
+     *
+     * The marker file is the part that needs no configuration: it sits next to the
+     * session's stderr log, so logging back into the jump host shows it before the
+     * TUI is open. The command is whatever the user pointed `ssh-tui.notify` at,
+     * run once; it never blocks the wait and never reports its own failure.
+     */
+    announceWaitingQuestion(request) {
+        const sessionId = String(this.agent.id);
+        const question = request.questions
+            .map(item => item.question.trim())
+            .filter(text => text !== '')
+            .join(' / ')
+            .slice(0, 200);
+        const since = this.questionWaitSince ?? Date.now();
+        void writeWaitingMarker({
+            sessionId,
+            count: this.queuedQuestions,
+            question,
+            since,
+        });
+        const command = this.readNotifyCommand();
+        if (command === undefined)
+            return;
+        const smtp = this.readNotifySmtp();
+        const context = {
+            sessionId,
+            count: this.queuedQuestions,
+            question,
+            waitedMs: Date.now() - since,
+            resumeCommand: `dsh --profile ${profileFromArgv()} --resume ${sessionId}`,
+            ...(smtp.user === undefined ? {} : { smtpUser: smtp.user }),
+            ...(smtp.password === undefined ? {} : { smtpPassword: smtp.password }),
+        };
+        void runNotify(command, context);
+    }
+    /** The SMTP account `/notify smtp` saved, when the target is authenticated. */
+    readNotifySmtp() {
+        const raw = readSettingsSection(this.ctx, UI_LOCALE_NAMESPACE);
+        if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
+            return {};
+        const saved = raw;
+        const user = typeof saved.notifySmtpUser === 'string' ? saved.notifySmtpUser : undefined;
+        const password = typeof saved.notifySmtpPassword === 'string' ? saved.notifySmtpPassword : undefined;
+        return {
+            ...(user === undefined || user === '' ? {} : { user }),
+            ...(password === undefined || password === '' ? {} : { password }),
+        };
+    }
+    /** `DSH_TUI_NOTIFY`, else the saved `ssh-tui.notify`. Empty means off. */
+    readNotifyCommand() {
+        const raw = readSettingsSection(this.ctx, UI_LOCALE_NAMESPACE);
+        const saved = raw !== null && typeof raw === 'object' && !Array.isArray(raw)
+            ? raw.notify
+            : undefined;
+        return notifyCommand(process.env, typeof saved === 'string' ? saved : undefined);
+    }
     waitForLiveDisplay(signal) {
         if (this.hasLiveDisplay())
             return Promise.resolve();
@@ -5784,7 +6213,7 @@ export class SshTui {
                                 ...(request.reason === undefined || request.reason.trim() === '' ? {} : { reason: request.reason }),
                                 ...(this.hostSandboxMode === undefined || this.hostSandboxMode.trim() === '' ? {} : { sandboxMode: this.hostSandboxMode }),
                             }) }],
-                    source: { kind: 'plugin', plugin: 'dsh-ssh-tui' },
+                    source: { kind: TUI_SOURCE_KIND },
                 })],
             system: reviewSystemPrompt(getLocale()),
             maxTokens: 400,
@@ -5866,6 +6295,10 @@ export class SshTui {
      * `the user rejected tool "bash"`. Steer a plugin notice with the real
      * classifier/reviewer reason. Summary matches the workspace decision row
      * so the handler does not paint the body twice.
+     *
+     * This notice is committed to the session, so it is exactly the injection a
+     * V4 log refuses when it wears the released `plugin` wrapper — see
+     * {@link TUI_SOURCE_KIND}.
      */
     tellModelApprovalDenied(command, reason, summary) {
         if (this.replaying || this.agentGone)
@@ -5873,7 +6306,7 @@ export class SshTui {
         const text = t('approval.modelDenied', { command, reason });
         const message = createUserMessage({
             content: [{ type: 'text', text }],
-            source: { kind: 'plugin', plugin: 'dsh-ssh-tui', form: 'notice', summary },
+            source: { kind: TUI_SOURCE_KIND, form: 'notice', summary },
         });
         try {
             if (this.agent.status === 'running')
@@ -5983,11 +6416,20 @@ export class SshTui {
             // Counted here, not read off the rows: the card is built only after the
             // wait resolves, so at reattach time a queued question has no row yet.
             this.queuedQuestions += 1;
+            this.questionWaitSince ??= Date.now();
+            // The user learns about the wait from a marker file and, when they
+            // configured one, a command. Both run after the counter moves, so a
+            // reconnect during either still sees the question as queued.
+            this.announceWaitingQuestion(request);
             try {
                 await this.waitForLiveDisplay(request.signal);
             }
             finally {
                 this.queuedQuestions -= 1;
+                if (this.queuedQuestions === 0) {
+                    this.questionWaitSince = undefined;
+                    void clearWaitingMarker(String(this.agent.id));
+                }
             }
         }
         const answers = [];
@@ -6209,7 +6651,7 @@ export class SshTui {
     piAiProviderProfile(provider) {
         if (provider === 'deepseek-official')
             return undefined;
-        const section = this.ctx.get('settings')?.get(settingsNamespace('llm-pi-ai'));
+        const section = readSettingsSection(this.ctx, settingsNamespace('llm-pi-ai'));
         return section?.providers?.[provider];
     }
     /**
@@ -6428,7 +6870,7 @@ export class SshTui {
      * picker costs one listing instead of one per sibling.
      */
     async discoverGatewayListing(provider, signal) {
-        const llmPiAi = this.ctx.get('settings')?.get(settingsNamespace('llm-pi-ai'));
+        const llmPiAi = readSettingsSection(this.ctx, settingsNamespace('llm-pi-ai'));
         const profile = this.piAiProviderProfile(provider);
         const source = openCodeSourceFor(provider, llmPiAi);
         const baseURL = typeof profile?.baseURL === 'string' && profile.baseURL.trim() !== ''
@@ -6821,7 +7263,7 @@ export class SshTui {
     }
     /** Persist a provider/model/effort choice and keep the subagent on the same family. */
     rememberedRoute(provider) {
-        const section = this.ctx.get('settings')?.get(ROUTE_MEMORY_NS);
+        const section = readSettingsSection(this.ctx, ROUTE_MEMORY_NS);
         const memory = section !== null && typeof section === 'object' && !Array.isArray(section)
             ? parseRouteMemory(section.providers)
             : {};
@@ -6870,7 +7312,7 @@ export class SshTui {
         const settings = this.ctx.get('settings');
         if (settings === undefined)
             return;
-        const section = settings.get(ROUTE_MEMORY_NS);
+        const section = readSettingsSection(this.ctx, ROUTE_MEMORY_NS);
         const memory = section !== null && typeof section === 'object' && !Array.isArray(section)
             ? parseRouteMemory(section.providers)
             : {};
@@ -6986,7 +7428,7 @@ export class SshTui {
         }
         if (settings !== undefined) {
             try {
-                await settings.replace(AGENT_DEFAULT_MODEL_SETTINGS_NAMESPACE, {
+                await settings.replace(AGENT_DEFAULT_MODEL_NS, {
                     provider: next.provider,
                     model: next.model,
                     ...(next.reasoningEffort === undefined ? {} : { reasoningEffort: String(next.reasoningEffort) }),
@@ -7553,6 +7995,44 @@ export class SshTui {
         this.pushRow({ kind: 'system', text: t('view.switched', { name: next === 'compact' ? t('view.compact') : t('view.detailed') }) });
         this.markDirty();
     }
+    /**
+     * /notify: where a question waiting on an absent user is announced.
+     *
+     * No argument shows what is configured. `off` clears it. `mail`, `smtp` and
+     * `local` store the command that target needs; the SMTP password is kept
+     * beside it and handed to the command through the environment, so it is never
+     * part of the command string.
+     */
+    async runNotifyCommand(arg) {
+        const target = parseNotifyTarget(arg);
+        if (target === undefined) {
+            this.pushRow({ kind: 'error', text: t('notify.usage') });
+            this.markDirty();
+            return;
+        }
+        if (target.kind === 'off' && arg.trim() === '') {
+            const current = this.readNotifyCommand();
+            this.pushRow({
+                kind: 'system',
+                text: current === undefined ? t('notify.statusOff') : t('notify.statusOn', { command: current }),
+            });
+            this.markDirty();
+            return;
+        }
+        if (target.kind === 'off') {
+            await this.mergeUiSettings({ notify: '', notifySmtpUser: '', notifySmtpPassword: '' });
+            this.pushRow({ kind: 'system', text: t('notify.cleared') });
+            this.markDirty();
+            return;
+        }
+        await this.mergeUiSettings({
+            notify: notifyTargetCommand(target),
+            notifySmtpUser: target.kind === 'smtp' ? target.user ?? '' : '',
+            notifySmtpPassword: target.kind === 'smtp' ? target.password ?? '' : '',
+        });
+        this.pushRow({ kind: 'system', text: t('notify.saved', { target: notifyTargetLabel(target) }) });
+        this.markDirty();
+    }
     /** /disconnect: pause (default) or continue the turn after SSH drop. */
     async runDisconnectCommand(arg) {
         const direct = parseDisconnectPolicy(arg);
@@ -7586,7 +8066,7 @@ export class SshTui {
     }
     /** /mode: pick an agent preset (standard / minimal / ptc / cordis / routing-suite / ...). */
     async runModeCommand(arg = '') {
-        const agentPresets = this.ctx.get('agentPresets');
+        const agentPresets = this.presetService();
         const direct = arg.trim().toLowerCase();
         if (direct === 'fix' || direct === 'repair') {
             await this.repairRoster();
@@ -7601,13 +8081,7 @@ export class SshTui {
             const profile = profileFromArgv();
             this.pushRow({
                 kind: 'error',
-                text: [
-                    t('mode.missingService'),
-                    t('mode.missingServiceHint', {
-                        profile,
-                        patch: rosterPatchPath(resolveDshHome(), profile),
-                    }),
-                ].join('\n'),
+                text: this.missingPresetService(t('mode.missingService')),
             });
             this.markDirty();
             return;
@@ -7667,6 +8141,13 @@ export class SshTui {
         const selectedName = option.label;
         const hasWork = sessionEvents(this.agent.session).some(event => event.type === 'turn/start');
         if (!hasWork) {
+            // Feature-detected: a host whose registry predates `recompose` still
+            // lists presets, and switching then needs a restarted session.
+            if (typeof agentPresets.recompose !== 'function') {
+                this.pushRow({ kind: 'error', text: t('mode.noRecompose', { id: selected.id }) });
+                this.markDirty();
+                return;
+            }
             await agentPresets.recompose(this.agent.ctx, selected.id);
             this.presetId = selected.id;
             this.presetName = selectedName;
@@ -7690,13 +8171,40 @@ export class SshTui {
      */
     /** Re-read the roster fact this process was composed with (cheap, no IO). */
     refreshRosterHealth() {
-        this.rosterMissing = this.ctx.get('agentPresets') === undefined;
+        // 0.1.7 has no roster to be missing: what a terminal profile owns there is
+        // the agent-plane rows, so the chip reports those instead.
+        this.rosterMissing = this.settingsGeneration === 'forms'
+            ? !formsRowsDeclared(resolveDshHome(), profileFromArgv())
+            : this.ctx.get('agentPresets') === undefined;
+    }
+    /** Which settings protocol this host speaks; decides what "missing" means. */
+    get settingsGeneration() {
+        return hostSettingsGeneration(this.ctx);
+    }
+    /**
+     * The two lines `/mode` and `/preset` print when the preset service is absent.
+     *
+     * The reason differs by host line: 0.1.5 lost a roster the profile can mount,
+     * while 0.1.7 composes the agent process-wide and has no terminal presets at
+     * all — the repair there is the agent-plane rows, not a roster.
+     */
+    missingPresetService(first) {
+        const profile = profileFromArgv();
+        const patch = rosterPatchPath(resolveDshHome(), profile);
+        return this.settingsGeneration === 'forms'
+            ? [first, t('mode.formsHost'), t('mode.formsHint', { profile, patch })].join('\n')
+            : [first, t('mode.missingServiceHint', { profile, patch })].join('\n');
     }
     async repairRoster() {
         const profile = profileFromArgv();
         const patch = rosterPatchPath(resolveDshHome(), profile);
         try {
-            const result = await ensureRosterRows(resolveDshHome(), profile);
+            // Which rows are "the rows" is a host-line fact: 0.1.7 composes the agent
+            // process-wide and owns the agent-plane rows instead of the roster. Both
+            // the list and the header come from the same generation `/doctor` uses,
+            // or this writes rows the running host cannot resolve.
+            const generation = this.settingsGeneration;
+            const result = await ensureRosterRows(resolveDshHome(), profile, rosterRows(generation), generation);
             this.refreshRosterHealth();
             this.pushRow({
                 kind: 'system',
@@ -7817,7 +8325,7 @@ export class SshTui {
                 return;
             }
             const provider = this.currentProviderId();
-            const llmPiAi = this.ctx.get('settings')?.get(settingsNamespace('llm-pi-ai'));
+            const llmPiAi = readSettingsSection(this.ctx, settingsNamespace('llm-pi-ai'));
             const source = openCodeSourceFor(provider, llmPiAi);
             if (source?.flavor === 'zen') {
                 this.pushRow({ kind: 'system', text: this.zenUsageText(source) });
@@ -7879,7 +8387,7 @@ export class SshTui {
      * neither gets nothing.
      */
     hasQuotaSurface(provider) {
-        const llmPiAi = this.ctx.get('settings')?.get(settingsNamespace('llm-pi-ai'));
+        const llmPiAi = readSettingsSection(this.ctx, settingsNamespace('llm-pi-ai'));
         return providerHasQuotaSurface(provider, llmPiAi);
     }
     async refreshQuota(options) {
@@ -7938,7 +8446,7 @@ export class SshTui {
             const apiKey = await this.resolveCredential('DEEPSEEK_API_KEY');
             if (apiKey === undefined)
                 throw new Error(t('usage.noDeepseekKey'));
-            const section = this.ctx.get('settings')?.get(settingsNamespace('llm-deepseek'));
+            const section = readSettingsSection(this.ctx, settingsNamespace('llm-deepseek'));
             const baseURL = typeof section?.baseURL === 'string' && section.baseURL.trim() !== ''
                 ? section.baseURL.trim()
                 : (process.env.DEEPSEEK_BASE_URL?.trim() || DEEPSEEK_PUBLIC_BASE_URL);
@@ -8007,7 +8515,7 @@ export class SshTui {
                 return parseSuperGrokBilling(payload);
             }
         }
-        const llmPiAi = this.ctx.get('settings')?.get(settingsNamespace('llm-pi-ai'));
+        const llmPiAi = readSettingsSection(this.ctx, settingsNamespace('llm-pi-ai'));
         const commandCode = commandCodeSourceFor(provider, llmPiAi);
         if (commandCode !== null)
             return this.fetchCommandCodeQuota(commandCode);
@@ -8068,13 +8576,21 @@ export class SshTui {
         // routing so a plain control byte reaches it as readily as a CSI sequence;
         // everything else keeps the handling below, which is what makes the defaults
         // unchanged by construction.
-        if (this.dialog === undefined && combined !== '') {
-            const moved = this.keymap.sequences.get(combined);
+        const moved = combined === '' ? undefined : this.keymap.sequences.get(combined);
+        // While a dialog is open its own routing owns the keys — with one exception:
+        // an inspect overlay is the only place the copy key can be pressed at all,
+        // and gating it put the reader's rebound key out of reach exactly where the
+        // overlay's own hint advertises copying.
+        const overlayCopy = this.dialog !== undefined
+            && this.dialog.kind === 'inspect'
+            && (this.dialog.copyText ?? '') !== ''
+            && moved === 'copy';
+        if ((this.dialog === undefined || overlayCopy) && combined !== '') {
             if (moved !== undefined && this.keymap.overridden.has(moved)) {
                 if (this.runKeyAction(moved))
                     return;
             }
-            if (this.keymap.suppressed.has(combined))
+            if (this.dialog === undefined && this.keymap.suppressed.has(combined))
                 return;
         }
         const escape = /^\x1b\[([A-D])$/u;
@@ -8099,7 +8615,7 @@ export class SshTui {
                         this.markDirty();
                     }
                     else if (this.input === '' && this.collapsibleRows().length > 0) {
-                        this.moveCollapsibleFocus(-1);
+                        this.moveFocus(-1);
                     }
                     else {
                         this.historyBack();
@@ -8123,7 +8639,7 @@ export class SshTui {
                         this.markDirty();
                     }
                     else if (this.input === '' && this.collapsibleRows().length > 0) {
-                        this.moveCollapsibleFocus(1);
+                        this.moveFocus(1);
                     }
                     else {
                         this.historyForward();
@@ -8151,19 +8667,23 @@ export class SshTui {
                     this.scrollInspectOrTranscript(-3);
                     return;
                 }
-                // 32 is "motion with the left button held": a drag over a reply.
-                if (button === 32) {
+                // 32 is "motion with the left button held": a drag over a reply. Shift
+                // adds 4 to every button code, and a terminal that still forwards the
+                // report while Shift is down (instead of keeping it for its own
+                // selection) must drag exactly like an unshifted one — otherwise the
+                // gesture the user was told to fall back on does nothing here.
+                if (button === 32 || button === 36) {
                     this.extendMouseSelection(y, x);
                     return;
                 }
-                if (button === 0) {
+                if (button === 0 || button === 4) {
                     this.beginMouseSelection(y, x);
                     return;
                 }
                 return;
             }
             // A release ends either a drag (copy what it covered) or a plain click.
-            if (button === 0)
+            if (button === 0 || button === 4)
                 this.endMouseSelection(y, x);
             return;
         }
@@ -8396,13 +8916,20 @@ export class SshTui {
                 this.input = this.input.slice(0, this.cursor);
                 this.markDirty();
                 return;
+            // A dialog owns the keyboard while it is up: moving the transcript cursor
+            // under it changed what a later copy would take while the screen showed
+            // nothing of the sort.
             case '\x0e':
-                this.moveCollapsibleFocus(1);
+                if (this.dialog === undefined)
+                    this.moveFocus(1);
                 return;
             case '\x10':
-                this.moveCollapsibleFocus(-1);
+                if (this.dialog === undefined)
+                    this.moveFocus(-1);
                 return;
             case '\x12':
+                if (this.dialog !== undefined)
+                    return;
                 if (this.focusedRow === null)
                     this.toggleCollapsible();
                 else
@@ -9374,6 +9901,10 @@ export class SshTui {
         const shadowed = shadowing !== undefined && shadowing !== '';
         if (credentials !== undefined && !shadowed) {
             await credentials.set(credentialRef(envRef), key);
+            // The store writes it; we are the reason it exists. On Windows that write
+            // ignored any mode the store passed, so the file that holds every API key
+            // gets its ACL tightened here.
+            await restrictPathToUser(join(dshHomeDir(), '.credentials.yaml'), { mode: 0o600 });
             this.pushRow({ kind: 'system', text: t('onboard.credSaved', { env: envRef, path: displayDshPath('.credentials.yaml') }) });
             return;
         }
@@ -9384,13 +9915,13 @@ export class SshTui {
                 ? IS_WINDOWS
                     ? t('onboard.envShadowWin', { env: envRef })
                     : t('onboard.envShadowUnix', { env: envRef })
-                : t('onboard.credMissing', { path: displayDshPath(IS_WINDOWS ? 'env.cmd' : 'env.sh') }),
+                : t('onboard.credMissing', { path: displayDshPath(envFileName()) }),
         });
     }
     /** Write launch-environment overrides so they beat system-injected variables. */
     async writeLaunchEnv(entries) {
         const home = dshHomeDir();
-        const file = join(home, IS_WINDOWS ? 'env.cmd' : 'env.sh');
+        const file = join(home, envFileName());
         await mkdir(home, { recursive: true, mode: 0o700 });
         if (IS_WINDOWS) {
             let previous = '';
@@ -9414,6 +9945,10 @@ export class SshTui {
             const additions = Object.entries(entries).map(([name, value]) => `set "${name}=${value.replaceAll('"', '')}"`);
             const lines = ['@echo off', 'rem Generated by dsh-ssh-tui onboarding.', ...preserved, ...additions];
             await writeFile(file, `${lines.join('\r\n')}\r\n`, { mode: 0o600 });
+            // This file holds API keys. `mode` covers POSIX; on Windows the same
+            // intent has to be an ACL or the keys sit under whatever the parent
+            // directory allowed.
+            await restrictPathToUser(file, { mode: 0o600 });
             // Persist for future processes; best-effort, env.cmd remains as a manual fallback.
             await Promise.all(Object.entries(entries).map(([name, value]) => this.setWindowsEnv(name, value))).catch(() => { });
             return;
@@ -9437,6 +9972,7 @@ export class SshTui {
         });
         const additions = Object.entries(entries).map(([name, value]) => `export ${name}=${quote(value)}`);
         await writeFile(file, `${['# Generated by dsh-ssh-tui onboarding.', ...preserved, ...additions].join('\n')}\n`, { mode: 0o600 });
+        await restrictPathToUser(file, { mode: 0o600 });
         await this.ensurePosixEnvHook();
     }
     /** Persist one variable into the Windows user environment (best-effort). */
@@ -9567,7 +10103,11 @@ export class SshTui {
     }
     /** The painted lines as plain text, for the selection rules. */
     plainSelectableLines() {
-        return this.selectableLines.map(line => ({ text: stripAnsi(line.raw), copyable: line.copyable }));
+        return this.selectableLines.map(line => ({
+            text: stripAnsi(line.raw),
+            copyable: line.copyable,
+            gutter: line.gutter,
+        }));
     }
     /** Screen row from a mouse report to an index into `selectableLines`. */
     selectableLineAt(screenY) {
@@ -9692,17 +10232,48 @@ export class SshTui {
     }
     copyPlainText(text, notice) {
         this.copyYank = text;
-        this.focusedRow = null;
+        // The selection stays: the marker on the copied row is how the reader sees
+        // *what* went to the clipboard, and a second press of the copy key must be
+        // idempotent. Clearing it here made the next `/copy` silently fall back to
+        // "the latest reply" — a different row, with nothing on screen to say so.
         this.input = '';
         this.cursor = 0;
         this.inputFolded = false;
         this.leaveHistoryBrowse();
         this.write(osc52Clipboard(text));
         this.pushRow({ kind: 'system', text: notice });
+        // The write is a request the terminal may ignore: VTE (GNOME/XFCE/…) has
+        // never implemented OSC 52, conhost and screen cannot, Konsole only from
+        // 24.12, and xterm/tmux need configuration. The write still goes out — it is
+        // how the terminals that *do* honour it work — but where the table does not
+        // promise it the user is told once per session rather than at every copy, or
+        // not at all until they paste into an empty clipboard.
+        //
+        // An SSH session is the exception the table cannot see. The classifier reads
+        // the *remote* terminal (the tty on the far side of the connection, which is
+        // usually a bare Linux console or an unnamed pty), while the bytes are
+        // written to the *local* terminal — the one the user is actually copying
+        // into. That local terminal is what accepted the write, which is why a copy
+        // over SSH works and then warns that it did not. Warning there is a lie, so
+        // the caveat stays quiet inside an SSH session.
+        //
+        // The test is the session itself and not `paintLink`, which is also `'ssh'`
+        // on a local window whenever the launcher relayed the frame: there the
+        // capability table *did* describe the terminal that receives the bytes, so
+        // the caveat is exactly what the user needs to read (the terminal probe
+        // asserts it does, for seven terminal profiles).
+        if (!this.terminalCaps.osc52 && !this.sshSession && !this.osc52HintShown) {
+            this.osc52HintShown = true;
+            this.pushRow({ kind: 'system', text: t('copy.osc52Hint', { terminal: this.terminalCaps.label }) });
+        }
         this.markDirty();
     }
     copyFocusedCard(arg = '') {
-        if (this.dialog !== undefined)
+        // A dialog covers the input line, so the copy key is the only way to copy
+        // from inside one. The inspect overlay carries what it is showing; every
+        // other dialog keeps the key inert, exactly as it always was.
+        const overlay = this.dialog?.kind === 'inspect' ? this.dialog : undefined;
+        if (this.dialog !== undefined && overlay === undefined)
             return false;
         // `error` copies the newest failure or diagnostic row: a long path or a
         // command in one of those must reach the clipboard whole, which is exactly
@@ -9720,14 +10291,30 @@ export class SshTui {
             return true;
         }
         if (arg.trim() === '') {
-            const picked = copyTextFromTranscript(this.rows, this.focusedRow);
+            const shown = overlay?.copyText;
+            const picked = shown !== undefined && shown.trim() !== ''
+                ? { text: shown, source: 'focused' }
+                : copyTextFromTranscript(this.rows, this.focusedRow);
             if (picked.text.trim() === '') {
                 this.pushRow({ kind: 'system', text: t('copy.empty') });
                 this.markDirty();
                 return false;
             }
-            const source = picked.source === 'focused' ? t('copy.sourceFocused') : t('copy.sourceAssistant');
-            this.copyPlainText(picked.text, t('copy.ok', { chars: picked.text.length, source }));
+            // The label follows the text: when the overlay supplied it, the row the
+            // cursor sits on may be a different card entirely (Ctrl+N/P used to move
+            // it behind the overlay), and naming that row would be a false report.
+            const source = shown !== undefined && shown.trim() !== ''
+                ? t('copy.sourceFull')
+                : picked.source === 'focused'
+                    ? t(this.focusedRow?.kind === 'assistant' ? 'copy.sourceFocusedReply' : 'copy.sourceFocused')
+                    : t('copy.sourceAssistant');
+            const notice = t('copy.ok', { chars: picked.text.length, source });
+            this.copyPlainText(picked.text, notice);
+            if (overlay !== undefined) {
+                // The notice row is behind the overlay, so the overlay says it too.
+                overlay.notice = notice;
+                this.markDirty();
+            }
             return true;
         }
         this.pushRow({ kind: 'system', text: t('copy.usage') });
@@ -9777,6 +10364,14 @@ export class SshTui {
             return;
         }
         this.scrollOffset = 0;
+        // A selected reply has no card to fold, so Enter has to reach it too: the
+        // gate below only asks about collapsible rows, and in a session with no card
+        // at all (a plain Q&A, or right after `/clear`) that left Enter doing
+        // nothing while `Alt+4` / Ctrl+N had just selected the reply.
+        if (this.input.trim() === '' && this.focusedRow !== null && this.focusedRow.kind === 'assistant') {
+            this.toggleCollapsible();
+            return;
+        }
         if (this.input.trim() === '' && this.collapsibleRows().length > 0) {
             this.toggleCollapsible();
             return;
@@ -9951,6 +10546,12 @@ export class SshTui {
                     this.markDirty();
                 });
                 break;
+            case 'notify':
+                void this.runNotifyCommand(arg).catch((error) => {
+                    this.pushRow({ kind: 'error', text: t('cmd.failedNamed', { command: 'notify', error: errorChain(error) }) });
+                    this.markDirty();
+                });
+                break;
             case 'disconnect':
                 void this.runDisconnectCommand(arg).catch((error) => {
                     if (error instanceof UserQuestionError) {
@@ -10388,7 +10989,16 @@ export function mountTui(ctx, config) {
         else
             process.exit(1);
     };
-    const disposeCreated = ctx.on('agent/created', ({ agent }) => start(agent));
+    // The explicit `return undefined` is deliberate, not noise: 0.1.6-alpha.2 turns
+    // `agent/created` into a serial event whose handler must return
+    // `undefined | Promise<undefined>`, and a bare `void` body is *not* assignable
+    // to that (verified by compiling this file against the published 0.1.6-alpha.2
+    // types: TS2322/TS2345). Returning `undefined` satisfies the whole 0.1.5 line
+    // too, so the handler is ready for the next line without a compat branch.
+    const disposeCreated = ctx.on('agent/created', ({ agent }) => {
+        start(agent);
+        return undefined;
+    });
     const disposeFailure = ctx.on('agent-loop/config-start-failed', ({ sessionId: failedSessionId, error }) => fail(failedSessionId, error));
     const stopWaiting = () => {
         disposeCreated();