elanous 0.2.29 → 0.2.32

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

@@ -5,7 +5,7 @@ import { randomBytes } from 'node:crypto';
 import { effectiveInstanceRoot } from '../instance/resolve.js';
 import { getUserConfig } from '../user-config.js';
 import { debug, redactSecretText } from '../debug/log.js';
-import { realGateRemoteRunner, resolveGateRemoteSettings, runOnRemote, type GateRemoteRunner, type RemoteRunOutcome } from '../self-implement/gate-remote.js';
+import { gateRemoteHostCap, realGateRemoteRunner, resolveGateRemoteSettings, runOnRemote, type GateRemoteRunner, type RemoteRunOutcome } from '../self-implement/gate-remote.js';
 
 const SHA = /^[0-9a-f]{40}$/i;
 // WSL is excluded until its push permissions and gate environment are proven stable.
@@ -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: settings.hostCap, installPwa: 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,11 +25,12 @@ 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;
 
 interface OverlapEvidenceFile {
-  pr: number;
+  pr: number | string;
   head: string;
   /** ①② 경로에서만 필수 — 겹친 착지가 전부 조상(already-ancestor)이면 생략해도 된다. */
   gate?: { head: string; baseCommit: string; passed: boolean };
@@ -45,7 +46,7 @@ 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 };
 
 export interface VerifyOverlapEvidenceInput {
   evidencePath: string;
@@ -174,6 +175,47 @@ function checkReview(input: Pick<VerifyOverlapEvidenceInput, 'pr' | 'readFile'>,
   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 };
+  // 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;
+  }
+  if (raw) {
+    const actualBackend = typeof raw.actualBackend === 'string' ? raw.actualBackend.trim().toLowerCase() : '';
+    const model = typeof raw.model === 'string' ? raw.model.trim().toLowerCase() : '';
+    const route = typeof raw.reviewRoute === 'string' ? raw.reviewRoute.trim().toLowerCase() : '';
+    const respondedProvider = typeof raw.respondedProvider === 'string' ? raw.respondedProvider.trim().toLowerCase() : '';
+    const respondedModel = typeof raw.respondedModel === 'string' ? raw.respondedModel.trim().toLowerCase() : '';
+    if (actualBackend === 'acp:claude' || actualBackend.startsWith('acp:claude/')
+      || model === 'acp:claude' || model.startsWith('acp:claude/')
+      || ((route === 'acp' || route === 'acp-fallback') && typeof raw.fallbackBackend === 'string' && raw.fallbackBackend.trim().toLowerCase() === 'claude')) {
+      return { ok: false, reason: 'review-forbidden-acp-claude', baseTip };
+    }
+    const requested = typeof raw.requestedModel === 'string' ? raw.requestedModel.trim().toLowerCase() : '';
+    if (requested) {
+      const requestedAcpBackend = requested.startsWith('acp:') ? requested.split('/')[0] : '';
+      // Only explicit provider-qualified forms identify a provider here. Bare model IDs
+      // (for example claude-sonnet-4 or gpt-6-sol) cannot be compared to a provider name.
+      const apiProvider = requested.startsWith('openrouter/') ? 'openrouter'
+        : requested.startsWith('local:') ? 'local' : '';
+      const expectedResponseModel = requested.startsWith('openrouter/') ? requested.slice('openrouter/'.length) : requested;
+      const mismatch = (model !== '' && model !== requested)
+        || (actualBackend !== '' && (requestedAcpBackend ? actualBackend !== requestedAcpBackend : actualBackend !== 'api'
+          && (apiProvider === '' || actualBackend !== apiProvider)))
+        || (route !== '' && route !== (requestedAcpBackend ? 'acp' : 'api'))
+        || (!requestedAcpBackend && apiProvider !== '' && respondedProvider !== '' && respondedProvider !== apiProvider)
+        || (!requestedAcpBackend && respondedModel !== '' && respondedModel !== expectedResponseModel
+          && respondedModel !== requested);
+      if (mismatch) console.warn(`⚠ overlap-evidence: review provider mismatch — requestedModel=${requested} actualBackend=${actualBackend || 'unmeasured'} model=${model || 'unmeasured'} reviewRoute=${route || 'unmeasured'} respondedProvider=${respondedProvider || 'unmeasured'} respondedModel=${respondedModel || 'unmeasured'} (${e.reviewResult})`);
+    }
+  }
   if (review.error) return { ok: false, reason: 'review-error', baseTip };
   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 };
