maka-agent 0.2.0-dev.4.20260830 → 0.2.0-dev.41.20260918

package/dist/pi-tui-runner.js

@@ -17,13 +17,14 @@
  * under the License.
  */
 import { randomUUID } from 'node:crypto';
-import { basename } from 'node:path';
 import { Key, ProcessTerminal, SelectList, TuiMainScreen, isKeyRelease, isKeyRepeat, matchesKey, } from '@earendil-works/pi-tui';
-import { isThinkingLevel, thinkingVariantsForModel, } from '@maka/core/model-thinking';
+import { CurrentTodoStore, TodoOverlay, renderTodoIndicator } from './pi-tui-todo.js';
+import { isThinkingLevel } from '@maka/core/model-thinking';
+import { deriveConnectionSlug } from '@maka/core/llm-connections';
 import { projectRevisionLinkedSessionTree } from '@maka/core/session-revisions';
 import { slashCommandsForSurface, } from '@maka/core/slash-command-catalog';
 import { latestAssistantModelId, } from '@maka/core/session';
-import { buildForeignSessionHandoffMessage, foreignSessionHandoffDisplayText, foreignSourceLabel, } from '@maka/core/foreign-session';
+import { defineUiMessageCatalog, formatUiMessage, resolveUiMessageCatalog, } from '@maka/core/ui-locale';
 import { listApiKeyOnboardableProviders } from './onboarding-catalog.js';
 import { AUTO_RECAP_DISPLAY_LIMIT_BYTES, shouldAutoRecap } from './session-recap.js';
 import { MakaSkillHighlightEditor } from './skill-highlight-editor.js';
@@ -31,21 +32,58 @@ import { parseGraphCommand } from '@maka/core/graph-command';
 import { parseSwarmCommand } from '@maka/core/swarm-command';
 import { inspectSessionResumeAvailability, } from './session-driver.js';
 import { SafeBoundaryResumeParkedError } from './runtime-host-session-driver.js';
-import { appendExpansionCollapseConfirmation, appendTurnFailureToTranscript, appendUserCommandToTranscript, appendUserPrompt, applyMakaSessionEventToTranscript, applyShellRunUpdateToTranscript, createMakaPiTranscriptState, hasRunningUserCommand, activeSandboxBoundaryRequest, activeUserQuestionRequest, applyExpansionDefaultToAll, completePendingInteraction, applyShellRunViewUpdateToTranscript, EXPANSION_COLLAPSE_CONFIRM_WINDOW_MS, hasExpandedEntriesAboveViewport, permissionModeLabel, retireCancelledTransientMessages, replaceTranscriptWithStoredMessages, hydrateToolsWithStoredMessages, submitCompactToTranscript, toggleAllThinkingExpansion, toggleAllToolExpansion, } from './pi-transcript.js';
+import { appendExpansionCollapseConfirmation, appendTurnFailureToTranscript, appendUserCommandToTranscript, appendUserPrompt, applyMakaSessionEventToTranscript, applyShellRunUpdateToTranscript, createMakaPiTranscriptState, hasRunningUserCommand, activeSandboxBoundaryRequest, activeFormRequest, activeUserQuestionRequest, applyExpansionDefaultToAll, completePendingInteraction, applyShellRunViewUpdateToTranscript, EXPANSION_COLLAPSE_CONFIRM_WINDOW_MS, hasExpandedEntriesAboveViewport, permissionModeLabel, retireCancelledTransientMessages, replaceTranscriptWithStoredMessages, hydrateToolsWithStoredMessages, submitCompactToTranscript, toggleAllThinkingExpansion, toggleAllToolExpansion, } from './pi-transcript.js';
+import { FormInteractionOverlay } from './pi-tui-form-interaction.js';
 import { runMakaPiTuiTurn } from './pi-tui-turn.js';
 import { editorTheme, selectListTheme } from './tui-ansi.js';
 import { MakaAutocompleteAboveEditorComponent } from './tui-autocomplete-layout.js';
 import { TranscriptViewerOverlay } from './pi-tui-transcript-viewer.js';
+import { copyToClipboard } from './tui-clipboard.js';
+import { getTuiCopyCopy, lastAssistantText, serializeTranscriptText } from './tui-copy-command.js';
+import { getTuiHostOwnerCopy } from './tui-host-owner-copy.js';
 import { McpManagementOverlay } from './pi-tui-mcp-status.js';
 import { createShellRunElapsedTicker } from './shell-run-elapsed-ticker.js';
 import { createShellRunHydrationController } from './shell-run-hydration.js';
+import { CTX_REFRESH_DEBOUNCE_MS, createCtxRefresher, scheduleCtxRefreshTimeout, } from './tui-context-refresh.js';
 import { sessionStatusBadge } from './tui-session-status.js';
 import { AttentionController, DISABLE_FOCUS_REPORTING, ENABLE_FOCUS_REPORTING, FOCUS_IN_SEQUENCE, FOCUS_OUT_SEQUENCE, } from './tui-attention.js';
 import { MakaActivityStripComponent, MakaPendingQueueComponent, MakaPiLayoutComponent, MakaStatusLineComponent, MakaTranscriptComponent, } from './pi-tui-layout.js';
-import { MakaAutocompleteProvider, DirectoryPickerOverlay, ModelSearchOverlay, OnboardingWizard, PickerOverlay, UserQuestionOverlay, modelChoiceConnectionLabels, getTuiPickerCopy, modelPickerItems, onboardingFailureMessage, permissionModePickerItems, skillPickerItems, thinkingLevelPickerItems, } from './pi-tui-pickers.js';
+import { MakaAutocompleteProvider, DirectoryPickerOverlay, ModelSearchOverlay, SessionSearchOverlay, OnboardingWizard, PickerOverlay, UserQuestionOverlay, modelChoiceConnectionLabels, getTuiPickerCopy, modelPickerItems, onboardingFailureMessage, onboardingOAuthFailureMessage, permissionModePickerItems, skillPickerItems, thinkingLevelPickerItems, } from './pi-tui-pickers.js';
 import { formatMakaResumeCommand } from './cli-invocation.js';
 import { goalAttachedNoticeText, goalPausedNoticeText, goalStatusLabel, goalSummaryLines, isLiveGoalStatus, } from './pi-goal.js';
 import { getTuiPrimaryGuidance } from './tui-primary-guidance.js';
