elanous 0.2.31 → 0.2.34

package/src/cli/pr-land-heavy-remote.ts

@@ -51,6 +51,8 @@ export interface HeavyRemoteResult {
   reason?: string;
   elapsedMs: number;
   evidencePath: string;
+  /** Redacted stdout/stderr from a failed remote gate; never a reusable pass. */
+  failureLogPath?: string;
   rootPlan?: RootPlanSummary | null;
   interferenceMeasured?: boolean;
 }
@@ -60,6 +62,8 @@ export interface HeavyRemoteDeps {
   runRemote?: (input: Parameters<typeof runOnRemote>[0], runner: GateRemoteRunner) => RemoteRunOutcome;
   settings?: ReturnType<typeof resolveGateRemoteSettings>;
   now?: () => number;
+  /** Test seam — same cadence as self gate (`dispatchHeavyCheck`): sleep at most 15s while a host stays busy. */
+  sleep?: (ms: number) => void;
   observe?: (event: string, data: Record<string, unknown>) => void;
 }
 
@@ -157,6 +161,38 @@ function failedGateSummary(stdout: Buffer, stderr: Buffer): string | undefined {
   return bounded.length ? bounded.join(' | ') : undefined;
 }
 
+/** The self-gate baseline prints one failure per line after its count header. Keep only distinct test paths here. */
+function failedGateFiles(stdout: Buffer, stderr: Buffer): string | undefined {
+  const files = { introduced: new Set<string>(), preexisting: new Set<string>() };
+  for (const line of `${stdout.toString('utf8')}\n${stderr.toString('utf8')}`.split(/\r?\n/)) {
+    const match = /^- (introduced|preexisting):\s+(\S+\.(?:test|spec)\.[cm]?[jt]sx?)(?:\s+>|\s|$)/.exec(line.trim());
+    if (match) files[match[1] as keyof typeof files].add(match[2]!);
+  }
+  const parts = (['introduced', 'preexisting'] as const).filter((kind) => files[kind].size > 0)
+    .map((kind) => { const names = [...files[kind]].sort(); return `${kind}-files=${names.slice(0, 5).map((name) => redactSecretText(name).slice(0, 160)).join(',')}${names.length > 5 ? `,+${names.length - 5}` : ''}`; });
+  return parts.length ? parts.join(' · ') : undefined;
+}
+
+/** Remote scratch is deleted on exit. Preserve a bounded, redacted copy before returning a refusal. */
+function writeFailedGateLog(path: string, stdout: Buffer, stderr: Buffer): string | undefined {
+  // One latest refusal log per PR; repeated attempts replace it atomically instead of accumulating files.
+  const logPath = `${path}.failure.log`;
+  const tempPath = `${logPath}.${process.pid}.${randomBytes(4).toString('hex')}.tmp`;
+  const maxBytes = 2 * 1024 * 1024;
+  const render = (label: string, bytes: Buffer): string => {
+    const safe = Buffer.from(redactSecretText(bytes.toString('utf8')), 'utf8');
+    const clipped = safe.length > maxBytes
+      ? `${safe.subarray(0, maxBytes / 2).toString('utf8')}\n[remote log middle truncated]\n${safe.subarray(-maxBytes / 2).toString('utf8')}` : safe.toString('utf8');
+    return `=== ${label} (${bytes.length} bytes${safe.length > maxBytes ? ', middle truncated' : ''}) ===\n${clipped}\n`;
+  };
+  try {
+    mkdirSync(dirname(path), { recursive: true, mode: 0o700 });
+    writeFileSync(tempPath, render('stdout', stdout) + render('stderr', stderr), { mode: 0o600, flag: 'wx' });
+    renameSync(tempPath, logPath);
+    return logPath;
+  } catch { rmSync(tempPath, { force: true }); return undefined; }
+}
+
 /** No local gate fallback: host refusal, an unmeasured run, and a failed gate all block landing. */
 export function ensurePrLandHeavyRemote(input: HeavyRemoteInput, deps: HeavyRemoteDeps = {}): HeavyRemoteResult {
   const path = evidencePath(input);
@@ -170,48 +206,66 @@ export function ensurePrLandHeavyRemote(input: HeavyRemoteInput, deps: HeavyRemo
   }
   const cached = matchingEvidence(path, input);
   if (cached) return { ok: true, host: cached.host, source: 'cached', elapsedMs: 0, evidencePath: path, rootPlan: cached.rootPlan, interferenceMeasured: cached.interferenceMeasured };
-  const started = (deps.now ?? Date.now)();
+  const now = deps.now ?? Date.now;
+  const sleep = deps.sleep ?? ((ms: number) => { if (ms > 0) Bun.sleepSync(ms); });
+  const started = now();
+  const deadline = started + settings.slotWaitSeconds * 1000;
   let outcome: RemoteRunOutcome = { kind: 'busy' };
   const primaryHost: PrLandHeavyHost = settings.host;
   let selectedHost: PrLandHeavyHost = primaryHost;
-  for (const host of [primaryHost, ...PR_LAND_HEAVY_HOSTS.filter((candidate) => candidate !== primaryHost)]) {
-    selectedHost = host;
-    try {
-      outcome = (deps.runRemote ?? runOnRemote)({
-        repo: input.repo, host, mirror: settings.mirror, commit: input.head,
-        refs: [input.main], hostCap: gateRemoteHostCap(settings, host), installPwa: true, stableCheckout: true,
-        // Test the tree GitHub will merge: scratch-checkout the reviewed head, merge the pinned main tip there,
-        // then run typecheck and self gate (changed tests and PWA reach/build) at that exact pair.
-        // The detached integration commit stays on the selected host and never changes the PR branch.
-        argv: (sha) => ['sh', '-c',
+  const hosts = [primaryHost, ...PR_LAND_HEAVY_HOSTS.filter((candidate) => candidate !== primaryHost)];
+  wait: for (;;) {
+    for (const host of hosts) {
+      selectedHost = host;
+      try {
+        outcome = (deps.runRemote ?? runOnRemote)({
+          repo: input.repo, host, mirror: settings.mirror, commit: input.head,
+          refs: [input.main], hostCap: gateRemoteHostCap(settings, host), installPwa: true, stableCheckout: true,
+          // Test the tree GitHub will merge: scratch-checkout the reviewed head, merge the pinned main tip there,
+          // then run typecheck and self gate (changed tests and PWA reach/build) at that exact pair.
+          // The detached integration commit stays on the selected host and never changes the PR branch.
+          argv: (sha) => ['sh', '-c',
           'git -c user.name=elanous-gate -c user.email=gate@localhost -c commit.gpgsign=false merge --no-ff --no-edit "$1" && TSC_BASE_REF="$1" bun run scripts/ci-typecheck-changed.ts --local && bun bin/elanous.mjs self gate --changed --base "$1" --local --shards 4 && bun scripts/pr-land-extra-remote-gates.ts "$1"',
           'sh', sha(input.main)],
-      }, deps.runner ?? realGateRemoteRunner);
-    } catch (error) {
-      outcome = { kind: 'infra', reason: `exception: ${error instanceof Error ? error.message : String(error)}` };
+        }, deps.runner ?? realGateRemoteRunner);
+      } catch (error) {
+        outcome = { kind: 'infra', reason: `exception: ${error instanceof Error ? error.message : String(error)}` };
+      }
+      // A completed run or infrastructure failure is a verdict. Only a full host slot asks for another host.
+      if (outcome.kind !== 'busy') break wait;
     }
-    // A completed run or infrastructure failure is a verdict. Only a full host slot asks for another host.
-    if (outcome.kind !== 'busy') break;
+    // Both allowlisted hosts were busy. Wait the same slotWaitSeconds window as self gate, then retry.
+    debug.log('pr.land', 'host-busy', { host: selectedHost, occupied: outcome.occupied ?? null, slotWaitSeconds: settings.slotWaitSeconds });
+    const left = deadline - now();
+    if (left <= 0) break;
+    sleep(Math.min(15_000, left));
+    if (now() >= deadline) break;
   }
-  const elapsedMs = Math.max(0, (deps.now ?? Date.now)() - started);
+  const elapsedMs = Math.max(0, now() - started);
   const observe = deps.observe ?? ((event: string, data: Record<string, unknown>) => debug.log('pr.land', event, data));
   const actualHost = outcome.kind === 'ran' ? outcome.host : undefined;
   const base = { pr: input.pr, head: input.head, main: input.main, host: actualHost ?? null, attemptedHost: selectedHost, elapsedMs };
   // The outcome must identify the selected allowlisted host; the configured host alone is not evidence.
   if (outcome.kind !== 'ran' || outcome.commit !== input.head || outcome.rc !== 0 || outcome.host !== selectedHost) {
     const summary = outcome.kind === 'ran' && outcome.rc !== 0 ? failedGateSummary(outcome.stdout, outcome.stderr) : undefined;
+    // A different host cannot attest to this gate, so do not promote its file list into the refusal.
+    const files = outcome.kind === 'ran' && outcome.rc !== 0 && outcome.host === selectedHost && outcome.commit === input.head
+      ? failedGateFiles(outcome.stdout, outcome.stderr) : undefined;
+    const failureLogPath = outcome.kind === 'ran' ? writeFailedGateLog(path, outcome.stdout, outcome.stderr) : undefined;
     const reason = outcome.kind === 'ran'
       ? outcome.host !== selectedHost
-        ? `gate-host-mismatch (${outcome.host})`
-        : `gate-rc-${outcome.rc}${outcome.commit !== input.head ? '-head-mismatch' : ''}${summary ? ` · remote: ${summary}` : ''}`
+        ? `gate-host-mismatch (${outcome.host})${failureLogPath ? ` · remote-log: ${failureLogPath}` : ''}`
+        : `gate-rc-${outcome.rc}${outcome.commit !== input.head ? '-head-mismatch' : ''}${files ? ` · ${files}` : ''}${summary ? ` · remote: ${summary}` : ''}${failureLogPath ? ` · remote-log: ${failureLogPath}` : ' · remote-log: unavailable'}`
       : outcome.kind === 'busy' ? 'gate-host-busy' : outcome.reason;
-    observe('heavy-remote', { ...base, outcome: outcome.kind === 'ran' ? 'fail' : 'unmeasured', reason });
-    return { ok: false, ...(actualHost ? { host: actualHost } : {}), attemptedHost: selectedHost, source: 'unmeasured', reason, elapsedMs, evidencePath: path };
+    observe('heavy-remote', { ...base, outcome: outcome.kind === 'ran' ? 'fail' : 'unmeasured', reason, failureLogPath: failureLogPath ?? null });
+    return { ok: false, ...(actualHost ? { host: actualHost } : {}), attemptedHost: selectedHost, source: 'unmeasured', reason, elapsedMs, evidencePath: path, ...(failureLogPath ? { failureLogPath } : {}) };
   }
   const extraGates = extraGatesFromOutput(outcome.stdout);
   if (!extraGates) {
-    observe('heavy-remote', { ...base, outcome: 'unmeasured', reason: 'extra-global-unmeasured' });
-    return { ok: false, host: selectedHost, attemptedHost: selectedHost, source: 'unmeasured', reason: 'extra-global-unmeasured', elapsedMs, evidencePath: path };
+    const failureLogPath = writeFailedGateLog(path, outcome.stdout, outcome.stderr);
+    const reason = `extra-global-unmeasured${failureLogPath ? ` · remote-log: ${failureLogPath}` : ' · remote-log: unavailable'}`;
+    observe('heavy-remote', { ...base, outcome: 'unmeasured', reason, failureLogPath: failureLogPath ?? null });
+    return { ok: false, host: selectedHost, attemptedHost: selectedHost, source: 'unmeasured', reason, elapsedMs, evidencePath: path, ...(failureLogPath ? { failureLogPath } : {}) };
   }
   const evidence: HeavyRemoteEvidence = {
     schema: 2, pr: input.pr, head: input.head, main: input.main, host: selectedHost,
@@ -225,8 +279,10 @@ export function ensurePrLandHeavyRemote(input: HeavyRemoteInput, deps: HeavyRemo
     renameSync(temp, path);
   } catch (error) {
     rmSync(temp, { force: true });
-    observe('heavy-remote', { ...base, outcome: 'unmeasured', reason: 'evidence-write-failed' });
-    return { ok: false, host: selectedHost, attemptedHost: selectedHost, source: 'unmeasured', reason: `evidence-write-failed: ${error instanceof Error ? error.message : String(error)}`, elapsedMs, evidencePath: path };
+    const failureLogPath = writeFailedGateLog(path, outcome.stdout, outcome.stderr);
+    const reason = `evidence-write-failed: ${error instanceof Error ? error.message : String(error)}${failureLogPath ? ` · remote-log: ${failureLogPath}` : ' · remote-log: unavailable'}`;
+    observe('heavy-remote', { ...base, outcome: 'unmeasured', reason, failureLogPath: failureLogPath ?? null });
+    return { ok: false, host: selectedHost, attemptedHost: selectedHost, source: 'unmeasured', reason, elapsedMs, evidencePath: path, ...(failureLogPath ? { failureLogPath } : {}) };
   }
   observe('heavy-remote', { ...base, outcome: 'pass', evidencePath: path, rootPlan: evidence.rootPlan, interferenceMeasured: evidence.interferenceMeasured });
   return { ok: true, host: selectedHost, source: 'remote', elapsedMs, evidencePath: path, rootPlan: evidence.rootPlan, interferenceMeasured: evidence.interferenceMeasured };

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

@@ -25,6 +25,7 @@ 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';
 
 const SHA40 = /^[0-9a-f]{40}$/i;
 
@@ -35,7 +36,7 @@ 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;
-  /** Explicitly replaced failed reviews. Each reason is the verifier's original refusal reason. */
+  /** 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. */
   followupPr?: number;
@@ -45,7 +46,12 @@ export type OverlapEvidenceVerdict =
   | { ok: true; mode: 'already-ancestor'; reviewResult: string }
   | { ok: true; mode: 'rebased'; baseTip: string; reviewResult: string }
   | { ok: true; mode: 'base-advanced-disjoint'; baseTip: string; gateBase: string; windowCommits: number; reviewResult: string }
-  | { ok: false; reason: string };
+  | { ok: false; reason: string; baseTip?: string };
+
+/** Resolve CLI-supplied evidence against the selected repository, not the caller's shell cwd. */
+export function resolveOverlapEvidencePath(evidencePath: string, cwd: string): string {
+  return resolve(cwd, evidencePath);
+}
 
 export interface VerifyOverlapEvidenceInput {
   evidencePath: string;
@@ -98,8 +104,12 @@ function checkSelectedReviewAttempts(input: VerifyOverlapEvidenceInput, e: Parti
   const entries = e.supersedes;
   if (entries !== undefined && (!Array.isArray(entries) || entries.length === 0)) return { ok: false, reason: 'review-supersedes-invalid' };
   const superseded = new Map<string, string>();
+  const resolvedPriorAccepted: string[] = [];
   let selectedTime: number | undefined;
-  if (entries?.length) {
+  let selectedRecord: Record<string, unknown> | undefined;
+  try { selectedRecord = lastReviewRecord(input.readFile(selected)); } catch { return { ok: false, reason: 'review-unreadable' }; }
+  const hasResolvedPrior = hasResolvedPriorDeclaration(selectedRecord);
+  if (entries?.length || hasResolvedPrior) {
     try { selectedTime = input.reviewMtime(selected); } catch { return { ok: false, reason: 'review-attempt-time-unmeasured' }; }
     if (!Number.isFinite(selectedTime)) return { ok: false, reason: 'review-attempt-time-unmeasured' };
   }
@@ -122,9 +132,22 @@ function checkSelectedReviewAttempts(input: VerifyOverlapEvidenceInput, e: Parti
       if (superseded.has(path)) return { ok: false, reason: 'review-supersedes-passing' };
       continue;
     }
-    if (superseded.get(path) !== review.reason) return { ok: false, reason: `review-attempt-not-superseded: ${basename(path)} (${review.reason})` };
-    if (!/^review-(verdict-fail|must-fix-[1-9][0-9]*)$/.test(review.reason)) {
-      return { ok: false, reason: `review-supersedes-not-failed: ${basename(path)} (${review.reason})` };
+    if (superseded.has(path)) {
+      if (superseded.get(path) !== review.reason) return { ok: false, reason: `review-attempt-not-superseded: ${basename(path)} (${review.reason})` };
+      if (!/^review-(verdict-fail|must-fix-[1-9][0-9]*)$/.test(review.reason)) {
+        return { ok: false, reason: `review-supersedes-not-failed: ${basename(path)} (${review.reason})` };
+      }
+      continue;
+    }
+    if (!/^review-(verdict-fail|must-fix-[1-9][0-9]*)$/.test(review.reason)
+      || !selectedRecord || !reviewAttemptExplicitlyResolved(input, selectedRecord, path, head)) {
+      return { ok: false, reason: `review-attempt-not-superseded: ${basename(path)} (${review.reason})` };
+    }
+    resolvedPriorAccepted.push(path);
+    let failedTime: number;
+    try { failedTime = input.reviewMtime(path); } catch { return { ok: false, reason: 'review-attempt-time-unmeasured' }; }
+    if (!Number.isFinite(failedTime) || selectedTime === undefined || failedTime >= selectedTime) {
+      return { ok: false, reason: 'review-selected-not-later-than-failure' };
     }
   }
   if (entries?.length) {
@@ -144,11 +167,137 @@ function checkSelectedReviewAttempts(input: VerifyOverlapEvidenceInput, e: Parti
     head,
     selected,
     superseded: [...superseded.entries()].map(([reviewResult, reason]) => ({ reviewResult, reason })),
+    resolvedPriorAccepted,
     followupPr: e.followupPr ?? null,
   });
   return { ok: true };
 }
 
+function lastReviewRecord(text: string): Record<string, unknown> | undefined {
+  const lines = text.split('\n').reverse();
+  for (const line of lines) {
+    if (!line.trim().startsWith('{')) continue;
+    let value: unknown;
+    try { value = JSON.parse(line); } catch { continue; }
+    if (!value || typeof value !== 'object' || Array.isArray(value)) continue;
+    const result = value as Record<string, unknown>;
+    if (result.pr !== undefined && (('verdict' in result && Array.isArray(result.mustFix)) || typeof result.error === 'string')) return result;
+  }
+  return undefined;
+}
+
+function hasResolvedPriorDeclaration(review: Record<string, unknown> | undefined): boolean {
+  if (!review) return false;
+  const value = review.resolvedPrior;
+  if (Array.isArray(value) && value.length > 0) return true;
+  if (value && typeof value === 'object' && Object.keys(value).length > 0) return true;
+  return [review.intent, review.intentBlock, review.reviewIntent, review.reviewIntentBlock]
+    .some((intent) => typeof intent === 'string' && /resolved prior|prior review findings resolved/i.test(intent));
+}
+
+function normalizedFinding(value: string): string {
+  return value.trim().replace(/\s+/g, ' ').toLowerCase();
+}
+
+function containsUnresolvedClaim(value: string): boolean {
+  return /\b(?:unresolved|not(?:\s+yet)?[\s-]+resolved|not(?:\s+yet)?[\s-]+fixed|not(?:\s+yet)?[\s-]+addressed|still[\s-]+open|remains?[\s-]+open|still[\s-]+present|status\s*[:=]\s*(?:open|unresolved|pending|in[- ]progress))\b/i.test(value);
+}
+
+function containsUnresolvedDeclaration(value: unknown): boolean {
+  if (typeof value === 'string') return containsUnresolvedClaim(value);
+  if (Array.isArray(value)) return value.some(containsUnresolvedDeclaration);
+  if (!value || typeof value !== 'object') return false;
+  const record = value as Record<string, unknown>;
+  if (record.resolved === false || (typeof record.status === 'string' && /^(?:open|unresolved|pending|in[- ]progress)$/i.test(record.status))) return true;
+  return Object.values(record).some(containsUnresolvedDeclaration);
+}
+
+function referencesReview(value: unknown, path: string): boolean {
+  return typeof value === 'string' && (value === path || value === basename(path));
+}
+
+function findingList(value: unknown): string[] {
+  const values = Array.isArray(value) ? value : typeof value === 'string' ? [value] : [];
+  return values.filter((entry): entry is string => typeof entry === 'string' && entry.trim().length > 0);
+}
+
+/** A later same-head pass/mf0 review may resolve prior attempts only when it names every finding explicitly. */
+function reviewAttemptExplicitlyResolved(input: VerifyOverlapEvidenceInput, selected: Record<string, unknown>, failedPath: string, head: string): boolean {
+  let failed: Record<string, unknown> | undefined;
+  try { failed = lastReviewRecord(input.readFile(failedPath)); } catch { return false; }
+  if (!failed || failed.pr === undefined || String(failed.pr) !== String(input.pr)
+    || (typeof failed.headCommit === 'string' && failed.headCommit.toLowerCase() !== head)
+    || (typeof failed.currentHeadCommit === 'string' && failed.currentHeadCommit.toLowerCase() !== head)) return false;
+  const rawFindings = findingList(failed.mustFix).map((finding) => finding.trim());
+  const findings = rawFindings.map(normalizedFinding);
+  if (findings.length === 0) return false;
+
+  const declared = selected.resolvedPrior;
+  if (declared !== undefined && containsUnresolvedDeclaration(declared)) return false;
+  const intentBlocks = [selected.intent, selected.intentBlock, selected.reviewIntent, selected.reviewIntentBlock]
+    .filter((value): value is string => typeof value === 'string');
+  // A resolution in one field cannot override an OPEN/PENDING declaration in another.
+  if (intentBlocks.some(containsUnresolvedClaim)) return false;
+
+  let resolved: string[] = [];
+  if (Array.isArray(declared)) {
+    for (const entry of declared) {
+      if (typeof entry === 'string') {
+        if (containsUnresolvedClaim(entry)) continue;
+        // A string can be an exact finding axis or an explicit "filename: finding" row.
+        const line = entry.trim();
+        if (rawFindings.includes(line)) resolved.push(line);
+        const prefix = `${basename(failedPath)}: `;
+        if (line.startsWith(prefix)) {
+          const declaredFinding = line.slice(prefix.length).trim();
+          const index = rawFindings.indexOf(declaredFinding);
+          if (index >= 0) resolved.push(findings[index]!);
+        }
+        continue;
+      }
+      if (!entry || typeof entry !== 'object' || Array.isArray(entry)) continue;
+      const item = entry as Record<string, unknown>;
+      const ref = item.reviewResult ?? item.review ?? item.path;
+      if (ref !== undefined && !referencesReview(ref, failedPath)) continue;
+      if (item.head !== undefined && (typeof item.head !== 'string' || item.head.toLowerCase() !== head)) continue;
+      if (item.headCommit !== undefined && (typeof item.headCommit !== 'string' || item.headCommit.toLowerCase() !== head)) continue;
+      if (item.resolved === false || item.status === 'unresolved'
+        || Object.values(item).some((value) => typeof value === 'string' && containsUnresolvedClaim(value))) continue;
+      const listed = findingList(item.mustFix ?? item.resolvedMustFix ?? item.findings ?? item.axes ?? item.finding ?? item.axis);
+      if (listed.some(containsUnresolvedClaim)) continue;
+      if (ref === undefined && listed.every((finding) => rawFindings.includes(finding.trim()))) {
+        resolved.push(...listed.filter((finding) => rawFindings.includes(finding.trim())));
+      } else if (ref !== undefined) {
+        resolved.push(...listed.filter((finding) => rawFindings.includes(finding.trim())));
+      }
+    }
+  } else if (declared && typeof declared === 'object') {
+    const record = declared as Record<string, unknown>;
+    const value = record[failedPath] ?? record[basename(failedPath)];
+    resolved.push(...findingList(value).filter((finding) => !containsUnresolvedClaim(finding) && rawFindings.includes(finding.trim())));
+  }
+
+  for (const intent of intentBlocks) {
+    const lines = intent.split(/\r?\n/);
+    const header = lines.findIndex((line) => /^resolved prior review findings:\s*$/i.test(line.trim()));
+    if (header < 0) continue;
+    // Only explicit rows under the resolution header count. A finding quoted in
+    // background prose is evidence of context, not a declaration of repair.
+    const prefix = `- ${basename(failedPath)}:`;
+    for (const raw of lines.slice(header + 1)) {
+      const line = raw.trim();
+      if (!line) continue;
+      if (!line.startsWith('- ')) break;
+      if (!line.startsWith(prefix)) continue;
+      const declaredFinding = line.slice(prefix.length).trim();
+      const index = rawFindings.indexOf(declaredFinding);
+      if (index >= 0) resolved.push(findings[index]!);
+    }
+  }
+  const resolvedSet = new Set(resolved.map(normalizedFinding));
+  return findings.every((finding) => resolvedSet.has(finding));
+}
+
 type Checked = { ok: false; reason: string; baseTip?: string; gateBase?: string; windowCommits?: number }
   | (OverlapEvidenceVerdict & { ok: true; baseTip?: string });
 
@@ -175,17 +324,7 @@ function checkReview(input: Pick<VerifyOverlapEvidenceInput, 'pr' | 'readFile'>,
   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 };
   // The capture parser projects away model provenance; inspect the same last result-shaped line here.
-  let raw: Record<string, unknown> | undefined;
-  for (const line of text.split('\n').reverse()) {
-    if (!line.trim().startsWith('{')) continue;
-    let value: unknown;
-    try { value = JSON.parse(line); } catch { continue; }
-    if (!value || typeof value !== 'object' || Array.isArray(value)) continue;
-    const result = value as Record<string, unknown>;
-    if (result.pr === undefined || !(('verdict' in result && Array.isArray(result.mustFix)) || typeof result.error === 'string')) continue;
-    raw = result;
-    break;
-  }
+  const raw = lastReviewRecord(text);
   if (raw) {
     const actualBackend = typeof raw.actualBackend === 'string' ? raw.actualBackend.trim().toLowerCase() : '';
     const model = typeof raw.model === 'string' ? raw.model.trim().toLowerCase() : '';
@@ -222,6 +361,47 @@ function checkReview(input: Pick<VerifyOverlapEvidenceInput, 'pr' | 'readFile'>,
   return { ok: true, reviewResult: e.reviewResult };
 }
 
+/** Reuse the evidence-selected review when a pinned head needs a read-only virtual rebase. */
+export function verifyOverlapEvidenceVirtualRebase(input: VerifyOverlapEvidenceInput, baseTip: string):
+  { ok: true; reviewResult: string; patchId: string } | { ok: false; reason: string; baseTip?: string } {
+  const head = input.expectedHead.toLowerCase();
+  if (!SHA40.test(head) || !SHA40.test(baseTip)) return { ok: false, reason: 'virtual-rebase-invalid-sha' };
+  let raw: unknown;
+  try { raw = JSON.parse(input.readFile(input.evidencePath)); }
+  catch { return { ok: false, reason: 'evidence-unreadable' }; }
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return { ok: false, reason: 'evidence-not-object' };
+  const evidence = raw as Partial<OverlapEvidenceFile>;
+  const evidencePr = typeof evidence.pr === 'number' ? evidence.pr
+    : typeof evidence.pr === 'string' && /^[0-9]+$/.test(evidence.pr) ? Number(evidence.pr) : NaN;
+  if (!Number.isSafeInteger(evidencePr) || evidencePr !== input.pr) return { ok: false, reason: 'evidence-pr-mismatch' };
+  if (typeof evidence.head !== 'string' || evidence.head.toLowerCase() !== head) return { ok: false, reason: 'evidence-head-mismatch' };
+  const gate = evidence.gate;
+  if (!gate || typeof gate !== 'object') return { ok: false, reason: 'gate-missing' };
+  if (gate.passed !== true) return { ok: false, reason: 'gate-not-passed' };
+  if (typeof gate.head !== 'string' || gate.head.toLowerCase() !== head) return { ok: false, reason: 'gate-head-mismatch' };
+  if (typeof gate.baseCommit !== 'string' || !SHA40.test(gate.baseCommit)) return { ok: false, reason: 'gate-base-unmeasured' };
+  const review = checkReview(input, evidence, head, baseTip);
+  if (!review.ok) return review;
+  const attempts = checkSelectedReviewAttempts(input, evidence, head);
+  if (!attempts.ok) return attempts;
+  const remote = input.run('git', ['ls-remote', input.remote, `refs/heads/${input.branch}`], { cwd: input.cwd });
+  if (!remote.ok || remote.out.trim().split(/\s+/)[0]?.toLowerCase() !== baseTip.toLowerCase()) {
+    return { ok: false, reason: 'virtual-rebase-base-advanced' };
+  }
+  const local = input.run('git', ['rev-parse', '--verify', `refs/remotes/${input.remote}/${input.branch}`], { cwd: input.cwd });
+  if (!local.ok || local.out.trim().toLowerCase() !== baseTip.toLowerCase()) {
+    return { ok: false, reason: 'virtual-rebase-base-stale-or-unmeasured' };
+  }
+  const patch = verifyVirtualRebasePatch({ cwd: input.cwd, baseTip, head });
+  if (!patch.ok) return patch;
+  const oldBase = patch.oldBase.toLowerCase();
+  const gateBase = gate.baseCommit.toLowerCase();
+  if (!input.run('git', ['merge-base', '--is-ancestor', gateBase, oldBase], { cwd: input.cwd }).ok) {
+    return { ok: false, reason: 'gate-base-not-ancestor-of-old-base' };
+  }
+  return { ok: true, reviewResult: review.reviewResult, patchId: patch.patchId };
+}
+
 type WindowResult = { ok: true; windowCommits: number } | { ok: false; reason: string; windowCommits?: number };
 
 /**
@@ -431,7 +611,9 @@ export function verifyOverlapEvidence(input: VerifyOverlapEvidenceInput): Overla
     gateBase: (verdict.ok ? (verdict.mode === 'base-advanced-disjoint' ? verdict.gateBase : undefined) : verdict.gateBase) ?? null,
     windowCommits: (verdict.ok ? (verdict.mode === 'base-advanced-disjoint' ? verdict.windowCommits : undefined) : verdict.windowCommits) ?? null,
   });
-  if (!verdict.ok) return { ok: false, reason: verdict.reason };
+  if (!verdict.ok) return (verdict.reason.startsWith('not-rebased:') || verdict.reason.startsWith('base-stale-overlap:')) && verdict.baseTip
+    ? { ok: false, reason: verdict.reason, baseTip: verdict.baseTip }
+    : { ok: false, reason: verdict.reason };
   if (verdict.mode === 'already-ancestor') return { ok: true, mode: 'already-ancestor', reviewResult: verdict.reviewResult };
   if (verdict.mode === 'base-advanced-disjoint') {
     return { ok: true, mode: 'base-advanced-disjoint', baseTip: verdict.baseTip!, gateBase: verdict.gateBase, windowCommits: verdict.windowCommits, reviewResult: verdict.reviewResult };

package/src/cli/pr-land-pod-shadow-job.ts

@@ -7,6 +7,9 @@ import type { RootPlanSummary } from './pr-land-heavy-remote.js';
 
 const SHA = /^[0-9a-f]{40}$/i;
 const MARKER = 'ELANOUS_PRLAND_SHADOW';
+/** Shadow evidence is optional; it must not hold a ready landing for the Pod's 45-minute deadline. */
+export const LANDING_POD_SHADOW_HOST_TIMEOUT_MS = 10 * 60_000;
+export const LANDING_POD_SHADOW_STATUS_UNREADABLE_MS = 60_000;
 
 export interface LandingPodShadowInput { head: string; main: string }
 export interface LandingPodShadowVerdict {
@@ -42,12 +45,32 @@ export function landingPodShadowScript(head: string, main: string): string {
 export async function runLandingPodShadowJob(input: LandingPodShadowInput, deps: {
   runPod?: (options: RunPodCommandOptions) => Promise<PodCommandResult>;
   readLog?: (path: string) => string;
+  /** Deterministic timer seam for the host deadline. */
+  armTimeout?: (onTimeout: () => void, ms: number) => () => void;
 } = {}): Promise<LandingPodShadowVerdict> {
   const script = landingPodShadowScript(input.head, input.main);
-  const job = await (deps.runPod ?? runPodCommand)({
-    command: ['bash', '-lc', script], clone: true, source: { kind: 'commit', sha: input.head },
-    returnLogs: true, deadlineSeconds: 45 * 60,
+  const controller = new AbortController();
+  const armTimeout = deps.armTimeout ?? ((onTimeout: () => void, ms: number) => {
+    const timer = setTimeout(onTimeout, ms);
+    return () => clearTimeout(timer);
   });
+  const disarm = armTimeout(() => {
+    const reason = new Error(`pod shadow: host timeout after ${LANDING_POD_SHADOW_HOST_TIMEOUT_MS}ms`);
+    controller.abort(reason);
+  }, LANDING_POD_SHADOW_HOST_TIMEOUT_MS);
+  let job: PodCommandResult;
+  try {
+    // Wait for the runner to observe abort and finish Job/Secret/lease cleanup before landing continues.
+    job = await (deps.runPod ?? runPodCommand)({
+      command: ['bash', '-lc', script], clone: true, source: { kind: 'commit', sha: input.head },
+      returnLogs: true, deadlineSeconds: 45 * 60,
+      statusUnreadableMs: LANDING_POD_SHADOW_STATUS_UNREADABLE_MS,
+      hostDeadlineAtMs: Date.now() + LANDING_POD_SHADOW_HOST_TIMEOUT_MS,
+      signal: controller.signal,
+    });
+  } finally {
+    disarm();
+  }
   let log: string;
   try { log = (deps.readLog ?? ((path: string) => readFileSync(path, 'utf8')))(join(job.artifactsDir, 'child.log')); }
   catch (error) {

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

@@ -0,0 +1,64 @@
+import { classifyPrLandRefusal } from './pr-land-refusal.js';
+import { readJourneyEdge } from '../self-dev/graph-journey-route.js';
+
+/** A recover unit selects a next action. The train or TA still owns every effect. */
+export interface PrLandRecoveryContext {
+  refusal: string;
+  pr?: number;
+  head?: string;
+  isDraft?: boolean;
+}
+
+export interface PrLandRecoveryPlan {
+  outcome: 'rework' | 'needs-human' | 'failed';
+  result: { action: 'wait-retry' | 'request-review' | 'needs-human' | 'none'; pr?: number; head?: string; delayMs?: number; reason: string };
+  evidence: { refusal: string; label: string; route: string | null; source: string };
+}
+
+export function planPrLandRecovery(context: PrLandRecoveryContext): PrLandRecoveryPlan {
+  const raw = typeof context.refusal === 'string' ? context.refusal : '';
+  const lines = raw.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  // Callers must extract exactly one refusal line. A second diagnostic may be
+  // unmarked (for example `error: review-missing`), so never select a line
+  // from a larger transcript and mistake it for the whole verdict.
+  const refusal = lines.length === 1 ? lines[0]! : raw.trim();
+  const label = classifyPrLandRefusal(refusal, { isDraft: context.isDraft });
+  const route = readJourneyEdge('merge', label);
+  const evidence = { refusal: refusal.slice(0, 500), label, route: route.to, source: route.source };
+  const pr = Number.isSafeInteger(context.pr) && context.pr! > 0 ? context.pr : undefined;
+  const head = typeof context.head === 'string' && /^[0-9a-f]{40}$/i.test(context.head) ? context.head.toLowerCase() : undefined;
+  if (!refusal || !pr || !head) return { outcome: 'failed', result: { action: 'none', reason: 'pinned PR, head and refusal are required' }, evidence };
+  if (lines.length !== 1 || !refusal.startsWith('✗')) return { outcome: 'needs-human', result: { action: 'needs-human', pr, head, reason: `expected one marked refusal line, observed ${lines.length} nonempty lines` }, evidence };
+  if (route.source !== 'graph') return { outcome: 'needs-human', result: { action: 'needs-human', pr, head, reason: 'refusal has no declared graph route' }, evidence };
+  if (label === 'gate-host-busy' && route.to === 'next-move') {
+    return { outcome: 'rework', result: { action: 'wait-retry', pr, head, delayMs: 30_000, reason: 'remote gate host busy; retry through existing admission after delay' }, evidence };
+  }
+  if (label === 'review-missing' && route.to === 'review') {
+    return { outcome: 'rework', result: { action: 'request-review', pr, head, reason: 'request exact-head review through existing review gate' }, evidence };
+  }
+  return { outcome: 'needs-human', result: { action: 'needs-human', pr, head, reason: `${label} requires the existing ${route.to ?? 'unknown'} admission before another landing` }, evidence };
+}
+
+/** A graph call_entry cannot turn one refusal into another action. */
+export function planPrLandRecoveryForEntry(context: PrLandRecoveryContext, entry: string): PrLandRecoveryPlan {
+  const plan = planPrLandRecovery(context);
+  // The default entry keeps the original read-only planner contract.
+  if (entry === 'plan') return plan;
+  if (entry === 'human-review') {
+    if (plan.outcome === 'needs-human' && plan.result.action === 'needs-human') return plan;
+    return { outcome: 'failed', result: { action: 'none', reason: `recover entry ${entry} does not match ${plan.result.action}` }, evidence: plan.evidence };
+  }
+  if (entry === 'request-review' || entry === 'wait-retry') {
+    if (plan.outcome === 'rework' && plan.result.action === entry) return plan;
+    return {
+      outcome: 'failed',
+      result: { action: 'none', reason: `recover entry ${entry} does not match ${plan.result.action}` },
+      evidence: plan.evidence,
+    };
+  }
+  return {
+    outcome: 'failed',
+    result: { action: 'none', reason: `unknown recover entry: ${entry}` },
+    evidence: plan.evidence,
+  };
+}

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

@@ -1,20 +1,35 @@
 import { readJourneyEdge, recordJourneyEdge } from '../self-dev/graph-journey-route.js';
 import { debug } from '../debug/log.js';
 
-/** The five outcomes of an observed `pr land` refusal. This function never retries a landing. */
-export type PrLandRefusal = 'draft' | 'head-branch' | 'not-ancestor' | 'review-missing' | 'other';
+/** Observed `pr land` refusal reasons. Classification never retries a landing. */
+export type PrLandRefusal = 'draft' | 'head-branch' | 'not-ancestor' | 'review-missing'
+  | 'gate-host-busy' | 'gate-merge-conflict' | 'gate-touch-clean'
+  | 'pr-base-unreadable' | 'public-export-leak' | 'other';
 
 export function classifyPrLandRefusal(message: string, context: { isDraft?: boolean } = {}): PrLandRefusal {
   if (context.isDraft === true && message.startsWith('✗ expected-head: PR OPEN non-draft')) return 'draft';
   if (message.startsWith('✗ branch: PR head branch와 현재 브랜치가 다릅니다.')) return 'head-branch';
   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 (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';
   return 'other';
 }
 
+/** Direct landing failures are observed only when today's refusal shape is recognized. */
+export function observeDirectPrLandRefusal(message: string): void {
+  if (classifyPrLandRefusal(message) === 'other') return;
+  observePrLandRefusal(message);
+}
+
 /** Read the declared recovery edge and observe the refusal. No recovery command runs here. */
 export function observePrLandRefusal(message: string, context: { isDraft?: boolean } = {}): void {
-  const route = readJourneyEdge('merge', classifyPrLandRefusal(message, context));
-  if (route.to !== null) recordJourneyEdge(route, route.to, 'pr-land-refused; recovery-execution=none');
-  else debug.log('self-implement', 'graph-edge-unresolved', { from: 'merge', label: route.label, reason: 'pr-land-refused; recovery-execution=none' });
+  try {
+    const route = readJourneyEdge('merge', classifyPrLandRefusal(message, context));
+    if (route.to !== null) recordJourneyEdge(route, route.to, 'pr-land-refused; recovery-execution=none');
+    else debug.log('self-implement', 'graph-edge-unresolved', { from: 'merge', label: route.label, reason: 'pr-land-refused; recovery-execution=none' });
+  } catch { /* An observation failure must never change the landing refusal. */ }
 }