elanous 0.2.38 → 0.2.41

package/src/tui/sidetab/list.ts

@@ -1,139 +1,25 @@
-import { resolveInstanceName } from '../../instance-identity.js';
-import { listPtyManifestRows, type PtyManifestRow } from '../../pty-shell/pty-manifest.js';
-import { describePtyRunState } from '../../pty-shell/tui-run-state.js';
-
-const graphemes = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
-
-export type SidetabBadge = 'busy' | 'idle' | 'stale' | 'unknown' | 'exited';
-
-export interface SidetabRow {
-  readonly id: string;
-  readonly label: string;
-  readonly kind: string;
-  readonly badge: SidetabBadge;
-  readonly sessionId?: string;
-  readonly ptyId?: string;
-  readonly nestDepth?: number;
-  readonly ownerPid?: number;
-  readonly currentProcess?: boolean;
-}
-
-export interface SidetabState {
-  readonly open: boolean;
-  readonly selected: number;
-}
-
-export interface SidetabScope {
-  readonly all?: boolean;
-  readonly currentPtyId?: string;
-  readonly currentPid?: number;
-  /** Current classic chat session; classic shell rows carry it in their purpose tag. */
-  readonly currentSessionId?: string;
-}
-
-export type SidetabKey = 'toggle' | 'up' | 'down' | 'other';
-
-export function createSidetabState(): SidetabState {
-  return { open: false, selected: 0 };
-}
-
-export function sidetabWidthForTerminal(columns: number): number {
-  return columns < 34 ? 0 : Math.min(28, Math.max(12, Math.floor(columns / 3)));
-}
-
-export function sidetabRowIndexAtTerminalRow(rowCount: number, selected: number, panelHeight: number, terminalRow: number): number | null {
-  const rowCapacity = Math.max(0, Math.floor(panelHeight) - 3);
-  const visibleCount = Math.min(rowCount, rowCapacity);
-  const offset = terminalRow - 3;
-  if (visibleCount === 0 || offset < 0 || offset >= visibleCount) return null;
-  const start = rowCount <= visibleCount
-    ? 0
-    : Math.max(0, Math.min(selected - visibleCount + 1, rowCount - visibleCount));
-  return start + offset;
-}
-
-export function applySidetabKey(state: SidetabState, key: SidetabKey, rowCount: number): SidetabState {
-  if (key === 'toggle') return { ...state, open: !state.open, selected: Math.min(state.selected, Math.max(0, rowCount - 1)) };
-  if (!state.open || rowCount === 0 || (key !== 'up' && key !== 'down')) return state;
-  const delta = key === 'up' ? -1 : 1;
-  return { ...state, selected: (state.selected + delta + rowCount) % rowCount };
-}
-
-export function sidetabRowsFromManifest(
-  rows: readonly PtyManifestRow[],
-  instance: string,
-  runState: (row: PtyManifestRow) => { turn: string; stale: boolean | null } = describePtyRunState,
-  scope?: SidetabScope,
-): SidetabRow[] {
-  const currentPid = scope?.currentPid ?? process.pid;
-  const currentSessionId = scope?.currentSessionId;
-  const eligible = rows.filter((row) => row.instance === instance && (
-    (row.kind === 'tui' && Boolean(row.sessionId))
-    || Boolean(row.parentPtyId)
-    || row.purpose?.startsWith('next-tui-sidetab:')
-    || (row.kind === 'shell'
-      && currentSessionId !== undefined
-      && row.parentPid === currentPid
-      && row.purpose?.includes(`:session:${currentSessionId}:terminal:`))
-  ));
-  let scoped = eligible;
-  if (scope) {
-    const parent = eligible.find((row) => row.kind === 'tui'
-      && (row.id === (scope.currentPtyId ?? `tui:${currentPid}`) || row.ownerPid === currentPid));
-    if (!scope.all) {
-      const includedIds = new Set<string>(parent ? [parent.id] : []);
-      const includedPids = new Set<number>(parent ? [parent.ownerPid, parent.ptyPid, currentPid] : [currentPid]);
-      let changed = true;
-      while (changed) {
-        changed = false;
-        for (const row of eligible) {
-          if (row.kind === 'tui' || includedIds.has(row.id)) continue;
-          if ((row.parentPtyId && includedIds.has(row.parentPtyId)) || (row.parentPid > 0 && includedPids.has(row.parentPid))) {
-            includedIds.add(row.id);
-            if (row.ownerPid > 0) includedPids.add(row.ownerPid);
-            if (row.ptyPid > 0) includedPids.add(row.ptyPid);
-            changed = true;
-          }
-        }
-      }
-      scoped = eligible.filter((row) => includedIds.has(row.id));
-    }
-    if (!scope.all) scoped = scoped.filter((row) => row.alive);
-  }
-  return scoped
-    .map((row) => {
-      const badge: SidetabBadge = !row.alive
-        ? 'exited'
-        : (() => {
-            const state = runState(row);
-            return state.stale === true ? 'stale' : state.turn === 'busy' ? 'busy' : state.turn === 'idle' ? 'idle' : 'unknown';
-          })();
-      const sessionId = row.purpose?.startsWith('next-tui-sidetab:') ? row.purpose.slice('next-tui-sidetab:'.length) : undefined;
-      const classicTerminalSessionId = currentSessionId !== undefined && row.kind === 'shell'
-        ? row.purpose?.split(`:session:${currentSessionId}:terminal:`)[1]
-        : undefined;
-      return {
-        id: row.id,
-        label: `${'  '.repeat(Math.min(2, row.nestDepth ?? 0))}${row.nickname || row.purpose || row.cmd || row.kind}`,
-        ...(row.sessionId ? { sessionId: row.sessionId } : {}),
-        kind: row.kind,
-        badge,
-        ptyId: row.id,
-        nestDepth: row.nestDepth,
-        ownerPid: row.ownerPid,
-        currentProcess: row.kind === 'tui' && row.ownerPid === process.pid,
-        ...(sessionId ? { sessionId } : classicTerminalSessionId ? { sessionId: classicTerminalSessionId } : {}),
-      };
-    });
-}
-
+/** Compatibility entry point for existing Next TUI callers. Shared behavior lives in sidetab-core. */
+export * from '../../sidetab-core/model.js';
+import {
+  formatSidetabLines as formatCoreSidetabLines,
+  loadSidetabRows as loadCoreSidetabRows,
+  type SidetabRow,
+} from '../../sidetab-core/model.js';
+import { listPtyManifestRows } from '../../pty-shell/pty-manifest.js';
+import { formatSidetabPeekLines } from './peek.js';
+
+type PreviewSidetabRow = SidetabRow & { readonly previewSource?: string };
+
+/** Attach the latest manifest snapshot without changing the shared row contract. */
 export function loadSidetabRows(all = false, currentSessionId?: string): SidetabRow[] {
-  return sidetabRowsFromManifest(listPtyManifestRows(), resolveInstanceName(), describePtyRunState, {
-    all,
-    ...(currentSessionId ? { currentSessionId } : {}),
-  });
+  const snapshots = new Map<string, string>(listPtyManifestRows().map((row) => [row.id, row.snapshot || row.frame] as const));
+  return loadCoreSidetabRows(all, currentSessionId).map((row) => ({
+    ...row,
+    previewSource: snapshots.get(row.id) ?? '',
+  }));
 }
 
