elanous 0.2.28 → 0.2.31

package/src/capture/tui-self-report.ts

@@ -42,7 +42,9 @@ import {
   upsertPtyManifest, updatePtyManifestFrame, touchLivePtyManifest, markPtyManifestClosed, removePtyManifest,
 } from '../pty-shell/pty-manifest.js';
 import { writeHarnessScreen } from '../harness/harness-screen.js';
+import { startTuiRunStateRecorder } from '../pty-shell/tui-run-state.js';
 import { debug } from '../debug/log.js';
+import { routeExternalInput, type ExternalInputRoute } from '../input/external-input-queue.js';
 
 export interface TuiFrameObserverCfg {
   surfaceId: string;
@@ -99,6 +101,8 @@ export interface TuiControlTargetDeps {
   splitKeys?: (input: string) => Key[];
   /** The foreground terminal's real size; `undefined` when it cannot be known (stdout is not a TTY). */
   dims?: () => { readonly cols: number; readonly rows: number } | undefined;
+  /** 외부 주입 라우터 — 글 한 줄을 사용자 버퍼에 섞지 않고 별도 대기열로 돌린다(`input/external-input-queue`). */
+  routeExternal?: (chars: string) => ExternalInputRoute;
 }
 
 function stdoutDims(): { cols: number; rows: number } | undefined {
@@ -116,6 +120,7 @@ export function createTuiControlTarget(surfaceId: string, deps: TuiControlTarget
   const inject = deps.injectKey ?? injectKey;
   const parse = deps.splitKeys ?? splitKeys;
   const dims = deps.dims ?? stdoutDims;
+  const routeExternal = deps.routeExternal ?? routeExternalInput;
   let alive = true;
   let accessMode: PtyAccessMode = 'write';
   let transitionPolicy: PtyTransitionPolicy = 'open';
@@ -135,6 +140,8 @@ export function createTuiControlTarget(surfaceId: string, deps: TuiControlTarget
     isAlive: () => alive,
     canWrite: (actor: PtyWriteActor = 'human') => resolveWriteDecision(accessMode, actor).allow,
     write(chars: string): void {
+      // ⭐ 이 write 는 «바깥»(제어 IPC)에서만 온다 — 키보드와 섞이기 전에 라우터가 먼저 가른다.
+      if (routeExternal(chars) !== 'passthrough') return;
       const keys = parse(chars);
       if (!keys.length || !keys.every(inject)) throw new Error('tui-input-undelivered');
     },
@@ -145,11 +152,13 @@ export function createTuiControlTarget(surfaceId: string, deps: TuiControlTarget
 
 export interface TuiSelfReportDeps {
   surfaceId?: string;
+  /** `elanous --name <name>` — 자기 manifest 행 별명. `pty list`·`pty snapshot <name>` 이 이것으로 부른다. */
+  nickname?: string;
   throttleMs?: number;
   now?: () => number;
   register?: (fn: ((lines: readonly string[], dims: { rows: number; cols: number }) => void) | null) => void;
   publishFrame?: (frame: SelfReportFrame) => void;
-  registerRow?: (surfaceId: string, now: number) => void;
+  registerRow?: (surfaceId: string, now: number, nickname?: string) => void;
   writeFrame?: (surfaceId: string, text: string, now: number) => void;
   /** B(harness-screens 파일) sink — `elanous self screen` 이 읽는 substrate.
    *  자식 harness 발행과 대칭(tmux 없이 L2 대시보드 자기 화면 관측). */
@@ -174,6 +183,10 @@ export interface TuiSelfReportDeps {
   startControlPoller?: () => (() => void);
   reportControlInitFailure?: (stage: TuiControlInitStage, error: unknown) => void;
   reportControlCleanupFailure?: (stage: TuiControlCleanupStage, error: unknown) => void;
+  /** 행 등록 직후 실행 판 ⊕ 턴(idle) 기록을 연다 — `elanous pty state` 가 읽는다. 반환 = 정리. */
+  startRunState?: (surfaceId: string) => (() => void);
+  /** 미룬 우편 깨움 폴러(TUI-H4)를 연다 — 반환 = 정리. 기본은 실 행 등록과 짝일 때만 늦게 불러온 `startPendingWakePoller`. */
+  startWakePoller?: (surfaceId: string) => (() => void);
 }
 
 export type TuiControlInitStage = 'create-target' | 'register-target' | 'start-poller' | 'publish-manifest';
@@ -235,7 +248,9 @@ export function startTuiSelfReport(deps: TuiSelfReportDeps = {}): () => void {
     initDisposers.push({ stage: 'stop-poller', dispose: stopControlPoller });
     controlInitStage = 'publish-manifest';
     initDisposers.push({ stage: 'rollback-manifest', dispose: () => rollbackRow(surfaceId) });
-    registerRow(surfaceId, now());
+    const nickname = deps.nickname?.trim() || undefined;
+    registerRow(surfaceId, now(), nickname);
+    if (nickname) debug.log('pty.rename', 'tui-launch-name', { ptyId: surfaceId, nickname });
   } catch (error) {
     for (let disposer = initDisposers.pop(); disposer; disposer = initDisposers.pop()) {
       try { disposer.dispose(); } catch (cleanupError) {
@@ -246,6 +261,21 @@ export function startTuiSelfReport(deps: TuiSelfReportDeps = {}): () => void {
     return () => {};
   }
   const activeControlTarget = controlTarget;
+  let stopRunState: () => void = () => {};
+  // 행 등록을 갈아 끼운 호출자(시험)는 실 manifest 를 안 건드린다 — 기본 녹음기는 기본 행 등록과 짝일 때만.
+  const startRunState = deps.startRunState ?? (deps.registerRow ? () => () => {} : startTuiRunStateRecorder);
+  try { stopRunState = startRunState(surfaceId); } catch { /* fail-soft — recorder logs its own write failures */ }
+  // 미룬 우편 깨움(TUI-H4) — 이 TUI 가 턴 중·5분 창이라 못 받은 깨움을 idle 로 «기록»된 뒤 한 번 다시 두드린다.
+  // 실 행 등록과 짝일 때만(시험이 행 등록을 갈아 끼우면 0) · 무거운 모듈은 늦게 불러온다.
+  let stopWakePoller: () => void = () => {};
+  let wakePollerStopped = false;
+  if (deps.startWakePoller) {
+    try { stopWakePoller = deps.startWakePoller(surfaceId); } catch { /* fail-soft */ }
+  } else if (!deps.registerRow) {
+    void import('../loops/msg-wake.js').then(mod => {
+      if (!wakePollerStopped) stopWakePoller = mod.startPendingWakePoller(surfaceId);
+    }).catch(() => { /* fail-soft — the post-time wake still runs */ });
+  }
   const driveTicks = deps.driveTicks ?? ((tick, ms) => {
     const t = setInterval(tick, ms);
     (t as { unref?: () => void }).unref?.();
@@ -320,6 +350,9 @@ export function startTuiSelfReport(deps: TuiSelfReportDeps = {}): () => void {
     try { stopSource(); } catch { /* fail-soft — unregisters observer / clears tick timer */ }
     try { mirror?.stop(); } catch { /* fail-soft — restores stdout.write */ }
     clearInterval(hb);
+    try { stopRunState(); } catch { /* fail-soft */ }
+    wakePollerStopped = true;
+    try { stopWakePoller(); } catch { /* fail-soft */ }
     try { markClosed(surfaceId, now()); } catch { /* fail-soft */ }
     try { activeControlTarget?.deactivate(); } catch { /* fail-soft */ }
     try { stopControlPoller(); } catch { /* fail-soft */ }
@@ -357,8 +390,8 @@ function defaultPublishFrame(frame: SelfReportFrame): void {
   publishSelfReportFrame(getChannelBus(), frame);
 }
 
-function defaultRegisterRow(surfaceId: string, now: number): void {
-  upsertPtyManifest({ id: surfaceId, kind: 'tui', cmd: 'elanous', startedAt: now, now });
+function defaultRegisterRow(surfaceId: string, now: number, nickname?: string): void {
+  upsertPtyManifest({ id: surfaceId, kind: 'tui', ...(nickname ? { nickname } : {}), cmd: 'elanous', startedAt: now, now });
 }
 
 function defaultWriteFrame(surfaceId: string, text: string, now: number): void {

package/src/chat/chat-cli.ts

@@ -17,6 +17,10 @@ import type { DevChatOpts } from '../self-dev/dev-pipeline.js';
 export interface ChatCliOpts {
   session?: string;
   new?: boolean;
+  /** `--continue` — 활성 세션 이어하기(명시). 대표 #73: 기본은 새 세션. */
+  continue?: boolean;
+  /** `--resume [id]` — id 면 그 세션, 값 없이(true) 면 활성 세션. */
+  resume?: string | boolean;
   json?: boolean;
   tools?: boolean;
   goalLoop?: boolean;
@@ -29,13 +33,17 @@ export interface ChatCliDeps {
   runDevPipeline?: typeof runDevPipeline;
 }
 
-/** CLI 옵션 → DevChatOpts(--new→forceNew·나머지 boolean 정규화). reuseActive 는 dispatch 클로저에서 !forceNew 파생.
+/** CLI 옵션 → DevChatOpts(--new→forceNew·--continue/--resume→continueActive·나머지 boolean 정규화).
+ *  대표 #73 — reuseActive 는 dispatch 클로저에서 continueActive 로만 켠다(인자 없음 = 새 세션).
  *  session 은 `!== undefined` 로 통과(원 액션 explicitSessionId:opts.session 과 정확 등가 — 빈 문자열도 그대로,
  *  runChatTurnCli 가 falsy 처리해 결과는 동일하나 중간값까지 무손실 유지). */
 export function toDevChatOpts(opts: ChatCliOpts): DevChatOpts {
   return {
-    ...(opts.session !== undefined ? { session: opts.session } : {}),
+    ...(opts.session !== undefined
+      ? { session: opts.session }
+      : typeof opts.resume === 'string' ? { session: opts.resume } : {}),
     forceNew: opts.new === true,
+    continueActive: opts.continue === true || opts.resume === true,
     json: opts.json === true,
     enableTools: opts.tools === true,
     goalLoop: opts.goalLoop === true,

package/src/chat/index.ts

@@ -2,7 +2,7 @@
 // Integrates into the dashboard log pane as an inline chat
 
 import { getGrokApiKey, GROK_MODEL, GROK_API_URL } from '../config.js';
-import { C, ansi, KeyStreamParser, readKey, traceKey, traceKeyListener, termSize, pad, visibleWidth, stripAnsi, truncate, render, hLine, closeTui, resetRenderCache, invalidateRenderCacheFromRow, injectKey } from '../tui.js';
+import { C, ansi, KeyStreamParser, readKey, traceKey, traceKeyListener, termSize, pad, visibleWidth, stripAnsi, truncate, render, hLine, closeTui, resetRenderCache, invalidateRenderCacheFromRow, injectKey, takeInjectedKeys, cancelPendingReadKey } from '../tui.js';
 import { paintCursorMove, paintCursorVisibility, type CursorState } from '../display/cursor-state.js';
 import { firstVisibleInputLineIdx, inputLineWindow } from '../display/prompt-frame.js';
 import { createChatPickerFamilySource, createChatPickerFamilySources } from './pickers/modals.js';
@@ -211,6 +211,8 @@ export interface TextInputHost {
      *  exactly as if the user had typed Enter. Reset to undefined on
      *  textInput return. */
     submit?: (request?: string | TextInputExternalSubmitRequest) => void;
+    /** Live buffer text while textInput is mounted; undefined after it returns. */
+    getBufferText?: () => string;
   };
   onLinesChange?: (visibleLines: number) => void;
   /** Preferred host seam for input-global shortcuts. textInput emits a
@@ -230,6 +232,7 @@ export interface ResolvedTextInputHost {
     repaint: () => void;
     insertAtCursor?: (text: string) => void;
     submit?: (request?: string | TextInputExternalSubmitRequest) => void;
+    getBufferText?: () => string;
   };
   onLinesChange?: (visibleLines: number) => void;
   dispatchGlobalAction?: (action: TextInputGlobalAction) => void | Promise<void>;
@@ -245,6 +248,8 @@ export interface TextInputRenderActions {
   repaintUserMutation: () => void;
 }
 
+/** Prefix painted in place of the prompt on input continuation rows. */
+const TEXT_INPUT_CONTINUATION_PREFIX = '  \u00B7 ';
 const TEXT_INPUT_CURSOR_PROTOCOL_ENABLE = '\x1b[>1u\x1b[>4;2m';
 const TEXT_INPUT_CURSOR_PROTOCOL_DISABLE = '\x1b[<u\x1b[>4;0m';
 const SYNCHRONIZED_OUTPUT_BEGIN = '\x1b[?2026h';
@@ -473,7 +478,7 @@ export const SLASH_COMMANDS: SlashCommand[] = [
   { name: 'sync',  aliases: ['s'],         description: 'Enter sync mode' },
   { name: 'plugin', aliases: ['plugins'], description: 'Manage plugins', subcommands: ['list', 'activate', 'deactivate', 'reload'] },
   { name: 'widget', aliases: ['widgets'], description: 'Manage widgets', subcommands: ['list', 'reload', 'instances'] },
-  { name: 'log',   aliases: [],             description: 'Chat Log controls — size / clear / filter / search / freeze / solo / turn / fold / help', subcommands: ['size', 'clear', 'filter', 'search', 'freeze', 'solo', 'turn', 'fold', 'help'] },
+  { name: 'log',   aliases: [],             description: 'Chat Log controls — size / clear / filter / search / freeze / solo / turn / fold / unfold / help', subcommands: ['size', 'clear', 'filter', 'search', 'freeze', 'solo', 'turn', 'fold', 'unfold', 'help'] },
   { name: 'loops', aliases: [], description: '루프와 크론 상태 표 — /loops [owner]' },
   { name: 'board', aliases: [], description: '판 체크리스트 — /board [판]' },
   { name: 'memory', aliases: ['mem'], description: 'Memory ops — list / show / search / add / delete (see `elanous memory --help`)', subcommands: ['list', 'show', 'search', 'add', 'delete', 'index'] },
@@ -496,7 +501,7 @@ export const SLASH_COMMANDS: SlashCommand[] = [
   { name: 'telegram',  aliases: ['tg'],    description: 'Telegram bot — status / pair / send / pause / stop / attach / detach / sessions', subcommands: ['status', 'pair', 'setup', 'send', 'pause', 'stop', 'attach', 'detach', 'sessions'] },
   { name: 'tablet',    aliases: [],        description: 'Tablet mode — collapse layout to log + input', subcommands: ['on', 'off', 'toggle', 'auto', 'status', 'browser-preview', 'bp'] },
   { name: 'surface',   aliases: [], description: 'Surface control — open a pane/catalog launcher (/surface catalog · browser · preview · log · scratch · obsidian · skill) OR set a preferred LLM surface (/surface coding-agent · research-agent · control-agent · ops-agent · … · clear · status)', subcommands: ['catalog', 'browser', 'preview', 'browser-preview', 'log', 'scratch', 'obsidian', 'skill', 'skill-file', 'agents', 'coding-agent', 'coding-chat', 'research-agent', 'research-chat', 'control-agent', 'ops-ui-agent', 'ops-fleet-agent', 'ops-agent', 'clear', 'status'] },
-  { name: 'term',  aliases: ['terminal'], description: 'Interactive terminal modal — spawn / list / attach / detach / switch / kill / snapshot / resume', subcommands: ['spawn', 'list', 'attach', 'detach', 'switch', 'kill', 'snapshot', 'resume'] },
+  { name: 'term',  aliases: ['terminal'], description: 'Interactive terminal modal — new / list / attach / detach / switch / kill / snapshot / resume', subcommands: ['new', 'list', 'attach', 'detach', 'switch', 'kill', 'snapshot', 'resume'] },
   { name: 'claude', aliases: [], description: 'Spawn claude-code CLI in a terminal modal' },
   { name: 'codex',  aliases: [], description: 'Spawn codex CLI in a terminal modal' },
   { name: 'gemini', aliases: [], description: 'Spawn gemini CLI in a terminal modal' },
@@ -675,6 +680,20 @@ export interface InputResult {
    *  similar. textInput itself doesn't act on the chord beyond
    *  returning — the host decides. */
   saved?: boolean;
+  /** H2 내부 턴 문 — 입력칸이 «비켜 줬다»(버퍼가 비어 있었다). 텍스트 없음 · 제출 아님. 호스트는
+   *  내부 턴 문(`InternalTurnGate.takePending`)에서 실행할 턴을 꺼낸다. */
+  yieldedToInternalTurn?: true;
+}
+
+/** H2 내부 턴 문이 마운트된 textInput 에 «비켜 달라»를 청하는 자리.
+ *  ⛔ 입력칸 버퍼·합성 키를 쓰지 않는다 — textInput 은 버퍼가 «비었을 때만» 스스로 물러난다. */
+export interface TextInputInternalTurnYieldPort {
+  /** textInput 이 마운트되면 부른다. 넘긴 함수는 버퍼가 비었으면 true(물러남 예약), 아니면 false. */
+  attach(requestYield: () => boolean): void;
+  /** textInput 이 내려가면 부른다. `yielded` 가 아니면 열린 내부 턴은 거둬진다(사람이 먼저 끝냈다). */
+  detach(opts?: { yielded?: boolean }): void;
+  /** 물러남을 예약한 뒤 그 사이 사람이 글자를 넣어 «물러나지 않았다». */
+  declined?(detail: string): void;
 }
 
 export interface TextInputExternalSubmitRequest {
@@ -693,6 +712,7 @@ export async function textInput(opts: {
   getRow?: () => number;
   col: number;
   width: number;
+  getWidth?: () => number;
   maxLines?: number;
   prompt?: string;
   placeholder?: string;
@@ -891,8 +911,11 @@ export async function textInput(opts: {
    *  side-effect boundary instead of a flat callback bag. Legacy
    *  fields above remain supported for compatibility/tests. */
   host?: TextInputHost;
+  /** H2 내부 턴 문 — 버퍼가 비었을 때 입력 루프가 물러나 호스트가 내부 턴을 실행하게 한다. */
+  internalTurnYield?: TextInputInternalTurnYieldPort;
 }): Promise<InputResult> {
   const { row: initialRow, col, width, maxLines = 5, prompt = '\u276f ', placeholder = '' } = opts;
+  const getWidth = (): number => opts.getWidth?.() ?? width;
   const getRow = (): number => opts.getRow?.() ?? initialRow;
   const row = getRow();
   // P2.1: report the input's top row so writeTerminal scopes its
@@ -902,7 +925,8 @@ export async function textInput(opts: {
   setInputPromptStartRow(row);
   const commands = opts.commands ?? SLASH_COMMANDS;
   const history = opts.history ?? [];
-  let lines: string[] = [opts.initialText ?? ''];
+  // 턴 중 typeahead 가 Shift+Enter 로 만든 여러 줄 prefill 은 줄 단위로 연다.
+  let lines: string[] = (opts.initialText ?? '').split('\n');
   // Line-count reporting: only fires when the visible count actually
   // changes, so hosts don't re-render on every keystroke.
   const resolvedHost = resolveTextInputHost(opts);
@@ -910,8 +934,8 @@ export async function textInput(opts: {
   const onLinesChangeHandler = resolvedHost.onLinesChange;
   const dispatchGlobalAction = resolvedHost.dispatchGlobalAction;
   let lastReportedLines = -1;
-  let lineIdx = 0;   // current line
-  let colIdx = lines[0]!.length;  // cursor at end of initial text
+  let lineIdx = lines.length - 1;   // current line
+  let colIdx = lines[lineIdx]!.length;  // cursor at end of initial text
   let ctrlCArmedAt: number | null = null;
   let ctrlCHintTimer: ReturnType<typeof setTimeout> | null = null;
   let ctrlCHint: string | null = null;
@@ -985,7 +1009,7 @@ export async function textInput(opts: {
     picker,
     getBufferView: bufView,
     writeTerminal,
-    getBounds: () => ({ row: getRow(), col, width, height: 1 }),
+    getBounds: () => ({ row: getRow(), col, width: getWidth(), height: 1 }),
     getInputZoneHeight: () => Math.min(lines.length, maxLines),
     onDispatchResult: async (dispatched) => processPickerDispatch(dispatched),
   });
@@ -1129,7 +1153,12 @@ export async function textInput(opts: {
     setInputPromptStartRow(row);
     const promptStr = C.accent(prompt);
     const promptW = visibleWidth(prompt);
-    const textW = width - promptW - 1;
+    // Continuation rows carry a 4-cell `  · ` prefix instead of the prompt,
+    // so each row gets its own text width — sharing the first row's width
+    // let continuation rows overrun the terminal by `contPfxW - promptW` cells.
+    const contPfxW = visibleWidth(TEXT_INPUT_CONTINUATION_PREFIX);
+    const textWFor = (idx: number): number =>
+      Math.max(0, getWidth() - (idx === 0 ? promptW : contPfxW) - 1);
     const numLines = lines.length;
     // Visible window: at most `maxLines` rows on screen, but the buffer
     // (`lines`) may exceed that. `firstVisibleIdx` keeps the cursor's
@@ -1172,16 +1201,17 @@ export async function textInput(opts: {
       if (i < visibleLines) {
         const lineIdxInArray = firstVisibleIdx + (visibleLines - 1 - i);
         const lineContent = lines[lineIdxInArray]!;
-        const pfx = lineIdxInArray === 0 ? promptStr : C.muted('  ' + '\u00B7' + ' ');
+        const pfx = lineIdxInArray === 0 ? promptStr : C.muted(TEXT_INPUT_CONTINUATION_PREFIX);
+        const rowTextW = textWFor(lineIdxInArray);
         const display = lineIdxInArray === 0 && numLines === 1 && !lineContent
-          ? truncate(C.muted(placeholder), Math.max(0, textW))
+          ? truncate(C.muted(placeholder), Math.max(0, rowTextW))
           : inputLineWindow(
             lineContent,
             lineIdxInArray === lineIdx ? colIdx : lineContent.length,
-            textW,
+            rowTextW,
           ).display;
 
-        const padded = display + ' '.repeat(Math.max(0, textW - visibleWidth(display)));
+        const padded = display + ' '.repeat(Math.max(0, rowTextW - visibleWidth(display)));
         writeTerminal(ansi.moveTo(r, col) + '\x1b[2K' + pfx + padded);
       } else {
         // This row had content on the previous paint but doesn't anymore
@@ -1194,7 +1224,7 @@ export async function textInput(opts: {
     prevDrawnLines = visibleLines;
 
     if (ctrlCHint) {
-      writeTerminal(ansi.moveTo(row + 2, col) + '\x1b[2K' + C.muted(truncate(ctrlCHint, width)));
+      writeTerminal(ansi.moveTo(row + 2, col) + '\x1b[2K' + C.muted(truncate(ctrlCHint, getWidth())));
       ctrlCHintPainted = true;
     } else if (ctrlCHintPainted) {
       writeTerminal(ansi.moveTo(row + 2, col) + '\x1b[2K');
@@ -1211,8 +1241,8 @@ export async function textInput(opts: {
       Math.min(lineIdx - firstVisibleIdx, visibleLines - 1),
     );
     const curR = row - (visibleLines - 1 - cursorScreenLine);
-    const pfxW = lineIdx === 0 ? visibleWidth(prompt) : 4;
-    const { cursorCol } = inputLineWindow(lines[lineIdx]!, colIdx, textW);
+    const pfxW = lineIdx === 0 ? visibleWidth(prompt) : contPfxW;
+    const { cursorCol } = inputLineWindow(lines[lineIdx]!, colIdx, textWFor(lineIdx));
     const curX = col + pfxW + cursorCol;
     // P2.2.c — coordinator owns the cursor emit when wired; falls
     // back to direct stdout for non-coordinator callers (tests, non-dashboard
@@ -1248,7 +1278,7 @@ export async function textInput(opts: {
   };
 
   const pickerModalFamily = pickerModalRuntime.createFamily({
-    bounds: { row: getRow(), col, width, height: 1 },
+    bounds: { row: getRow(), col, width: getWidth(), height: 1 },
     sources: createChatPickerFamilySources({
       // 명시 K — createChatPickerFamilySource<K> 의 K 를 pin. getItems 반환이
       // conditional 타입 ChatPickerItems<K> 라 역추론이 K 를 union(ChatPickerKind)
@@ -1282,7 +1312,7 @@ export async function textInput(opts: {
     pickerModalRuntime.syncFamily({
       activeKind: activePickerKind(),
       clearRows: MAX_PICKER + 3,
-      debugLayout: { row, col, width },
+      debugLayout: { row: getRow(), col, width: getWidth() },
       family: pickerModalFamily,
     });
   };
@@ -1295,7 +1325,7 @@ export async function textInput(opts: {
     const searchRow = row;
     const promptStr = C.accent(prompt);
     const promptW = visibleWidth(prompt);
-    const textW = width - promptW - 1;
+    const textW = Math.max(0, getWidth() - promptW - 1);
     const match = currentReverseSearchResult();
     const status = match ? 'reverse-i-search' : 'failed reverse-i-search';
     const prefixRaw = `(${status})\`${reverseSearch.query}': `;
@@ -1375,6 +1405,9 @@ export async function textInput(opts: {
   const drawAll = renderActions.repaintUserMutation;
   let pendingExternalSubmitSource: InputSourceRef | undefined;
   const finalizeInput = (result: InputResult): InputResult => {
+    // 외부 주입 라우터가 «composer 가 안 떠 있다»를 알 수 있게 내린다.
+    if (hostControl) hostControl.getBufferText = undefined;
+    detachInternalTurnYield(result.yieldedToInternalTurn === true);
     clearPicker();
     writeTerminal(endTextInputCursor(opts.cursorSink));
     return result;
@@ -1420,23 +1453,61 @@ export async function textInput(opts: {
     // Enter into the readKey queue so the main loop returns the
     // submit outcome exactly like a typed Enter. Reset to
     // undefined on textInput return.
+    hostControl.getBufferText = () => lines.join('\n');
     hostControl.submit = (request?: string | TextInputExternalSubmitRequest) => {
       const nextText = typeof request === 'string' ? request : request?.text;
+      // 합성 Enter 가 못 들어가면 버퍼·커서·출처를 «통째로» 되돌린다 — 외부 글이 composer 에 남아
+      // 사용자 입력과 섞이거나 대기열이 다시 보내 중복되지 않게(원자적 제출).
+      const before = { lines: [...lines], lineIdx, colIdx, source: pendingExternalSubmitSource };
       pendingExternalSubmitSource = typeof request === 'string' ? undefined : request?.source;
       if (nextText !== undefined) {
         const next = nextText.split('\n');
         lines = next.length > 0 ? next : [''];
         lineIdx = lines.length - 1;
         colIdx = lines[lineIdx]!.length;
-        drawAll();
       }
-      injectKey({ name: 'enter', ctrl: false, shift: false });
+      // 반환값 = 합성 Enter 가 키 큐에 들어갔나(raw 모드가 아니면 false) — 외부 입력 대기열이 유실을 막는 데 쓴다.
+      const accepted = injectKey({ name: 'enter', ctrl: false, shift: false });
+      if (!accepted) {
+        lines = before.lines; lineIdx = before.lineIdx; colIdx = before.colIdx;
+        pendingExternalSubmitSource = before.source;
+      }
+      // 렌더 실패가 수락 결과를 뒤집으면 이미 큐에 든 Enter 와 대기열이 같은 글을 두 번 보낸다 — 삼킨다.
+      if (nextText !== undefined) {
+        try { drawAll(); } catch (error) { debug.log('chat.input', 'external-submit-draw-failed', { accepted, error: String(error) }); }
+      }
+      return accepted;
     };
   }
 
+  // ⭐ H2 내부 턴 문 — 버퍼가 비었을 때만 물러남을 예약하고 걸린 readKey 를 «빈 키»로 깨운다.
+  //   ⛔ 버퍼·커서·키 큐는 건드리지 않는다(대표 비침투). 마운트가 끝나면(어느 반환 길이든) 무효다.
+  let internalYieldRequested = false;
+  let internalYieldMounted = true;
+  function detachInternalTurnYield(yielded = false): void {
+    if (!internalYieldMounted) return;
+    internalYieldMounted = false;
+    internalYieldRequested = false;
+    opts.internalTurnYield?.detach({ yielded });
+  }
+  opts.internalTurnYield?.attach(() => {
+    if (!internalYieldMounted || lines.join('\n').length > 0) return false;
+    internalYieldRequested = true;
+    cancelPendingReadKey();
+    return true;
+  });
+
   drawAll();
 
   while (true) {
+    if (internalYieldRequested) {
+      internalYieldRequested = false;
+      if (lines.join('\n').length === 0) {
+        return finalizeInput({ text: '', submitted: false, yieldedToInternalTurn: true });
+      }
+      // 판정과 물러남 사이에 사람이 글자를 넣었다 — 사람이 먼저다.
+      opts.internalTurnYield?.declined?.('buffer');
+    }
     // IDX-F2.5 — picker.onKey may have set pendingSubmit on the
     // previous iteration (the closure can't return from textInput
     // itself). Consume the signal at the top of the loop, tear
@@ -1451,6 +1522,7 @@ export async function textInput(opts: {
     }
 
     const key = await (opts.readKey ?? (() => readKey('input')))();
+    if (internalYieldRequested && !key.name) continue; // H2 — 내부 턴 문이 깨운 빈 키
     traceAfterSubmitKey(key);
 
     // Raw-key trace — diagnoses "modifier bit dropped before global-action
@@ -1650,6 +1722,8 @@ export async function textInput(opts: {
         // Host owns the focus swap; we return gotoPane:true so the
         // input loop exits cleanly and the dashboard's pane dispatcher
         // picks up the keys.
+        if (hostControl) hostControl.getBufferText = undefined;
+        detachInternalTurnYield();
         return { text: '', submitted: false, gotoPane: true };
       }
       drawAll();
@@ -1980,8 +2054,18 @@ export function attachStreamingKeys(
   //    ⭐ 창 길이는 `readKey` 와 같은 25ms — 두 진입점이 같은 규칙을 쓴다.
   let escapeTimer: ReturnType<typeof setTimeout> | undefined;
   const clearEscapeTimer = () => { if (escapeTimer) { clearTimeout(escapeTimer); escapeTimer = undefined; } };
+  // ⭐ TUI-ESC-ABORT-TOOLS (2026-10-15) — 바깥 키(`pty key` · 제어 IPC input-key)는 stdin 이
+  //    아니라 `injectKey` 큐로 들어오고 빈 청크로 깨울 뿐이다. 이 리스너가 큐를 안 보면 턴 중
+  //    Esc 가 escGate 에 닿지 않고 다음 readKey(턴 끝)까지 잠든다. 주입이 먼저 왔으므로 먼저 배달한다.
+  const deliverInjected = () => {
+    const injected = takeInjectedKeys();
+    if (injected.length === 0) return;
+    for (const key of injected) debug.log('tui.input', 'injected-key-stream-delivered', { key: key.name });
+    deliver(injected);
+  };
   const listener = (data: string | Buffer) => {
     clearEscapeTimer();
+    deliverInjected();
     const keys = parser.push(data);
     deliver(keys);
     // ⚠️ `unref()` — 이 타이머가 프로세스를 붙잡아 두면 안 된다(입력 대기는 stdin 의 몫).
@@ -2012,6 +2096,9 @@ export function attachStreamingKeys(
   // leaves streaming typeahead and lone Escape with no events at all.
   process.stdin.resume();
   traceKeyListener('attach', 'stream');
+  // 턴 시작 «전»에 주입돼 큐에 남은 키도 배달한다 — 마이크로태스크로 미뤄 호출자가 cleanup 을
+  // 손에 쥔 뒤에 handler 가 불리게 한다.
+  queueMicrotask(() => { if (!cleanedUp) deliverInjected(); });
   return () => {
     if (cleanedUp) return;
     cleanedUp = true;

package/src/chat/input-control-key.ts

@@ -16,22 +16,24 @@ export interface TextInputControlState {
 }
 
 export function resolveTextInputControlAction(
-  key: Pick<Key, 'name' | 'ctrl' | 'shift'>,
+  key: Pick<Key, 'name' | 'ctrl' | 'shift'> & { alt?: boolean },
   state: TextInputControlState,
 ): TextInputControlAction {
   const stripTrailingBackslash =
     key.name === 'enter'
     && state.cursor > 0
     && state.currentLine[state.cursor - 1] === '\\';
+  // ⭐ Alt+Enter 도 줄바꿈이다 — kitty 프로토콜을 켠 멀티플렉서(herdr)는 바깥의 `ESC CR` 을
+  //    `CSI 13;3u`(alt) 로 바꿔 넘긴다. 종전엔 그 꼴이 «제출»로 떨어져 대체 키가 죽어 있었다.
   const isNewline =
-    (key.name === 'enter' && key.shift)
+    (key.name === 'enter' && (key.shift || key.alt === true))
     || (key.name === 'j' && key.ctrl)
     || stripTrailingBackslash;
 
   if (isNewline) {
     return { kind: 'newline', stripTrailingBackslash };
   }
-  if (key.name === 'enter' && !key.shift) {
+  if (key.name === 'enter' && !key.shift && !key.alt) {
     return { kind: 'submit' };
   }
   if (key.name === 'escape') {

package/src/chat/pickers/modal-runtime.ts

@@ -145,6 +145,7 @@ export function createChatPickerModalRuntime(deps: ChatPickerModalRuntimeDeps):
     maxVisible: spec.maxVisible,
     getInputZoneHeight: deps.getInputZoneHeight,
     width: deps.getBounds().width,
+    getWidth: () => deps.getBounds().width,
     onKey: makePickerOnKey(kind),
     onRowClick: makePickerOnRowClick(kind),
   });

package/src/chat/pickers/modals.ts

@@ -107,6 +107,7 @@ export interface ChatPickerModalBindings {
   maxVisible: number;
   getInputZoneHeight: () => number;
   width: number;
+  getWidth?: () => number;
   onKey?: PickerOnKey;
   onRowClick?: PickerOnRowClick;
 }
@@ -122,6 +123,7 @@ type FramedPickerSpec<T> = {
   maxVisible: number;
   getInputZoneHeight: () => number;
   width: number;
+  getWidth?: () => number;
   onKey?: PickerOnKey;
   onRowClick?: PickerOnRowClick;
 };
@@ -140,7 +142,7 @@ function createFramedPickerModal<T>(spec: FramedPickerSpec<T>): ModalSurface {
     if (visibleCount <= 0) return null;
     const height = visibleCount + 3;
     const row = bottomRow - height + 1;
-    return { row, col: spec.bounds.col, width: spec.width, height, startIdx, visibleCount };
+    return { row, col: spec.bounds.col, width: spec.getWidth?.() ?? spec.width, height, startIdx, visibleCount };
   };
 
   /** Phase 4.5a (substrate Occam · §4-pre.7 · 2026-05-03) — update

package/src/chat/tool-interrupt-behavior.ts

@@ -0,0 +1,38 @@
+// ── 도구별 «제출로 끊어도 되나» 선언 (10-14 · 대표 «지금 밀어 넣기») ─────────────────
+//
+// 턴 중에 사용자가 «지금 밀어 넣기»를 하면, 도는 도구가 «전부» `cancel` 일 때만 턴을 끊고 그 발화로
+// 바로 이어 간다. 하나라도 `block` 이면 끊지 않고 다음 도구 경계에 최우선으로 넣는다.
+// ⭐ 기본은 `block` 이다 — 모르는 도구(쓰기·실행·자식 띄우기)를 «끊어도 된다»로 읽지 않는다.
+// ⭐ `cancel` 은 부작용 없는 읽기·대기 도구만 — 끊으면 결과를 버릴 뿐 바깥 상태가 안 바뀐다.
+//   (Claude Code `Tool.interruptBehavior()` 계약과 같은 축 · 기본 block)
+// ⚠️ 이 표가 «도구 선언 칸»이다. TUI 는 도는 도구의 «이름»만 알아서 스펙 객체가 아니라 이름으로 선언한다.
+//   새 읽기 전용 도구를 더하면 여기 한 줄을 더한다.
+
+export type ToolInterruptBehavior = 'cancel' | 'block';
+
+const DECLARED: ReadonlyMap<string, ToolInterruptBehavior> = new Map<string, ToolInterruptBehavior>([
+  ['Read', 'cancel'],
+  ['Grep', 'cancel'],
+  ['Glob', 'cancel'],
+  ['ListDir', 'cancel'],
+  ['WebSearch', 'cancel'],
+  ['WebFetch', 'cancel'],
+  // 대기·조회 — 끊어도 자식은 산다(턴만 끊는다).
+  ['AgentOutput', 'cancel'],
+  ['AgentList', 'cancel'],
+  ['TaskGet', 'cancel'],
+  ['TaskList', 'cancel'],
+]);
+
+export function toolInterruptBehavior(name: string): ToolInterruptBehavior {
+  return DECLARED.get(name) ?? 'block';
+}
+
+/**
+ * 도는 도구가 «전부» 끊어도 되는가. 도는 도구가 없으면(모델이 글을 쓰는 중) 참이다.
+ * 막는 도구 이름을 함께 낸다(안내 줄용).
+ */
+export function canInterruptRunningTools(names: readonly string[]): { ok: boolean; blocking: string[] } {
+  const blocking = [...new Set(names.filter(name => toolInterruptBehavior(name) === 'block'))].sort();
+  return { ok: blocking.length === 0, blocking };
+}

package/src/chat/tool-render/dispatch.ts

@@ -361,7 +361,11 @@ function extractSyntheticGuardSummary(result: unknown): string | null {
     return 'inspect budget exhausted — summarize inspected files';
   }
   if (text.includes('TOOL CALL REJECTED')) {
-    return 'tool budget exhausted — final answer required';
+    // Only the turn-budget stub is a budget; phase guards (VERIFY/REPAIR/INSPECT ACTION
+    // REQUIRED …) reject a tool for the current phase and must not read as «budget» (#67).
+    if (text.includes('tool-loop budget exhausted')) return 'tool budget exhausted — final answer required';
+    const reason = /\b([A-Z][A-Z]+(?: [A-Z]+)* (?:REQUIRED|EXHAUSTED))\b/.exec(text)?.[1];
+    return reason ? `tool call rejected — ${reason.toLowerCase()}` : 'tool call rejected';
   }
   if (text.includes('RUNTIME BLOCKED')) {
     return 'reuse current candidates';