elanous 0.2.37 → 0.2.38

package/src/auto-research/research-turn.ts

@@ -0,0 +1,134 @@
+import { streamLLM } from '../llm.js';
+import { invokeResearchAxes } from '../research-bridge/index.js';
+import type { AxisFanoutResult } from '../research/axis-fanout.js';
+import { attachResearchEvidence, buildResearchQuestionLadderPrompt,
+  parseSixLevelResearchQuestionLadder, type ResearchEvidenceEnvelope,
+  type SixLevelResearchQuestionLadder } from './question-ladder-contract.js';
+
+export interface ResearchQuestionLadderRunOptions {
+  generate?: (prompt: string) => Promise<string>;
+  invokeAxes?: (questions: SixLevelResearchQuestionLadder['questions']) => Promise<AxisFanoutResult>;
+}
+
+export interface ResearchGroundingResult {
+  ok: boolean;
+  output: string;
+}
+
+export interface ResearchQuestionLadderRunResult {
+  ok: boolean;
+  ladder: SixLevelResearchQuestionLadder;
+  output: string;
+  error?: string;
+}
+
+/** Generate Bloom axes, search each axis natively, and attach its source evidence. */
+export async function runResearchQuestionLadder(
+  request: string,
+  options: ResearchQuestionLadderRunOptions = {},
+): Promise<ResearchQuestionLadderRunResult> {
+  const initial: SixLevelResearchQuestionLadder = { request, questions: [], evidence: [] };
+  let raw: string;
+  try {
+    raw = await (options.generate ?? defaultGenerate)(buildResearchQuestionLadderPrompt(request));
+  } catch (error) {
+    return { ok: false, ladder: initial, output: '', error: `question generation failed: ${errorText(error)}` };
+  }
+
+  let generated: unknown;
+  try {
+    generated = JSON.parse(extractJson(raw));
+  } catch (error) {
+    return { ok: false, ladder: initial, output: '', error: `question generation returned invalid JSON: ${errorText(error)}` };
+  }
+  const parsed = parseSixLevelResearchQuestionLadder(withRequest(generated, request));
+  if (!parsed.ok) return { ok: false, ladder: initial, output: '', error: parsed.reason };
+
+  const ladder = parsed.value;
+  const observedAt = new Date().toISOString();
+  let fanout: AxisFanoutResult;
+  try {
+    fanout = await (options.invokeAxes ?? invokeResearchAxes)(ladder.questions);
+  } catch (error) {
+    fanout = {
+      plan: [],
+      axes: ladder.questions.map((question) => ({ questionId: question.id, error: errorText(error), evidence: [{
+        questionId: question.id, sourceKind: 'search-query', source: question.searchTerms[0] ?? question.id,
+        ...(question.requestedWindow ? { requestedWindow: question.requestedWindow } : {}),
+        observedAt, content: errorText(error), outcome: 'failed', truncated: false,
+      }] })),
+    };
+  }
+
+  let allOk = true;
+  const sections: string[] = [`# Research: ${request}`, ''];
+  const byQuestion = new Map(fanout.axes.map((axis) => [axis.questionId, axis]));
+  for (const question of ladder.questions) {
+    const axis = byQuestion.get(question.id);
+    const axisEvidence = axis?.evidence ?? [];
+    const envelopes: ResearchEvidenceEnvelope[] = axisEvidence.length ? axisEvidence : [{
+      questionId: question.id, sourceKind: 'search-query', source: question.searchTerms[0] ?? question.id,
+      ...(question.requestedWindow ? { requestedWindow: question.requestedWindow } : {}),
+      observedAt, content: axis?.error ?? 'axis evidence missing', outcome: 'failed', truncated: false,
+    }];
+    const snippets: string[] = [];
+    for (const envelope of envelopes) {
+      const attached = attachResearchEvidence(ladder, envelope);
+      if (!attached.ok) {
+        allOk = false;
+        snippets.push(`Evidence rejected: ${attached.reason}`);
+        continue;
+      }
+      ladder.evidence = attached.value.evidence;
+      if (envelope.outcome !== 'complete') allOk = false;
+      snippets.push(`- [${envelope.outcome}] ${envelope.sourceKind} · ${envelope.source}: ${envelope.content}`);
+    }
+    sections.push(`## ${question.id} · Bloom ${question.level}: ${question.prompt}`,
+      `Search terms: ${question.searchTerms.join(', ')}`,
+      ...snippets);
+  }
+
+  const incompleteQuestions = ladder.questions.filter((question) => {
+    const evidence = ladder.evidence.filter((item) => item.questionId === question.id);
+    return evidence.length === 0 || evidence.some((item) => item.outcome !== 'complete');
+  }).length;
+  return {
+    ok: allOk,
+    ladder,
+    output: sections.join('\n\n'),
+    ...(allOk ? {} : { error: `${incompleteQuestions} of ${ladder.questions.length} question searches were incomplete` }),
+  };
+}
+
+/** Preserve usable partial findings when the grounding seam has only an ok/output contract. */
+export function researchTurnForGrounding(result: ResearchQuestionLadderRunResult): ResearchGroundingResult {
+  const output = result.output.trim() || result.error || 'Research question ladder failed.';
+  return {
+    ok: result.ladder.evidence.some((item) => item.outcome === 'complete') && result.output.trim().length > 0,
+    output,
+  };
+}
+
+async function defaultGenerate(prompt: string): Promise<string> {
+  return streamLLM([{ role: 'user', content: prompt }], () => {}, {
+    usageSite: 'research-question-ladder',
+    usagePhase: 'research',
+  });
+}
+
+function withRequest(value: unknown, request: string): unknown {
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) return value;
+  return { ...(value as Record<string, unknown>), request };
+}
+
+function extractJson(raw: string): string {
+  const unfenced = raw.trim().replace(/^```(?:json)?\s*/i, '').replace(/\s*```$/, '');
+  const start = unfenced.indexOf('{');
+  const end = unfenced.lastIndexOf('}');
+  if (start < 0 || end <= start) throw new Error('no JSON object found');
+  return unfenced.slice(start, end + 1);
+}
+
+function errorText(error: unknown): string {
+  return error instanceof Error ? error.message : String(error);
+}