+/** Render the core list and reserve a bounded tail preview for the selected PTY row. */
 export function formatSidetabLines(
   rows: readonly SidetabRow[],
   selected: number,
@@ -141,36 +27,21 @@ export function formatSidetabLines(
   height = Number.POSITIVE_INFINITY,
   mode: 'list' | 'new' = 'list',
 ): string[] {
-  const fit = (value: string): string => {
-    const segments = [...graphemes.segment(value)].map(({ segment }) => segment);
-    const truncated = Bun.stringWidth(value) > width;
-    const limit = truncated ? Math.max(0, width - 1) : width;
-    let result = '';
-    let used = 0;
-    for (const segment of segments) {
-      const cells = Bun.stringWidth(segment);
-      if (used + cells > limit) break;
-      result += segment;
-      used += cells;
-    }
-    if (truncated && width > 0) { result += '…'; used++; }
-    return result + ' '.repeat(Math.max(0, width - used));
-  };
-  const lines = mode === 'new'
-    ? [fit(' 새 PTY'), fit(' s shell · e elanous'), fit(' c codex · l claude · Esc')]
-    : [fit(' 세션 · PTY'), fit(' ↑↓ 전환 · 클릭 선택')];
-  const rowCapacity = Math.max(0, Math.floor(height) - lines.length - (mode === 'list' ? 1 : 0));
-  const visibleCount = Math.min(rows.length || 1, rowCapacity);
-  const start = rows.length <= visibleCount
-    ? 0
-    : Math.max(0, Math.min(selected - visibleCount + 1, rows.length - visibleCount));
-  if (mode === 'list' && rows.length === 0 && visibleCount > 0) lines.push(fit(' 항목 없음'));
-  for (let offset = 0; offset < visibleCount && rows.length > 0; offset++) {
-    const index = start + offset;
-    const row = rows[index]!;
-    const marker = index === selected ? '›' : ' ';
-    lines.push(fit(` ${marker} ${row.badge} ${row.label}`));
-  }
-  if (mode === 'list' && lines.length < Math.floor(height)) lines.push(fit(' + new · /side new'));
-  return lines;
+  const selectedRow = rows[selected] as PreviewSidetabRow | undefined;
+  const peekLines = mode === 'list' && selectedRow
+    ? formatSidetabPeekLines(selectedRow.previewSource ?? '', width)
+    : [];
+  if (peekLines.length === 0) return formatCoreSidetabLines(rows, selected, width, height, mode);
+
+  const reservedRows = peekLines.length + 1;
+  const coreLines = formatCoreSidetabLines(rows, selected, width, Math.max(0, height - reservedRows), mode);
+  // The core formatter reserves the leading ` › ` token for selection; a
+  // session label may itself contain `›`, so searching anywhere in the line
+  // can place the preview under the wrong row.
+  const selectedLine = coreLines.findIndex((line) => line.startsWith(' › '));
+  if (selectedLine < 0) return coreLines;
+
+  const lines = [...coreLines];
+  lines.splice(selectedLine + 1, 0, ' '.repeat(width), ...peekLines);
+  return Number.isFinite(height) ? lines.slice(0, Math.max(0, Math.floor(height))) : lines;
 }

package/src/tui/sidetab/nl-tool.ts

@@ -1,136 +1,2 @@
-import type { LLMToolSpec } from '../../llm.js';
-import type { SidetabRow } from './list.js';
-
-export const NEXT_SIDETAB_TOOL_NAME = 'NextSidetab';
-const CALL = 'elanous.sidetab.call';
-const RESULT = 'elanous.sidetab.result';
-
-export type NextSidetabAction = 'list' | 'switch' | 'attach' | 'detach' | 'new' | 'kill';
-export interface NextSidetabRequest {
-  action: NextSidetabAction;
-  target?: string;
-  character?: 'shell' | 'elanous';
-  confirm?: boolean;
-}
-export interface NextSidetabCall { type: typeof CALL; callId: string; request: NextSidetabRequest }
-export interface NextSidetabResult { type: typeof RESULT; callId: string; result: unknown }
-export type NextSidetabHandler = (request: NextSidetabRequest) => Promise<unknown>;
-export interface NextSidetabHostDeps {
-  rows(): readonly SidetabRow[] | Promise<readonly SidetabRow[]>;
-  selected(): number;
-  switchSession(row: SidetabRow): Promise<unknown>;
-  attach(row: SidetabRow): Promise<unknown>;
-  detach(): unknown;
-  spawn(character: 'shell' | 'elanous'): unknown;
-  kill(row: SidetabRow): unknown;
-}
-export interface NextSidetabIpcProcess {
-  send?: (message: unknown) => boolean | void;
-  on(event: 'message', listener: (message: unknown) => void): unknown;
-}
-
-export const nextSidetabToolSpec: LLMToolSpec = {
-  name: NEXT_SIDETAB_TOOL_NAME,
-  description: 'Control the Next TUI side tab: list/view sessions and PTYs, switch sessions, attach or detach, start a local shell or elanous PTY, or kill a PTY. Ask the user to confirm before calling kill with confirm=true. Starting coding agents is not supported.',
-  parameters: {
-    type: 'object',
-    properties: {
-      action: { type: 'string', enum: ['list', 'switch', 'attach', 'detach', 'new', 'kill'] },
-      target: { type: 'string', description: 'Optional exact or partial row id/label; required for targeted actions.' },
-      character: { type: 'string', enum: ['shell', 'elanous'], description: 'Only used with action=new.' },
-      confirm: { type: 'boolean', description: 'Must be true only after the user explicitly confirmed killing the selected PTY.' },
-    },
-    required: ['action'],
-    additionalProperties: false,
-  },
-};
-
-export function isNextSidetabCall(value: unknown): value is NextSidetabCall {
-  const call = value as Partial<NextSidetabCall> | null;
-  return Boolean(call && call.type === CALL && typeof call.callId === 'string'
-    && call.request && typeof call.request === 'object');
-}
-
-export async function answerNextSidetabCall(handler: NextSidetabHandler, call: NextSidetabCall): Promise<NextSidetabResult> {
-  try { return { type: RESULT, callId: call.callId, result: await handler(call.request) }; }
-  catch (error) {
-    return { type: RESULT, callId: call.callId, result: { error: error instanceof Error ? error.message : String(error) } };
-  }
-}
-
-export function createNextSidetabHostHandler(deps: NextSidetabHostDeps): NextSidetabHandler {
-  return async (request) => {
-    if (!request || !['list', 'switch', 'attach', 'detach', 'new', 'kill'].includes(request.action)) {
-      return { error: '지원하지 않는 사이드탭 동작입니다' };
-    }
-    if (request.action === 'new') {
-      if (request.character !== 'shell' && request.character !== 'elanous') return { error: 'character는 shell 또는 elanous여야 합니다' };
-      return deps.spawn(request.character);
-    }
-    if (request.action === 'detach') return deps.detach();
-    const rows = await deps.rows();
-    if (request.action === 'list') return rows.map(({ id, label, kind, badge, sessionId }) => ({ id, label, kind, badge, ...(sessionId ? { sessionId } : {}) }));
-    const target = request.target?.trim();
-    const exact = target ? rows.find((item) => item.id === target)
-      ?? rows.find((item) => item.label.toLowerCase() === target.toLowerCase()) : undefined;
-    const partial = target && !exact ? rows.filter((item) => item.label.toLowerCase().includes(target.toLowerCase())) : [];
-    if (partial.length > 1) return { error: `사이드탭 항목이 여러 개 일치합니다: ${target}` };
-    const row = exact ?? partial[0] ?? (target ? undefined : rows[deps.selected()]);
-    if (!row) return { error: target ? `사이드탭 항목을 찾지 못했습니다: ${target}` : '선택된 사이드탭 항목이 없습니다' };
-    if (request.action === 'switch') return row.kind === 'tui' ? deps.switchSession(row) : { error: 'Next TUI 세션만 전환할 수 있습니다' };
-    if (request.action === 'attach') return deps.attach(row);
-    if (row.currentProcess) return { error: '현재 TUI 세션은 사이드탭에서 종료할 수 없습니다' };
-    if (request.confirm !== true) return { needsConfirmation: true, message: `PTY 종료 확인 필요: ${row.label}` };
-    return deps.kill(row);
-  };
-}
-
-export function createReplNextSidetabTool(
-  proc: NextSidetabIpcProcess,
-  env: NodeJS.ProcessEnv = process.env,
-  timeoutMs = 15_000,
-): { spec: LLMToolSpec; dispatch: (args: Record<string, unknown>) => Promise<unknown> } | null {
-  if (env.ELANOUS_NEXT_TUI_SIDETAB_IPC !== '1' || typeof proc.send !== 'function') return null;
-  const send = proc.send.bind(proc);
-  const waiting = new Map<string, (result: unknown) => void>();
-  let sequence = 0;
-  const listener = (message: unknown): void => {
-    const result = message as Partial<NextSidetabResult> | null;
-    if (!result || result.type !== RESULT || typeof result.callId !== 'string') return;
-    const resolve = waiting.get(result.callId);
-    if (!resolve) return;
-    waiting.delete(result.callId);
-    resolve(result.result);
-  };
-  proc.on('message', listener);
-  return {
-    spec: nextSidetabToolSpec,
-    dispatch: (args) => new Promise((resolve) => {
-      const callId = `s${++sequence}`;
-      const timer = setTimeout(() => {
-        if (!waiting.delete(callId)) return;
-        resolve({ error: 'Next TUI did not answer the side-tab request' });
-      }, timeoutMs);
-      waiting.set(callId, (result) => { clearTimeout(timer); resolve(result); });
-      try {
-        send({ type: CALL, callId, request: args as unknown as NextSidetabRequest } satisfies NextSidetabCall);
-      } catch (error) {
-        waiting.delete(callId);
-        clearTimeout(timer);
-        resolve({ error: `Next TUI IPC send failed: ${error instanceof Error ? error.message : String(error)}` });
-      }
-    }),
-  };
-}
-
-export function registerNextSidetabReplTool(
-  specs: LLMToolSpec[],
-  dispatchByName: Map<string, (args: Record<string, unknown>) => Promise<unknown>>,
-  proc: NextSidetabIpcProcess,
-  env: NodeJS.ProcessEnv = process.env,
-): void {
-  const tool = createReplNextSidetabTool(proc, env);
-  if (!tool) return;
-  specs.push(tool.spec);
-  dispatchByName.set(tool.spec.name, tool.dispatch);
-}
+/** Compatibility entry point for Next TUI callers. Shared contracts and policy live in sidetab-core. */
+export * from '../../sidetab-core/model.js';

package/src/tui/sidetab/peek.ts

@@ -0,0 +1,52 @@
+const graphemes = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
+
+const ANSI_CONTROL = /\x1b(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1b\\)|[PX^_].*?\x1b\\|.)/gs;
+const NON_TEXT_CONTROL = /[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g;
+const MAX_PEEK_SOURCE_CHARS = 16_384;
+
+function fitLine(value: string, width: number): string {
+  if (width <= 0) return '';
+  if (Bun.stringWidth(value) <= width) return value;
+  const maxTextWidth = Math.max(0, width - 1);
+  let result = '';
+  let used = 0;
+  for (const { segment } of graphemes.segment(value)) {
+    const cells = Bun.stringWidth(segment);
+    if (used + cells > maxTextWidth) break;
+    result += segment;
+    used += cells;
+  }
+  return `${result}…`;
+}
+
+/** Return up to three recent plain-text output lines for the selected sidebar row. */
+export function formatSidetabPeekLines(
+  source: string,
+  width: number,
+  maxLines = 3,
+): string[] {
+  if (!source || width < 5 || maxLines <= 0) return [];
+
+  let start = Math.max(0, source.length - MAX_PEEK_SOURCE_CHARS);
+  // Keep a surrogate pair intact when the bounded tail starts in its second code unit.
+  const firstCodeUnit = source.charCodeAt(start);
+  if (start > 0 && firstCodeUnit >= 0xdc00 && firstCodeUnit <= 0xdfff) start++;
+  let bounded = source.slice(start);
+  // The cut may land in an ANSI sequence or line. Drop that partial prefix; recent complete lines follow it.
+  if (start > 0) {
+    const firstLineBreak = bounded.search(/[\r\n]/);
+    if (firstLineBreak >= 0) bounded = bounded.slice(firstLineBreak + 1);
+  }
+
+  const clean = bounded
+    .replace(ANSI_CONTROL, '')
+    .replace(NON_TEXT_CONTROL, '')
+    .replace(/\r\n?/g, '\n');
+  const recent = clean.split('\n')
+    .map((line) => line.trimEnd())
+    .filter((line) => line.trim().length > 0)
+    .slice(-Math.min(3, Math.floor(maxLines)));
+  const prefix = '   ↳ ';
+  const textWidth = Math.max(1, width - Bun.stringWidth(prefix));
+  return recent.map((line) => `${prefix}${fitLine(line, textWidth)}`);
+}

package/src/tui/slash/term.ts

@@ -176,7 +176,10 @@ type TermSubHandler = (sub: string, args: string[], ctx: TermSlashContext, local
 
 async function termHelp(sub: string, args: string[], ctx: TermSlashContext, locals: TermSlashLocals): Promise<void> {
   const { slashRuntime } = locals;
-  for (const line of slashRuntime.helpLines()) ctx.chatLines.push(line);
+  const lines = (args[1] ?? '').toLowerCase() === 'experimental'
+    ? slashRuntime.experimentalHelpLines()
+    : slashRuntime.helpLines();
+  for (const line of lines) ctx.chatLines.push(line);
   ctx.setChatScrollOffset(-1);
   return;
 }
@@ -850,6 +853,14 @@ export async function handleTermSlash(args: string[], ctx: TermSlashContext): Pr
   // dispatchTerminalModalObserve. Behavior preserved verbatim from
   // the inline case.
   const sub = (args[0] ?? '').toLowerCase();
+  const destination = (args[2] ?? '').trim().toLowerCase();
+  if (sub === 'vw-bar' || sub === 'vwbar' || sub === 'vw-sync' || sub === 'vwsync'
+      || (sub === 'move' && (destination === 'vw' || destination === 'window'))) {
+    const command = sub === 'move' ? 'move <id> vw' : sub === 'vwbar' ? 'vw-bar' : sub === 'vwsync' ? 'vw-sync' : sub;
+    ctx.chatLines.push(ctx.warning(`  /term ${command} is retired; it no longer changes terminal state.`));
+    ctx.setChatScrollOffset(-1);
+    return;
+  }
   const slashRuntime = ctx.termSlash.slashRuntime;
   const sessionRegistry = ctx.termSlash.sessionRegistry;
   const terminalMatrix = ctx.termSlash.terminalMatrix;

package/src/tui-client/dashboard-session.ts

@@ -133,6 +133,8 @@ export interface DashboardSendRequest {
   /** TUI-TURN-NARRATION — `agent_thought_chunk` ⊕ `_meta.reasoning: true`(추론 요약 문단).
    *  전에는 usage 봉투가 아니면 버려서 화면에 0줄이었다(결함 #87). */
   onThought?(text: string): void;
+  /** Transient runtime status (`_meta.status: true`), kept separate from model reasoning. */
+  onStatus?(text: string): void;
 }
 
 export interface DashboardSendResult {
@@ -209,6 +211,9 @@ export class DashboardSession {
         ? { resolveMaxToolTurns: opts.resolveMaxToolTurns }
         : {}),
       ...(opts.abortPollMs !== undefined ? { abortPollMs: opts.abortPollMs } : {}),
+      // TUI-TOKEN-GUARD-WIRE — the host history write-back for the request-size cap.
+      ...(opts.compactPersistedHistory ? { compactPersistedHistory: opts.compactPersistedHistory } : {}),
+      ...(opts.requestSizeMaxChars !== undefined ? { requestSizeMaxChars: opts.requestSizeMaxChars } : {}),
     });
 
     const serverPromise = runAcpServer({
@@ -553,7 +558,7 @@ function buildSendInterceptor(req: DashboardSendRequest): SessionUpdateIntercept
         rawInput?: unknown;
         rawOutput?: unknown;
         status?: string;
-        _meta?: { reasoning?: unknown };
+        _meta?: { reasoning?: unknown; status?: unknown };
       };
     };
     const inner = n.update;
@@ -588,6 +593,10 @@ function buildSendInterceptor(req: DashboardSendRequest): SessionUpdateIntercept
       case 'agent_thought_chunk': {
         if (inner.content?.type !== 'text') return;
         const text = inner.content.text ?? '';
+        if (inner._meta?.status === true) {
+          req.onStatus?.(text);
+          return;
+        }
         if (inner._meta?.reasoning === true) {
           req.onThought?.(text);
           return;

package/src/user-config.ts

@@ -187,6 +187,8 @@ export interface LLMConfig {
   apiKey?: string;
   model?: string;
   baseUrl?: string;
+  /** Override the text stream idle watchdog in milliseconds. Omitted keeps provider/family defaults. */
+  streamIdleTimeoutMs?: number;
   /** OpenRouter 설정 한 곳(두 골이 같은 키를 쓴다):
    *  - `providerPreferences` — 상류 라우팅 선호; 도구 가능 기본값(require_parameters·allow_fallbacks)을 얕게 덮는다(OR-LLM-ROUTING-1).
    *  - `fallbackModel` — 유료 OpenRouter 폴백 모델; 체인에 openrouter 를 명시하고 모델·키를 모두 줄 때만 선택된다(OR-FALLBACK-TIER-1).
@@ -1154,6 +1156,8 @@ export interface HarnessBudgetGateConfig {
 }
 
 export interface SelfImplementToolConfig {
+  /** Explicit opt-in for the needs-human reason-specific automatic repair goal. Defaults off. */
+  supervisor?: { reasonRepair?: boolean };
   /** Absolute root that holds per-repository child worktree directories. */
   worktreeRoot: string;
   /** Self-implement children receive a derived isolated universe by default; `inherit` keeps the parent's universe. */
@@ -1290,7 +1294,7 @@ const TOOLS_DEFAULTS: ToolsConfig = {
   selfOrchestrate: {},
   nativeStructure: { enabled: false },
   // 대표 결정(2026-07-26): 오토 선호 — 기본 ON.
-  selfImplement: { worktreeRoot: join(homedir(), '.elanous', 'worktrees'), childInstanceMode: 'isolated', prApprovalDelivery: 'terminal' as const, observeOnly: false, goalRecordInDoc: true, fabricDecompose: false, fabricDecomposeAutoPathThreshold: 5, autoOpenPr: true, autoStop: { enabled: true, minRung: 2 }, autoAssist: { enabled: true, minRung: 2 }, screenStallTermination: { enabled: true, minRung: 2 }, reworkBudget: { shadowStop: false, maxRounds: 3 }, decompositionShadow: { enabled: false }, clarificationEscalation: { enabled: false } },
+  selfImplement: { worktreeRoot: join(homedir(), '.elanous', 'worktrees'), childInstanceMode: 'isolated', prApprovalDelivery: 'terminal' as const, observeOnly: false, goalRecordInDoc: true, fabricDecompose: false, fabricDecomposeAutoPathThreshold: 5, autoOpenPr: true, supervisor: { reasonRepair: false }, autoStop: { enabled: true, minRung: 2 }, autoAssist: { enabled: true, minRung: 2 }, screenStallTermination: { enabled: true, minRung: 2 }, reworkBudget: { shadowStop: false, maxRounds: 3 }, decompositionShadow: { enabled: false }, clarificationEscalation: { enabled: false } },
 };
 
 // ── Debug ────────────────────────────────────────────────────────────
@@ -1986,6 +1990,8 @@ function parseTasteConfig(raw: unknown): TasteConfig | undefined {
  */
 export interface WebSearchConfig {
   tavily?: { enabled?: boolean };
+  grokApi?: { enabled?: boolean };
+  firecrawl?: { enabled?: boolean };
 }
 
 /** OpenDesign 데몬 접속. url 이 없으면 시안 생성은 꺼진 것이다. tokenFile 은 토큰 «경로»만 담는다. */
@@ -2032,6 +2038,13 @@ function parseWebSearchConfig(raw: unknown): WebSearchConfig | undefined {
     const t = r.tavily as Record<string, unknown>;
     if (typeof t.enabled === 'boolean') out.tavily = { enabled: t.enabled };
   }
+  for (const key of ['grokApi', 'firecrawl'] as const) {
+    const section = r[key];
+    if (section && typeof section === 'object' && !Array.isArray(section)) {
+      const enabled = (section as Record<string, unknown>).enabled;
+      if (typeof enabled === 'boolean') out[key] = { enabled };
+    }
+  }
   return Object.keys(out).length > 0 ? out : undefined;
 }
 
@@ -2041,6 +2054,11 @@ export function isTavilySearchEnabled(cfg: Pick<UserConfig, 'webSearch'> = getUs
   return cfg.webSearch?.tavily?.enabled === true;
 }
 
+/** An API key being present does not authorize metered web search. */
+export function isPaidWebSearchEnabled(provider: 'grokApi' | 'firecrawl', cfg: Pick<UserConfig, 'webSearch'> = getUserConfig()): boolean {
+  return cfg.webSearch?.[provider]?.enabled === true;
+}
+
 function parseSessionFabricConfig(raw: unknown): SessionFabricConfig | undefined {
   if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return undefined;
   const r = raw as Record<string, unknown>;
@@ -2633,6 +2651,10 @@ function parseToolsConfig(raw: unknown): ToolsConfig {
   const selfImplRaw = (root.selfImplement && typeof root.selfImplement === 'object' && !Array.isArray(root.selfImplement))
     ? root.selfImplement as Record<string, unknown>
     : {};
+  const supervisorRaw = selfImplRaw.supervisor && typeof selfImplRaw.supervisor === 'object' && !Array.isArray(selfImplRaw.supervisor)
+    ? selfImplRaw.supervisor as Record<string, unknown>
+    : {};
+  const supervisor = { reasonRepair: supervisorRaw.reasonRepair === true };
   const observeOnly = typeof selfImplRaw.observeOnly === 'boolean'
     ? selfImplRaw.observeOnly
     : TOOLS_DEFAULTS.selfImplement.observeOnly;
@@ -2791,7 +2813,7 @@ function parseToolsConfig(raw: unknown): ToolsConfig {
     runDevHarness,
     selfOrchestrate,
     nativeStructure,
-    selfImplement: { worktreeRoot, childInstanceMode, prApprovalDelivery, observeOnly, goalRecordInDoc, goalAuthorPersistentGrounding, fabricDecompose, fabricDecomposeAutoPathThreshold, autoOpenPr, draftOnStop, salvageRetention, autoStop, autoAssist, screenStallTermination, reworkBudget, decompositionShadow, clarificationEscalation, ...(childLlm ? { childLlm } : {}), ...(escalateChild && Object.keys(escalateChild).length ? { escalateChild } : {}), ...(selfImplRaw.podChildDefault !== undefined ? { podChildDefault: selfImplRaw.podChildDefault } : {}), ...(runTtlHours !== undefined ? { runTtlHours } : {}), ...(draftSweepCloseCap !== undefined ? { draftSweepCloseCap } : {}), ...(runTtl ? { runTtl } : {}), ...(autoheal ? { autoheal } : {}) },
+    selfImplement: { worktreeRoot, childInstanceMode, prApprovalDelivery, observeOnly, goalRecordInDoc, goalAuthorPersistentGrounding, fabricDecompose, fabricDecomposeAutoPathThreshold, autoOpenPr, supervisor, draftOnStop, salvageRetention, autoStop, autoAssist, screenStallTermination, reworkBudget, decompositionShadow, clarificationEscalation, ...(childLlm ? { childLlm } : {}), ...(escalateChild && Object.keys(escalateChild).length ? { escalateChild } : {}), ...(selfImplRaw.podChildDefault !== undefined ? { podChildDefault: selfImplRaw.podChildDefault } : {}), ...(runTtlHours !== undefined ? { runTtlHours } : {}), ...(draftSweepCloseCap !== undefined ? { draftSweepCloseCap } : {}), ...(runTtl ? { runTtl } : {}), ...(autoheal ? { autoheal } : {}) },
   };
 }
 
@@ -3901,8 +3923,8 @@ function parseProjectsConfig(raw: unknown): Record<string, ProjectConfig> | unde
 }
 
 export interface UserConfig {
-  /** Next TUI sidetab visibility: off disables it, collapsed starts folded, open starts visible. */
-  tui?: { sidetab?: 'off' | 'collapsed' | 'open' };
+  /** Next TUI options. `unattended` makes confirmation/clarification paths non-blocking. */
+  tui?: { sidetab?: 'off' | 'collapsed' | 'open'; unattended?: boolean };
   projects?: Record<string, ProjectConfig>;
   /** Default personal topic watch; absent = enabled when user sources exist. */
   watch?: { enabled?: boolean };
@@ -3937,7 +3959,7 @@ export interface UserConfig {
   loops?: { owners?: Record<string, EventSeat>; defaultOwner?: EventSeat; orchestrator?: OrchestratorLoopConfig; steward?: { mode?: StewardLoopMode; linearTeam?: string; roles?: Record<string, { maxConcurrent?: number }>; budget?: number; tracks?: Record<string, string>; alertAfterFailures?: number; launch?: 'off' | 'shadow' | 'live'; maxParallel?: number; podPool?: string }; seat?: SeatLoopConfig; persona?: PersonaLoopConfig };
   /** 🔐 Pod 의 Grok API 키 과금은 명시 opt-in 만. 생략·잘못된 값은 false.
    *  budgetGate 와 같은 `harness` 객체다 — 중복 선언이면 뒤 타입이 앞을 지운다. */
-  harness?: { edgeRail?: { canaryOkRuns?: number; failureMultiplier?: number; minSamples?: number }; /** Goal authoring grade; absent or invalid config resolves to full. */ authorGrade?: 'full' | 'lite'; revertGuard?: { depth: number }; pod?: { grokApiKeyOptIn: boolean }; budgetGate?: HarnessBudgetGateConfig; exposeGate?: 'warn' | 'strict'; difficultyPlacement?: boolean; defaultRepo?: string; /** Optional GitHub repository name (owner/repo), distinct from the local defaultRepo path. */ repo?: string; /** `auto` = SUBSTRATE-ROUTE: routeAutoSubstrate 가 pod/local 을 고른다(신호가 없으면 pod). */ substrate?: 'local' | 'pod' | 'auto'; podPool?: string; /** IMAGE-ONE-SOURCE: Pod 발사가 당길 기준 이미지 커밋(hex 12~40 · 레지스트리 태그 = 앞 12자리). 없으면 종전대로 HEAD 비교·굽기. */ imageCommit?: string; worktreeAddTimeoutSec?: number; queue?: { seatCap?: Partial<Record<'OP' | 'TC' | 'MK' | 'UX', number>>; /** Direct `harness say|ask` goes through the seat queue first (ONEDOOR-2). Absent = env ELANOUS_HARNESS_QUEUE_DIRECT_SAY, else off. */ directSay?: boolean; /** SEAT-CAP-STALE: a run whose last ledger progress is older than this stops holding its seat. Absent = env ELANOUS_HARNESS_QUEUE_STALE_RUN_MINUTES, else 30. */ staleRunMinutes?: number; /** Seat-less runs count in one bucket with this cap instead of every seat. Absent = env ELANOUS_HARNESS_QUEUE_UNKNOWN_SEAT_CAP, else 2. */ unknownSeatCap?: number; /** QUEUE-BURST: most launches one scheduled tick may make (30 s apart, each within seat cap and Pod pool headroom). Absent or invalid = 5; 1 = one launch per tick. */ burstMax?: number }; /** `harness say` 문장을 Pod 안에서 저작부터 돌릴지. 생략·false = 끔(호스트가 저작). */ authorOnPod?: boolean; /** SIBLING-RESYNC-ON-MERGE: most open sibling PR file inventories fetched per merge. Absent or invalid = 40. */ siblingResync?: { maxFetch?: number }; /** Stopped-PR repair goals: shadow records only (default); live enqueues them. */ helper?: { repair?: 'shadow' | 'live'; /** Live launches allowed per UTC day. Absent or invalid means 3. */ repairPerDay?: number };
+  harness?: { /** KNOWHOW-PACK-TO-SUPERVISORS: child goal injection is legacy opt-in; omitted = off. */ knowhowChildInjection?: boolean; edgeRail?: { canaryOkRuns?: number; failureMultiplier?: number; minSamples?: number }; /** Goal authoring grade; absent or invalid config resolves to full. */ authorGrade?: 'full' | 'lite'; revertGuard?: { depth: number }; pod?: { grokApiKeyOptIn: boolean }; budgetGate?: HarnessBudgetGateConfig; exposeGate?: 'warn' | 'strict'; difficultyPlacement?: boolean; defaultRepo?: string; /** Optional GitHub repository name (owner/repo), distinct from the local defaultRepo path. */ repo?: string; /** `auto` = SUBSTRATE-ROUTE: routeAutoSubstrate 가 pod/local 을 고른다(신호가 없으면 pod). */ substrate?: 'local' | 'pod' | 'auto'; podPool?: string; /** IMAGE-ONE-SOURCE: Pod 발사가 당길 기준 이미지 커밋(hex 12~40 · 레지스트리 태그 = 앞 12자리). 없으면 종전대로 HEAD 비교·굽기. */ imageCommit?: string; worktreeAddTimeoutSec?: number; queue?: { seatCap?: Partial<Record<'OP' | 'TC' | 'MK' | 'UX', number>>; /** Direct `harness say|ask` goes through the seat queue first (ONEDOOR-2). Absent = env ELANOUS_HARNESS_QUEUE_DIRECT_SAY, else off. */ directSay?: boolean; /** SEAT-CAP-STALE: a run whose last ledger progress is older than this stops holding its seat. Absent = env ELANOUS_HARNESS_QUEUE_STALE_RUN_MINUTES, else 30. */ staleRunMinutes?: number; /** Seat-less runs count in one bucket with this cap instead of every seat. Absent = env ELANOUS_HARNESS_QUEUE_UNKNOWN_SEAT_CAP, else 2. */ unknownSeatCap?: number; /** QUEUE-BURST: most launches one scheduled tick may make (30 s apart, each within seat cap and Pod pool headroom). Absent or invalid = 5; 1 = one launch per tick. */ burstMax?: number }; /** `harness say` 문장을 Pod 안에서 저작부터 돌릴지. 생략·false = 끔(호스트가 저작). */ authorOnPod?: boolean; /** SIBLING-RESYNC-ON-MERGE: most open sibling PR file inventories fetched per merge. Absent or invalid = 40. */ siblingResync?: { maxFetch?: number }; /** Stopped-PR repair goals: shadow records only (default); live enqueues them. */ helper?: { repair?: 'shadow' | 'live'; /** Live launches allowed per UTC day. Absent or invalid means 3. */ repairPerDay?: number };
   /** Nested elanous launches. Only depth 0 may set `allow`. Absent or any other value refuses. A depth >= 1 `--nested-elanous allow` is ignored. */
   nestedElanous?: 'allow' | 'refuse';
   /** Maximum nested elanous depth; safe positive integer, default 2. */
@@ -5135,7 +5157,10 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
   const gateRemoteConfig = parseGateRemoteConfig(rawObj.gateRemote);
   const projects = parseProjectsConfig(rawObj.projects);
   return {
-    tui: { sidetab: tuiRaw.sidetab === 'off' || tuiRaw.sidetab === 'open' ? tuiRaw.sidetab : 'collapsed' },
+    tui: {
+      sidetab: tuiRaw.sidetab === 'off' || tuiRaw.sidetab === 'open' ? tuiRaw.sidetab : 'collapsed',
+      ...(typeof tuiRaw.unattended === 'boolean' ? { unattended: tuiRaw.unattended } : {}),
+    },
     ...(projects ? { projects } : {}),
     ...(rawObj.starter && typeof rawObj.starter === 'object' && !Array.isArray(rawObj.starter)
       && Array.isArray((rawObj.starter as Record<string, unknown>).topics)
@@ -5305,6 +5330,7 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
         };
       })(),
       model: resolveRuntimeLlmModel(baseProvider, selectedProvider, str(llm.model), escalationProvider || undefined),
+      streamIdleTimeoutMs: positiveFiniteNumber(llm.streamIdleTimeoutMs),
       openrouter: (() => {
         const router = llm.openrouter;
         if (!router || typeof router !== 'object' || Array.isArray(router)) return undefined;
@@ -6227,6 +6253,15 @@ export function getUserConfig(path: string = defaultPath()): UserConfig {
   return cache;
 }
 
+/** Resolve the explicit TUI unattended switch: saved user config wins over the seat-launch env override. */
+export function resolveTuiUnattended(
+  config: UserConfig = getUserConfig(),
+  env: NodeJS.ProcessEnv = process.env,
+): boolean {
+  if (typeof config.tui?.unattended === 'boolean') return config.tui.unattended;
+  return env.ELANOUS_TUI_UNATTENDED === '1';
+}
+
 // Read at call time, not registration time, so reload/reset and on-disk edits keep their semantics.
 // Stored timezone is kept in raw by buildUserConfig; do not change getUserConfig's returned shape.
 setConfigTimeZoneSource(() => {
@@ -6315,11 +6350,11 @@ export const PROVIDER_DEFAULT_MODEL: Record<LLMProviderName, string> = {
   //   ⛔ openai(API 키)는 gpt-4o 그대로 — `gpt-6-*` 는 openai-codex 계열이라 openai 로 부르면 호환 판정이 거부한다(09-23 대표 · 같은 날 되돌림).
   anthropic: 'claude-opus-5-5',
   openai: 'gpt-4o',
-  // ⛔ 2026-09-23: `gpt-5.5` 는 ***두 세대 낡았다***. 운영 기본은 `gpt-6-sol` 이고
-  //    (대표 2026-09-23 · `llm.ts` `CODEX_DEFAULT_MODEL`), 이 표만 안 따라왔다.
+  // 2026-10-28: GPT-6.1 Terra is the current recommended Codex default.
+  //    `llm.ts` avoids importing this UI-facing module, so keep its local default aligned here.
   //    ⚠️ `llm.ts` 에서 import 하지 «않는다» — 이 파일은 UI 소비자가 CLI 표면을 안 끌어오게
   //    «일부러» 독립돼 있다(이 상수의 머리말). ⇒ 값을 맞추고 «자»로 묶는다.
-  'openai-codex': 'gpt-6-sol',
+  'openai-codex': 'gpt-6.1-terra',
   // ⛔ 2026-08-18: 'grok-4-1-fast' 는 «200 OK 로 응답하지만 실제로는 grok-4.3 이 도는»
   //    레거시 별칭이었다(xAI 실호출 대조). 실물 flagship 으로 고친다.
   grok: 'grok-4.7',
@@ -6623,6 +6658,7 @@ export function saveUserConfig(
       apiKey: cfg.llm.apiKey,
       model: cfg.llm.model,
       baseUrl: cfg.llm.baseUrl,
+      streamIdleTimeoutMs: cfg.llm.streamIdleTimeoutMs,
       // Persist the rotation exactly as held in memory — each entry
       // stripped of its own undefined fields so the on-disk JSON
       // stays minimal. Omit the key entirely when no rotation is