@@ -181,6 +223,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 };
 
 /**
@@ -245,7 +328,11 @@ function check(input: VerifyOverlapEvidenceInput): Checked {
   }
   if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return { ok: false, reason: 'evidence-not-object' };
   const e = raw as Partial<OverlapEvidenceFile>;
-  if (e.pr !== input.pr) return { ok: false, reason: `evidence-pr-mismatch: ${String(e.pr)} ≠ ${input.pr}` };
+  const evidencePr = typeof e.pr === 'number' ? e.pr
+    : typeof e.pr === 'string' && /^[0-9]+$/.test(e.pr) ? Number(e.pr) : NaN;
+  const prMatches = Number.isSafeInteger(input.pr) && input.pr > 0
+    && Number.isSafeInteger(evidencePr) && evidencePr === input.pr;
+  if (!prMatches) return { ok: false, reason: `evidence-pr-mismatch: ${String(e.pr)} ≠ ${input.pr}` };
   if (typeof e.head !== 'string' || e.head.toLowerCase() !== head) return { ok: false, reason: 'evidence-head-mismatch' };
 
   // ⓐ 이미 조상 — 겹친 착지가 전부 머리 안에 있으면 그 머리의 게이트·리뷰가 이미 그것을 보고 쟀다.
@@ -317,13 +404,10 @@ export interface VerifyAncestorAutoInput {
   overlappingLandings: readonly string[];
 }
 
-function checkAncestorAuto(input: VerifyAncestorAutoInput): AncestorAutoVerdict {
+/** Standard same-head reviews must all pass; a later passing review cannot hide a failed attempt. */
+export function verifyAllSameHeadReviews(input: Pick<VerifyAncestorAutoInput, 'pr' | 'expectedHead' | 'readFile' | 'reviewResultsDir' | 'listDir'>):
+  { ok: true; reviewResult: string } | { ok: false; reason: string } {
   const head = input.expectedHead.toLowerCase();
-  const landings = input.overlappingLandings;
-  if (landings.length === 0) return { ok: false, reason: 'ancestor-auto-no-overlapping-landings' };
-  const notAncestor = landings.find((sha) => !(/^[0-9a-f]{7,40}$/i.test(sha)
-    && input.run('git', ['merge-base', '--is-ancestor', sha, head], { cwd: input.cwd }).ok));
-  if (notAncestor !== undefined) return { ok: false, reason: `ancestor-auto-not-ancestor: ${notAncestor.slice(0, 12)} is not an ancestor of ${head.slice(0, 12)}` };
   let names: readonly string[];
   try { names = input.listDir(input.reviewResultsDir); } catch { return { ok: false, reason: 'review-missing' }; }
   const filename = new RegExp(`^[A-Za-z0-9][A-Za-z0-9._-]*-${input.pr}-([a-f0-9]{10,40})\\.json$`, 'i');
@@ -333,11 +417,23 @@ function checkAncestorAuto(input: VerifyAncestorAutoInput): AncestorAutoVerdict
     const match = filename.exec(n);
     return Boolean(match && match[1]!.length >= 10 && head.startsWith(match[1]!.toLowerCase()));
   }).sort()) {
+    // The auto-ancestor landing path uses the same provider/forbidden-backend check as explicit evidence.
     const review = checkReview(input, { reviewResult: join(input.reviewResultsDir, name) }, head);
     if (!review.ok) return { ok: false, reason: review.reason };
     accepted = review.reviewResult;
   }
