elanous 0.2.36 → 0.2.38

package/src/dashboard/index.ts

@@ -255,6 +255,62 @@ import {
   getDashboardContextMenuRegistry,
 } from './context-menu/registry.js';
 import { createTransientOverlayHost } from '../display/transient-overlay-host.js';
+import { beginSynchronizedFrameOutput } from './synchronized-frame-output.js';
+import type { SynchronizedFrameOutputDeps } from './synchronized-frame-output.js';
+export {
+  beginSynchronizedFrameOutput,
+  SYNCHRONIZED_OUTPUT_BEGIN,
+  SYNCHRONIZED_OUTPUT_END,
+} from './synchronized-frame-output.js';
+export type {
+  SynchronizedFrameOutput,
+  SynchronizedFrameOutputDeps,
+} from './synchronized-frame-output.js';
+
+/**
+ * TUI-FLICKER-DRAW-INTEGRATION — the single synchronized-output owner that every
+ * dashboard draw entry goes through: BSU → draw body (frame + coordinator modal
+ * overlay + prompt repaint) → ESU. The finally keeps the region closed when the
+ * body throws, so a failed compose cannot leave a dangling BSU that swallows the
+ * next frame.
+ */
+export function runSynchronizedFrameDraw<T>(
+  drawBody: () => T,
+  deps: SynchronizedFrameOutputDeps,
+): T {
+  const frame = beginSynchronizedFrameOutput(deps);
+  try {
+    return drawBody();
+  } finally {
+    frame.close();
+  }
+}
+
+export interface SynchronizedFrameDrawSink {
+  write: (chunk: string) => void;
+  /** Production passes `process.stdout.isTTY`: only a tty receives DEC 2026. */
+  isTTY?: boolean;
+  /** Environment for the `ELANOUS_SYNC_OUTPUT` escape hatch. Defaults to `process.env`. */
+  env?: Record<string, string | undefined>;
+}
+
+/**
+ * TUI-FLICKER-DRAW-INTEGRATION — production entry for a synchronized dashboard
+ * frame. `drawNow` (the single draw function both the force path and the queued
+ * microtask path call) hands its compose body to this function, so the tty gate
+ * and the BSU/ESU ownership live in exactly one place.
+ */
+export function drawDashboardFrameSynchronized<T>(
+  drawBody: () => T,
+  sink: SynchronizedFrameDrawSink = process.stdout,
+): T {
+  return runSynchronizedFrameDraw(drawBody, {
+    write: (chunk) => { sink.write(chunk); },
+    supported: sink.isTTY === true,
+    env: sink.env,
+  });
+}
+
 import { configureThemeIconsGetter } from '../theme/icons.js';
 import { configureModalAdapterTheme } from '../ui/modal-adapter.js';
 import {
@@ -947,7 +1003,7 @@ import { runPtySnapshot, type PtyTakeoverCommandDeps } from '../cli/pty-takeover
 import { requestRemotePtyControl } from '../pty-shell/pty-control-ipc.js';
 import { getHarnessRunId } from '../harness/harness-space.js';
 import { formatPtyCallLine, formatPtyResultLine } from '../pty-activity-log.js';
-import { getSessionMetrics } from '../status/metrics.js';
+import { getSessionMetrics, noteRestoredContext } from '../status/metrics.js';
 import {
   createContextRegistry, tokenizeInput, pruneUnreferenced,
   addAttachmentEx as ctxAddEx,
@@ -1024,7 +1080,7 @@ import {
   deriveDaemonHttpBase,
   fetchDaemonSessionHistory,
 } from './acp-boot.js';
-import { renderReplayPreviewLines } from './replay-preview.js';
+import { renderRestoredTranscriptLines } from './replay-preview.js';
 import {
   buildDashboardTurnPreamble,
 } from './turn-preamble.js';
@@ -1062,6 +1118,7 @@ import { spawnCodingAgent, CodingAgentBinaryMissing } from '../terminal/coding-a
 import type { TerminalSession } from '../terminal/session-registry.js';
 import { createSessionPickerModal } from '../session/picker-modal.js';
 import { listSessions as listChatSessionsForResume, adoptSession as adoptChatSession, setActiveSessionId as markActiveChatSession } from '../session/index.js';
+import { idPrefixCell, sessionIdPrefixes, sessionListTime } from '../session/id-prefix.js';
 // TUI 부활 S-b — 타임트래블 포크 엔진 (codex ForkSnapshot 동형 · 2026-07-09
 // 이식 후 호출처 0 이던 방치 자산 회수). 순수 히스토리 절단 로직만 소비;
 // 영속은 세션 스토어(forkSessionFromHistory)가 담당한다.
@@ -1213,7 +1270,7 @@ import { type ExecutionSurfaceHandle } from '../display/index.js';
 import { AgentSurfaceStore, renderAgentDetail, renderAgentRoster, type AgentSurfaceState } from '../display/agent-surface.js';
 import { globalAgentFlash } from '../display/agent-flash.js';
 import { globalTaskNotificationQueue, type TaskNotificationQueue, type PendingTaskNotification } from '../agent/task-notification.js';
-import { createDashboardAgentWakeNotify, installAgentWake, wrapAgentWakePort } from './input/agent-wake.js';
+import { createDashboardAgentWakeNotify, installSeatedAgentWake, wrapAgentWakePort } from './input/agent-wake.js';
 import { renderDebugEventDetail, renderDebugEventRows, renderDebugStack, renderPromptInjectionDebug } from '../display/debug-surface.js';
 import { buildDebugCallStack } from '../debug/call-stack.js';
 import { buildAstGrepHostTool } from '../skills/tools/ast-grep.js';
@@ -2752,16 +2809,18 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
     // Pickers share the composer bottom slot.
     const placement = resolveDecisionPickerPlacement({ height: 16 });
     const modalWidth = placement.width;
+    // Unique prefixes, not a fixed 8 — two sessions sharing 8 characters used to look identical (TUI-RESUME-PICKER).
+    const idPrefixes = sessionIdPrefixes(rows.map((m) => m.id));
     const fmtRow = (m: (typeof rows)[number]): string => {
       const marker = m.id === attachedSessionId ? '▸ ' : '  ';
-      const ts = m.updatedAt.slice(5, 16).replace('T', ' ');
+      const ts = sessionListTime(m.updatedAt);
       const binds: string[] = [];
       if (m.bindings?.cli) binds.push('cli');
       if (m.bindings?.telegram) binds.push('tg');
       if (m.bindings?.discord) binds.push('dc');
       const bindStr = binds.length > 0 ? `[${binds.join(',')}]` : '';
       const title = (m.title || '(no title)').slice(0, 42);
-      return `${marker}${m.id.slice(0, 8)}  ${ts}  ${String(m.messageCount).padStart(3)}t ${bindStr.padEnd(9)} ${title}`;
+      return `${marker}${idPrefixCell(idPrefixes, m.id)}  ${ts}  ${String(m.messageCount).padStart(3)}t ${bindStr.padEnd(9)} ${title}`;
     };
     const handle = createSearchModal({
       id: `session-resume:${Date.now().toString(36)}`,
@@ -2788,7 +2847,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
           promptCtl.submit(`/session load ${id}`);
         } else {
           // 입력 루프 비활성 등으로 합성 submit 불가 — 수동 안내 폴백.
-          chatLines.push(C.muted(`  /session load ${id.slice(0, 8)} 를 입력해 재개하세요`));
+          chatLines.push(C.muted(`  /session load ${idPrefixes.get(id) ?? id} 를 입력해 재개하세요`));
           chatScrollOffset = -1;
           draw();
         }
@@ -5019,8 +5078,8 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
   };
 
   // P5 — register the mode-enter actions + default chord bindings so
-  // `Ctrl+B s` from input focus enters sync, `Ctrl+B c` enters
-  // control, `Ctrl+B g` returns to general. The `allowOverwrite`
+  // `Ctrl+X s` from input focus enters sync, `Ctrl+X c` enters
+  // control, `Ctrl+X g` returns to general. The `allowOverwrite`
   // flag is critical because this closure may re-run on hot-reload
   // scenarios (tests, plugin reinit) — the registry should be idempotent.
   // A2 — forward-declared toast hook. mouseWiring is initialized
@@ -5041,7 +5100,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
     handler: () => {
       enterSessionControlMode(chatModeState);
       void inputCoreSetMode(resolveSessionInputModeFromChatMode({ chatModeState }));
-      chatLines.push(C.error('-- CONTROL MODE —') + C.text(' (via ^B c chord)'));
+      chatLines.push(C.error('-- CONTROL MODE —') + C.text(' (via ^X c chord)'));
       chatScrollOffset = -1;
       draw();
       pushModeToast('→ control mode', 'success');
@@ -7422,7 +7481,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
   // Scratch visibility (Phase S5). When closed, the workingDir
   // layouts drop the scratch cell so the remaining panes expand
   // to fill the reclaimed columns — useful on narrow terminals.
-  // Reopen via the ^B ^S chord.
+  // Reopen via the ^X ^S chord.
   let scratchClosed = false;
   const dashboardViewRegistryOptions = () => ({
     extraPanes: pluginHost.activeDashboardPanes().map(p => p.paneId),
@@ -7617,10 +7676,9 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
     );
   };
 
-  // Prefix chord (Phase O6). tmux-style Ctrl+B arms the chord; the
-  // next key within the timeout window triggers a bound action
-  // (Ctrl+W / Ctrl+O for browser focus). HUD segment `chord` shows
-  // `[^B]` while armed so the user knows the terminal is waiting.
+  // Prefix chord (Phase O6). Ctrl+X arms the chord; the next key
+  // within the timeout window triggers a bound action. HUD segment
+  // `chord` shows `[^X]` while armed.
   const chord: ChordState = createChord();
   const disarmChordHud = (): void => {
     disarmChord(chord);
@@ -7693,7 +7751,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
   let previewTerminalDims: { cols: number; rows: number } | null = null;
   // Phase T7 — when true, the preview widget swells to the full
   // top-row width, hiding browser / scratch / obsidian / skill
-  // siblings. Toggled by `^B e` / `^B ㄷ` (global chord) and by `e`
+  // siblings. Toggled by `^X e` / `^X ㄷ` (pane chord) and by `e`
   // on the focused preview pane (muscle memory). Auto-clears when
   // the terminal session exits.
   let terminalExpanded = false;
@@ -7850,7 +7908,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
   };
 
   /** Shared helper for both the pane-level `t` key AND the global
-   *  `Ctrl+B t` chord. Idempotent — calling while a session is
+   *  `Ctrl+X t` chord. Idempotent — calling while a session is
    *  already alive just re-focuses the preview pane. Handles:
    *    - view 4 (chat-only) → bounce to view 1 so wd-preview is visible
    *    - wiring onUpdate / onExit callbacks with cleanup
@@ -8613,7 +8671,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
     widgetHost.register(planBoardWidget, 'builtin', 'src/widgets/plan-board.ts');
   }
   // NT4 — notification bell modal widget. Registered + spawned here
-  // so Ctrl+B b (NT5) can toggle without spawn latency. The bellOpen
+  // so Ctrl+X b (NT5) can toggle without spawn latency. The bellOpen
   // flag + helpers live further down (after notificationStore is
   // created) because refreshBellInto reads from the store.
   widgetHost.register(bellModalWidget, 'builtin', 'src/notification-bell-modal.ts');
@@ -11337,7 +11395,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
     try { mouseWiring.toasts().push({ text, kind, ttlMs: 1200 }); } catch { /* ignore */ }
   };
 
-  drawNow = ({ force: forceFromCoordinator = false } = {}) => {
+  const drawFrameNow = ({ force: forceFromCoordinator = false } = {}) => {
     const { rows: termRows, cols } = termSize();
     const totalW = cols - 1;
 
@@ -11781,6 +11839,15 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
       if (overlay.length > 0) process.stdout.write(overlay);
     } catch { /* overlay must not crash main draw */ }
   };
+  // TUI-FLICKER-DRAW-INTEGRATION — one synchronized-output owner for the whole
+  // frame compose: BSU → frame (+ coordinator modal overlay) → prompt repaint →
+  // ESU. Both draw entry paths (force and queued microtask) call this same
+  // seam, and the finally keeps the region closed when a compose throws so the
+  // next frame is not swallowed by a dangling BSU. `supported` is the tty gate:
+  // piped/captured output keeps the bytes it had before this seam existed.
+  drawNow = (opts = {}) => {
+    drawDashboardFrameSynchronized(() => { drawFrameNow(opts); }, process.stdout);
+  };
   draw = (opts = {}) => {
     if (debug.enabled) {
       const now = Date.now();
@@ -12424,8 +12491,8 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
   }
 
   /** N2 — open the shell-runner rollup popup centered on the viewport.
-   *  Shared entry point for `/shell rollup` slash + `^B S` chord so
-   *  keyboard users can access the same UI mouse users get by clicking
+   *  Entry point for `/shell rollup` so keyboard users can access the
+   *  same UI mouse users get by clicking
    *  the 🐚 status-bar pill. Anchored-to-pill placement stays in
    *  dashboard-mouse-wiring; this path is explicitly center-placed so
    *  it works with status row unknown. */
@@ -12645,7 +12712,8 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
   const disposeResizeListener = installResizeListener({
     draw: (opts) => draw(opts),
     promptCtl,
-    requestOverlayFrame: () => display.requestRender({ force: true }),
+    requestOverlayFrame: () => display.requestRenderNow({ force: true }),
+    withSynchronizedOutput: (paint) => display.withSynchronizedOutput(paint),
   });
   process.on('exit', disposeResizeListener);
   // 외부 주입(`pty text`)을 사용자 타이핑과 섞지 않고 별도 대기열로 — 결함 #6(10-14).
@@ -13267,14 +13335,16 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
     // ⭐ TUI-AGENT-IDLE-WAKE — 배경 자식(⊕ RunShell bg) 완료 큐의 «유일한» 구독(onEnqueue 구독 0 → 1).
     //   채팅 한 줄 «✓ 위임 끝: <이름> — 다음 턴에 결과» · 결과는 다음 턴 preamble 이 싣는다.
     //   ⛔ 입력칸·injectKey·pty 주입 0(대표 비침투). dedupe·수명은 모듈, 여기선 배선만.
-    const agentWake = installAgentWake({
+    const agentWake = installSeatedAgentWake({
       subscribe: (listener) => subscribeDashboardAgentResults(
         globalTaskNotificationQueue, listener, (line) => { pushChatLine(C.muted(line)); draw(); },
       ),
       // 그리기 실패는 삼키지 않는다 — 모듈이 잡아 notified{shown:false} 로 남긴다.
       notify: createDashboardAgentWakeNotify((line) => { chatLines.push(C.muted(line)); }, () => draw()),
       // 조각 2 — 자리 TUI ∧ 유휴면 H2 문으로 다음 턴(origin child-complete) · 판정은 모듈.
-      openTurn: { startTurnIfIdle: (text, opts) => internalTurnGate.startTurnIfIdle(text, opts), getCwd: () => workingDir.cwd, isPending: (taskId) => globalTaskNotificationQueue.has(taskId) },
+      startTurnIfIdle: (text, opts) => internalTurnGate.startTurnIfIdle(text, opts),
+      getCwd: () => workingDir.cwd,
+      isPending: (taskId) => globalTaskNotificationQueue.has(taskId),
     });
     disposeDashboardAgentWake = () => agentWake.dispose();
 
@@ -13399,8 +13469,10 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
       try {
         if (req.kind === 'shell') {
           const shellSeat = resolveTuiShellSeat(req.cwd, process.env.COORD_ID);
+          const terminalSessionId = crypto.randomUUID();
           session = sessionRegistry.spawn(
             {
+              id: terminalSessionId,
               title: 'terminal',
               cwd: req.cwd,
               command: req.command,
@@ -13410,7 +13482,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
               registryKind: 'shell',
               registryNickname: `tui-shell:${req.cwd}`,
               registryOrigin: { originRoot: 'elanous-internal', controller: 'tui-shell' },
-              registryPurpose: `tui-shell:${shellSeat}`,
+              registryPurpose: `tui-shell:${shellSeat}:session:${currentChatPersonaSessionId()}:terminal:${terminalSessionId}`,
               registrySeat: shellSeat,
               onExit: handleExit,
               onTitleAction: handleTitleAction,
@@ -14867,7 +14939,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
           chatScrollOffset = -1;
           break;
         // Phase T: spawn an embedded terminal in this pane. Same
-        // code path as the `Ctrl+B t` global chord.
+        // code path as the `Ctrl+X t` pane chord.
         case 't': case 'ㅅ':
           openPreviewTerminal();
           break;
@@ -14883,7 +14955,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
       }
 
       // Ctrl+W (no chord armed — chord would have consumed the
-      // key earlier) closes the scratch pane. Reopen via the ^B ^S chord.
+      // key earlier) closes the scratch pane. Reopen via the ^X ^S chord.
       if (key.ctrl && (key.name === 'w' || key.name === 'ㅈ')) {
         scratchClosed = true;
         userClosedPanes.add('scratch');
@@ -15236,14 +15308,15 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
               chat.history.push(m as ChatMessage);
             }
             const turns = past.length;
-            chatLines.push(C.muted(`    ${turns} turn${turns === 1 ? '' : 's'} restored. Preview of last 5:`));
+            chatLines.push(C.muted(`    ${turns} turn${turns === 1 ? '' : 's'} restored:`));
+            noteRestoredContext(chat.history);
             // BACKLOG #1 — markdown-aware preview rendering. Replaces
             // the previous one-line `slice(0, 100)` snippet so tables
             // / bold / lists in replayed turns look the same as when
             // they were originally streamed (`formatResponse` path).
             const previewWidth = Math.max(40, termSize().cols - 8);
             const previewWrap = getUserConfig().chat.rendering.wrap;
-            const previewLines = renderReplayPreviewLines(past, {
+            const previewLines = renderRestoredTranscriptLines(past, {
               maxWidth: previewWidth,
               wrapOpts: previewWrap,
             });
@@ -15285,7 +15358,16 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
         if (resume.repaired) {
           chatLines.push(C.muted(`    깨진 도구 호출·결과 짝을 잘라 이어받았다(호출 ${resume.repaired.removedCalls} · 결과 ${resume.repaired.removedResults})`));
         }
-        chatLines.push(C.muted(`    ${resume.turns} turns restored. Next turn continues this conversation.`));
+        // TUI-RESUME-PICKER ②③④ — `--resume` used to leave the chat log blank and ctx at 0, so the user could
+        // not see that 379 messages had come back. Show the restored conversation and its size now.
+        chatLines.push(C.muted(`    ${resume.turns} turns restored:`));
+        for (const line of renderRestoredTranscriptLines(chat.history, {
+          maxWidth: Math.max(40, termSize().cols - 8),
+          wrapOpts: getUserConfig().chat.rendering.wrap,
+        })) chatLines.push(line);
+        const restoredTokens = noteRestoredContext(chat.history);
+        debug.log('chat.session.resume', 'restored', { sessionId: resume.sessionId, turns: resume.turns, estimatedContextTokens: restoredTokens });
+        chatLines.push(C.muted('    Next turn continues this conversation.'));
       }
     }
     observeSessionStart({
@@ -16152,7 +16234,7 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
                 terminalExpanded = !terminalExpanded;
                 previewTerminalDims = null;
                 chatLines.push(C.muted(terminalExpanded
-                  ? 'Terminal expanded. Ctrl+Shift+E or ^B e to restore.'
+                  ? 'Terminal expanded. Ctrl+Shift+E to restore.'
                   : 'Terminal collapsed to preview slot.'));
                 chatScrollOffset = -1;
               },
@@ -17866,6 +17948,9 @@ Mode- and sync-specific instructions are injected per-turn when relevant — do
               },
             };
             const slashOutcome = await dashboardSlashRegistry.dispatch(cmdLower, args, slashCtx);
+            if (cmdLower === 'mission') {
+              debug.log('tui.legacy-slash-use', 'mission', { surface: 'classic', tuiSession: null });
+            }
             if (debug.enabled) {
               debug.log('dashboard.slash.dispatch', cmdLower, {
                 argsCount: args.length,

package/src/dashboard/input/agent-wake.ts

@@ -13,6 +13,8 @@
 //   턴 중(NotIdle)·입력 중(HumanTyping)에 온 완료는 «대기»: 입력칸이 다시 뜰 때(`wrapAgentWakePort`) 그 결과가
 //   아직 큐에 남아 있으면(=어느 턴도 안 실었으면) 한 번만 다시 청한다. 이미 실렸으면(drain) 아무것도 안 한다.
 // ⛔ 같은 알림(taskId)은 한 번만 — 큐 `seen` 이 `clear()` 로 비워져도, 대시보드가 재진입해도 막는다.
+// ⭐ 생산 조립은 `installSeatedAgentWake` «하나» — `src/dashboard/index.ts` 의 `showDashboard` 가 그 함수만
+//   부르고, 이 파일의 무대 시험이 «같은 함수»를 지난다(문자열 배선 확인이 아니라 생산 호출 경로 증거).
 //
 // 세 얼굴:
 //   관측 = debug.log('tui.agent-wake', 'notified' | 'opened' | 'rejected' | 'deferred', { taskId, agent, state, seat, shown, reason })
@@ -240,6 +242,47 @@ export function installAgentWake(deps: Omit<AgentWakeDeps, 'handled'>): AgentWak
   return own;
 }
 
+/** 대시보드가 넘기는 «생산 포트» — showDashboard 가 실제로 채우는 모양 그대로. */
+export interface DashboardAgentWakePorts {
+  /** 큐 구독 — `subscribeDashboardAgentResults(globalTaskNotificationQueue, …)` 가 여기로 들어온다. */
+  subscribe: AgentWakeDeps['subscribe'];
+  /** 채팅 한 줄 — `createDashboardAgentWakeNotify(pushLine, draw)`. */
+  notify: AgentWakeDeps['notify'];
+  /** H2 문 — `internalTurnGate.startTurnIfIdle`. 자리 TUI ∧ 유휴일 때만 실제로 열린다. */
+  startTurnIfIdle: AgentWakeOpenTurnDeps['startTurnIfIdle'];
+  /** 지금 화면의 cwd(자리 판정 입력) — `() => workingDir.cwd`. */
+  getCwd: () => string;
+  /** 그 완료가 아직 어느 턴에도 안 실렸나 — `globalTaskNotificationQueue.has`. «대기» 재시도의 근거. */
+  isPending: (taskId: string) => boolean;
+  /** 시험·주입 자리(생산은 안 넘긴다 — 기본 `homedir()`·`detectSeatTui`·`setTimeout 0`). */
+  home?: string;
+  detectSeat?: AgentWakeOpenTurnDeps['detectSeat'];
+  defer?: AgentWakeOpenTurnDeps['defer'];
+  log?: AgentWakeDeps['log'];
+}
+
+/**
+ * 대시보드 생산 조립 — `showDashboard` 는 이 함수 «하나»만 부른다.
+ * 알림(조각 1)과 «자리 TUI ∧ 유휴 → H2 한 턴(origin child-complete)»(조각 2)을 같은 큐 구독에서 낸다.
+ * 중복 거부(같은 taskId 한 번)·DEFERRABLE 대기→입력칸 재시도·수명은 `createAgentWake` 몫이다.
+ */
+export function installSeatedAgentWake(ports: DashboardAgentWakePorts): AgentWakeController {
+  const openTurn: AgentWakeOpenTurnDeps = {
+    startTurnIfIdle: ports.startTurnIfIdle,
+    getCwd: ports.getCwd,
+    isPending: ports.isPending,
+    ...(ports.home !== undefined ? { home: ports.home } : {}),
+    ...(ports.detectSeat !== undefined ? { detectSeat: ports.detectSeat } : {}),
+    ...(ports.defer !== undefined ? { defer: ports.defer } : {}),
+  };
+  return installAgentWake({
+    subscribe: ports.subscribe,
+    notify: ports.notify,
+    openTurn,
+    ...(ports.log !== undefined ? { log: ports.log } : {}),
+  });
+}
+
 /** 시험 격리용 — 설치·공유 dedupe 를 비운다. */
 export function resetAgentWakeForTest(): void {
   installed?.dispose();

package/src/dashboard/input/chat-main-acp-dispatch.ts

@@ -1,6 +1,7 @@
 import type { NormalizedAttachment } from '../../acp/content-blocks.js';
 import { debug } from '../../debug/log.js';
 import type { ControlSignalBus } from '../../input/control-signal.js';
+import { classifyInterimReply, formatInterimFoldLine } from '../../tui/chat/goal-interim.js';
 import {
   createTurnOutputBundle,
   runTurnOutputBundleSettle,
@@ -76,6 +77,8 @@ export function dispatchDashboardChatMainAcpSend(
   let firstChunk = true;
   let assistantTextActive = false;
   let assistantBodyStart = -1;
+  let assistantBodyEnd = -1;
+  const interimBodyRanges: Array<{ start: number; end: number }> = [];
   let assistantBodyText = '';
   let assistantRunUsesPrefix = false;
 
@@ -91,6 +94,7 @@ export function dispatchDashboardChatMainAcpSend(
         if (firstChunk) firstChunk = false;
         assistantBodyText = '';
         assistantBodyStart = -1;
+        assistantBodyEnd = -1;
         assistantTextActive = true;
       }
       assistantBodyText += delta;
@@ -110,7 +114,7 @@ export function dispatchDashboardChatMainAcpSend(
       deps.autoTtsHooks?.pushChunk(delta);
       const rendered = deps.formatAssistantLines(assistantBodyText);
       if (assistantBodyStart < 0) assistantBodyStart = deps.chatLines.length;
-      deps.chatLines.length = assistantBodyStart;
+      deps.chatLines.splice(assistantBodyStart, Math.max(0, assistantBodyEnd - assistantBodyStart));
       rendered.forEach((line, index) => {
         if (index === 0 && assistantRunUsesPrefix) {
           deps.chatLines.push(`${deps.formatAssistantPrefix(display)} ${line}`);
@@ -118,8 +122,24 @@ export function dispatchDashboardChatMainAcpSend(
           deps.chatLines.push(`  ${line}`);
         }
       });
+      assistantBodyEnd = assistantBodyStart + rendered.length;
+      if (interimBodyRanges.at(-1)?.start === assistantBodyStart) interimBodyRanges[interimBodyRanges.length - 1]!.end = assistantBodyEnd;
+      else interimBodyRanges.push({ start: assistantBodyStart, end: assistantBodyEnd });
       deps.setChatScrollToTail();
     },
+    foldGoalInterim: (text) => {
+      const verdict = classifyInterimReply(text.split('\n'));
+      if (verdict.interim && interimBodyRanges.length > 0) {
+        const first = interimBodyRanges[0]!.start;
+        for (const { start, end } of [...interimBodyRanges].reverse()) deps.chatLines.splice(start, end - start);
+        deps.chatLines.splice(first, 0, `  ${formatInterimFoldLine(verdict.summary)}`);
+        deps.setChatScrollToTail();
+      }
+      interimBodyRanges.length = 0;
+      assistantTextActive = false;
+      assistantBodyStart = -1;
+      assistantBodyEnd = -1;
+    },
     pushToolCall: (tool) => {
       deps.chatLines.push(deps.formatToolLine(tool));
       deps.setChatScrollToTail();

package/src/dashboard/input/terminal-modal-router.ts

@@ -1,159 +1,8 @@
-// Dashboard key routing for interactive terminal modals.
-//
-// Holds singleton state for "which interactive terminal modal is
-// currently foregrounded" + the key-intercept policy:
-//
-//   • while a modal is present, ESC / Ctrl-G dispose it
-//   • all other keys forward to modal.surface.onKey(ev) so the PTY
-//     receives them without the chat readKey loop trying to
-//     interpret them
-//
-// Kept as a standalone module so the policy is unit-testable
-// without standing up the full dashboard. dashboard.ts imports and
-// wires it into the top of its stdin handler in a follow-up commit.
-//
-// P10 will extend this with Ctrl-B prefix handling (d=detach,
-// s=switch, etc.) once a session registry exists to act on.
-
-import type { InteractiveTerminalModalHandle } from '../../interactive-terminal-modal.js';
-import type { KeyEvent } from '../../display/types.js';
-import { debug } from '../../debug/log.js';
-
-export type KeyRouteResult = 'consumed' | 'passthrough' | 'closed';
-
-export interface TerminalModalRouter {
-  current(): InteractiveTerminalModalHandle | null;
-  /** Install a modal handle. Optional closePolicy controls what
-   *  ESC/Ctrl-G does: 'kill' disposes the modal + PTY (default);
-   *  'detach' calls handle.dispose({keepPreview:true}) so the PTY
-   *  survives for re-attach (session registry flow). An explicit
-   *  onClose hook wins over closePolicy — that's how dashboard
-   *  wires sessionRegistry.detach(session.id) on Esc. */
-  set(
-    handle: InteractiveTerminalModalHandle | null,
-    opts?: { closePolicy?: 'kill' | 'detach'; onClose?: () => void },
-  ): void;
-  close(): void;
-  handleKey(ev: KeyEvent): KeyRouteResult;
-}
-
-// `exit` typed cleanly + Enter closes the popup. claude / codex don't
-// recognize plain `exit` (their command is /exit or /quit), so a user
-// typing `exit\n` would otherwise be stuck — the popup stays open
-// because the child never exits, and the typed text just becomes chat
-// input. elanous intercepts the exact sequence at the router so:
-//   • plain shell: same end result (we close before shell evaluates)
-//   • claude / codex: popup closes as the user expected
-// Sequence is reset on any non-letter key (other than backspace, which
-// rewinds), Ctrl/Alt modifiers, or any character outside `e/x/i/t` —
-// so genuine words containing "exit" (e.g. typing "exit this loop"
-// into a claude prompt without Enter) DON'T trigger the close. The
-// trigger is specifically `e`, `x`, `i`, `t`, Enter with nothing else.
-const EXIT_CHARS = ['e', 'x', 'i', 't'] as const;
-
-export function createTerminalModalRouter(): TerminalModalRouter {
-  let handle: InteractiveTerminalModalHandle | null = null;
-  let closePolicy: 'kill' | 'detach' = 'kill';
-  let onClose: (() => void) | null = null;
-  let exitProgress = 0; // how many of EXIT_CHARS have been typed in order
-
-  const close = (): void => {
-    if (!handle) return;
-    const h = handle;
-    const cb = onClose;
-    if (debug.enabled) debug.log('window.terminalModalRouter.close', h.id, { id: h.id, closePolicy, hasOnClose: !!cb });
-    handle = null;
-    onClose = null;
-    exitProgress = 0;
-    try {
-      if (cb) cb();
-      else if (closePolicy === 'detach') h.dispose({ keepPreview: true });
-      else h.dispose();
-    } catch { /* already disposed */ }
-    closePolicy = 'kill';
-  };
-
-  return {
-    current: () => handle,
-    set: (h, opts) => {
-      if (handle && h && handle.id !== h.id) close();
-      handle = h;
-      closePolicy = opts?.closePolicy ?? 'kill';
-      onClose = opts?.onClose ?? null;
-      exitProgress = 0;
-      if (debug.enabled) {
-        debug.log('window.terminalModalRouter.set', h?.id ?? '(null)', {
-          id: h?.id ?? null,
-          closePolicy,
-          hasOnClose: !!onClose,
-        });
-      }
-    },
-    close,
-    handleKey: (ev) => {
-      if (!handle) return 'passthrough';
-      const name = (ev.name ?? '').toLowerCase();
-      // ESC must NOT close the modal — claude / codex inside the popup
-      // use ESC to cancel an in-progress chat / tool turn. Closing the
-      // wrapper window on ESC made the only-way-to-cancel kill the
-      // whole popup. iTerm / ghostty don't close their own windows on
-      // ESC either; the wrapper should match. Modal close is reserved
-      // for: Ctrl+G (close + focus log), Ctrl+Shift+T (toggle off),
-      // typed `exit\n`, and the child's own `exit`. ESC just forwards.
-      if (ev.ctrl && (name === 'g' || name === 'ㅎ')) {
-        if (debug.enabled) debug.log('window.terminalModalRouter.handleKey.close', 'ctrl-g', { id: handle.id });
-        close();
-        return 'closed';
-      }
-
-      // Track typed `exit` followed by Enter so the user's natural
-      // mental model ("type exit to quit") works inside agent popups
-      // (claude / codex) where the child app doesn't recognize a bare
-      // `exit` command. See EXIT_CHARS comment above for false-positive
-      // avoidance.
-      const noMods = !ev.ctrl && !ev.alt;
-      if (noMods && name === 'enter' && exitProgress === EXIT_CHARS.length) {
-        if (debug.enabled) {
-          debug.log('window.terminalModalRouter.handleKey.close', 'typed-exit', {
-            id: handle.id,
-          });
-        }
-        close();
-        return 'closed';
-      }
-      if (noMods && name === 'backspace') {
-        if (exitProgress > 0) exitProgress--;
-      } else if (noMods && name.length === 1 && exitProgress < EXIT_CHARS.length && name === EXIT_CHARS[exitProgress]) {
-        exitProgress++;
-      } else if (noMods && name === 'enter') {
-        // Enter without a complete `exit` prefix — reset and forward.
-        exitProgress = 0;
-      } else if (name.length === 1 || name === 'space' || ev.ctrl || ev.alt) {
-        // Any other printable key OR a modifier keystroke breaks the
-        // streak. Multi-char named keys (arrow / fn / etc.) leave the
-        // streak alone — the child may consume them without affecting
-        // the user's typed prompt buffer.
-        exitProgress = 0;
-      }
-
-      if (debug.enabled) {
-        debug.log('window.terminalModalRouter.handleKey.forward', name || '(empty)', {
-          id: handle.id,
-          name,
-          ctrl: ev.ctrl ?? false,
-          shift: ev.shift ?? false,
-          alt: ev.alt ?? false,
-          exitProgress,
-        });
-      }
-      try {
-        handle.surface.onKey?.(ev);
-      } catch { /* surface disposed mid-event; treat as no-op */ }
-      return 'consumed';
-    },
-  };
-}
-
-/** Singleton instance used by dashboard.ts. Exported as a separate
- *  factory + singleton so tests can inject a fresh router per case. */
-export const terminalModalRouter = createTerminalModalRouter();
+// Compatibility entry for dashboard-owned consumers. The routing policy is
+// shared with the standalone Next TUI from src/terminal.
+export {
+  createTerminalModalRouter,
+  terminalModalRouter,
+  type KeyRouteResult,
+  type TerminalModalRouter,
+} from '../../terminal/terminal-modal-router.js';

package/src/dashboard/replay-preview.ts

@@ -105,3 +105,28 @@ export function renderReplayPreviewLines(
   }
   return lines;
 }
+
+/** Restored transcripts longer than this show their tail plus one «earlier N messages» line. */
+export const RESTORED_TRANSCRIPT_MAX_MESSAGES = 200;
+
+/**
+ * The restored conversation in full (TUI-RESUME-PICKER ③): every user/assistant message, every line —
+ * not the 5-message, 2-line preview. Resuming used to leave the chat log blank but for that preview,
+ * so the user could not see what they were continuing. Very long sessions keep the last
+ * `maxMessages` and say how many were left out.
+ */
+export function renderRestoredTranscriptLines(
+  messages: readonly ReplayPreviewMessage[],
+  opts: Omit<ReplayPreviewOpts, 'tail' | 'perMessageLines'> & { maxMessages?: number },
+): string[] {
+  const visible = messages.filter((m) => m.role !== 'system' && extractReplayText(m.content).length > 0);
+  const max = opts.maxMessages ?? RESTORED_TRANSCRIPT_MAX_MESSAGES;
+  const hidden = Math.max(0, visible.length - max);
+  const lines = hidden > 0 ? [C.muted(`        … 앞 ${hidden}개 메시지 생략 (최근 ${max}개 표시)`)] : [];
+  return lines.concat(renderReplayPreviewLines(visible.slice(-max), {
+    maxWidth: opts.maxWidth,
+    ...(opts.wrapOpts ? { wrapOpts: opts.wrapOpts } : {}),
+    tail: max,
+    perMessageLines: Number.MAX_SAFE_INTEGER,
+  }));
+}