elanous 0.2.29 → 0.2.31

package/src/autopilot/pr-manager.ts

@@ -17,6 +17,7 @@ import { DEFAULT_BRANCH_WORKTREE_BASE } from '../git-fs/worktree.js';
 import { isElanousRuntimeArtifactPath } from '../self-implement/gate-scope.js';
 import { isTransientExecutionFailure } from '../self-dev/execution-transient.js';
 import { withGhRestFallback } from './gh-rest-fallback.js';
+import { cellIdFromBody, guardNewPr, parseDiffHunks, readOpenPrs, recordGuardUnmeasured, type GuardVerdict, type Seat } from '../pr-tool/census.js';
 
 /** ★ stderr 캡처(대표 2026-07-21·관측 갭) — 종전엔 stdout 만 담아 git/gh 실패 사유가 소실됐다
  *  (705308: makePr 실패가 bare null 로 뭉뚱그려져 triage 가 "인증·네트워크"로 환각 오라우팅).
@@ -99,6 +100,8 @@ export interface UpsertPrInput {
   draft?: boolean;
   /** PR 라벨 — 신규 생성 시 `--label`, 재사용 시 `--add-label` 로 부착(무인 리뷰 진입 라벨이 재실행에도 유지). */
   labels?: readonly string[];
+  /** Harness caller's seat; stamped on newly created PRs for later census. */
+  seat?: Seat;
   /** 기존 PR 재사용 시 남길 코멘트(재구현 반영 안내·비평 해소). */
   reuseComment?: string;
   /**
@@ -115,7 +118,7 @@ export interface UpsertPrResult { url: string; reused: boolean }
  *  나머지 reason(add/commit/push/gh)은 진짜 실패로 detail(stderr)과 함께 관측·pr-failed. */
 export type UpsertPrOutcome =
   | { ok: true; url: string; reused: boolean; labelsApplied?: boolean; labelsOmitted?: boolean }
-  | { ok: false; reason: 'add' | 'commit' | 'base' | 'noop' | 'push' | 'gh'; detail: string };
+  | { ok: false; reason: 'add' | 'commit' | 'base' | 'noop' | 'push' | 'gh' | 'guard'; detail: string };
 
 /** 관측된 문면 두 가지:
  *    could not add label: 'auto-review' not found
@@ -312,9 +315,29 @@ function isTransientPushFailure(detail: string): boolean {
   return isTransientExecutionFailure(pushFailureMessageForTransientCheck(detail));
 }
 
+function seatFromEnvironment(): Seat | null {
+  // Production launchers stamp this in harness-pod-dispatch.ts and harness-cli-command.ts.
+  const value = process.env.ELANOUS_HARNESS_SEAT;
+  return value === 'OP' || value === 'TC' || value === 'MK' || value === 'UX' ? value : null;
+}
+
+function defaultPrCreateGuard(input: { cwd: string; base: string | undefined; seat: Seat | null; body: string }, run: CmdRunner): GuardVerdict {
+  if (!input.base) return guardNewPr({ files: null, seat: input.seat }, { status: 'unknown', reason: '비교 base 없음' });
+  const diff = run('git', ['-C', input.cwd, 'diff', '--name-only', '-z', `${input.base}...HEAD`]);
+  const files = diff.ok ? diff.out.split('\0').filter(Boolean) : null;
+  const patch = run('git', ['-C', input.cwd, 'diff', '--unified=0', `${input.base}...HEAD`]);
+  if (!patch.ok) return guardNewPr({ files: null, seat: input.seat }, { status: 'unknown', reason: `후보 수정 줄 조회 실패: ${patch.err || patch.out}` });
+  return guardNewPr({ files, seat: input.seat, cellId: cellIdFromBody(input.body), hunks: parseDiffHunks(patch.out) }, readOpenPrs(run, { cwd: input.cwd, ...(files ? { candidateFiles: files } : {}) }));
+}
+
 /** ★ PR 매니저 팩토리(대표 2026-07-12) — CmdRunner 주입(테스트 스텁). 실 배선은 기본 러너. */