package/src/autopilot/discovery/doc-lint.ts

@@ -402,7 +402,7 @@ export async function lintGitHubIssueCommentPointers(
       // ⛔⭐ **파싱 실패는 `valid` 로 둔다**(리뷰 3R must-fix) — `issue_url` 형태를 못 읽은 것은
       //    *"다른 데를 가리킨다"* 는 **증거가 아니다**. 대조가 가능할 때만 대조한다.
       // ⭐ GitHub 의 owner/repo 는 **대소문자를 구분하지 않는다**(리뷰 4R must-fix) — 양쪽을 같은
-      //    규칙으로 정규화하지 않으면 `JOOSUNG80` vs `ElanvitalAI` 이 `mismatched` 로 오진된다.
+      //    규칙으로 정규화하지 않으면 대문자 owner 와 소문자 owner 를 `mismatched` 로 오진한다.
       const sameRepo = actual
         && actual.owner.toLowerCase() === owner.toLowerCase()
         && actual.repo.toLowerCase() === repo.toLowerCase();

package/src/bots/screen-probe.ts

@@ -343,7 +343,7 @@ export function interpretCrontab(out: { readonly code: number; readonly said: st
   //    ⇒ 이제 «화이트리스트»다: 이 문면이 아니면 rc≠0 은 전부 「못 물었다」.
   // ⛔⭐ ***부분문자열로 보지 않는다***(3차 리뷰) — ssh 배너·MOTD 에 그 낱말이 섞이면
   //    rc≠0 «실패»가 「빈 크론탭」으로 둔갑한다. ⇒ 다듬은 산출이 ***그 한 줄 «전체»***여야 한다.
-  //    📏 실측(2026-09-01 · gcpvm): 정확히 `no crontab for user\n` ⊕ rc=1.
+  //    📏 실측(2026-09-01 · 원격 노드): 정확히 `no crontab for <user>\n` ⊕ rc=1.
   //       (macOS 는 `crontab: ` 접두를 붙이는 판이 있어 그것만 허용한다)
   if (/^(crontab: )?no crontab for \S+$/i.test(out.said.trim())) return '';
   return null;

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

@@ -39,7 +39,7 @@ import { createTuiScreenMirror } from './tui-screen-mirror.js';
 import { getChannelBus } from '../terminal-matrix/index.js';
 import { publishSelfReportFrame } from './self-report-frame.js';
 import {
-  upsertPtyManifest, updatePtyManifestFrame, touchLivePtyManifest, markPtyManifestClosed, removePtyManifest, getPtyManifest,
+  upsertPtyManifest, updatePtyManifestFrame, updatePtyManifestSession, touchLivePtyManifest, markPtyManifestClosed, removePtyManifest, getPtyManifest,
   updatePtyManifestBuild,
 } from '../pty-shell/pty-manifest.js';
 import { writeHarnessScreen } from '../harness/harness-screen.js';
@@ -468,7 +468,15 @@ export function startTuiSelfReport(deps: TuiSelfReportDeps = {}): () => void {
     lastEmittedText = text;
     // TUI-H9 — 이 프레임이 «지금 이 TUI 가 보여 주는 대화» 의 소유 기록이다. 재기동은 이 id 로만 잇는다
     // (읽기 실패 → 소유 없음 → 재기동 막힘 · 다른 세션으로 대체하지 않는다).
-    try { claimTuiOwnedSession(readActiveSessionId(), at); } catch { claimTuiOwnedSession(null, at); }
+    let sessionId: string | null = null;
+    try {
+      sessionId = readActiveSessionId();
+      claimTuiOwnedSession(sessionId, at);
+    } catch {
+      sessionId = null;
+      claimTuiOwnedSession(null, at);
+    }
+    try { updatePtyManifestSession(surfaceId, sessionId ?? '', at); } catch { /* fail-soft */ }
     const frame: SelfReportFrame = { surfaceId, instance, kind: 'tui', mode: 'self-report', text, cols, rows, at, ...(runId ? { runId } : {}) };
     try { publishFrame(frame); } catch { /* fail-soft */ }
     // `at` is shared with the manifest write → its internal throttle keys

package/src/chat/index.ts

@@ -514,6 +514,7 @@ export const SLASH_COMMANDS: SlashCommand[] = [
   { name: 'tablet',    aliases: [],        description: 'Tablet mode — collapse layout to log + input', subcommands: ['on', 'off', 'toggle', 'auto', 'status', 'browser-preview', 'bp'] },
   { name: 'surface',   aliases: [], description: 'Surface control — open a pane/catalog launcher (/surface catalog · browser · preview · log · scratch · obsidian · skill) OR set a preferred LLM surface (/surface coding-agent · research-agent · control-agent · ops-agent · … · clear · status)', subcommands: ['catalog', 'browser', 'preview', 'browser-preview', 'log', 'scratch', 'obsidian', 'skill', 'skill-file', 'agents', 'coding-agent', 'coding-chat', 'research-agent', 'research-chat', 'control-agent', 'ops-ui-agent', 'ops-fleet-agent', 'ops-agent', 'clear', 'status'] },
   { name: 'term',  aliases: ['terminal'], description: 'Interactive terminal modal — new / list / attach / detach / switch / kill / snapshot / resume', subcommands: ['new', 'list', 'attach', 'detach', 'switch', 'kill', 'snapshot', 'resume'] },
+  { name: 'side', aliases: [], description: '사이드탭 기초 — 목록 · 셸 생성 · 번호로 PTY 보기/attach', subcommands: ['list', 'new', 'attach'] },
   { name: 'claude', aliases: [], description: 'Spawn claude-code CLI in a terminal modal' },
   { name: 'codex',  aliases: [], description: 'Spawn codex CLI in a terminal modal' },
   { name: 'gemini', aliases: [], description: 'Spawn gemini CLI in a terminal modal' },

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/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

@@ -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,13 @@ 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> }>;
+}
+
 /** `--limit` 원 문자열 → 0 이상의 정수. 숫자만(`/^\d+$/`) 받고 나머지('' · 공백 · 음수 · 소수)는 거부한다. */
 export function parseCandidatesLimit(raw: string): number {
   const limit = /^\d+$/.test(raw) ? Number(raw) : NaN;
@@ -187,6 +195,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 +242,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);
@@ -500,17 +542,11 @@ 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 } : {}),
+      });
     });
 
   intakeCmd

package/src/cli/lesson-cli.ts

@@ -1,5 +1,6 @@
 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 { importLessons, scanLessonDocs } from '../lessons/lesson-import.js';
 import { LessonInputError, LessonLedger, type LessonLedgerOptions, type LessonRow, type LessonDetail } from '../lessons/lesson-ledger.js';
@@ -38,6 +39,11 @@ 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);
@@ -68,14 +74,68 @@ 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 missing: string[] = required.filter((key) => typeof o[key] !== 'string' || !(o[key] as string).trim());
+      if (!id?.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, 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>')

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';