-  return accepted === undefined ? { ok: false, reason: 'review-missing' } : { ok: true, mode: 'already-ancestor-auto', reviewResult: accepted };
+  return accepted === undefined ? { ok: false, reason: 'review-missing' } : { ok: true, reviewResult: accepted };
+}
+
+function checkAncestorAuto(input: VerifyAncestorAutoInput): AncestorAutoVerdict {
+  const head = input.expectedHead.toLowerCase();
+  const landings = input.overlappingLandings;
+  if (landings.length === 0) return { ok: false, reason: 'ancestor-auto-no-overlapping-landings' };
+  const notAncestor = landings.find((sha) => !(/^[0-9a-f]{7,40}$/i.test(sha)
+    && input.run('git', ['merge-base', '--is-ancestor', sha, head], { cwd: input.cwd }).ok));
+  if (notAncestor !== undefined) return { ok: false, reason: `ancestor-auto-not-ancestor: ${notAncestor.slice(0, 12)} is not an ancestor of ${head.slice(0, 12)}` };
+  const reviews = verifyAllSameHeadReviews(input);
+  return reviews.ok ? { ok: true, mode: 'already-ancestor-auto', reviewResult: reviews.reviewResult } : reviews;
 }
 
 /**
@@ -377,7 +473,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

@@ -0,0 +1,106 @@
+/** Opt-in shadow of the pinned landing typecheck and changed-file gate on a Pod Job. */
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { runPodCommand, type RunPodCommandOptions, type PodCommandResult } from '../task-orchestrator/surfaces/pod-command-job.js';
+import { redactSecretText } from '../debug/log.js';
+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 {
+  measured: boolean;
+  ok: boolean;
+  rootPlan: RootPlanSummary | null;
+  tscRc?: number;
+  gateRc?: number;
+  reason?: string;
+  job?: string;
+}
+
+export function landingPodShadowScript(head: string, main: string): string {
+  if (!SHA.test(head) || !SHA.test(main)) throw new Error('pod shadow: invalid head/main');
+  return [
+    'set -u',
+    `test "$(git rev-parse HEAD)" = '${head}' || { echo '${MARKER} unmeasured source-head'; exit 2; }`,
+    `git fetch origin '${main}' >/dev/null 2>&1 || { echo '${MARKER} unmeasured main-fetch'; exit 2; }`,
+    `git cat-file -e '${main}^{commit}' || { echo '${MARKER} unmeasured main-missing'; exit 2; }`,
+    `if [ "$(git rev-parse --is-shallow-repository)" = true ]; then git fetch --unshallow origin '${head}' >/tmp/prland-shadow-unshallow.log 2>&1 || { tail -n 12 /tmp/prland-shadow-unshallow.log; echo '${MARKER} unmeasured unshallow'; exit 2; }; fi`,
+    'git -c user.name=elanous-gate -c user.email=gate@localhost -c commit.gpgsign=false merge --no-ff --no-edit ' + `'${main}'` + ` >/tmp/prland-shadow-merge.log 2>&1 || { tail -n 12 /tmp/prland-shadow-merge.log; echo '${MARKER} unmeasured merge'; exit 2; }`,
+    `bun install --frozen-lockfile >/tmp/prland-shadow-install.log 2>&1 || { echo '${MARKER} unmeasured root-install'; exit 2; }`,
+    `if [ -f apps/pwa/package.json ]; then (cd apps/pwa && bun install --frozen-lockfile) >/tmp/prland-shadow-pwa-install.log 2>&1 || { echo '${MARKER} unmeasured pwa-install'; exit 2; }; fi`,
+    `TSC_BASE_REF='${main}' bun scripts/ci-typecheck-changed.ts --local >/tmp/prland-shadow-tsc.log 2>&1; tsc_rc=$?`,
+    `bun bin/elanous.mjs self gate --changed --base '${main}' --local --shards 4 >/tmp/prland-shadow-gate.log 2>&1; gate_rc=$?`,
+    `printf '${MARKER}_TSC_PLAN %s\\n' "$(grep '^\\[tsc-gate\\] root-plan ' /tmp/prland-shadow-tsc.log | tail -n 1 | sed 's/^\\[tsc-gate\\] root-plan //')"`,
+    "tail -n 8 /tmp/prland-shadow-tsc.log; tail -n 8 /tmp/prland-shadow-gate.log",
+    `printf '${MARKER} head=%s main=%s tsc=%s gate=%s\\n' '${head}' '${main}' "$tsc_rc" "$gate_rc"`,
+    'exit 0',
+  ].join('\n');
+}
+
+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 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) {
+    const detail = redactSecretText(error instanceof Error ? error.message : String(error)).slice(0, 180);
+    return { measured: false, ok: false, rootPlan: null, reason: `child-log-unreadable:${detail}`, job: job.job };
+  }
+  const expected = `${MARKER} head=${input.head} main=${input.main} `;
+  const lines = log.split(/\r?\n/);
+  let markerIndex = -1;
+  for (let index = lines.length - 1; index >= 0; index--) {
+    if (lines[index]!.startsWith(MARKER)) { markerIndex = index; break; }
+  }
+  const line = markerIndex >= 0 ? lines[markerIndex] : undefined;
+  if (job.exitCode !== 0 || !line?.startsWith(expected)) {
+    const detail = markerIndex > 0 ? redactSecretText(lines[markerIndex - 1] ?? '').trim().slice(0, 180) : '';
+    return { measured: false, ok: false, rootPlan: null, reason: `${line ?? `pod-exit-${job.exitCode}`}${detail ? ` · ${detail}` : ''}`, job: job.job };
+  }
+  const match = /^tsc=(\d+) gate=(\d+)$/.exec(line.slice(expected.length));
+  if (!match) return { measured: false, ok: false, rootPlan: null, reason: 'marker-unreadable', job: job.job };
+  const planLine = log.split(/\r?\n/).reverse().find((part) => part.startsWith(`${MARKER}_TSC_PLAN `));
+  let rootPlan: RootPlanSummary | null = null;
+  if (planLine) {
+    try {
+      const candidate = JSON.parse(planLine.slice(`${MARKER}_TSC_PLAN `.length)) as RootPlanSummary;
+      if ((candidate.mode === 'affected' || candidate.mode === 'full') && (candidate.roots === null || Number.isSafeInteger(candidate.roots))
+        && typeof candidate.promoted === 'boolean' && (candidate.reason === null || typeof candidate.reason === 'string')) rootPlan = candidate;
+    } catch { /* an unreadable plan stays unmeasured */ }
+  }
+  if (!rootPlan) return { measured: false, ok: false, rootPlan: null, reason: 'root-plan-missing', job: job.job };
+  const tscRc = Number(match[1]);
+  const gateRc = Number(match[2]);
+  return { measured: true, ok: tscRc === 0 && gateRc === 0, rootPlan, tscRc, gateRc, job: job.job };
+}

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