+import { TUI_COPY_RESOURCES } from './tui-copy-catalog.js';
+function externalSourceLabel(adapterId) {
+    switch (adapterId) {
+        case 'claude-code':
+            return 'Claude Code';
+        case 'codex':
+            return 'Codex';
+        case 'opencode':
+            return 'OpenCode';
+        default:
+            return adapterId;
+    }
+}
+function externalImportErrorCode(error) {
+    if (typeof error !== 'object' || error === null)
+        return 'commit_outcome_unknown';
+    const value = error;
+    if (value.operation !== undefined && value.operation !== 'external-session.import') {
+        return undefined;
+    }
+    if (value.mode === 'command' && value.dispatch === 'not_dispatched')
+        return undefined;
+    if (value.mode === 'command' && value.dispatch === 'dispatched') {
+        return 'commit_outcome_unknown';
+    }
+    if (value.code === 'commit_outcome_unknown' ||
+        value.code === 'model_unavailable' ||
+        value.code === 'source_unreadable') {
+        return value.code;
+    }
+    return value.code === undefined ? 'commit_outcome_unknown' : undefined;
+}
 export function resolveTaskbarProgress(setting, environment = {
     platform: process.platform,
     override: process.env.MAKA_TASKBAR_PROGRESS,
@@ -84,38 +122,55 @@ export function safeBoundaryResumeParkedCopy(reason) {
             return { level: 'error', text: `Safe-boundary resume parked: ${reason}` };
     }
 }
+const TUI_REWIND_COPY = resolveUiMessageCatalog(defineUiMessageCatalog()(TUI_COPY_RESOURCES.rewind));
+const TUI_SKILLS_COPY = resolveUiMessageCatalog(defineUiMessageCatalog()(TUI_COPY_RESOURCES.skills));
+const TUI_CONNECTION_IDENTITY_COPY = resolveUiMessageCatalog(defineUiMessageCatalog()(TUI_COPY_RESOURCES['connection-identity']));
+const TUI_SESSION_ACTIONS_COPY = resolveUiMessageCatalog(defineUiMessageCatalog()(TUI_COPY_RESOURCES['session-actions']));
+/**
+ * What the exhausted bound is called, in the user's language.
+ *
+ * The limit kinds are protocol tokens; a reader told the session exceeds the
+ * `record_bytes` limit has been handed an implementation detail instead of an
+ * explanation.
+ */
+function externalImportLimitLabel(copy, kind) {
+    switch (kind) {
+        case 'transcript_bytes':
+            return copy.externalImportLimitTranscriptBytes;
+        case 'record_bytes':
+            return copy.externalImportLimitRecordBytes;
+        case 'records':
+            return copy.externalImportLimitRecords;
+        case 'converted_bytes':
+            return copy.externalImportLimitConvertedBytes;
+        case 'messages':
+            return copy.externalImportLimitMessages;
+    }
+}
 function sessionConnectionIdentityNotice(session, identities, locale) {
     if (!identities)
         return undefined;
-    const emptyChoiceRecovery = locale === 'zh'
-        ? '如果 /model 没有可选项，请先添加或启用连接（API Key 连接可运行 /setup）。'
-        : 'If /model has no choices, add or enable a connection first (run /setup for API-key connections).';
+    const copy = TUI_CONNECTION_IDENTITY_COPY[locale];
+    const withRecovery = (notice) => formatUiMessage(copy.withRecovery, { notice, recovery: copy.emptyChoiceRecovery }, locale);
     if (!session.llmConnectionId) {
-        return locale === 'zh'
-            ? `此任务来自旧版本，需要确认一次账号。运行 /model 选择现有账号和模型。${emptyChoiceRecovery}`
-            : `This task comes from an older version and needs a one-time account confirmation. Run /model and choose an existing account and model. ${emptyChoiceRecovery}`;
+        return withRecovery(copy.confirmAccount);
     }
     const identified = identities.find((entry) => entry.connectionId === session.llmConnectionId);
     if (!identified) {
-        return locale === 'zh'
-            ? `原账号已删除；运行 /model 选择新账号和模型后继续。${emptyChoiceRecovery}`
-            : `The original account was deleted. Run /model and choose a new account and model to continue. ${emptyChoiceRecovery}`;
+        return withRecovery(copy.accountDeleted);
     }
     if (identified.connectionSlug !== session.llmConnectionSlug) {
-        return locale === 'zh'
-            ? `任务保存的账号身份与当前连接不一致；运行 /model 重新选择账号和模型。${emptyChoiceRecovery}`
-            : `The saved account identity no longer matches its connection. Run /model and choose an account and model again. ${emptyChoiceRecovery}`;
+        return withRecovery(copy.identityMismatch);
     }
     if (!identified.enabled) {
-        return locale === 'zh'
-            ? `原账号已停用；请启用该账号，或运行 /model 选择新账号和模型。${emptyChoiceRecovery}`
-            : `The original account is disabled. Enable it, or run /model and choose a new account and model. ${emptyChoiceRecovery}`;
+        return withRecovery(copy.accountDisabled);
     }
     return undefined;
 }
 export async function runMakaPiTui(input) {
     const locale = input.locale ?? 'en';
     const pickerCopy = getTuiPickerCopy(locale);
+    const copyCopy = getTuiCopyCopy(locale);
     const primaryGuidance = getTuiPrimaryGuidance(locale);
     const terminal = input.terminal ?? new ProcessTerminal();
     const taskbarProgress = resolveTaskbarProgress(input.taskbarProgress);
@@ -141,18 +196,9 @@ export async function runMakaPiTui(input) {
     let model = input.model;
     let connectionId = input.connectionId;
     let connectionSlug = input.connectionSlug;
-    // Mutable: a cross-connection /model switch rebinds the provider, which changes
-    // both the connection and the thinking variants the new model supports.
-    let providerType = input.providerType;
-    let modelContextWindow = input.modelContextWindow;
     let permissionMode = input.permissionMode;
     let orchestrationMode = input.driver.getOrchestrationMode?.() ?? 'default';
     let thinkingLevel = undefined;
-    // The boot connection's declared capabilities win (an openai-compatible
-    // relay can declare relayModelProfiles[model].thinkingLevels). The
-    // providerType+model metadata variant is the fallback for modelChoices-free
-    // embeddings of the runner.
-    let thinkingLevels = input.modelChoices?.find((choice) => choice.connectionSlug === connectionSlug && choice.model === model)?.thinkingLevels ?? (providerType ? thinkingVariantsForModel(providerType, model) : []);
     let sessionListScope = input.sessionListScope ?? 'current';
     let connectionIdentityNotice;
     let busy = false;
@@ -193,6 +239,13 @@ export async function runMakaPiTui(input) {
     let userQuestionInFlight = false;
     let userQuestionOverlay;
     let userQuestionProgress;
+    let formResponseInFlightRequestId;
+    let formOverlay;
+    let formOverlayComponent;
+    let formOverlayRequestId;
+    let formOverlaySessionId;
+    let formOverlaySchema;
+    let retainedFormDraft;
     let turnRunning = false;
     // Monotonic generation for visible agent turns. A mid-turn `/session`
     // switch-away (#3380) bumps it to orphan the in-flight drain: every callback
@@ -210,6 +263,20 @@ export async function runMakaPiTui(input) {
     // True while the /session picker is open mid-turn: Escape must close the
     // overlay, not arm the double-Escape interrupt for the running Turn (#3380).
     let sessionPickerOverlayOpen = false;
+    let transcriptOverlay;
+    let todoOverlay;
+    const closeTodoOverlay = () => {
+        todoOverlay?.hide();
+        todoOverlay = undefined;
+    };
+    let transcriptViewer;
+    let transcriptViewerSessionId;
+    const resetTranscriptViewer = () => {
+        transcriptOverlay?.hide();
+        transcriptOverlay = undefined;
+        transcriptViewer = undefined;
+        transcriptViewerSessionId = undefined;
+    };
     let lastTurnEscapeAt = 0;
     let lastIdleEscapeAt = 0;
     let lastIdleCtrlCAt = 0;
@@ -292,11 +359,11 @@ export async function runMakaPiTui(input) {
         permissionMode,
         orchestrationMode,
         thinkingLevel,
-        thinkingLevels,
+        thinkingLevels: currentThinkingLevels(),
         sessionId: input.driver.getSessionId(),
         busy,
         usage: state.usage,
-        modelContextWindow,
+        modelContextWindow: currentModelContextWindow(),
         turnElapsedMs: turnStartedAt !== undefined ? Date.now() - turnStartedAt : undefined,
         providerRetry: state.providerRetry,
         uiLocale: locale,
@@ -314,8 +381,36 @@ export async function runMakaPiTui(input) {
     });
     const transcript = new MakaTranscriptComponent(state, metadata);
     const activityStrip = new MakaActivityStripComponent(metadata);
-    const pendingQueue = new MakaPendingQueueComponent(state);
+    const pendingQueue = new MakaPendingQueueComponent(state, locale);
     const statusLine = new MakaStatusLineComponent(metadata);
+    const currentTodo = new CurrentTodoStore({
+        read: async (sessionId) => {
+            if (!input.driver.queryTodo)
+                throw new Error('Todo query unavailable');
+            return input.driver.queryTodo(sessionId);
+        },
+    }, () => {
+        if (!closed)
+            tui.requestRender();
+    });
+    const syncTodoSession = () => {
+        currentTodo.setSession(input.driver.getSessionId() ?? undefined);
+    };
+    const unsubscribeTodoChanges = input.driver.subscribeTodoChanges?.((sessionId) => {
+        if (sessionId !== input.driver.getSessionId())
+            return;
+        syncTodoSession();
+        void currentTodo.refresh();
+    });
+    const todoIndicator = {
+        invalidate() { },
+        render(width) {
+            if (!input.driver.queryTodo)
+                return [];
+            const line = renderTodoIndicator(currentTodo.getState(), { locale, width });
+            return line === undefined ? [] : [line];
+        },
+    };
     // Use the vendor editor's full 20-item autocomplete capacity. Larger command
     // catalogs remain scrollable and keep an exact position/total counter.
     const editor = new MakaSkillHighlightEditor(tui, editorTheme(), {
@@ -324,7 +419,7 @@ export async function runMakaPiTui(input) {
     });
     let refreshEditorCwd;
     const editorSurface = new MakaAutocompleteAboveEditorComponent(editor);
-    const layout = new MakaPiLayoutComponent(state, transcript, activityStrip, pendingQueue, editorSurface, statusLine, terminal);
+    const layout = new MakaPiLayoutComponent(state, transcript, activityStrip, pendingQueue, editorSurface, statusLine, terminal, todoIndicator);
     const attention = new AttentionController(terminal, {
         baseTitle: input.title,
         ...(input.attentionLongTurnThresholdMs !== undefined
@@ -378,7 +473,7 @@ export async function runMakaPiTui(input) {
             return;
         }
         permissionResponseInFlightRequestId = null;
-        syncUserQuestionOverlay();
+        syncInteractionOverlays();
         requestRender();
     }) ?? (() => { });
     const unsubscribeTranscriptReplacements = input.driver.subscribeTranscriptReplacements?.((sessionId, turnId, messages, reason) => {
@@ -386,6 +481,7 @@ export async function runMakaPiTui(input) {
             return;
         if (reason === 'reconnect') {
             replaceTranscript(messages, { preserveClientLocalEntries: true });
+            syncInteractionOverlays();
             shellRunElapsedTicker.sync();
             requestRender();
             const messageIds = state.entries.flatMap((entry) => entry.kind === 'user' && entry.transient === true ? [entry.messageId] : []);
@@ -414,6 +510,40 @@ export async function runMakaPiTui(input) {
         now: input.shellRunTicker?.now,
         schedule: input.shellRunTicker?.schedule,
     });
+    // Live ctx refresh (#4545): the end-of-turn token_usage event moves the
+    // statusline once per turn, but the Host's latest-context snapshot moves at
+    // every settled provider request. Pull it on the desktop inspector's signal
+    // (tui-context-refresh.ts) so a long turn shows the context filling as it
+    // fills. The query is a plain read on the driver — deliberately not routed
+    // through runControl, whose serial lock exists for mutations.
+    const getContextDiagnostics = input.driver.getContextDiagnostics?.bind(input.driver);
+    const ctxRefresher = getContextDiagnostics
+        ? createCtxRefresher({
+            query: async () => {
+                const sessionId = input.driver.getSessionId();
+                const diagnostics = await getContextDiagnostics();
+                return { sessionId, diagnostics };
+            },
+            apply: ({ sessionId, diagnostics }) => {
+                // The session moved under the query (switch, /new): its usage was
+                // rebuilt from stored messages, and a pre-switch snapshot must not
+                // overwrite it.
+                if (closed || input.driver.getSessionId() !== sessionId)
+                    return;
+                if (diagnostics.status !== 'available')
+                    return;
+                const { inputTokens, contextWindow } = diagnostics;
+                if (inputTokens === undefined || contextWindow === undefined || contextWindow <= 0)
+                    return;
+                // Same formula the token_usage path uses (#1067), from the same
+                // settled request — the two cannot disagree.
+                state.usage.contextRemaining = Math.max(0, contextWindow - inputTokens);
+                requestRender();
+            },
+            delayMs: input.ctxRefreshTicker?.delayMs ?? CTX_REFRESH_DEBOUNCE_MS,
+            schedule: input.ctxRefreshTicker?.schedule ?? scheduleCtxRefreshTimeout,
+        })
+        : undefined;
     // ── Explicit skill invocation (#1148) ────────────────────────────────────
     // One cached list feeds autocomplete, the `/skill` picker, and the editor's
     // sync highlight validator. The cache is keyed by cwd (project-level skill
@@ -454,30 +584,31 @@ export async function runMakaPiTui(input) {
     // Warm the highlight validator so tokens light up before the first
     // autocomplete or picker open.
     void listSkillsCached(true);
-    const SKILL_INVOCATION_FAILURE_REASON_LABEL = {
-        not_found: '未找到',
-        disabled: '已禁用',
-        host_incompatible: '当前主机缺少其依赖的工具',
-        invalid_name: '名称无效',
-        too_many_requests: '调用请求过多',
-    };
+    const skillsCopy = TUI_SKILLS_COPY[locale];
     const showSkillInvocation = (skillInvocation) => {
         const failed = skillInvocation.failed;
         const failedLabels = failed.map((entry) => entry.reason === 'too_many_requests'
-            ? `请求超过 ${entry.requestLimit} 个上限（${SKILL_INVOCATION_FAILURE_REASON_LABEL[entry.reason]}）`
-            : `/skill:${entry.request}（${SKILL_INVOCATION_FAILURE_REASON_LABEL[entry.reason] ?? entry.reason}）`);
+            ? formatUiMessage(skillsCopy.tooManyRequestsItem, { limit: entry.requestLimit, reason: skillsCopy.failureReasons[entry.reason] }, locale)
+            : formatUiMessage(skillsCopy.failedItem, { request: entry.request, reason: skillsCopy.failureReasons[entry.reason] }, locale));
         if (failed.length > 0) {
             state.entries.push({
                 kind: 'notice',
                 level: 'info',
-                text: `未能加载技能 ${failedLabels.join('、')}；${skillInvocation.loaded.length === 0 ? '未发起模型请求。' : '失败的调用标记未发送给模型。'}`,
+                text: formatUiMessage(skillsCopy.loadFailed, {
+                    failures: failedLabels.join(skillsCopy.listSeparator),
+                    outcome: skillInvocation.loaded.length === 0
+                        ? skillsCopy.outcomeNoRequest
+                        : skillsCopy.outcomeMarkersNotSent,
+                }, locale),
             });
         }
         if (skillInvocation.loaded.length > 0) {
             state.entries.push({
                 kind: 'notice',
                 level: 'info',
-                text: `已加载技能：${skillInvocation.loaded.map((skill) => skill.name).join('、')}`,
+                text: formatUiMessage(skillsCopy.loaded, {
+                    names: skillInvocation.loaded.map((skill) => skill.name).join(skillsCopy.listSeparator),
+                }, locale),
             });
         }
         requestRender();
@@ -564,16 +695,22 @@ export async function runMakaPiTui(input) {
         process.off('uncaughtException', handleUncaughtException);
         process.off('unhandledRejection', handleUnhandledRejection);
     };
+    let unsubscribeModelCatalogChanges;
     const restoreTerminal = () => {
         removeProcessHandlers();
+        unsubscribeModelCatalogChanges?.();
         unsubscribeSessionTitleChanges();
         unsubscribeGoalChanges?.();
+        unsubscribeTodoChanges?.();
+        currentTodo.dispose();
+        closeTodoOverlay();
         void sideConversation?.stopParentObserver?.();
         unsubscribeStartedTurns();
         unsubscribeResolvedInteractions();
         unsubscribeTranscriptReplacements();
         shellRunHydration.dispose();
         shellRunElapsedTicker.dispose();
+        ctxRefresher?.cancel();
         stopTurnElapsedTicker();
         setTaskbarProgress(false);
         // Drop the busy / attention title marker so the tab is not handed back to
@@ -592,10 +729,8 @@ export async function runMakaPiTui(input) {
             rejectClosed(error);
         else
             resolveClosed();
-        // Runtime stop is best-effort after the shell has its terminal back. A
-        // double-Escape/Ctrl-C interrupt may already have one in flight; reuse it.
-        if (!interruptRequested)
-            void input.driver.stop().catch(() => { });
+        // Closing a viewport is not a Turn or Host stop. Explicit interrupt keys
+        // retain their own stop path; an attached Host continues independently.
     };
     const handleProcessExit = (exitCode, error) => {
         process.exitCode = exitCode;
@@ -791,7 +926,7 @@ export async function runMakaPiTui(input) {
             // was dropped, and the submit answer is the only place it appears: the
             // Turn arrives through the started-Turn subscription, which carries
             // Session state rather than this Message's admission.
-            if (result?.disposition === 'turn_started' && result.skillInvocation) {
+            if (result) {
                 const { loaded, failed } = result.skillInvocation;
                 if (loaded.length > 0 || failed.length > 0)
                     showSkillInvocation(result.skillInvocation);
@@ -850,9 +985,8 @@ export async function runMakaPiTui(input) {
             requestRender();
         })().catch(reportError);
     };
-    // Onboarding wizard (#1098 UX redesign): one overlay spans provider search
-    // → API key → model curation, keeping every prompt/verifying/failure/saving/
-    // success notice beside the input field instead of the transcript entry flow.
+    // Onboarding wizard (#1098 UX redesign): one overlay spans provider search,
+    // authentication, model curation, and success without transcript notices.
     let wizardOverlay;
     let wizard;
     // The user's supplied key from the key step ('' reuses the stored secret for an
@@ -865,11 +999,39 @@ export async function runMakaPiTui(input) {
     // The existing connection the picked provider resolved to, so saving edits
     // it in place (a Desktop-created relay may live under a custom slug).
     let wizardTarget;
-    let wizardModels = [];
+    let wizardOAuthAbort;
     // Authoritative ready model choices for `/model`. A startup snapshot refreshed
     // in place after `/setup` saves so newly configured models are immediately
     // available — the single source the picker and connection/model lookups read.
     let modelChoices = input.modelChoices;
+    let connectionIdentities = input.connectionIdentities;
+    // Derived, never mirrored: both the choices and the selected target move —
+    // the Host republishes its catalog, the user switches model — and a stored
+    // copy of what the two imply has to be resynchronized at every one of those
+    // points or go stale at the one that was missed.
+    // The slug and model identify the target; the id narrows it only once the
+    // caller or a session summary has supplied one, because two connections can
+    // share a slug across a rebind but a caller need not know either id.
+    const currentModelChoice = () => modelChoices?.find((choice) => choice.connectionSlug === connectionSlug &&
+        choice.model === model &&
+        (connectionId === undefined || choice.connectionId === connectionId));
+    const onInitialTarget = () => connectionId === input.connectionId &&
+        connectionSlug === input.connectionSlug &&
+        model === input.model;
+    /** The caller's value stands only while no choice describes the target it came with. */
+    const currentModelContextWindow = () => currentModelChoice()?.contextWindow ??
+        (onInitialTarget() ? input.modelContextWindow : undefined);
+    // The Host resolved these when it projected the choice — including a relay's
+    // declared `modelOverrides[model].thinkingLevels`. A model no choice
+    // describes offers none rather than a locally guessed list.
+    const currentThinkingLevels = () => currentModelChoice()?.thinkingLevels ?? [];
+    unsubscribeModelCatalogChanges = input.subscribeModelCatalogChanges?.((refresh) => {
+        if (closed)
+            return;
+        modelChoices = refresh.modelChoices;
+        connectionIdentities = refresh.connectionIdentities;
+        requestRender();
+    });
     // Monotonic attempt id: each setup submit captures one, and any transition
     // that abandons the in-flight attempt (back, re-pick, close) increments it so
     // a late verify/save settlement cannot clobber a newer attempt.
@@ -1021,6 +1183,7 @@ export async function runMakaPiTui(input) {
                     replaceTranscript(authoritativeAttachedTurn.messages, {
                         preserveClientLocalEntries: true,
                     });
+                    syncInteractionOverlays();
                     shellRunHydration.reset();
                     if (input.listShellRunUpdates) {
                         await shellRunHydration.hydrate(authoritativeAttachedTurn.sessionId);
@@ -1045,11 +1208,14 @@ export async function runMakaPiTui(input) {
                 // not reach the adopted Session's transcript or overlays.
                 if (superseded())
                     return;
-                if ((event.type === 'sandbox_boundary_request' || event.type === 'user_question_request') &&
+                if ((event.type === 'sandbox_boundary_request' ||
+                    event.type === 'user_question_request' ||
+                    event.type === 'form_request') &&
                     resolvedInteractionIds.delete(event.requestId)) {
                     return;
                 }
                 applyMakaSessionEventToTranscript(state, event);
+                ctxRefresher?.observe(event);
                 if (event.type === 'error')
                     attention.attentionNeeded();
                 if (permissionResponseInFlightRequestId !== null &&
@@ -1069,7 +1235,7 @@ export async function runMakaPiTui(input) {
                     permissionAlerted = false;
                 }
                 shellRunElapsedTicker.sync();
-                syncUserQuestionOverlay();
+                syncInteractionOverlays();
                 requestRender();
             },
             // A turn failing is worth pulling the user back, regardless of how long it
@@ -1084,7 +1250,7 @@ export async function runMakaPiTui(input) {
                 appendTurnFailureToTranscript(state, error);
                 attention.attentionNeeded();
                 shellRunElapsedTicker.sync();
-                syncUserQuestionOverlay();
+                syncInteractionOverlays();
                 requestRender();
             },
         }).then(async (outcome) => {
@@ -1134,47 +1300,20 @@ export async function runMakaPiTui(input) {
         });
     }
     const adoptSessionMetadata = (summary, announceIdentity = true) => {
+        syncTodoSession();
         cwd = summary.cwd ?? cwd;
         setSessionTitle(summary.name);
-        const previousModel = model;
-        const previousConnectionId = connectionId;
-        const previousConnectionSlug = connectionSlug;
         model = summary.model;
         connectionId = summary.llmConnectionId;
         connectionSlug = summary.llmConnectionSlug;
-        const identityNotice = sessionConnectionIdentityNotice(summary, input.connectionIdentities, input.locale ?? 'en');
+        const identityNotice = sessionConnectionIdentityNotice(summary, connectionIdentities, input.locale ?? 'en');
         if (announceIdentity && identityNotice && identityNotice !== connectionIdentityNotice) {
             state.entries.push({ kind: 'notice', level: 'error', text: identityNotice });
         }
         connectionIdentityNotice = identityNotice;
-        const matchingChoice = modelChoices?.find((choice) => choice.connectionId === summary.llmConnectionId &&
-            choice.connectionSlug === summary.llmConnectionSlug);
-        providerType =
-            matchingChoice?.providerType ??
-                (previousConnectionId === summary.llmConnectionId &&
-                    previousConnectionSlug === summary.llmConnectionSlug
-                    ? providerType
-                    : undefined);
-        const contextWindowMatch = modelChoices?.find((choice) => choice.connectionId === summary.llmConnectionId &&
-            choice.connectionSlug === summary.llmConnectionSlug &&
-            choice.model === summary.model);
-        if (contextWindowMatch) {
-            modelContextWindow = contextWindowMatch.contextWindow;
-        }
-        else if (previousConnectionId !== summary.llmConnectionId ||
-            previousConnectionSlug !== summary.llmConnectionSlug ||
-            previousModel !== summary.model) {
-            modelContextWindow = undefined;
-        }
         permissionMode = input.driver.getPermissionMode?.() ?? summary.permissionMode;
         orchestrationMode = summary.orchestrationMode ?? 'default';
         thinkingLevel = summary.thinkingLevel;
-        // Choice-first: a relay model's user-declared levels live on the ModelChoice;
-        // the metadata fallback serves providers whose variants derive from the
-        // model id alone.
-        thinkingLevels =
-            contextWindowMatch?.thinkingLevels ??
-                (providerType ? thinkingVariantsForModel(providerType, summary.model) : []);
         refreshEditorCwd?.(cwd);
     };
     startAttachedTurn = (attached) => {
@@ -1188,16 +1327,7 @@ export async function runMakaPiTui(input) {
         const previousModel = transcriptLastUsedModel ?? model;
         await input.driver.setModel(nextModel);
         model = nextModel;
-        // Same-connection switch: scope the choice lookup to the live connection
-        // (another connection may expose the same model id with different
-        // declared thinking levels).
-        const match = modelChoices?.find((choice) => choice.connectionSlug === connectionSlug && choice.model === nextModel);
-        if (match)
-            modelContextWindow = match.contextWindow;
         thinkingLevel = undefined;
-        thinkingLevels =
-            match?.thinkingLevels ??
-                (providerType ? thinkingVariantsForModel(providerType, nextModel) : []);
         state.entries.push({
             kind: 'notice',
             level: 'info',
@@ -1213,9 +1343,6 @@ export async function runMakaPiTui(input) {
             choice.connectionId === connectionId) {
             return;
         }
-        if (!choice.connectionId) {
-            throw new Error('Model choice is missing its exact Connection identity');
-        }
         const previousModel = transcriptLastUsedModel ?? model;
         const previousConnectionSlug = connectionSlug;
         const connectionLabels = modelChoiceConnectionLabels(modelChoices ?? [choice]);
@@ -1223,11 +1350,7 @@ export async function runMakaPiTui(input) {
         model = choice.model;
         connectionId = choice.connectionId;
         connectionSlug = choice.connectionSlug;
-        providerType = choice.providerType;
-        modelContextWindow = choice.contextWindow;
         thinkingLevel = undefined;
-        thinkingLevels =
-            choice.thinkingLevels ?? thinkingVariantsForModel(choice.providerType, choice.model);
         state.entries.push({
             kind: 'notice',
             level: 'info',
@@ -1266,8 +1389,11 @@ export async function runMakaPiTui(input) {
     // `messages`. Shared by switchSession and rewindToTurn so both land the same
     // runner state (model/connection/thinking/transcript/scroll).
     const applySwitchResult = async ({ summary, messages, activeTurn, }) => {
+        resetTranscriptViewer();
+        closeTodoOverlay();
         adoptSessionMetadata(summary, false);
         replaceTranscript(messages);
+        syncInteractionOverlays();
         if (connectionIdentityNotice) {
             state.entries.push({ kind: 'notice', level: 'error', text: connectionIdentityNotice });
         }
@@ -1588,12 +1714,29 @@ export async function runMakaPiTui(input) {
         const pendingNotice = {
             kind: 'notice',
             level: 'info',
-            text: '正在回退到该轮之前…',
+            text: TUI_REWIND_COPY[locale].pending,
         };
         state.entries.push(pendingNotice);
         requestRender();
         try {
-            const result = await input.driver.rewindToTurn(turnId);
+            const result = await input.driver.rewindToTurn(turnId).catch((error) => {
+                // The driver refuses rewind with a machine code when the selected
+                // turn carries structured context the TUI cannot restore (#5109).
+                // Render the localized catalog copy for that code instead of the
+                // driver's English fallback.
+                const code = error?.code;
+                if (code === 'rewind_unsupported_quotes' ||
+                    code === 'rewind_unsupported_attachments' ||
+                    code === 'rewind_unsupported_directory_references') {
+                    const localized = code === 'rewind_unsupported_quotes'
+                        ? TUI_REWIND_COPY[locale].unsupportedQuotes
+                        : code === 'rewind_unsupported_attachments'
+                            ? TUI_REWIND_COPY[locale].unsupportedAttachments
+                            : TUI_REWIND_COPY[locale].unsupportedDirectoryReferences;
+                    throw new Error(localized);
+                }
+                throw error;
+            });
             await applySwitchResult(result);
             await discardCurrentSidePair();
             // Record the discarded turn's prompt in the editor history before
@@ -1614,9 +1757,7 @@ export async function runMakaPiTui(input) {
             state.entries.push({
                 kind: 'notice',
                 level: 'info',
-                text: refill
-                    ? '已回退到该轮之前（分支为新任务，原任务保留），该轮 prompt 已回填输入框，可修改后重新发送。'
-                    : '已回退到该轮之前（分支为新任务，原任务保留）。输入框已有未发送内容，未覆盖；该轮 prompt 已存入输入历史，可按 ↑ 找回。',
+                text: refill ? TUI_REWIND_COPY[locale].doneRefilled : TUI_REWIND_COPY[locale].doneKeptDraft,
             });
             requestRender();
         }
@@ -1630,7 +1771,10 @@ export async function runMakaPiTui(input) {
     const showBottomPicker = (picker) => tui.showOverlay(picker, {
         anchor: 'bottom-left',
         width: '100%',
-        maxHeight: Math.max(1, terminal.rows - BOTTOM_PICKER_MARGIN_ROWS),
+        // A numeric cap would freeze today's rows into the option; '100%' is
+        // re-resolved against the live terminal height on every composite, so
+        // after a resize the cap still lands at rows - margin (#4610 review).
+        maxHeight: '100%',
         margin: { bottom: BOTTOM_PICKER_MARGIN_ROWS },
     });
     const closeUserQuestionOverlay = () => {
@@ -1655,13 +1799,13 @@ export async function runMakaPiTui(input) {
                 completePendingInteraction(state, requestId);
             }
             userQuestionProgress = undefined;
-            syncUserQuestionOverlay();
+            syncInteractionOverlays();
             requestRender();
         })
             .catch((error) => {
             userQuestionInFlight = false;
             reportError(error);
-            syncUserQuestionOverlay();
+            syncInteractionOverlays();
         });
     };
     const showUserQuestion = () => {
@@ -1686,6 +1830,9 @@ export async function runMakaPiTui(input) {
             hint: '↑↓ move · type to answer · Enter select · Esc unanswered · Ctrl+C stop',
             placeholder: 'Other: type your answer…',
             options: question.options,
+            // Live budget: terminal.rows changes on resize, so read it per render
+            // rather than at overlay construction.
+            maxRows: () => Math.max(1, terminal.rows - BOTTOM_PICKER_MARGIN_ROWS),
             onSelectOption: (index) => advance(question.options[index]?.label ?? null),
             onSubmitText: (value) => advance(value),
             onSkip: () => advance(null),
@@ -1709,6 +1856,125 @@ export async function runMakaPiTui(input) {
             showUserQuestion();
         }
     };
+    const closeFormOverlay = (retainDraft = true) => {
+        if (retainDraft &&
+            formOverlayComponent &&
+            formOverlaySessionId &&
+            formOverlayRequestId &&
+            formOverlaySchema) {
+            retainedFormDraft = {
+                sessionId: formOverlaySessionId,
+                requestId: formOverlayRequestId,
+                schema: formOverlaySchema,
+                drafts: formOverlayComponent.snapshotDrafts(),
+            };
+        }
+        formOverlay?.hide();
+        formOverlay = undefined;
+        formOverlayComponent = undefined;
+        formOverlayRequestId = undefined;
+        formOverlaySessionId = undefined;
+        formOverlaySchema = undefined;
+    };
+    const finishUserForm = (response) => {
+        if (formResponseInFlightRequestId)
+            return;
+        const respond = input.driver.respondToUserForm;
+        if (!respond) {
+            formOverlayComponent?.setSubmissionFailed();
+            reportError(new Error('User forms are unavailable on this driver.'));
+            return;
+        }
+        const responseSessionId = formOverlaySessionId ?? input.driver.getSessionId();
+        formResponseInFlightRequestId = response.requestId;
+        void respond
+            .call(input.driver, response)
+            .then(() => {
+            if (formResponseInFlightRequestId === response.requestId) {
+                formResponseInFlightRequestId = undefined;
+            }
+            if (input.driver.getSessionId() === responseSessionId &&
+                activeFormRequest(state)?.requestId === response.requestId) {
+                completePendingInteraction(state, response.requestId);
+            }
+            if (retainedFormDraft?.sessionId === responseSessionId &&
+                retainedFormDraft.requestId === response.requestId) {
+                retainedFormDraft = undefined;
+            }
+            if (formOverlaySessionId === responseSessionId &&
+                formOverlayRequestId === response.requestId) {
+                closeFormOverlay(false);
+            }
+            syncInteractionOverlays();
+            requestRender();
+        })
+            .catch((error) => {
+            if (formResponseInFlightRequestId === response.requestId) {
+                formResponseInFlightRequestId = undefined;
+            }
+            if (activeFormRequest(state)?.requestId === response.requestId &&
+                formOverlaySessionId === responseSessionId &&
+                formOverlayRequestId === response.requestId) {
+                formOverlayComponent?.setSubmissionFailed();
+            }
+            else {
+                closeFormOverlay();
+                syncInteractionOverlays();
+            }
+            reportError(error);
+            requestRender();
+        });
+    };
+    const syncFormOverlay = () => {
+        const request = activeFormRequest(state);
+        if (!request) {
+            closeFormOverlay();
+            return;
+        }
+        const sessionId = input.driver.getSessionId();
+        if (!sessionId) {
+            closeFormOverlay();
+            return;
+        }
+        if (retainedFormDraft?.sessionId === sessionId &&
+            retainedFormDraft.requestId !== request.requestId) {
+            retainedFormDraft = undefined;
+        }
+        if (formOverlaySessionId !== sessionId || formOverlayRequestId !== request.requestId)
+            closeFormOverlay();
+        if (formResponseInFlightRequestId || formOverlayComponent)
+            return;
+        const schema = JSON.stringify(request.fields);
+        const restoredDrafts = retainedFormDraft?.sessionId === sessionId &&
+            retainedFormDraft.requestId === request.requestId &&
+            retainedFormDraft.schema === schema
+            ? retainedFormDraft.drafts
+            : undefined;
+        if (retainedFormDraft?.sessionId === sessionId &&
+            retainedFormDraft.requestId === request.requestId &&
+            retainedFormDraft.schema !== schema) {
+            retainedFormDraft = undefined;
+        }
+        formOverlayComponent = new FormInteractionOverlay(tui, {
+            locale,
+            request,
+            initialDrafts: restoredDrafts,
+            onRespond: finishUserForm,
+        });
+        formOverlaySessionId = sessionId;
+        formOverlaySchema = schema;
+        formOverlayRequestId = request.requestId;
+        formOverlay = showBottomPicker(formOverlayComponent);
+    };
+    const syncInteractionOverlays = () => {
+        if (state.pendingInteraction) {
+            closeTodoOverlay();
+            transcriptOverlay?.hide();
+            transcriptOverlay = undefined;
+        }
+        syncUserQuestionOverlay();
+        syncFormOverlay();
+    };
     const showSelectPicker = (title, rightLabel, items, onSelect, options) => {
         const list = new SelectList(items, 10, selectListTheme(), {
             minPrimaryColumnWidth: options.minPrimaryColumnWidth,
@@ -1734,6 +2000,8 @@ export async function runMakaPiTui(input) {
         overlay = showBottomPicker(picker);
     };
     const closeWizard = () => {
+        wizardOAuthAbort?.abort();
+        wizardOAuthAbort = undefined;
         wizardAttempt += 1; // drop any in-flight verify/save before clearing the slots
         wizardOverlay?.hide();
         wizardOverlay = undefined;
@@ -1741,7 +2009,108 @@ export async function runMakaPiTui(input) {
         wizardApiKey = '';
         wizardBaseUrl = '';
         wizardTarget = undefined;
-        wizardModels = [];
+    };
+    const discoverWizardOAuthModels = (targetWizard, attempt, target) => {
+        if (!input.onboarding)
+            return;
+        void input.onboarding.verify({ target }).then((result) => {
+            if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
+                return;
+            if (result.kind !== 'ok') {
+                targetWizard.setOAuthModelError(onboardingFailureMessage(result, locale));
+                requestRender();
+                return;
+            }
+            targetWizard.setModels(result.models);
+            requestRender();
+        }, () => {
+            if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
+                return;
+            targetWizard.setOAuthModelError(onboardingFailureMessage({ kind: 'unavailable' }, locale));
+            requestRender();
+        });
+    };
+    const startWizardOAuth = () => {
+        const target = wizardTarget;
+        const targetWizard = wizard;
+        if (!target || !targetWizard)
+            return;
+        if (!input.onboarding?.loginOAuth) {
+            targetWizard.setOAuthError(pickerCopy.onboardingUnavailable);
+            requestRender();
+            return;
+        }
+        wizardOAuthAbort?.abort();
+        const abort = new AbortController();
+        wizardOAuthAbort = abort;
+        const attempt = ++wizardAttempt;
+        requestRender();
+        void input.onboarding
+            .loginOAuth({
+            target,
+            signal: abort.signal,
+            onPresentation: (presentation) => {
+                if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
+                    return;
+                targetWizard.setOAuthPresentation(presentation);
+                requestRender();
+            },
+        })
+            .then((result) => {
+            if (wizardOAuthAbort === abort)
+                wizardOAuthAbort = undefined;
+            if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
+                return;
+            if (result.kind === 'unconfirmed') {
+                targetWizard.setOAuthUnconfirmed();
+                requestRender();
+                return;
+            }
+            if (result.kind === 'cancelled') {
+                targetWizard.setOAuthCancelled();
+                wizardAttempt += 1;
+                requestRender();
+                return;
+            }
+            if (result.kind === 'failed') {
+                const message = onboardingOAuthFailureMessage(result.reason, locale);
+                if (result.reason === 'slug_taken' && target.kind === 'create') {
+                    targetWizard.setIdentityError(message);
+                }
+                else {
+                    targetWizard.setOAuthError(message);
+                }
+                requestRender();
+                return;
+            }
+            const existingTarget = {
+                kind: 'existing',
+                connectionId: result.connection.connectionId,
+            };
+            // Authentication is the durable create/reauthorize commit point. All
+            // later work addresses that exact Connection and never repeats OAuth.
+            wizardTarget = existingTarget;
+            targetWizard.setOAuthAuthenticated();
+            requestRender();
+            discoverWizardOAuthModels(targetWizard, attempt, existingTarget);
+        }, () => {
+            if (wizardOAuthAbort === abort)
+                wizardOAuthAbort = undefined;
+            if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
+                return;
+            targetWizard.setOAuthError(onboardingOAuthFailureMessage('unavailable', locale));
+            requestRender();
+        });
+    };
+    const continueWizardOAuth = () => {
+        const target = wizardTarget;
+        const targetWizard = wizard;
+        if (!targetWizard || target?.kind !== 'existing')
+            return;
+        const attempt = ++wizardAttempt;
+        targetWizard.setOAuthAuthenticated();
+        requestRender();
+        discoverWizardOAuthModels(targetWizard, attempt, target);
     };
     // Key submit from the wizard. Slash commands route as commands (so /exit
     // still escapes the wizard) instead of being stored as an API key; every
@@ -1769,11 +2138,16 @@ export async function runMakaPiTui(input) {
             if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
                 return;
             if (result.kind !== 'ok') {
-                wizard.setKeyError(onboardingFailureMessage(result, locale));
+                // A rejected slug is the identity step's to fix, not the key's.
+                if (result.kind === 'rejected' && result.reason === 'slug_taken') {
+                    wizard.setIdentityError(onboardingFailureMessage(result, locale));
+                }
+                else {
+                    wizard.setKeyError(onboardingFailureMessage(result, locale));
+                }
                 requestRender();
                 return;
             }
-            wizardModels = result.models;
             wizard.setModels(result.models); // advance to the models step
             requestRender();
         }, () => {
@@ -1806,13 +2180,17 @@ export async function runMakaPiTui(input) {
             apiKey: wizardApiKey,
             baseUrl: wizardBaseUrl,
             enabledModelIds,
-            models: wizardModels,
         })
             .then((result) => {
             if (result.kind !== 'ok') {
                 if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
                     return;
-                wizard.setModelError(onboardingFailureMessage(result, locale));
+                if (result.kind === 'rejected' && result.reason === 'slug_taken') {
+                    wizard.setIdentityError(onboardingFailureMessage(result, locale));
+                }
+                else {
+                    wizard.setModelError(onboardingFailureMessage(result, locale));
+                }
                 requestRender();
                 return;
             }
@@ -1832,6 +2210,7 @@ export async function runMakaPiTui(input) {
             // attempt must not overwrite choices refreshed by a newer save.
             if (result.refresh.kind === 'ok') {
                 modelChoices = result.refresh.modelChoices;
+                connectionIdentities = result.refresh.connectionIdentities;
             }
             if (input.firstRun) {
                 beginClose();
@@ -1869,6 +2248,7 @@ export async function runMakaPiTui(input) {
                 ...provider,
                 target: { kind: 'create', providerType: provider.providerType },
                 label: provider.label,
+                suggestedSlug: deriveConnectionSlug(provider.providerType),
                 enabledModelIds: [],
             }));
         }
@@ -1892,15 +2272,47 @@ export async function runMakaPiTui(input) {
                 wizardTarget = { ...provider.target };
                 wizardApiKey = '';
                 wizardBaseUrl = '';
-                wizardModels = [];
                 wizardAttempt += 1; // a new pick supersedes any in-flight attempt
                 requestRender();
             },
+            onSubmitIdentity: (identity) => {
+                if (wizardTarget?.kind === 'create') {
+                    wizardTarget = {
+                        kind: 'create',
+                        providerType: wizardTarget.providerType,
+                        ...(identity.slug === null ? {} : { slug: identity.slug }),
+                        ...(identity.name === null ? {} : { name: identity.name }),
+                    };
+                }
+                requestRender();
+            },
             onSubmitBaseUrl: (baseUrl) => {
                 wizardBaseUrl = baseUrl;
                 requestRender();
             },
             onSubmitKey: submitWizardKey,
+            onStartOAuth: startWizardOAuth,
+            onCancelOAuth: () => {
+                wizard?.setOAuthCancelling();
+                wizardOAuthAbort?.abort();
+                requestRender();
+            },
+            onContinueOAuth: continueWizardOAuth,
+            onReturnToProviders: () => {
+                const targetWizard = wizard;
+                const attempt = ++wizardAttempt;
+                requestRender();
+                if (!targetWizard || !input.onboarding)
+                    return;
+                void input.onboarding.listProviders().then((providers) => {
+                    if (closed || wizard !== targetWizard || attempt !== wizardAttempt)
+                        return;
+                    targetWizard.setProviders(providers);
+                    requestRender();
+                }, () => {
+                    // Keep the cached list usable if refreshing the saved account fails.
+                });
+            },
             onSubmitModels: submitWizardModels,
             onCancel: () => {
                 closeWizard();
@@ -2062,8 +2474,9 @@ export async function runMakaPiTui(input) {
         try {
             for await (const event of input.driver.resumeLatest()) {
                 applyMakaSessionEventToTranscript(state, event);
+                ctxRefresher?.observe(event);
                 shellRunElapsedTicker.sync();
-                syncUserQuestionOverlay();
+                syncInteractionOverlays();
                 requestRender();
             }
         }
@@ -2083,14 +2496,258 @@ export async function runMakaPiTui(input) {
             throw error;
         }
     };
+    const openImportedExternalSession = async (sessionId, failureText) => {
+        try {
+            await switchSession(sessionId);
+        }
+        catch {
+            state.entries.push({ kind: 'notice', level: 'error', text: failureText });
+            requestRender();
+            return;
+        }
+        try {
+            await discardCurrentSidePair();
+        }
+        catch (error) {
+            reportError(error);
+        }
+    };
+    const importExternalSession = async (adapterId, source) => {
+        if (!input.externalSessions)
+            return;
+        const copy = TUI_SESSION_ACTIONS_COPY[locale];
+        if (source.importState.isImporting) {
+            state.entries.push({
+                kind: 'notice',
+                level: 'error',
+                text: copy.externalUnavailable,
+            });
+            requestRender();
+            return;
+        }
+        let importedSessionId;
+        try {
+            const result = await input.externalSessions.importSession({
+                adapterId,
+                sourceSessionId: source.id,
+            });
+            if (result.kind === 'source_limit_exceeded') {
+                state.entries.push({
+                    kind: 'notice',
+                    level: 'error',
+                    text: formatUiMessage(copy.externalImportLimit, {
+                        kind: externalImportLimitLabel(copy, result.limit.kind),
+                        max: result.limit.max,
+                    }, locale),
+                });
+                return;
+            }
+            importedSessionId = result.session.id;
+        }
+        catch (error) {
+            const code = externalImportErrorCode(error);
+            if (code === 'model_unavailable') {
+                state.entries.push({
+                    kind: 'notice',
+                    level: 'error',
+                    text: copy.externalImportModelUnavailable,
+                });
+                return;
+            }
+            if (code === 'source_unreadable') {
+                state.entries.push({
+                    kind: 'notice',
+                    level: 'error',
+                    text: copy.externalImportSourceUnreadable,
+                });
+                return;
+            }
+            if (code !== 'commit_outcome_unknown') {
+                state.entries.push({ kind: 'notice', level: 'error', text: copy.externalImportFailed });
+                return;
+            }
+            state.entries.push({ kind: 'notice', level: 'error', text: copy.externalImportUncertain });
+            return;
+        }
+        await openImportedExternalSession(importedSessionId, formatUiMessage(copy.externalOpenFailed, { sessionId: importedSessionId }, locale));
+    };
+    const showExternalSessionPage = async (adapterId, initialScope) => {
+        if (!input.externalSessions || closed)
+            return;
+        const copy = TUI_SESSION_ACTIONS_COPY[locale];
+        let scope = initialScope;
+        let query = '';
+        let sessions = [];
+        let nextCursor = null;
+        let revision = 0;
+        let overlay;
+        let search;
+        let byValue = new Map();
+        const closeOverlay = () => overlay?.hide();
+        const toggleScope = () => {
+            const alternate = input.externalSessions
+                ?.listScopes()
+                .find((candidate) => candidate !== scope);
+            if (!alternate)
+                return;
+            scope = alternate;
+            void load(false);
+        };
+        const render = () => {
+            // SelectList has no disabled-row contract. A Host-owned in-flight import
+            // disables another import, but it does not disable opening an already
+            // published task.
+            const selectable = sessions.filter((session) => !session.importState.isImporting || session.importState.importedSessionIds.length > 0);
+            byValue = new Map(selectable.map((session) => [`external:${adapterId}:${session.id}`, session]));
+            const choices = selectable.map((session) => ({
+                item: {
+                    value: `external:${adapterId}:${session.id}`,
+                    label: session.name,
+                    description: [
+                        session.hostCwd,
+                        session.importState.importedCount > 0
+                            ? formatUiMessage(copy.externalImportedCount, { count: session.importState.importedCount }, locale)
+                            : undefined,
+                    ]
+                        .filter(Boolean)
+                        .join(' · '),
+                },
+                searchText: '',
+            }));
+            if (nextCursor) {
+                choices.push({
+                    item: { value: 'external:load-more', label: copy.externalLoadMore },
+                    searchText: '',
+                });
+            }
+            const alternateScope = input.externalSessions
+                ?.listScopes()
+                .find((candidate) => candidate !== scope);
+            if (alternateScope) {
+                choices.push({
+                    item: {
+                        value: 'external:toggle-workspace',
+                        label: alternateScope === 'all' ? copy.externalAllWorkspaces : copy.externalCurrentWorkspace,
+                    },
+                    searchText: '',
+                });
+            }
+            const scopeLabel = scope === 'all' ? copy.externalAllWorkspaces : copy.externalCurrentWorkspace;
+            const notice = sessions.length > 0 && selectable.length === 0 ? copy.externalUnavailable : undefined;
+            if (search) {
+                search.updateChoices(choices, scopeLabel, notice);
+                search.invalidate();
+                return;
+            }
+            search = new SessionSearchOverlay(tui, {
+                locale,
+                choices,
+                scopeLabel,
+                title: formatUiMessage(copy.externalSessionTitle, { source: externalSourceLabel(adapterId) }, locale),
+                emptyText: sessions.length === 0 ? copy.externalEmpty : copy.externalUnavailable,
+                notice,
+                onQuery: (text) => {
+                    query = text;
+                    void load(false);
+                },
+                onSelect: (item) => {
+                    if (item.value === 'external:load-more' && nextCursor) {
+                        void load(true, nextCursor);
+                        return;
+                    }
+                    if (item.value === 'external:toggle-workspace' && alternateScope) {
+                        toggleScope();
+                        return;
+                    }
+                    const source = byValue.get(item.value);
+                    if (!source)
+                        return;
+                    closeOverlay();
+                    if (busy || turnRunning) {
+                        state.entries.push({ kind: 'notice', level: 'error', text: copy.externalImportBusy });
+                        requestRender();
+                        return;
+                    }
+                    const latestImportedSessionId = source.importState.importedSessionIds[0];
+                    if (latestImportedSessionId === undefined) {
+                        void runControl(() => importExternalSession(adapterId, source));
+                        return;
+                    }
+                    const actionTitle = formatUiMessage(copy.externalImportedActionsTitle, { source: source.name }, locale);
+                    const actions = [
+                        { value: 'open-latest', label: copy.externalOpenLatestImported },
+                        ...(!source.importState.isImporting
+                            ? [{ value: 'import-again', label: copy.externalImportAgain }]
+                            : []),
+                    ];
+                    showSelectPicker(actionTitle, source.name, actions, (action) => {
+                        if (busy || turnRunning) {
+                            state.entries.push({
+                                kind: 'notice',
+                                level: 'error',
+                                text: copy.externalImportBusy,
+                            });
+                            requestRender();
+                            return;
+                        }
+                        if (action.value === 'import-again') {
+                            void runControl(() => importExternalSession(adapterId, source));
+                            return;
+                        }
+                        void runControl(() => openImportedExternalSession(latestImportedSessionId, formatUiMessage(copy.externalOpenLatestFailed, { sessionId: latestImportedSessionId }, locale)));
+                    }, { minPrimaryColumnWidth: 24, maxPrimaryColumnWidth: 48 });
+                },
+                onCancel: closeOverlay,
+                onToggleScope: toggleScope,
+            });
+            overlay = showBottomPicker(search);
+        };
+        const load = async (append, cursor) => {
+            const requestRevision = ++revision;
+            try {
+                const page = await input.externalSessions.listSessions({
+                    adapterId,
+                    scope,
+                    ...(cursor ? { cursor } : {}),
+                    ...(query ? { text: query } : {}),
+                });
+                if (requestRevision !== revision || closed || turnRunning)
+                    return;
+                sessions = append ? [...sessions, ...page.sessions] : page.sessions;
+                nextCursor = page.nextCursor;
+                render();
+            }
+            catch {
+                if (requestRevision !== revision)
+                    return;
+                state.entries.push({ kind: 'notice', level: 'error', text: copy.externalCatalogFailed });
+                requestRender();
+            }
+        };
+        await load(false);
+    };
+    const showExternalSourcePicker = (adapterIds) => {
+        if (!input.externalSessions)
+            return;
+        const initialScope = input.externalSessions.listScopes()[0];
+        if (adapterIds.length === 1) {
+            void showExternalSessionPage(adapterIds[0], initialScope);
+            return;
+        }
+        const copy = TUI_SESSION_ACTIONS_COPY[locale];
+        showSelectPicker(copy.externalSourceTitle, copy.externalSourceTitle, adapterIds.map((adapterId) => ({
+            value: adapterId,
+            label: externalSourceLabel(adapterId),
+        })), (item) => void showExternalSessionPage(item.value, initialScope), { minPrimaryColumnWidth: 20, maxPrimaryColumnWidth: 40 });
+    };
     const showSessionList = async () => {
         const sessions = await input.driver.listSessions();
         const sessionTree = projectRevisionLinkedSessionTree(sessions, input.driver.getSessionId() ?? undefined);
         const projectedSessions = flattenLinkedSessionTree(sessionTree.roots, sessionTree.childrenByParentId);
-        // Maka-session availability and the foreign scan are independent I/O; run
+        // Maka-session availability and Host source discovery are independent I/O; run
         // them concurrently so the picker's open latency is the slower of the two,
         // not their sum.
-        const [availabilityEntries, foreignScan] = await Promise.all([
+        const [availabilityEntries, externalSourceQuery] = await Promise.all([
             Promise.all(sessions.map(async (session) => {
                 return [
                     session.id,
@@ -2098,76 +2755,71 @@ export async function runMakaPiTui(input) {
                         (await inspectSessionResumeAvailability(session)),
                 ];
             })),
-            // Foreign (Claude Code / Codex) rows are an import flow: it starts a NEW
-            // Session and hands off a turn, which cannot detach from the running
-            // one (#3380). Skip the scan mid-turn instead of offering rows whose
-            // selection would silently no-op on importForeignSession's busy guard.
-            input.foreignSessions && !turnRunning
-                ? input.foreignSessions.listSessions({ cwd }).then((summaries) => ({ summaries }), (error) => ({ error }))
-                : Promise.resolve({ summaries: [] }),
+            input.externalSessions && !turnRunning
+                ? input.externalSessions.listSources().then((adapterIds) => ({ adapterIds }), () => ({ error: true }))
+                : Promise.resolve({ adapterIds: [] }),
         ]);
         const availability = new Map(availabilityEntries);
-        // Foreign (Claude Code / Codex) sessions for the current cwd, keyed by a
-        // prefixed select value so they never collide with Maka session ids. A scan
-        // error is surfaced (not silently swallowed): degrade to no rows but tell
-        // the user why, so a real store bug isn't mistaken for "no sessions".
-        const foreignByValue = new Map();
-        if ('error' in foreignScan) {
-            const detail = foreignScan.error instanceof Error ? foreignScan.error.message : String(foreignScan.error);
+        if ('error' in externalSourceQuery) {
             state.entries.push({
                 kind: 'notice',
                 level: 'error',
-                text: `读取外部对话失败：${detail}`,
+                text: TUI_SESSION_ACTIONS_COPY[locale].externalCatalogFailed,
             });
         }
-        else {
-            for (const summary of foreignScan.summaries) {
-                foreignByValue.set(`foreign:${summary.source}:${summary.id}`, summary);
-            }
-        }
+        let overlay;
+        let sessionSearch;
         const renderScope = () => {
             const visibleSessions = sessionListScope === 'current'
                 ? projectedSessions.filter(({ session }) => session.cwd === cwd)
                 : projectedSessions;
-            const items = visibleSessions.map(({ session, depth }) => {
+            const choices = visibleSessions.map(({ session, depth }) => {
                 const state = availability.get(session.id);
                 const statusBadge = sessionStatusBadge(session, locale);
                 const statusDetail = statusBadge ? ` · ${statusBadge}` : '';
-                const location = sessionListScope === 'all' && session.cwd ? ` ${basename(session.cwd)}` : '';
+                const location = sessionListScope === 'all' && session.cwd ? ` ${session.cwd}` : '';
                 const childDetail = session.subagentRuntime
                     ? ` subagent:${session.subagentRuntime.profile}`
                     : '';
-                return {
+                const item = {
                     value: session.id,
                     label: `${depth > 0 ? `${'  '.repeat(depth - 1)}↳ ` : ''}${session.name || session.id}`,
                     description: state?.available === false
                         ? `${shortSessionId(session.id)}${statusDetail} ${state.reason}`
                         : `${shortSessionId(session.id)}${statusDetail}${location}${childDetail} ${session.llmConnectionSlug} ${session.model}`,
                 };
+                return {
+                    item,
+                    searchText: [
+                        session.name,
+                        session.id,
+                        session.cwd,
+                        session.model,
+                        session.llmConnectionSlug,
+                    ]
+                        .filter(Boolean)
+                        .join(' ')
+                        .toLocaleLowerCase(),
+                };
             });
-            // Foreign sessions are cwd-scoped; show them in both scope views (they
-            // belong to this project) so a Tab toggle never makes them vanish.
-            for (const [value, summary] of foreignByValue) {
-                items.push({
-                    value,
-                    label: summary.title,
-                    description: `↩ resume from ${foreignSourceLabel(summary.source)}`,
+            if ('adapterIds' in externalSourceQuery && externalSourceQuery.adapterIds.length > 0) {
+                choices.push({
+                    item: {
+                        value: 'external:import',
+                        label: TUI_SESSION_ACTIONS_COPY[locale].externalImport,
+                        description: TUI_SESSION_ACTIONS_COPY[locale].externalImportDescription,
+                    },
+                    searchText: TUI_SESSION_ACTIONS_COPY[locale].externalImport.toLocaleLowerCase(),
                 });
             }
-            const list = new SelectList(items, 10, selectListTheme(), {
-                minPrimaryColumnWidth: 20,
-                maxPrimaryColumnWidth: Math.max(20, terminal.columns - 30),
-            });
-            let overlay;
             const closeOverlay = () => {
                 sessionPickerOverlayOpen = false;
                 overlay?.hide();
             };
-            list.onSelect = (item) => {
-                const foreign = foreignByValue.get(item.value);
-                if (foreign) {
+            const onSelect = (item) => {
+                if (item.value === 'external:import' && 'adapterIds' in externalSourceQuery) {
                     closeOverlay();
-                    void importForeignSession(foreign);
+                    showExternalSourcePicker(externalSourceQuery.adapterIds);
                     return;
                 }
                 if (availability.get(item.value)?.available === false)
@@ -2175,21 +2827,27 @@ export async function runMakaPiTui(input) {
                 closeOverlay();
                 void goToSession(item.value);
             };
-            list.onCancel = () => closeOverlay();
-            sessionPickerOverlayOpen = true;
-            overlay = showBottomPicker(new PickerOverlay(list, {
-                title: 'Resume Session',
-                rightLabel: sessionListScope === 'current' ? 'Current' : 'All',
-                hint: 'Tab scope · ↑↓ move · Enter select · Esc close',
-                onInput: (data) => {
-                    if (!matchesKey(data, Key.tab) || isKeyRelease(data) || isKeyRepeat(data))
-                        return false;
+            const scopeLabel = sessionListScope === 'current'
+                ? pickerCopy.sessionScopeCurrent
+                : pickerCopy.sessionScopeAll;
+            if (sessionSearch) {
+                sessionSearch.updateChoices(choices, scopeLabel);
+                sessionSearch.invalidate();
+                return;
+            }
+            sessionSearch = new SessionSearchOverlay(tui, {
+                locale,
+                choices,
+                scopeLabel,
+                onSelect,
+                onCancel: closeOverlay,
+                onToggleScope: () => {
                     sessionListScope = sessionListScope === 'current' ? 'all' : 'current';
-                    overlay?.hide();
                     renderScope();
-                    return true;
                 },
-            }));
+            });
+            sessionPickerOverlayOpen = true;
+            overlay = showBottomPicker(sessionSearch);
         };
         renderScope();
     };
@@ -2199,7 +2857,7 @@ export async function runMakaPiTui(input) {
             state.entries.push({
                 kind: 'notice',
                 level: 'info',
-                text: '没有可回退的轮次。',
+                text: TUI_REWIND_COPY[locale].noTargets,
             });
             requestRender();
             return;
@@ -2208,7 +2866,8 @@ export async function runMakaPiTui(input) {
             value: target.turnId,
             label: target.label,
         }));
-        showSelectPicker('Rewind', 'Rewind', items, (item) => {
+        const rewindCopy = TUI_REWIND_COPY[locale];
+        showSelectPicker(rewindCopy.pickerTitle, rewindCopy.pickerTitle, items, (item) => {
             // runControl drops the action silently when busy is already held (e.g.
             // a Goal auto-continuation started while the picker was open). The
             // overlay is already closed at this point, so say so instead of
@@ -2217,7 +2876,7 @@ export async function runMakaPiTui(input) {
                 state.entries.push({
                     kind: 'notice',
                     level: 'error',
-                    text: '无法回退：当前有正在进行的操作 — 请等待其完成，或中断（Esc）后重试。',
+                    text: rewindCopy.busy,
                 });
                 requestRender();
                 return;
@@ -2226,27 +2885,29 @@ export async function runMakaPiTui(input) {
         }, {
             minPrimaryColumnWidth: 24,
             maxPrimaryColumnWidth: 48,
-            hint: '回到选定轮次之前（丢弃该轮及之后，prompt 回填输入框） · enter 选择 / esc 取消',
+            hint: rewindCopy.pickerHint,
         });
     };
     const newSession = async () => {
         try {
             await input.driver.startNewSession();
         }
-        catch (error) {
+        catch {
             // The identity swap was aborted driver-side: the previous Session, its
             // transcript, and every user-command card stay exactly as they were.
-            // Surface why instead of silently stranding the running commands.
+            // Surface the failure instead of silently stranding the running
+            // commands; the driver's raw error text is not product copy (#2672).
             state.entries.push({
                 kind: 'notice',
                 level: 'error',
-                text: error instanceof Error && error.message.length > 0
-                    ? error.message
-                    : '无法开始新会话：停止本地命令失败，请稍后重试。',
+                text: TUI_SESSION_ACTIONS_COPY[locale].newSessionFailed,
             });
             requestRender();
             return false;
         }
+        resetTranscriptViewer();
+        closeTodoOverlay();
+        syncTodoSession();
         // A fresh session is not bound by the previous one's boundary. Falling back
         // to the *current* label would keep the previous Session's mode, including
         // Auto while a changed Host default creates with full access; the launch
@@ -2261,51 +2922,12 @@ export async function runMakaPiTui(input) {
         // session, send a prompt to begin" cue. A notice here would make entries
         // non-empty and suppress it.
         replaceTranscript([]);
+        syncInteractionOverlays();
         shellRunElapsedTicker.sync();
         await discardCurrentSidePair();
         requestRender();
         return true;
     };
-    // Import a foreign (Claude Code / Codex) session: read its digest, open a
-    // fresh Maka session, and seed the first turn with an untrusted handoff
-    // envelope. Mirrors submitPreparedUserPrompt: claim `busy` + an activity lease
-    // SYNCHRONOUSLY before the async read so no other turn (a Goal auto-
-    // continuation, or a user Enter) can start during it and make the import a
-    // silent no-op. runAgentTurn re-asserts busy for the turn; on any failure the
-    // finally releases the lease. The handoff is the model-facing `sendText`; a
-    // short line shows in the transcript.
-    const importForeignSession = async (summary) => {
-        if (busy || input.foreignSessions === undefined)
-            return;
-        busy = true;
-        const activity = beginActivity();
-        editor.disableSubmit = true;
-        let handedOff = false;
-        try {
-            const digest = await input.foreignSessions.readDigest(summary);
-            if (closed)
-                return;
-            if (!(await newSession()))
-                return;
-            submitMessage(foreignSessionHandoffDisplayText(digest), 'current_turn', {
-                modelText: buildForeignSessionHandoffMessage(digest),
-            });
-            handedOff = true;
-        }
-        catch (error) {
-            if (closed)
-                return;
-            reportError(error);
-        }
-        finally {
-            if (!handedOff) {
-                busy = false;
-                editor.disableSubmit = false;
-                requestRender();
-            }
-            activity.finish();
-        }
-    };
     const showHelp = () => {
         // Derive the command list from the registry so /help never drifts from the
         // real commands. Keybindings are not commands, so they are listed by hand.
@@ -2327,20 +2949,42 @@ export async function runMakaPiTui(input) {
         requestRender();
     };
     const showTranscriptViewer = () => {
-        let overlay;
-        const renderTranscript = transcript.createDocumentRenderer();
-        const viewer = new TranscriptViewerOverlay({
-            renderTranscript,
-            viewportRows: () => terminal.rows,
-            onClose: () => overlay?.hide(),
-            onChange: () => tui.requestRender(),
-        });
-        overlay = tui.showOverlay(viewer, {
+        if (state.pendingInteraction)
+            return;
+        const sessionId = input.driver.getSessionId() ?? undefined;
+        if (!transcriptViewer || transcriptViewerSessionId !== sessionId) {
+            transcriptViewerSessionId = sessionId;
+            transcriptViewer = new TranscriptViewerOverlay({
+                renderTranscript: transcript.createDocumentRenderer(),
+                locale,
+                viewportRows: () => terminal.rows,
+                onClose: () => {
+                    transcriptOverlay?.hide();
+                    transcriptOverlay = undefined;
+                },
+                onChange: () => tui.requestRender(),
+            });
+        }
+        transcriptOverlay = tui.showOverlay(transcriptViewer, {
             anchor: 'top-left',
             width: '100%',
             maxHeight: '100%',
         });
     };
+    const showTodo = () => {
+        if (state.pendingInteraction)
+            return;
+        syncTodoSession();
+        void currentTodo.refresh();
+        closeTodoOverlay();
+        todoOverlay = tui.showOverlay(new TodoOverlay({
+            locale,
+            getState: () => input.driver.queryTodo ? currentTodo.getState() : { status: 'error', items: [] },
+            viewportRows: () => terminal.rows,
+            onClose: closeTodoOverlay,
+            onChange: () => tui.requestRender(),
+        }), { anchor: 'top-left', width: '100%', maxHeight: '100%' });
+    };
     const showMcpStatus = () => {
         let overlay;
         const viewer = new McpManagementOverlay({
@@ -2398,18 +3042,18 @@ export async function runMakaPiTui(input) {
             state.entries.push({
                 kind: 'notice',
                 level: 'info',
-                text: '当前没有可调用的技能。',
+                text: skillsCopy.noneAvailable,
             });
             requestRender();
             return;
         }
-        showSelectPicker('Invoke Skill', String(entries.length), skillPickerItems(entries), (item) => {
+        showSelectPicker(skillsCopy.pickerTitle, String(entries.length), skillPickerItems(entries), (item) => {
             editor.insertTextAtCursor(`/skill:${item.value} `);
             requestRender();
         }, { minPrimaryColumnWidth: 16, maxPrimaryColumnWidth: 40 });
     };
     const showThinkingLevelList = () => {
-        const items = thinkingLevelPickerItems(thinkingLevels, thinkingLevel, locale);
+        const items = thinkingLevelPickerItems(currentThinkingLevels(), thinkingLevel, locale);
         showSelectPicker(pickerCopy.thinkingPickerTitle, thinkingLevel ?? 'default', items, (item) => {
             const level = item.value === 'default' ? undefined : item.value;
             if (level !== undefined && !isThinkingLevel(level))
@@ -2761,7 +3405,78 @@ export async function runMakaPiTui(input) {
             notice('Goal cleared.');
         }
     };
+    const runHostCommand = async (parts) => {
+        const copy = getTuiHostOwnerCopy(locale);
+        if (!input.hostControl)
+            throw new Error(copy.unavailable);
+        const action = parts[1] ?? 'status';
+        if (action === 'status' && parts.length <= 2) {
+            const text = await input.hostControl.status();
+            if (!closed) {
+                state.entries.push({ kind: 'notice', level: 'info', text });
+                requestRender();
+            }
+            return;
+        }
+        if (action !== 'stop' && action !== 'restart' && action !== 'update') {
+            throw new Error(copy.usage);
+        }
+        const targets = parts.slice(2);
+        if (targets.length > (action === 'update' ? 1 : 0)) {
+            throw new Error(copy.usage);
+        }
+        const accepted = await input.hostControl.prepare({
+            action,
+            ...(targets[0] ? { target: targets[0] } : {}),
+        }, (detail) => new Promise((resolve) => {
+            if (closed)
+                return resolve('cancel');
+            showSelectPicker(copy.pickerTitle, 'cancel', [
+                {
+                    value: 'cancel',
+                    label: copy.cancel,
+                    description: copy.cancelDescription,
+                },
+                {
+                    value: 'safe',
+                    label: copy.safe,
+                    description: copy.safeDescription,
+                },
+                ...(action === 'update'
+                    ? []
+                    : [
+                        {
+                            value: 'interrupt',
+                            label: copy.interrupt,
+                            description: copy.interruptDescription,
+                        },
+                    ]),
+            ], (item) => resolve(item.value), {
+                minPrimaryColumnWidth: 16,
+                maxPrimaryColumnWidth: 26,
+                selectedIndex: 0,
+                notice: detail,
+                onCancel: () => resolve('cancel'),
+            });
+        }));
+        if (accepted)
+            beginGracefulClose();
+    };
     const slashCommandHandlers = {
+        host: {
+            description: primaryGuidance.commands.host,
+            midTurn: 'local',
+            run: (parts) => {
+                void runHostCommand(parts).catch(reportError);
+            },
+        },
+        update: {
+            description: primaryGuidance.commands.update,
+            midTurn: 'local',
+            run: (parts) => {
+                void runHostCommand(['/host', 'update', ...parts.slice(1)]).catch(reportError);
+            },
+        },
         context: {
             description: primaryGuidance.commands.context,
             // Read-only diagnostics, but runControl-gated: mid-turn it would
@@ -2806,6 +3521,59 @@ export async function runMakaPiTui(input) {
                 void runControl(compactSession);
             },
         },
+        copy: {
+            description: primaryGuidance.commands.copy,
+            // Refused mid-turn: copy grabs the finished reply, and while a turn streams
+            // the last assistant entry is the half-written one — copying that would
+            // silently hand back a partial message. Wait for the turn (or Esc) first.
+            midTurn: 'refuse',
+            run: (parts) => {
+                const scope = parts.length >= 2 ? parts[1] : undefined;
+                if (parts.length > 2 || (scope !== undefined && scope !== 'all')) {
+                    state.entries.push({
+                        kind: 'notice',
+                        level: 'error',
+                        text: copyCopy.usage,
+                    });
+                    requestRender();
+                    return;
+                }
+                const copyAll = scope === 'all';
+                const text = copyAll
+                    ? serializeTranscriptText(state, {
+                        user: copyCopy.roleUser,
+                        assistant: copyCopy.roleAssistant,
+                        goalContinuation: copyCopy.roleGoalContinuation,
+                        legacyAutomation: copyCopy.roleLegacyAutomation,
+                    })
+                    : lastAssistantText(state);
+                if (!text) {
+                    state.entries.push({
+                        kind: 'notice',
+                        level: 'info',
+                        text: copyCopy.nothingToCopy,
+                    });
+                    requestRender();
+                    return;
+                }
+                const result = copyToClipboard(terminal, text);
+                if (!result.ok) {
+                    state.entries.push({
+                        kind: 'notice',
+                        level: 'error',
+                        text: formatUiMessage(copyCopy.tooLarge, { bytes: result.bytes, limit: result.limit }, locale),
+                    });
+                    requestRender();
+                    return;
+                }
+                state.entries.push({
+                    kind: 'notice',
+                    level: 'info',
+                    text: formatUiMessage(copyAll ? copyCopy.copiedAll : copyCopy.copiedLast, { count: text.length }, locale),
+                });
+                requestRender();
+            },
+        },
         exit: {
             description: primaryGuidance.commands.exit,
             // isExitPrompt (which also matches bare "quit"/"exit" without a slash)
@@ -2894,7 +3662,7 @@ export async function runMakaPiTui(input) {
                     state.entries.push({
                         kind: 'notice',
                         level: 'error',
-                        text: 'Usage: /skill，或直接在消息中输入 /skill:<name>',
+                        text: skillsCopy.usage,
                     });
                     requestRender();
                     return;
@@ -2955,6 +3723,7 @@ export async function runMakaPiTui(input) {
             description: primaryGuidance.commands.thinking,
             midTurn: 'refuse',
             run: (parts) => {
+                const thinkingLevels = currentThinkingLevels();
                 if (parts.length === 1) {
                     if (thinkingLevels.length === 0) {
                         state.entries.push({
@@ -3005,6 +3774,22 @@ export async function runMakaPiTui(input) {
                 showTranscriptViewer();
             },
         },
+        todo: {
+            description: primaryGuidance.commands.todo,
+            midTurn: 'local',
+            run: (parts) => {
+                if (parts.length !== 1) {
+                    state.entries.push({
+                        kind: 'notice',
+                        level: 'error',
+                        text: TUI_COPY_RESOURCES.todo[locale].usage,
+                    });
+                    requestRender();
+                    return;
+                }
+                showTodo();
+            },
+        },
         permissions: {
             description: primaryGuidance.commands.permissions,
             midTurn: 'refuse',
@@ -3244,7 +4029,7 @@ export async function runMakaPiTui(input) {
                 void runControl(closeSideConversation);
             return { consume: true };
         }
-        if (activeUserQuestionRequest(state) &&
+        if ((activeUserQuestionRequest(state) || activeFormRequest(state)) &&
             turnRunning &&
             matchesKey(data, Key.ctrl('c')) &&
             !isKeyRepeat(data)) {
@@ -3299,9 +4084,8 @@ export async function runMakaPiTui(input) {
         if (!matchesKey(data, Key.escape))
             lastIdleEscapeAt = 0;
         if (matchesKey(data, Key.ctrl('o')) && !isKeyRepeat(data)) {
-            if (handleExpansionToggleKey('tool')) {
-                return { consume: true };
-            }
+            showTranscriptViewer();
+            return { consume: true };
         }
         if (matchesKey(data, Key.ctrl('t')) && !isKeyRepeat(data)) {
             if (handleExpansionToggleKey('thinking')) {
@@ -3412,11 +4196,11 @@ export async function runMakaPiTui(input) {
     // re-wrapping) a full clear would wipe the scrollback the user scrolls through.
     // Differential rendering clears the vacated rows without the wipe.
     //
-    // The Ctrl+O / Ctrl+T toggles are viewport-anchored for the same reason: an
+    // The live Ctrl+T thinking toggle is viewport-anchored for the same reason: an
     // entry above the live viewport lives in terminal scrollback, which cannot
     // be rewritten, so resizing it would push pi-tui's differential renderer
     // into a scrollback-clearing full redraw (its `firstChanged < viewportTop`
-    // path). The toggles therefore retarget only entries inside the viewport;
+    // path). It therefore retargets only entries inside the viewport;
     // see entryInLiveViewport in pi-transcript.ts (#1097). A block whose own
     // expansion pushed its head above the viewport can consequently not be
     // collapsed by the next press (#1134): the toggle still flips the default
@@ -3425,6 +4209,7 @@ export async function runMakaPiTui(input) {
     // again within EXPANSION_COLLAPSE_CONFIRM_WINDOW_MS applies the collapsed
     // default to those blocks too and pays one scrollback-clearing full redraw
     // (requestRender(true)), re-anchoring the viewport at the tail.
+    // Ctrl+O instead opens a detached reader whose details never resize live rows.
     tui.setClearOnShrink(false);
     tui.addChild(layout);
     tui.setFocus(editorSurface);
@@ -3466,6 +4251,7 @@ export async function runMakaPiTui(input) {
             }
         });
     }
+    syncTodoSession();
     return closedPromise;
 }
 const BOTTOM_PICKER_MARGIN_ROWS = 4;