elanous 0.2.37 → 0.2.40

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

@@ -89,7 +89,7 @@ export function renderToolResultVariants(
   // Only successful MsgPost results enter the compact renderer. Returning
   // null for errors lets the dashboard formatter use its existing generic
   // result path, including its expanded argument/result view.
-  if (kind === 'MsgPost' && extractErrorText(call.result)) return null;
+  if (kind === 'MsgPost' && isMsgPostErrorResult(call.result)) return null;
   const model = buildToolRenderModel(kind, call, config);
   const collapsed = renderToolBlock(model, config.blockMaxLines, config.foldMode, config.expandHint);
   // ⭐ MsgPost 는 접힌 행에서 본문을 빼고 펼친 행에서만 싣는다 ⇒ 같은 model 로는 두 변형을
@@ -113,6 +113,13 @@ interface ToolRenderModelOptions {
   includeMsgPostBody?: boolean;
 }
 
+/** MsgPost 오류 — `llm.ts` 가 throw 를 `{ error }` 로 감싼 형태와, `ok: false` 결과. */
+function isMsgPostErrorResult(result: unknown): boolean {
+  if (extractErrorText(result)) return true;
+  const rec = asRecord(result);
+  return rec?.ok === false;
+}
+
 function normalizeToolRenderName(name: string): ToolRenderKind | null {
   if (name === 'update_plan' || name === 'UpdatePlan') return 'UpdatePlan';
   if (name === 'update_goal' || name === 'UpdateGoal') return 'UpdateGoal';

package/src/cli/agent-cli.ts

@@ -68,6 +68,25 @@ export function setCliAgentDispatchForTesting(dispatch: CliAgentDispatch | undef
   cliAgentDispatchForTesting = dispatch;
 }
 
+/** A completed standalone agent turn must not wait forever for a tool's leftover handle. */
+function armAgentCliExitSafetyNet(): void {
+  const timer = setTimeout(() => {
+    try {
+      const runtime = process as typeof process & {
+        _getActiveHandles?: () => Array<{ constructor?: { name?: string } }>;
+        _getActiveRequests?: () => Array<{ constructor?: { name?: string } }>;
+      };
+      const handleTypes = runtime._getActiveHandles?.().map(h => h.constructor?.name ?? 'unknown') ?? [];
+      const requestTypes = runtime._getActiveRequests?.().map(r => r.constructor?.name ?? 'unknown') ?? [];
+      debug.log('agent.cli.exit', 'grace-expired', { handleTypes, requestTypes }, { level: 'warn' });
+      debug.flush();
+    } finally {
+      process.exit(0);
+    }
+  }, 1_000);
+  timer.unref();
+}
+
 export function registerAgentCommands(program: Command): void {
   const agentCommand = program
   .command('agent')
@@ -128,6 +147,10 @@ export function registerAgentCommands(program: Command): void {
       // commander stores --no-tools as `tools: false`, plain absence as undefined → default true here.
       enableTools: opts.tools !== false,
     });
+    // runChatTurnCli has already flushed its JSON reply. Let clean turns exit
+    // naturally; a referenced child/socket/timer left by a tool gets one second
+    // before we log the surviving handles and end this standalone process.
+    armAgentCliExitSafetyNet();
   });
 
 // ── agent dispatch — RFC #7333 `A1` (트리거) ──