@@ -1,10 +1,10 @@
 /**
  * PRLAND-HEAVY-ON-POD-1 — `pr land` 무거운 판정을 Pod 에서 그림자 리허설한다.
  *
- * 착지 경로에 아직 잇지 않는다. `--heavy-on-pod-shadow` 플래그·실제 Pod 러너 바인딩은
- * 다음 조각(pr-cli.ts · pod-command-job.ts 무접촉). 이번 단위는 주입형 순수 함수만:
+ * `pr-cli.ts`의 `--heavy-remote --heavy-on-pod-shadow` 선택 경로가 호출한다.
+ * 비교기는 주입형 함수이며 Pod Job 바인딩은 `pr-land-pod-shadow-job.ts`에 둔다.
  * 켜지면 가짜/실 Pod 러너를 한 번 부르고 `pr.land`/`heavy-on-pod-shadow` 관측 한 줄을 남긴 뒤
- * 로컬 판정을 그대로 반환한다. 끄면 러너 0회. 러너가 던져도 경고 한 줄만 내고 로컬을 지킨다.
+ * 로컬 판정을 그대로 반환한다. 끄면 러너 0회. 러너가 던지면 미측정 관측과 경고를 남기고 로컬을 지킨다.
  */
 
 export interface HeavyOnPodShadowInput<T> {
@@ -18,6 +18,13 @@ export interface HeavyOnPodShadowInput<T> {
 }
 
 function agree(local: unknown, pod: unknown): boolean {
+  if (local && pod && typeof local === 'object' && typeof pod === 'object'
+    && 'measured' in local && 'measured' in pod) {
+    const a = local as { measured: unknown; ok?: unknown; rootPlan?: unknown };
+    const b = pod as { measured: unknown; ok?: unknown; rootPlan?: unknown };
+    return a.measured === true && b.measured === true && a.ok === b.ok
+      && JSON.stringify(a.rootPlan ?? null) === JSON.stringify(b.rootPlan ?? null);
+  }
   if (Object.is(local, pod)) return true;
   try {
     return JSON.stringify(local) === JSON.stringify(pod);
@@ -49,6 +56,12 @@ export async function runHeavyOnPodShadow<T>(input: HeavyOnPodShadowInput<T>): P
     });
   } catch (error) {
     warn(error instanceof Error ? error.message : String(error));
+    log('pr.land', 'heavy-on-pod-shadow', {
+      pr, head, local,
+      pod: { measured: false, ok: false, reason: `pod-exception:${error instanceof Error ? error.name : 'unknown'}` },
+      agree: false,
+      podMs: elapsedMs(started), localMs,
+    });
   }
   return local;
 }

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. */ }
 }