-export function makePrManager(runner: CmdRunner = defaultCmdRunner): PrManager {
+export function makePrManager(
+  runner: CmdRunner = defaultCmdRunner,
+  createGuard?: (input: { cwd: string; base: string | undefined; seat: Seat | null; body: string }, run: CmdRunner) => GuardVerdict,
+  recordUnmeasured: typeof recordGuardUnmeasured = recordGuardUnmeasured,
+): PrManager {
   const run = withGhRestFallback(runner);
+  const checkCreate = createGuard ?? (runner === defaultCmdRunner ? defaultPrCreateGuard : undefined);
   const findPrForBranchOutcome = (branch: string, cwd?: string): FindPrForBranchOutcome => {
     // ⛔ 표식은 base 를 「생략했다」는 뜻이지 브랜치 이름이 아니다. 그대로 `gh --head` 로 넘기면
     //    gh 가 `no pull requests found for branch "elanous:default-branch"` 를 stderr 로 뱉는다.
@@ -499,8 +522,8 @@ export function makePrManager(runner: CmdRunner = defaultCmdRunner): PrManager {
         //   트림은 신규 경로(resolveDeliverableBase)와 동일하게 — 공백 전용 base 는 미지정으로 본다(리뷰 should-fix).
         const explicitBase = input.base?.trim();
         if (explicitBase && !isBranchSelfRef(explicitBase, input.branch)) editArgs.push('--base', prBaseFromComparison(explicitBase));
-        for (const label of input.labels ?? []) if (label.trim()) editArgs.push('--add-label', label.trim());
-        const edited = run('gh', editArgs, opts);
+        for (const label of new Set((input.labels ?? []).map(label => label.trim()).filter(Boolean))) editArgs.push('--add-label', label);
+        let edited = run('gh', editArgs, opts);
         if (!edited.ok) return { ok: false, reason: 'gh', detail: detailOf(edited) || 'gh pr edit 실패' };
         if (input.draft !== undefined) {
           // 현재 draft 상태 조회 — 조회 실패/비정상 출력은 fail-closed(요청 draft 를 적용 못했는데
@@ -522,13 +545,43 @@ export function makePrManager(runner: CmdRunner = defaultCmdRunner): PrManager {
         if (input.reuseComment) run('gh', ['pr', 'comment', existing.url, '--body', input.reuseComment], opts);
         return { ok: true, url: existing.url, reused: true };
       }
+      let guardUnmeasured = false;
+      if (checkCreate) {
+        const seat = input.seat ?? seatFromEnvironment();
+        const verdict = checkCreate({ cwd, base: comparisonBase, seat, body: input.body }, run);
+        if (verdict.status === 'unknown' && verdict.reasons.length === 1 && verdict.reasons[0]?.code === 'inventory-unknown') {
+          const inPod = process.env.ELANOUS_SUBSTRATE === 'pod'
+            || Object.keys(process.env).some(key => key.startsWith('ELANOUS_POD_'));
+          if (inPod) {
+            // Pod state and mailbox are local to this Job. Count and alert only
+            // in the host parent, where the shared instance root is authoritative.
+            debug.log('pr-tool.open-guard', 'pod-unmeasured', { seat, reason: verdict.reasons[0].detail });
+          } else {
+            const count = recordUnmeasured({ seat, reason: verdict.reasons[0].detail });
+            if (count.blocked) {
+              const alert = run('eln', ['msg', 'post', '--from', seat ?? 'HARNESS', '--to', 'OP', '--kind', 'alert', '--body', `PR open-guard 판정 불가 1시간 ${count.count}회 · 새 PR 차단 · ${count.reason ?? verdict.reasons[0].detail}`]);
+              if (!alert.ok) debug.log('pr-tool.open-guard', 'op-alert-failed', { seat, reason: alert.err || alert.out || 'eln msg post 실패' });
+              return { ok: false, reason: 'guard', detail: `inventory-unknown: 1시간 ${count.count}회 · 새 PR 차단${count.reason ? ` (${count.reason})` : ''}` };
+            }
+          }
+          guardUnmeasured = true;
+        } else if (verdict.status !== 'allow') {
+          return { ok: false, reason: 'guard', detail: verdict.reasons.map(reason => `${reason.code}: ${reason.detail}${reason.prs?.length ? ` (${reason.prs.map(number => `#${number}`).join(', ')})` : ''}`).join('; ') };
+        }
+      }
       const createArgs = ['pr', 'create', '--head', input.branch, '--title', input.title, '--body', input.body];
       if (prBase) createArgs.push('--base', prBase);
       if (input.draft) createArgs.push('--draft');
-      const requestedLabels = (input.labels ?? []).map((label) => label.trim()).filter(Boolean);
+      const seat = input.seat ?? seatFromEnvironment();
+      const requiredLabels = [...(seat ? [`seat:${seat}`] : []), ...(guardUnmeasured ? ['pr-guard:unmeasured'] : [])];
+      const requestedLabels = [...new Set([...(input.labels ?? []), ...requiredLabels].map((label) => label.trim()).filter(Boolean))];
       const labeledArgs = [...createArgs];
       for (const label of requestedLabels) labeledArgs.push('--label', label);
-      const created = run('gh', labeledArgs, opts);
+      let created = run('gh', labeledArgs, opts);
+      if (!created.ok && requiredLabels.length && isLabelNotFoundFailure(created, requiredLabels)) {
+        for (const label of requiredLabels) run('gh', ['label', 'create', label, '--color', 'BFDADC'], opts);
+        created = run('gh', labeledArgs, opts);
+      }
       if (created.ok && created.out) {
         return {
           ok: true,
@@ -538,7 +591,9 @@ export function makePrManager(runner: CmdRunner = defaultCmdRunner): PrManager {
         };
       }
       if (requestedLabels.length > 0 && isLabelNotFoundFailure(created, requestedLabels)) {
-        const retry = run('gh', createArgs, opts);
+        const retryArgs = [...createArgs];
+        for (const label of requiredLabels) retryArgs.push('--label', label);
+        const retry = run('gh', retryArgs, opts);
         if (retry.ok && retry.out) {
           debug.log('autopilot.pr-manager', 'create.labels-omitted', {
             branch: input.branch,

package/src/briefing/brief-items.ts

@@ -105,6 +105,25 @@ function needsDecision(item: BriefItem, today: string): boolean {
   return item.priority === 'P0' || (item.deadline !== null && deadlineDate(item.deadline) === today);
 }
 
+/**
+ * Reorder BRIEF_DOMAINS from already-recorded weekly action rates.
+ * Domains with total>0 sort by action rate (not raw event count).
+ * Domains with total=0 keep their relative fixed BRIEF_DOMAINS order.
+ * Missing rate data returns the default BRIEF_DOMAINS order unchanged.
+ */
+export function orderBriefDomains(actions?: BriefWeeklyActions | null): BriefDomain[] {
+  if (actions == null) return [...BRIEF_DOMAINS];
+  const byKind = actions.byKind;
+  if (!BRIEF_DOMAINS.some(domain => (byKind[domain]?.total ?? 0) > 0)) return [...BRIEF_DOMAINS];
+  return [...BRIEF_DOMAINS].sort((a, b) => {
+    const xTotal = byKind[a]?.total ?? 0;
+    const yTotal = byKind[b]?.total ?? 0;
+    const xRate = xTotal > 0 ? byKind[a]!.rate : 0;
+    const yRate = yTotal > 0 ? byKind[b]!.rate : 0;
+    return yRate - xRate || BRIEF_DOMAINS.indexOf(a) - BRIEF_DOMAINS.indexOf(b);
+  });
+}
+
 /** Unsent decisions needing immediate delivery, using the same KST deadline rule as slot pages. */
 export function pendingRealtime(items: readonly BriefItem[], now: Date): BriefItem[] {
   const today = dateKey(now, { timeZone: KST });
@@ -113,8 +132,9 @@ export function pendingRealtime(items: readonly BriefItem[], now: Date): BriefIt
 
 /**
  * One briefing page. Item text is copied verbatim.
- * Order: decisions due (P0, then a deadline of today) → domain groups →
- * duplicate claims dropped (same normalized sentence, most urgent kept).
+ * Order: decisions due (P0, then a deadline of today) → domain groups ordered
+ * by recorded weekly action rate (sampled high-rate first; zero-sample kinds
+ * keep BRIEF_DOMAINS order) → duplicate claims dropped (same normalized sentence, most urgent kept).
  */
 export function composeBriefMarkdown(items: readonly BriefItem[], slot: BriefSlot, now: Date): string {
   return composeBriefPage(items, slot, now).markdown;
@@ -124,7 +144,6 @@ export function composeBriefMarkdown(items: readonly BriefItem[], slot: BriefSlo
 export function composeBriefPage(
   items: readonly BriefItem[], slot: BriefSendSlot, now: Date,
   actions?: BriefWeeklyActions,
-  observedKinds?: ReadonlySet<BriefDomain>,
 ): { markdown: string; ids: number[] } {
   const today = dateKey(now, { timeZone: KST });
   // A duplicate left out of a delivered page stays unsent in the ledger, but must not reappear on a later page.
@@ -151,17 +170,7 @@ export function composeBriefPage(
     for (const item of decisions) lines.push(itemLine(item));
     lines.push('');
   }
-  const domains = [...BRIEF_DOMAINS];
-  // Measured action leads. An unobserved kind keeps its normal position; a sent-but-unobserved
-  // item is not evidence of being ignored. Keep every domain heading in this first slice.
-  if (actions && Object.values(actions.byKind).some(count => count.acted > 0)) {
-    domains.sort((a, b) => {
-      const x = actions.byKind[a], y = actions.byKind[b];
-      const xRate = observedKinds?.has(a) ? x.rate : 0;
-      const yRate = observedKinds?.has(b) ? y.rate : 0;
-      return yRate - xRate || BRIEF_DOMAINS.indexOf(a) - BRIEF_DOMAINS.indexOf(b);
-    });
-  }
+  const domains = orderBriefDomains(actions);
   for (const domain of domains) {
     const group = unique.filter(item => item.domain === domain && !decisionIds.has(item.id));
     if (group.length === 0) continue;
@@ -463,14 +472,7 @@ export class BriefItemsLedger {
         this.log('briefing.items', 'requirement-funnel-failed', { slot, error: error instanceof Error ? error.message : String(error) });
       }
     }
-    const since = this.weekStart(now);
-    const until = now.toISOString();
-    const observedKinds = new Set((db.query(`SELECT DISTINCT i.domain FROM items i
-      JOIN reactions r ON r.item_id = i.id
-      WHERE r.reacted_at >= ? AND r.reacted_at <= ? AND EXISTS (
-        SELECT 1 FROM sends s WHERE s.item_id = i.id AND s.sent_at >= ? AND s.sent_at <= ?
-      )`).all(since, until, since, until) as Array<{ domain: BriefDomain }>).map(row => row.domain));
-    const composed = composeBriefPage([...items, ...funnelItems], slot, now, this.weeklyActionsFromDb(db, now), observedKinds);
+    const composed = composeBriefPage([...items, ...funnelItems], slot, now, this.weeklyActionsFromDb(db, now));
     // Ephemeral funnel lines appear on the page but have no ledger row to mark sent.
     const page = { markdown: composed.markdown, ids: composed.ids.filter(id => id > 0) };
     const candidates = (slot === 'realtime' ? pendingRealtime(items, now) : items.filter(item => item.sent_at === null && beforeSlot(item.created_at, slot, now))).length;

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

@@ -185,6 +185,8 @@ export interface TuiSelfReportDeps {
   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';
@@ -263,6 +265,17 @@ export function startTuiSelfReport(deps: TuiSelfReportDeps = {}): () => 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?.();
@@ -338,6 +351,8 @@ export function startTuiSelfReport(deps: TuiSelfReportDeps = {}): () => void {
     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 */ }

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';
@@ -248,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';
@@ -678,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 {
@@ -895,6 +911,8 @@ 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;
@@ -907,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);
@@ -915,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;
@@ -1134,7 +1153,12 @@ export async function textInput(opts: {
     setInputPromptStartRow(row);
     const promptStr = C.accent(prompt);
     const promptW = visibleWidth(prompt);
-    const textW = Math.max(0, getWidth() - 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
@@ -1177,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
@@ -1216,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
@@ -1382,6 +1407,7 @@ export async function textInput(opts: {
   const finalizeInput = (result: InputResult): InputResult => {
     // 외부 주입 라우터가 «composer 가 안 떠 있다»를 알 수 있게 내린다.
     if (hostControl) hostControl.getBufferText = undefined;
+    detachInternalTurnYield(result.yieldedToInternalTurn === true);
     clearPicker();
     writeTerminal(endTextInputCursor(opts.cursorSink));
     return result;
@@ -1454,9 +1480,34 @@ export async function textInput(opts: {
     };
   }
 
+  // ⭐ 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
@@ -1471,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
@@ -1671,6 +1723,7 @@ export async function textInput(opts: {
         // 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();
@@ -2001,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 의 몫).
@@ -2033,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/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';