@@ -413,7 +436,7 @@ tierCmd
  *  ui.info trailer and instead emits exactly ONE JSON line on stdout
  *  at end-of-turn:
  *    {sessionId, provider, model, reply, finalReply, transcript, logPath,
- *     budget, durationMs, ts}
+ *     budget, durationMs, ts, incomplete}
  *  Stable shape so LLMs can self-spawn `elanous chat` for follow-ups
  *  without parsing human-readable terminal output. */
 export async function runChatTurnCli(opts: {
@@ -484,7 +507,7 @@ export async function runChatTurnCli(opts: {
     dbg.setAmbientSessionId?.(session.id);
   } catch { /* debug module unavailable — fine */ }
   const replyChunks: string[] = [];
-  // Tool calls delimit assistant messages. finalReply retains its last non-empty-message meaning.
+  // Tool calls delimit assistant messages. Only text after the last tool call can be the final reply.
   let segmentChunks: string[] = [];
   let lastSegment = '';
   let finalMessage = '';
@@ -507,14 +530,17 @@ export async function runChatTurnCli(opts: {
   let tools: ReturnType<typeof buildCliAgentTools> | undefined;
   let dispatchTool: ((name: string, args: Record<string, unknown>) => Promise<unknown>) | undefined;
   let enabledToolNames: string[] | undefined;
+  const toolAbort = new AbortController();
+  const abortToolsOnSigint = (): void => toolAbort.abort();
   if (opts.enableTools) {
     const built = buildCliAgentTools(opts.cfg, harnessSpace ? {
       sessionId: session.id,
       emitFeedback: emitHarnessFeedbackProgress,
     } : undefined);   // ★ cfg 전달 → financeEnabled 시 finance 팩 노출(서피스 게이팅 정리)
     tools = built;
-    dispatchTool = built.dispatch;
+    dispatchTool = (name, args) => built.dispatch(name, args, { signal: toolAbort.signal });
     enabledToolNames = built.specs.map(s => s.name);
+    process.once('SIGINT', abortToolsOnSigint);
   }
   // Wire the universal preamble (project anchor + project tree +
   // family addendum + session-specific guidance) into every CLI system
@@ -604,6 +630,8 @@ export async function runChatTurnCli(opts: {
       process.exit(2);
     }
     throw err;
+  } finally {
+    if (opts.enableTools) process.removeListener('SIGINT', abortToolsOnSigint);
   }
   if (!sawToolCall && replyChunks.length === 0 && result.text) {
     replyChunks.push(result.text);
@@ -611,6 +639,7 @@ export async function runChatTurnCli(opts: {
     if (!opts.json && !opts.enableTools) process.stdout.write(result.text);
   }
   closeSegment();
+  const incomplete = sawToolCall && finalMessage.length === 0;
   if (opts.json) {
     let logPath: string | null = null;
     try {
@@ -624,17 +653,23 @@ export async function runChatTurnCli(opts: {
       model: result.model ?? null,
       reply: finalMessage,
       transcript: replyChunks.join(''),
-      finalReply: lastSegment,
+      finalReply: sawToolCall ? finalMessage : lastSegment,
+      incomplete,
       budget: sessionBudget(session.id),
       durationMs: Date.now() - startedAt,
       logPath,
       ts: new Date().toISOString(),
     };
     await writeStdoutJson(JSON.stringify(out) + '\n');
+    if (incomplete) process.exitCode = 1;
     return;
   }
   if (opts.enableTools) process.stdout.write(`${finalMessage}\n`);
   else process.stdout.write('\n');
+  if (incomplete) {
+    console.error('Turn ended without a final assistant reply.');
+    process.exitCode = 1;
+  }
   ui.info(`[session ${session.id.slice(0, 8)}  ${result.provider}${result.model ? '/' + result.model : ''}  ${sessionBudget(session.id)}]`);
 }
 
@@ -655,7 +690,7 @@ export function buildCliAgentTools(
   trustedWorkingDirectory?: string,
 ): {
   specs: import('../llm.js').LLMToolSpec[];
-  dispatch: (name: string, args: Record<string, unknown>) => Promise<unknown>;
+  dispatch: (name: string, args: Record<string, unknown>, context?: { signal?: AbortSignal }) => Promise<unknown>;
   workingDirectory: string;
 } {
   // An explicitly assigned child cwd is stable for its isolated lifetime. An
@@ -706,7 +741,7 @@ export function buildCliAgentTools(
   //   게이트. [[project_skill_native_duplication_surface_gating]].
   const shared = (require('../agent/shared-app-tools.js') as typeof import('../agent/shared-app-tools.js')).buildSharedAppTools(cfg);
   for (const s of shared.specs) specs.push(s);
-  for (const name of shared.names) dispatchByName.set(name, async (args) => shared.dispatch(name, args));
+  for (const name of shared.names) dispatchByName.set(name, async (args, signal) => shared.dispatch(name, args, { surface: 'tui', signal }));
   // Installed knowledge is queryable in CLI chat as well as the dashboard runtime.
   // No installed packs => preserve the existing CLI tool list and avoid creating a KGS database.
   const { kgsDefaultDbPath } = require('../knowledge/kgs/sqlite-store.js') as typeof import('../knowledge/kgs/sqlite-store.js');
@@ -751,10 +786,10 @@ export function buildCliAgentTools(
   const dispatchSessionRuntimeTool = sr.dispatchSessionRuntimeTool;
   const createPlanner = sr.createSearchPlannerState;
   const plannerState = createPlanner({ maxAutoNarrowCandidates: 2 });
-  const dispatch = async (name: string, args: Record<string, unknown>): Promise<unknown> => {
+  const dispatch = async (name: string, args: Record<string, unknown>, context?: { signal?: AbortSignal }): Promise<unknown> => {
     try {
       const direct = dispatchByName.get(name);
-      if (direct) return await direct(args);
+      if (direct) return await direct(args, context?.signal);
       // ⭐ BACKLOG L1b (2026-09-25) — ToolSearch 는 지연 도구가 있으면 «자동으로 광고»되는데 이 CLI 디스패처만
       //   라우팅이 없어 `plugin tool unavailable in CLI: ToolSearch` 로 죽었다(daemon·monad-agent-turn 은 라우팅한다).
       //   ⇒ 같은 공용 라우터로 이 CLI 의 도구 풀에서 찾는다.

package/src/cli/guardian-cli.ts

@@ -72,7 +72,9 @@ export function registerGuardianCommands(program: Command): void {
             debug.log('ops.orphan-cli', 'observation-failed', { error: String(error) });
           } catch { /* guardian shadow still runs */ }
         }
-        const result = await guardianTick(tickAt, plan, { config: cfg });
+        const result = await guardianTick(tickAt, plan, { config: cfg,
+          doctorShadow: async () => { (await import('../self-implement/doctor-visit.js')).recordPendingShadowDoctorReevaluations(); },
+        });
         await writeStdoutJson(JSON.stringify(result, null, 2) + '\n');
       } finally { db.close(); }
     });

package/src/cli/intake-cli.ts

@@ -5,7 +5,7 @@ import type { Command } from 'commander';
 import { getElanousConfigDir } from '../elanous-config-dir.js';
 import { readNexusRuntime } from '../nexus/runtime.js';
 import { resolveRoleLlm } from '../user-config.js';
-import { runIntakeToTasks, type IntakeTaskInput, type IntakeTaskRequest, type IntakeToTasksResult } from '../intake-plane/intake-to-tasks.js';
+import { approveChannelPublish, runIntakeToTasks, type IntakeTaskInput, type IntakeTaskRequest, type IntakeToTasksResult } from '../intake-plane/intake-to-tasks.js';
 import { writeStdoutJson } from './stdout-json.js';
 import { writeStdoutFully } from './stdout-flush.js';
 import { runGitCommand } from '../git-fs/runner.js';
@@ -13,6 +13,7 @@ import { debug } from '../debug/log.js';
 import { getUserConfig } from '../user-config.js';
 import { registerIntakeSourceCommands } from './intake-source-cli.js';
 import type { IntakeItem } from '../intake-plane/items.js';
+import type { CollectSavedResult, FetchSavedMessages } from '../intake-plane/collect-telegram-saved.js';
 import type { TaskCard } from '../task-cards/card-store.js';
 import { collectFunnelCandidates, type FunnelDirectiveRow } from '../intake-plane/requirement-funnel.js';
 
@@ -31,6 +32,15 @@ export interface IntakeCandidatesCliDeps {
   write?: (text: string) => Promise<void>;
 }
 
+export interface IntakeCliDeps extends IntakeCandidatesCliDeps {
+  /** 흡수 원장 우주 (기본 effectiveInstanceRoot()) — 시험은 격리 임시 root 를 넣는다. */
+  root?: string;
+  /** 텔레그램 «저장된 메시지» 연결 (기본 gramjsFetchSaved) — 시험은 가짜 fetch 를 넣는다. */
+  connectSaved?: () => Promise<{ fetch: FetchSavedMessages; close: () => Promise<void> }>;
+  /** 수집 연결 실패를 CLI 사용자에게 보고한다. */
+  error?: (message: string) => void;
+}
+
 /** `--limit` 원 문자열 → 0 이상의 정수. 숫자만(`/^\d+$/`) 받고 나머지('' · 공백 · 음수 · 소수)는 거부한다. */
 export function parseCandidatesLimit(raw: string): number {
   const limit = /^\d+$/.test(raw) ? Number(raw) : NaN;
@@ -187,6 +197,40 @@ export async function runIntakeDigestCli(
   return {};
 }
 
+export interface CollectTelegramSavedCliDeps {
+  root?: string;
+  connect?: () => Promise<{ fetch: FetchSavedMessages; close: () => Promise<void> }>;
+  write?: (text: string) => Promise<void>;
+  error?: (message: string) => void;
+}
+
+/**
+ * `intake collect-telegram-saved` — 읽기만 · 커서 이후만.
+ * «메시지 0»(필터로 비었나 · 커서를 다른 주체가 넘겼나)과 «원장 입력 0»(다른 주체가 이미 가져갔나)을 갈라 보여준다.
+ */
+export async function runCollectTelegramSavedCli(
+  opts: { max?: string; dryRun?: boolean; json?: boolean },
+  deps: CollectTelegramSavedCliDeps = {},
+): Promise<CollectSavedResult | undefined> {
+  const { collectTelegramSaved, gramjsFetchSaved, renderCollectTelegramSavedResult } = await import('../intake-plane/collect-telegram-saved.js');
+  const root = deps.root ?? (await import('../instance/resolve.js')).effectiveInstanceRoot();
+  let conn: { fetch: FetchSavedMessages; close: () => Promise<void> };
+  try { conn = await (deps.connect ?? (() => gramjsFetchSaved()))(); }
+  catch (e) { (deps.error ?? ((message: string) => console.error(message)))(String((e as Error).message ?? e)); process.exitCode = 2; return undefined; }
+  try {
+    const res = await collectTelegramSaved(root, conn.fetch, {
+      max: Math.max(1, Number(opts.max ?? 300) || 300),
+      ...(opts.dryRun ? { dryRun: true } : {}),
+    });
+    const write = deps.write ?? writeStdoutFully;
+    if (opts.json) await write(JSON.stringify(res, null, 2));
+    else await write(renderCollectTelegramSavedResult(res));
+    return res;
+  } finally {
+    await conn.close();
+  }
+}
+
 export function resolveIntakeCheckRoot(
   cwd: string,
   git: typeof runGitCommand = runGitCommand,
@@ -200,7 +244,7 @@ export function resolveIntakeCheckRoot(
   }
 }
 
-export function registerIntakeCommands(program: Command, candidateDeps: IntakeCandidatesCliDeps = {}): void {
+export function registerIntakeCommands(program: Command, candidateDeps: IntakeCliDeps = {}): void {
   // ── intake check — 바깥 사실을 elanous 현재와 대조 (태스크 등록 없음) ──
   const intakeCmd = program.command('intake').description('바깥 사실·문서를 elanous 현재와 대조하거나 태스크로 받는다');
   registerIntakeSourceCommands(intakeCmd);
@@ -493,6 +537,24 @@ export function registerIntakeCommands(program: Command, candidateDeps: IntakeCa
       if (result.failed > 0) process.exitCode = 1;
     });
 
+  intakeCmd
+    .command('approve-channel-post <id>')
+    .description('보호 범주의 채널 게시 초안을 사람 승인한다 (외부 게시 커넥터는 호출하지 않는다)')
+    .requiredOption('--by <approver>', '승인자: MK | 대표')
+    .option('--json', '구조화 출력')
+    .action(async (id: string, opts: { by: string; json?: boolean }) => {
+      const { effectiveInstanceRoot } = await import('../instance/resolve.js');
+      const approved = approveChannelPublish(candidateDeps.root ?? effectiveInstanceRoot(), id, opts.by);
+      if (!approved) {
+        console.error(`대기 중인 보호 초안을 찾지 못했거나 승인자(${opts.by})가 MK·대표가 아니다: ${id}`);
+        process.exitCode = 1;
+        return;
+      }
+      const result = { id, status: approved.status, approvedBy: approved.approvedBy, category: approved.category };
+      if (opts.json) await writeStdoutFully(JSON.stringify(result) + '\n');
+      else console.log(`${id} → ${approved.status} · 승인자 ${approved.approvedBy} · 외부 게시 미실행`);
+    });
+
   intakeCmd
     .command('collect-telegram-saved')
     .description('텔레그램 «저장된 메시지»를 읽기만 해 흡수 원장에 넣는다 (커서 이후만 · 호스트 전용 · 개인 메모는 user-private)')
@@ -500,17 +562,12 @@ export function registerIntakeCommands(program: Command, candidateDeps: IntakeCa
     .option('--dry-run', '원장·커서를 바꾸지 않고 건수만')
     .option('--json', '구조화 출력')
     .action(async (opts: { max?: string; dryRun?: boolean; json?: boolean }) => {
-      const { collectTelegramSaved, gramjsFetchSaved } = await import('../intake-plane/collect-telegram-saved.js');
-      const { effectiveInstanceRoot } = await import('../instance/resolve.js');
-      let conn: Awaited<ReturnType<typeof gramjsFetchSaved>>;
-      try { conn = await gramjsFetchSaved(); } catch (e) { console.error(String((e as Error).message ?? e)); process.exitCode = 2; return; }
-      try {
-        const res = await collectTelegramSaved(effectiveInstanceRoot(), conn.fetch, { max: Math.max(1, Number(opts.max ?? 300) || 300), ...(opts.dryRun ? { dryRun: true } : {}) });
-        if (opts.json) await writeStdoutFully(JSON.stringify(res, null, 2));
-        else console.log(`텔레그램 저장된 메시지: 메시지 ${res.messages} · 원장 입력 ${res.raws} · 커서 ${res.cursorBefore} → ${res.cursorAfter}${res.dryRun ? ' (dry-run · 안 씀)' : res.ingest ? ` · 새 ${res.ingest.added} · 합침 ${res.ingest.merged} · 이미 끝난 것 ${res.ingest.seen}` : ''}`);
-      } finally {
-        await conn.close();
-      }
+      await runCollectTelegramSavedCli(opts, {
+        ...(candidateDeps.root ? { root: candidateDeps.root } : {}),
+        ...(candidateDeps.connectSaved ? { connect: candidateDeps.connectSaved } : {}),
+        ...(candidateDeps.write ? { write: candidateDeps.write } : {}),
+        ...(candidateDeps.error ? { error: candidateDeps.error } : {}),
+      });
     });
 
   intakeCmd

package/src/cli/lesson-cli.ts

@@ -1,6 +1,8 @@
 import type { Command } from 'commander';
-import { resolve } from 'node:path';
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
 import { debug } from '../debug/log.js';
+import { FrictionInputError, FrictionLedger, frictionActor, type FrictionRecordInput } from '../lessons/friction-ledger.js';
 import { importLessons, scanLessonDocs } from '../lessons/lesson-import.js';
 import { LessonInputError, LessonLedger, type LessonLedgerOptions, type LessonRow, type LessonDetail } from '../lessons/lesson-ledger.js';
 
@@ -38,9 +40,26 @@ function detail(row: LessonDetail): string {
     '이력:', ...row.history.map(h => `  ${h.at} · ${h.event} · ${h.by} · ${h.detail}`)].join('\n');
 }
 
+function validAuthoringLessonClass(value: string): boolean {
+  return new Set(['a-missing-predecessor', 'b-stale-path', 'c-unbounded-goal', 'd-rigid-acceptance',
+    'e-format-trap', 'f-unaware-of-code', 'g-umbrella-scope']).has(value) || /^env-[a-z0-9][a-z0-9-]*$/u.test(value);
+}
+
 export function registerLessonCommands(program: Command, options: LessonLedgerOptions = {}, out: Pick<Console, 'log'> = console): void {
   const root = program.command('lesson').description('사고 · 원인 · 처방 · 재발 교훈 원장');
   const ledger = () => new LessonLedger(options);
+  // 손 걸음 원장은 그림자 기록이다: 비밀 꼴 note 는 빼고 남기며, 어떤 경우에도 lesson 명령을 실패시키지 않는다.
+  const recordFriction = (input: FrictionRecordInput): void => {
+    const friction = new FrictionLedger(options);
+    const attempts = input.note ? [input, { ...input, note: '' }] : [input];
+    for (const attempt of attempts) {
+      try { friction.record(attempt); return; }
+      catch (error) {
+        debug.log('lessons.friction', 'skipped', { kind: attempt.kind, signature: attempt.signature,
+          reason: error instanceof FrictionInputError ? error.message : String(error) });
+      }
+    }
+  };
   const emit = (value: unknown, json: boolean | undefined, text: string) => out.log(json ? JSON.stringify(value) : text);
   root.command('import').description('INCIDENT·FINDING 문서 교훈 미리 보기 (기본값); --apply 로 적재')
     .option('--apply', '원장에 적재').option('--json', 'JSON 출력').option('--by <name>', '기록자 (기본 AI_AGENT)')
@@ -68,19 +87,76 @@ export function registerLessonCommands(program: Command, options: LessonLedgerOp
         reportError('page', error instanceof Error ? error.message : String(error));
       }
     });
-  root.command('add <id>').requiredOption('--incident <text>').requiredOption('--cause <text>')
-    .requiredOption('--remedy <text>').requiredOption('--owner <name>').requiredOption('--source <path>')
-    .option('--enforced-by <paths>').option('--disproof <command>').option('--by <name>')
-    .action(handle('add', (id: string, o: { incident: string; cause: string; remedy: string; owner: string; source: string; enforcedBy?: string; disproof?: string; by?: string }) => {
-      const by = actor(o.by);
-      const row = ledger().add({ id, incident: o.incident, cause: o.cause, remedy: o.remedy, owner: o.owner,
-        source: o.source, by, ...(o.enforcedBy !== undefined ? { enforcedBy: o.enforcedBy } : {}),
-        ...(o.disproof !== undefined ? { disproof: o.disproof } : {}) });
+  root.command('add [id]').option('--incident <text>').option('--cause <text>').option('--remedy <text>')
+    .option('--owner <name>').option('--source <path>').option('--enforced-by <paths>').option('--disproof <command>').option('--by <name>')
+    .option('--authoring', '05-authoring-lessons.jsonl에 저작 교훈 한 행 추가')
+    .option('--cell <name>').option('--class <class>').option('--diag <text>').option('--action <text>').option('--lesson <text>')
+    .option('--run <id>').option('--card <id>').option('--launch <id>').option('--goal-sha <sha>')
+    .option('--paths <paths>').option('--model <model>').option('--host <host>').option('--evidence <text>')
+    .option('--rule <text>').option('--ms <milliseconds>').option('--outcome <state>', 'pending, fixed 또는 repeated')
+    .option('--resolve-pending <state>', '같은 cell/class의 pending을 fixed 또는 repeated로 전이')
+    .action(handle('add', (id: string | undefined, o: Record<string, string | boolean | undefined>) => {
+      if (o.authoring) {
+        const required = ['source', 'cell', 'class', 'diag', 'action', 'lesson'] as const;
+        const missing = required.filter((key) => typeof o[key] !== 'string' || !(o[key] as string).trim());
+        if (missing.length) throw new LessonInputError(`authoring fields required: ${missing.map(key => `--${key}`).join(', ')}`);
+        if (!validAuthoringLessonClass(o.class as string)) throw new LessonInputError('--class is not in the authoring lesson class set');
+        const outcome = typeof o.outcome === 'string' ? o.outcome : 'pending';
+        if (!['pending', 'fixed', 'repeated'].includes(outcome)) throw new LessonInputError('--outcome must be pending, fixed, or repeated');
+        if (o.resolvePending !== undefined && !['fixed', 'repeated'].includes(o.resolvePending as string)) {
+          throw new LessonInputError('--resolve-pending must be fixed or repeated');
+        }
+        const row: Record<string, string> = {
+          ts: new Date().toISOString(), by: actor(typeof o.by === 'string' ? o.by : undefined),
+          source: o.source as string, cell: o.cell as string, class: o.class as string, diag: o.diag as string,
+          action: o.action as string, lesson: o.lesson as string, run: String(o.run ?? ''), card: String(o.card ?? ''),
+          launch: String(o.launch ?? ''), goalSha: String(o.goalSha ?? ''), paths: String(o.paths ?? ''),
+          model: String(o.model ?? ''), host: String(o.host ?? ''), evidence: String(o.evidence ?? ''),
+          rule: String(o.rule ?? ''), ms: String(o.ms ?? ''), outcome,
+        };
+        const path = resolve(process.cwd(), 'docs/goal-context/05-authoring-lessons.jsonl');
+        let lines: string[] = [];
+        try {
+          lines = readFileSync(path, 'utf8').split(/\r?\n/u).filter(Boolean);
+          for (const line of lines) {
+            const parsed: unknown = JSON.parse(line);
+            if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) throw new Error('not an object');
+          }
+        } catch (error) {
+          if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw new LessonInputError('authoring lessons ledger is unreadable or malformed');
+        }
+        if (typeof o.resolvePending === 'string') {
+          lines = lines.map((line) => {
+            const prior = JSON.parse(line) as Record<string, unknown>;
+            return prior.cell === row.cell && prior.class === row.class && prior.outcome === 'pending'
+              ? JSON.stringify({ ...prior, outcome: o.resolvePending }) : line;
+          });
+        }
+        mkdirSync(dirname(path), { recursive: true });
+        const next = [...lines, JSON.stringify(row)].join('\n') + '\n';
+        const temp = `${path}.tmp-${process.pid}`;
+        writeFileSync(temp, next, { encoding: 'utf8', flag: 'w' });
+        renameSync(temp, path);
+        emit({ written: true, row }, false, `저작 교훈 추가 · ${row.cell} · ${row.class} · ${row.outcome}`);
+        return;
+      }
+      const required = ['incident', 'cause', 'remedy', 'owner', 'source'] as const;
+      const lessonId = id ?? '';
+      const missing: string[] = required.filter((key) => typeof o[key] !== 'string' || !(o[key] as string).trim());
+      if (!lessonId.trim()) missing.unshift('id');
+      if (missing.length) throw new LessonInputError(`required: ${missing.map(key => key === 'id' ? 'id' : `--${key}`).join(', ')}`);
+      const by = actor(typeof o.by === 'string' ? o.by : undefined);
+      const row = ledger().add({ id: lessonId, incident: o.incident as string, cause: o.cause as string, remedy: o.remedy as string,
+        owner: o.owner as string, source: o.source as string, by,
+        ...(o.enforcedBy !== undefined ? { enforcedBy: o.enforcedBy as string } : {}),
+        ...(o.disproof !== undefined ? { disproof: o.disproof as string } : {}) });
       emit(row, false, format(row));
     }));
   root.command('recur <id>').requiredOption('--source <path>').option('--note <text>').option('--by <name>')
     .action(handle('recur', (id: string, o: { source: string; note?: string; by?: string }) => {
-      const row = ledger().recur(id, { source: o.source, note: o.note ?? '', by: actor(o.by) });
+      const by = actor(o.by);
+      const row = ledger().recur(id, { source: o.source, note: o.note ?? '', by });
+      recordFriction({ actor: frictionActor(by), kind: 'hand-step', signature: row.incident ?? `lesson ${row.id}`, note: o.note ?? '', ref: o.source });
       emit(row, false, format(row));
     }));
   root.command('enforce <id>').requiredOption('--enforced-by <paths>').option('--by <name>')

package/src/cli/log-event-names.ts

@@ -1362,6 +1362,7 @@ export const KNOWN_LOG_EVENT_NAMES: ReadonlySet<string> = new Set([
   "status",
   "status-ledger",
   "status-port-resolved",
+  "status-question-interim-reprompt",
   "stdin-backpressure",
   "stdout",
   "step",

package/src/cli/pod-cli.ts

@@ -14,7 +14,7 @@ import { getUserConfig } from '../user-config.js';
 import { listCodexAccountsInStore } from '../oauth/codex-account-store.js';
 import { parsePodPool, resolvePodPoolSpec, podPoolHostLease, type PoolKubectl } from '../task-orchestrator/surfaces/pod-pool.js';
 import { leaseKubectl, measurePoolLease, probePoolDns, probePoolGitHub, recommendConcurrency, type PoolLeaseMeasure, type PoolDnsProbe, type ExternalGitHubProbe } from '../task-orchestrator/surfaces/pod-lease.js';
-import { POD_COMMAND_DEADLINE_SECONDS, runPodCommand, type PodCommandResult, type RunPodCommandOptions } from '../task-orchestrator/surfaces/pod-command-job.js';
+import { POD_COMMAND_DEADLINE_SECONDS, parseCpuRightsizeRequest, runPodCommand, type PodCommandResult, type PodCpuRightsizeRequest, type RunPodCommandOptions } from '../task-orchestrator/surfaces/pod-command-job.js';
 import { hostLeaseCounts, leaseHasPendingPod } from '../pod-lease/host-lease.js';
 
 export interface PodCliIo {
@@ -220,7 +220,8 @@ export function registerPodCommands(program: Command, deps: PodCliDeps = {}): vo
     .allowUnknownOption(true)
     .allowExcessArguments(true)
     .option('--lite', '네트워크 스킬(omni-crawl·omni-digest)만 쓰는 명령 — 작은 이미지 ⊕ 2Gi 한도(POD7 · clone 불가)')
-    .action(async (opts: { pool?: string; skill?: string; llm?: string; clone?: boolean; deadline?: string; lite?: boolean }, command: Command) => {
+    .option('--cpu-rightsize <json>', 'POD-CPU-REQUEST-RIGHTSIZE-2-FU: 공존 재측정 요청(JSON 파일 경로 또는 인라인 JSON) — { condition?, samples[], priorLaunches[] }. 선행 조건·측정이 모자라면 발사하지 않는다')
+    .action(async (opts: { pool?: string; skill?: string; llm?: string; clone?: boolean; deadline?: string; lite?: boolean; cpuRightsize?: string }, command: Command) => {
       const argv = process.argv.slice(2);
       const sep = argv.indexOf('--');
       const fromArgv = sep >= 0 ? argv.slice(sep + 1) : [];
@@ -244,6 +245,19 @@ export function registerPodCommands(program: Command, deps: PodCliDeps = {}): vo
           return;
         }
       }
+      // POD-CPU-REQUEST-RIGHTSIZE-2-FU — the OP-facing measurement launch reads its request from JSON (file path or inline).
+      let cpuRightsize: PodCpuRightsizeRequest | undefined;
+      if (opts.cpuRightsize !== undefined) {
+        try {
+          const source = opts.cpuRightsize.trim();
+          const text = source.startsWith('{') ? source : readFileSync(source, 'utf8');
+          cpuRightsize = parseCpuRightsizeRequest(JSON.parse(text), '--cpu-rightsize');
+        } catch (err) {
+          io.error(`pod run: --cpu-rightsize — ${err instanceof Error ? err.message : String(err)}`);
+          io.exit(2);
+          return;
+        }
+      }
       const skills = (opts.skill ?? '').split(',').map((s) => s.trim()).filter(Boolean);
       const cloneWarning = podCloneWithoutInstallWarning(commandArgs, opts.clone);
       if (cloneWarning !== null) {
@@ -268,6 +282,7 @@ export function registerPodCommands(program: Command, deps: PodCliDeps = {}): vo
           ...(opts.llm === 'grok' ? { llm: 'grok' as const } : {}),
           ...(opts.clone ? { clone: true } : {}),
           ...(opts.lite ? { lite: true } : {}),
+          ...(cpuRightsize ? { cpuRightsize } : {}),
           ...(deadlineSeconds !== undefined ? { deadlineSeconds } : {}),
         });
         if (result.image) io.error(`[pod] image ${result.image} · job ${result.job}`);

package/src/cli/pr-land-overlap-evidence.ts

@@ -21,11 +21,13 @@
  *   하나라도 못 재거나 어긋나면 거부 — 호출부는 종전 거부를 그대로 낸다(fail-closed).
  * - 관측: `pr.land` · `overlap-evidence` (decision · reason · 잰 값).
  */
+import { createHash } from 'node:crypto';
 import { basename, dirname, join, resolve } from 'node:path';
 import { debug } from '../debug/log.js';
 import type { CmdRunner } from '../autopilot/pr-manager.js';
 import { parseReviewResultOutput } from '../task-agent/review-result-capture.js';
 import { verifyVirtualRebasePatch } from './pr-land-virtual-rebase.js';
+import { proveReviewCarry } from './review-carry.js';
 
 const SHA40 = /^[0-9a-f]{40}$/i;
 
@@ -36,6 +38,8 @@ interface OverlapEvidenceFile {
   gate?: { head: string; baseCommit: string; passed: boolean };
   /** `self review --json` stdout 을 받은 파일(TA: `<state>/review-results/<card>-<pr>-<head접두 10~40>.json`); 내용의 전체 head도 확인한다. */
   reviewResult: string;
+  /** Explicit old-head review for a mechanically merged main head. Always re-proved against Git. */
+  reviewCarry?: { oldHead: string; oldBase: string; newBase: string; patchId: string; pathsModesHash: string; reviewSha256: string };
   /** Evidence-file override for explicitly replaced failed reviews. Each reason is the verifier's refusal reason. */
   supersedes?: { reviewResult: string; reason: string }[];
   /** OPEN follow-up PR that owns the findings intentionally split from this landing. */
@@ -82,9 +86,15 @@ function checkSelectedReviewAttempts(input: VerifyOverlapEvidenceInput, e: Parti
   let names: readonly string[];
   try { names = input.listDir(dir); } catch { return { ok: false, reason: 'review-attempts-unmeasured' }; }
   const filename = new RegExp(`^[A-Za-z0-9][A-Za-z0-9._-]*-${input.pr}-([a-f0-9]{10,40})\\.json$`, 'i');
-  const candidates = [...names].filter((name) => {
+  const selectedHead = e.reviewCarry?.oldHead?.toLowerCase() ?? head;
+  // A fresh review of the merged head supersedes carry. Never hide a failed current-head attempt.
+  if (e.reviewCarry && names.some((name) => {
     const match = filename.exec(name);
     return Boolean(match && head.startsWith(match[1]!.toLowerCase()));
+  })) return { ok: false, reason: 'carry-new-head-review-exists' };
+  const candidates = [...names].filter((name) => {
+    const match = filename.exec(name);
+    return Boolean(match && selectedHead.startsWith(match[1]!.toLowerCase()));
   }).map((name) => join(dir, name));
   if (!candidates.includes(selected)) return { ok: false, reason: 'review-selected-missing' };
   let physicalDir: string;
@@ -127,7 +137,7 @@ function checkSelectedReviewAttempts(input: VerifyOverlapEvidenceInput, e: Parti
   }
   for (const path of candidates) {
     if (path === selected) continue;
-    const review = checkReview(input, { reviewResult: path }, head);
+    const review = checkReview(input, { reviewResult: path }, selectedHead);
     if (review.ok) {
       if (superseded.has(path)) return { ok: false, reason: 'review-supersedes-passing' };
       continue;
@@ -324,8 +334,12 @@ type Checked = { ok: false; reason: string; baseTip?: string; gateBase?: string;
 const ACCEPTED_REVIEW_VERDICTS: ReadonlySet<string> = new Set(['pass', 'warn']);
 const COMMIT_MARK = '\u0001';
 
-function checkReview(input: Pick<VerifyOverlapEvidenceInput, 'pr' | 'readFile'>, e: Partial<OverlapEvidenceFile>, head: string, baseTip?: string): { ok: false; reason: string; baseTip?: string } | { ok: true; reviewResult: string } {
+function checkReview(input: Pick<VerifyOverlapEvidenceInput, 'pr' | 'readFile'> & Partial<Pick<VerifyOverlapEvidenceInput, 'cwd' | 'remote' | 'branch'>>,
+  e: Partial<OverlapEvidenceFile>, head: string, baseTip?: string): { ok: false; reason: string; baseTip?: string } | { ok: true; reviewResult: string } {
   if (typeof e.reviewResult !== 'string' || !e.reviewResult) return { ok: false, reason: 'review-missing', baseTip };
+  const carry = e.reviewCarry;
+  const reviewHead = carry?.oldHead?.toLowerCase() ?? head;
+  if (carry && (!SHA40.test(reviewHead) || reviewHead === head)) return { ok: false, reason: 'carry-invalid-old-head', baseTip };
   // TA 가 받는 자리(`<state>/review-results/<card>-<pr>-<head접두 10~40>.json` · reviewResultPath)만; 내용의 전체 head도 확인한다.
   const resultName = basename(e.reviewResult);
   const resultMatch = /^([A-Za-z0-9][A-Za-z0-9._-]*)-(\d+)-([a-f0-9]{10,40})\.json$/i.exec(resultName);
@@ -333,7 +347,7 @@ function checkReview(input: Pick<VerifyOverlapEvidenceInput, 'pr' | 'readFile'>,
     || !resultMatch
     || Number(resultMatch[2]) !== input.pr
     || resultMatch[3]!.length < 10
-    || !head.startsWith(resultMatch[3]!.toLowerCase())) {
+    || !reviewHead.startsWith(resultMatch[3]!.toLowerCase())) {
     return { ok: false, reason: 'review-path-not-for-this-pr-head', baseTip };
   }
   let text: string;
@@ -341,7 +355,7 @@ function checkReview(input: Pick<VerifyOverlapEvidenceInput, 'pr' | 'readFile'>,
   const review = parseReviewResultOutput(text);
   if (!review) return { ok: false, reason: 'review-no-result', baseTip };
   if (review.pr !== input.pr) return { ok: false, reason: 'review-pr-mismatch', baseTip };
-  if (!review.head || review.head.toLowerCase() !== head) return { ok: false, reason: 'review-head-mismatch', baseTip };
+  if (!review.head || review.head.toLowerCase() !== reviewHead) return { ok: false, reason: 'review-head-mismatch', baseTip };
   // The capture parser projects away model provenance; inspect the same last result-shaped line here.
   const raw = lastReviewRecord(text);
   if (raw) {
@@ -377,6 +391,25 @@ function checkReview(input: Pick<VerifyOverlapEvidenceInput, 'pr' | 'readFile'>,
   if (review.reviewed !== true) return { ok: false, reason: 'review-not-reviewed', baseTip };
   if (review.verdict === null || !ACCEPTED_REVIEW_VERDICTS.has(review.verdict)) return { ok: false, reason: `review-verdict-${review.verdict ?? 'null'}`, baseTip };
   if (review.mustFix !== 0) return { ok: false, reason: review.mustFix === null ? 'review-must-fix-unknown' : `review-must-fix-${review.mustFix}`, baseTip };
+  if (carry) {
+    if (!input.cwd || !input.remote || !input.branch) return { ok: false, reason: 'carry-repo-unmeasured', baseTip };
+    const digest = createHash('sha256').update(text).digest('hex');
+    if (carry.reviewSha256 !== digest) return { ok: false, reason: 'carry-review-hash-mismatch', baseTip };
+    const proof = proveReviewCarry(input.cwd, reviewHead, head, input.remote, input.branch);
+    if (!proof.ok) return { ok: false, reason: proof.reason, baseTip };
+    const gate = e.gate;
+    if (!gate || gate.passed !== true || gate.head?.toLowerCase() !== head
+      || gate.baseCommit?.toLowerCase() !== proof.newBase) {
+      return { ok: false, reason: 'carry-new-head-gate-missing-or-mismatch', baseTip };
+    }
+    if (carry.oldBase?.toLowerCase() !== proof.oldBase || carry.newBase?.toLowerCase() !== proof.newBase
+      || carry.patchId?.toLowerCase() !== proof.patchId || carry.pathsModesHash?.toLowerCase() !== proof.pathsModesHash) {
+      return { ok: false, reason: 'carry-proof-mismatch', baseTip };
+    }
+    debug.log('pr.land', 'review-carry', { pr: input.pr, remote: input.remote, branch: input.branch,
+      oldHead: reviewHead, newHead: head, oldBase: proof.oldBase,
+      newBase: proof.newBase, patchId: proof.patchId, reviewSha256: digest, decision: 'accepted' });
+  }
   return { ok: true, reviewResult: e.reviewResult };
 }
 

package/src/cli/pr-land-refusal.ts

@@ -12,7 +12,7 @@ export function classifyPrLandRefusal(message: string, context: { isDraft?: bool
   if (message.startsWith('✗ ancestor-auto: ancestor-auto-not-ancestor:')) return 'not-ancestor';
   if (/^✗ (?:ancestor-auto|overlap-evidence): (?:review-missing|review-not-reviewed|review-error|review-no-result|review-unreadable|review-pr-mismatch|review-head-mismatch|review-path-not-for-this-pr-head|review-verdict-null|review-must-fix-unknown)(?:\b|$)/.test(message)) return 'review-missing';
   if (message.startsWith('✗ heavy-remote: PR base=unreadable ≠ main')) return 'pr-base-unreadable';
-  if (/^✗ heavy-remote: (?:원격|병합 직전 원격|node-b) 게이트 gate-host-busy(?:\b|\s|$)/.test(message)) return 'gate-host-busy';
+  if (/^✗ heavy-remote: (?:원격|병합 직전 원격|[a-z][a-z0-9-]*) 게이트 gate-host-busy(?:\b|\s|$)/.test(message)) return 'gate-host-busy';
   if (message.startsWith('✗ heavy-remote: 원격 게이트 gate-rc-1 · remote: stdout: CONFLICT (content): Merge conflict')) return 'gate-merge-conflict';
   if (message.startsWith('✗ heavy-remote: 원격 게이트 gate-rc-1 · remote: stderr: 건드린 src/scripts 파일과 baseline 밖 test 파일은 tsc 클린이어야 합니다(touch-clean).')) return 'gate-touch-clean';
   if (message.startsWith('✗ public-export-leak: 바뀐 파일')) return 'public-export-leak';