elanous 0.2.29 → 0.2.31

package/src/cli/mcp-login.ts

@@ -91,9 +91,8 @@ export async function runMcpLogin(opts: McpLoginOpts): Promise<McpLoginResult> {
     const discovered = await discoverMcpOAuth(challenge.resourceMetadata, {
       resourceUrl: spec.url, ...oauthOpts,
     });
-    if ((why || !discovered.metadata.authorizationEndpoint) && discovered.metadata.deviceAuthorizationEndpoint) {
-      if (early?.server.listening) await closeServer(early.server);
-      if (why) out.log(why);
+    const loginWithDevice = async (): Promise<McpLoginResult> => {
+      if (server?.listening) await closeServer(server);
       const stored = loadStoredRegistration(discovered.metadata.issuer, oauthOpts);
       const deviceRegistration = await ensureClientRegistration(discovered.metadata, { ...oauthOpts, deviceCode: true });
       const authorizeDevice = (registration: typeof deviceRegistration) => authorizeMcpDevice(discovered.metadata, registration, {
@@ -119,6 +118,10 @@ export async function runMcpLogin(opts: McpLoginOpts): Promise<McpLoginResult> {
       out.log(`✓ credentials saved for '${opts.serverId}' (${discovered.metadata.issuer})`);
       persistLoginDiscovery(opts, discovered.metadata, out);
       return { exitCode: 0 };
+    };
+    if ((why || !discovered.metadata.authorizationEndpoint) && discovered.metadata.deviceAuthorizationEndpoint) {
+      if (why) out.log(why);
+      return await loginWithDevice();
     }
     const callbackListener = early ?? await listenForCallback(opts.createListener, 0);
     server = callbackListener.server;
@@ -170,7 +173,17 @@ export async function runMcpLogin(opts: McpLoginOpts): Promise<McpLoginResult> {
         }
       }
     }
-    const callback = await callbackPromise;
+    let callback: Callback;
+    try {
+      callback = await callbackPromise;
+    } catch (error) {
+      // A missing browser callback can use the advertised device flow. An explicit
+      // denial, mismatched state, or malformed callback must never silently fall back.
+      if (!discovered.metadata.deviceAuthorizationEndpoint ||
+          !/^authorization callback timed out after \d+ms$/.test(error instanceof Error ? error.message : '')) throw error;
+      out.log(`Browser approval did not complete for '${opts.serverId}'; trying device code.`);
+      return await loginWithDevice();
+    }
     await exchangeAuthorizationCode(authorization.metadata, authorization.request, callback, oauthOpts);
     out.log(`✓ credentials saved for '${opts.serverId}' (${authorization.metadata.issuer})`);
     persistLoginDiscovery(opts, authorization.metadata, out);
@@ -424,7 +437,10 @@ async function listenForCallback(
       }
       settle = resolve;
       reject = rejectWait;
-      const timer = setTimeout(() => rejectWait(new Error(`authorization callback timed out after ${timeoutMs}ms`)), timeoutMs);
+      const timer = setTimeout(() => {
+        completed = true;
+        settleCallback(new Error(`authorization callback timed out after ${timeoutMs}ms`));
+      }, timeoutMs);
       (timer as unknown as { unref?: () => void }).unref?.();
       // ⛔ 성공·실패 어느 쪽으로 끝나든 타이머를 «반드시» 거둔다.
       clearWaitTimer = () => clearTimeout(timer as unknown as ReturnType<typeof setTimeout>);

package/src/cli/msg-cli.ts

@@ -21,6 +21,14 @@ export interface MsgCliDeps {
   registerLogSink?: () => Promise<unknown>;
   /** Wake the recipient after a durable post; never changes the post outcome. */
   wake?: (address: string, msgId: number, message: { from: string; kind?: string }, deps: WakeDeps) => Promise<WakeOutcome>;
+  /** Test seams for the existing self-send transport and the selected task-card ledger. */
+  readCard?: typeof import('../task-agent/task-hand.js').readTaskCard;
+  podFragmentsForRun?: typeof import('../harness/self-send-target.js').listPodFragmentsForRun;
+  sendPod?: typeof import('../harness/self-send-target.js').dispatchPodSelfSend;
+  runScreen?: typeof import('../self-implement/run-ledger.js').queryRunScreenKey;
+  sendMemo?: typeof import('../harness/control-inbox.js').enqueueControlMemo;
+  sendStop?: typeof import('../harness/control-inbox.js').enqueueSoftStop;
+  screenAlive?: (spaceId: string) => boolean;
 }
 
 type CommonOptions = { json?: boolean };
@@ -59,6 +67,83 @@ export function registerMsgCommands(program: Command, deps: MsgCliDeps = {}): vo
   const setExitCode = deps.setExitCode ?? ((code: number) => { process.exitCode = code; });
   const msg = program.command('msg').description('Durable seat-addressed messages');
 
+  // Called by both msg post and msg ask after their durable TA request is written.
+  const handleTaMessage = async (request: Message): Promise<void> => {
+    if (request.to !== 'TA' || request.from === 'TA' || request.replyTo !== undefined) return;
+    const command = /\b(stop|memo|status)\b/i.exec(request.body);
+    const cardId = /\bta-[a-zA-Z0-9][a-zA-Z0-9._-]*\b/.exec(request.body)?.[0]?.replace(/[.,!?]+$/, '');
+    if (!command || !cardId) return;
+    const { readTaskCard } = await import('../task-agent/task-hand.js');
+    const { queryRunScreenKey } = await import('../self-implement/run-ledger.js');
+    const { listHarnessScreens } = await import('../harness/harness-screen.js');
+    const { normalizeRunId } = await import('../harness/harness-space.js');
+    const { dispatchPodSelfSend, listPodFragmentsForRun } = await import('../harness/self-send-target.js');
+    const { enqueueControlMemo, enqueueSoftStop } = await import('../harness/control-inbox.js');
+    withStore(store => {
+      // Reserve one linked reply and pending delivery before touching another store or Pod.
+      const pending = store.db.transaction(() => {
+        // A concurrent sender may have claimed after an earlier read. Keep this
+        // check in the same write transaction as any pending reply change.
+        if (store.taDeliveryClaimState(request.id) === 'held') return null;
+        const reply = store.listReplies(request.id, 1)[0];
+        if (reply && store.taDeliveryStatus(request.id) !== 'pending') return null;
+        let delivery: (() => void) | undefined;
+        let deliveryReply: string | undefined;
+        let answer: string;
+        try {
+          const card = (deps.readCard ?? readTaskCard)(cardId);
+          if (!card) throw new Error(`카드 없음: ${cardId}`);
+          if (command[1]!.toLowerCase() === 'status') {
+            answer = `${card.id}: ${card.status}${card.runId ? ` · run ${card.runId}` : ''}`;
+          } else {
+            const runId = card.runId;
+            if (!runId || normalizeRunId(runId) !== runId) throw new Error(`${cardId}: 연결된 런 없음`);
+            const fragments = (deps.podFragmentsForRun ?? listPodFragmentsForRun)(runId);
+            const resolved = fragments.length === 0 ? (deps.runScreen ?? queryRunScreenKey)(runId) : null;
+            const screen = resolved?.logStoreStatus === 'read' ? resolved.screenKey : null;
+            if (fragments.length > 1 || (fragments.length === 0 && (!screen || !(deps.screenAlive ?? ((id: string) => listHarnessScreens().some(row => row.spaceId === id)))(screen)))) {
+              throw new Error(`${cardId}: 실행 중인 단일 런 공간을 찾을 수 없음`);
+            }
+            const space = fragments[0]?.spaceId ?? screen!;
+            const stop = command[1]!.toLowerCase() === 'stop';
+            const body = stop ? '' : request.body.replace(command[0], '').replace(cardId, '').trim().replace(/^[,.:;\s-]+/, '');
+            if (!stop && (!body || /[\r\n]/.test(body))) throw new Error('memo는 비어 있지 않은 한 줄이어야 한다');
+            const memo = { version: 1 as const, kind: 'supervisor', urgency: 'normal' as const, body };
+            answer = `${cardId}: run ${runId} 전달 여부 미확인 (${space}) — 자동 재시도 중지; 런 인박스를 확인하세요.`;
+            delivery = () => {
+              if (fragments.length) {
+                if (!(deps.sendPod ?? dispatchPodSelfSend)(space, stop ? { stop: true } : { memo })) throw new Error(`${cardId}: Pod 전달 실패`);
+              } else if (stop) (deps.sendStop ?? enqueueSoftStop)(space);
+              else (deps.sendMemo ?? enqueueControlMemo)(space, memo);
+            };
+            deliveryReply = stop ? `${cardId}: run ${runId} soft stop 요청 기록 (${space})`
+              : `${cardId}: run ${runId} 감독 메모 기록 (${space})`;
+          }
+        } catch (error) {
+          answer = `${cardId}: ${error instanceof Error ? error.message : String(error)}`;
+        }
+        if (delivery) store.setTaDeliveryStatus(request.id, 'pending');
+        if (reply) store.updateTaReply(request.id, answer);
+        else store.post({ from: 'TA', to: request.from, kind: 'reply', body: answer, replyTo: request.id });
+        return delivery && deliveryReply ? { delivery, reply: deliveryReply } : null;
+      }).immediate();
+      if (pending) {
+        const claim = store.claimTaDelivery(request.id);
+        if (!claim) return;
+        try {
+          pending.delivery();
+          store.settleTaDelivery(request.id, claim, pending.reply, true);
+        }
+        catch (error) {
+          // A transport error or failed DB settlement may follow a successful publication.
+          // Keep the claim and require inspection rather than send the same memo again.
+          store.markTaDeliveryUnknown(request.id, claim,
+            `${cardId}: 전달 여부 미확인 — 자동 재시도 중지: ${error instanceof Error ? error.message : String(error)}`);
+        }
+      }
+    });
+  };
+
   const run = (action: () => void | Promise<void>) => async () => {
     try { await action(); }
     catch (error) {
@@ -94,6 +179,7 @@ export function registerMsgCommands(program: Command, deps: MsgCliDeps = {}): vo
         ? store.post(envelope)
         : store.appendWithProvenance(envelope, opts.originKey));
       emit(posted, opts.json, () => out.log(formatMessage(posted)));
+      await handleTaMessage(posted); // msg post: process the durable TA request (including pending retry).
       const noBody = noReplyBodyNotice(to);
       if (noBody) out.error(noBody);
       // 저장 «뒤» 한 번 — 읽는 몸이 없다는 안내가 이미 나갔으면 깨움 경고는 겹쳐 내지 않는다.
@@ -273,6 +359,8 @@ export function registerMsgCommands(program: Command, deps: MsgCliDeps = {}): vo
       let store: MsgStore | undefined;
       try {
         const asked = withStore(ledger => ledger.post({ from, to, body: question }));
+        // msg ask uses the same saved-message handler before waiting for its linked reply.
+        await handleTaMessage(asked);
         const deadline = Date.now() + waitSeconds * 1000;
         let reply: Message | undefined;
         store = open();

package/src/cli/pr-cli.ts

@@ -58,12 +58,16 @@ import { branchLineageSlug, findSiblingPrs } from './pr-lineage.js';
 import { parseReleaseNoteSection } from '../release-loop/release-note.js';
 import { landingFreezeMessage } from '../release-loop/landing-freeze.js';
 import { admitLandingMerge } from '../self-implement/frozen-merges.js';
-import { verifyAncestorAutoPass, verifyOverlapEvidence } from './pr-land-overlap-evidence.js';
+import { verifyAllSameHeadReviews, verifyAncestorAutoPass, verifyOverlapEvidence } from './pr-land-overlap-evidence.js';
+import { verifyVirtualRebasePatch } from './pr-land-virtual-rebase.js';
 import { observePrLandRefusal } from './pr-land-refusal.js';
 import { ensurePrLandHeavyRemote, type HeavyRemoteInput, type HeavyRemoteResult } from './pr-land-heavy-remote.js';
+import { runHeavyOnPodShadow } from './pr-land-pod-shadow.js';
+import type { LandingPodShadowInput, LandingPodShadowVerdict } from './pr-land-pod-shadow-job.js';
 import { taskAgentStatePath } from '../task-agent/task-hand.js';
 import { PR_LABEL_NAMES } from '../github/pr-labels.js';
 import { enqueueL8ShadowQueue, runL8ShadowQueue, shadowPrNumber, statusL8ShadowQueue, type L8ShadowQueueDeps } from '../self-implement/l8-merge-queue.js';
+import { censusOpenPrs, guardNewPr, parseDiffHunks, readOpenPrs, type Seat } from '../pr-tool/census.js';
 
 export { branchLineageSlug, findSiblingPrs };
 
@@ -93,6 +97,8 @@ export interface PrLandOpts {
   overlapEvidence?: string;
   /** Pinned landing opt-in: run the heavy changed-file gate on node-b at the reviewed head and current main tip. */
   heavyRemote?: boolean;
+  /** Opt-in comparison of the heavy remote verdict with a Pod Job; the remote verdict still decides landing. */
+  heavyOnPodShadow?: boolean;
 }
 
 export interface PrGranularityOpts {
@@ -146,6 +152,7 @@ export interface PrLandDeps {
   runIosGate?: (out: { log: (message: string) => void; error: (message: string) => void }, changedFiles: readonly string[]) => boolean;
   runPwaGate?: (out: { log: (message: string) => void; error: (message: string) => void }, changedFiles: readonly string[]) => boolean;
   runHeavyRemote?: (input: HeavyRemoteInput) => HeavyRemoteResult;
+  runLandingPodShadow?: (input: LandingPodShadowInput) => Promise<LandingPodShadowVerdict>;
   isInteractive?: () => boolean;
   /** Clock for the recent-landings window (test seam · default Date.now). */
   now?: () => number;
@@ -818,13 +825,22 @@ function renderConflictRunIds(runIds: readonly { runId: string; status: string }
   return runIds.map(({ runId, status }) => `${runId}) status=${status}`).join(', ');
 }
 
+function currentChangePaths(
+  run: CmdRunner, cwd: string, staged: PorcelainStatusRecord[] | null, base: string,
+  out: { log: (message: string) => void }, strict: true,
+): string[] | null;
+function currentChangePaths(
+  run: CmdRunner, cwd: string, staged: PorcelainStatusRecord[] | null, base: string,
+  out: { log: (message: string) => void }, strict?: false,
+): string[];
 function currentChangePaths(
   run: CmdRunner,
   cwd: string,
   staged: PorcelainStatusRecord[] | null,
   base: string,
   out: { log: (message: string) => void },
-): string[] {
+  strict = false,
+): string[] | null {
   const fromStatus = staged
     ? staged.flatMap(({ path, originalPath }) => (originalPath ? [path, originalPath] : [path]))
     : [];
@@ -847,6 +863,7 @@ function currentChangePaths(
   }
 
   const diff = run('git', ['diff', '--name-only', '--no-renames', `${comparisonBase}...HEAD`], { cwd });
+  if (strict && !diff.ok) return null;
   const fromDiff = diff.ok ? parseNameOnlyList(diff.out) : [];
   return unionPaths(fromStatus, fromDiff);
 }
@@ -1014,12 +1031,13 @@ function emitLandingOverlapAdvisory(
   currentFiles: readonly string[],
   out: { log: (message: string) => void },
   overlappingLandings: string[] = [],
+  resolvedLandings?: NonNullable<ReturnType<typeof collectResolvedBaseLandings>>,
 ): boolean {
   if (currentFiles.length === 0) {
     record('overlap', true, { outcome: 'no-changed-files' });
     return false;
   }
-  const commits = collectResolvedBaseLandings(run, cwd, DEFAULT_GRANULARITY_SINCE, base);
+  const commits = resolvedLandings ?? collectResolvedBaseLandings(run, cwd, DEFAULT_GRANULARITY_SINCE, base);
   if (commits === null) {
     record('overlap', false, { outcome: 'lookup-failed' });
     return false;
@@ -1041,6 +1059,88 @@ function emitLandingOverlapAdvisory(
   return false;
 }
 
+/** The pinned overlap evidence decision is shared by landing and its read-only preview. */
+function verifyPinnedOverlapDecision(input: {
+  opts: PrLandOpts;
+  deps: PrLandDeps;
+  run: CmdRunner;
+  cwd: string;
+  base: string;
+  readFile: (path: string) => string;
+  overlappingLandings: readonly string[];
+  decision: OverlapLandingDecisionOutcome | undefined;
+  out: { log: (message: string) => void; error: (message: string) => void };
+  refuse: (message: string) => void;
+}): boolean {
+  const { opts, deps, run, cwd, base, readFile, overlappingLandings, decision, out, refuse } = input;
+  if (decision === undefined || decision === 'user-merge') return true;
+  let accepted = false;
+  let ancestorResyncNeeded = false;
+  if (decision === 'unavailable' && opts.overlapEvidence !== undefined) {
+    const ref = resolveRemoteBranchRef(run, cwd, base);
+    const verdict = verifyOverlapEvidence({
+      evidencePath: opts.overlapEvidence, pr: Number(opts.pr), expectedHead: opts.expectedHead!,
+      remote: ref.remote, branch: ref.branch, cwd, run, readFile,
+      reviewResultsDir: deps.reviewResultsDir ?? join(dirname(taskAgentStatePath()), 'review-results'),
+      listDir: (dir) => readdirSync(dir), reviewMtime: (path) => statSync(path).mtimeMs,
+      reviewRealPath: (path) => realpathSync(path), overlappingLandings,
+    });
+    accepted = verdict.ok;
+    if (verdict.ok) {
+      out.log(verdict.mode === 'already-ancestor'
+        ? `✓ overlap-evidence: already-ancestor — 겹친 최근 착지 ${overlappingLandings.length}개가 전부 head ${opts.expectedHead!.slice(0, 12)} 의 조상 · review pass must-fix 0 (${verdict.reviewResult})`
+        : verdict.mode === 'base-advanced-disjoint'
+          ? `✓ overlap-evidence: base-advanced-disjoint — gate base ${verdict.gateBase.slice(0, 12)} ⊂ head ${opts.expectedHead!.slice(0, 12)} · ${ref.remote}/${ref.branch} ${verdict.baseTip.slice(0, 12)} 까지 ${verdict.windowCommits}개 커밋이 PR 파일을 안 건드린다 · review pass|warn must-fix 0 (${verdict.reviewResult})`
+          : `✓ overlap-evidence: ${ref.remote}/${ref.branch} ${verdict.baseTip.slice(0, 12)} ⊂ head ${opts.expectedHead!.slice(0, 12)} · gate passed on that base · review pass must-fix 0 (${verdict.reviewResult})`);
+    } else refuse(`✗ overlap-evidence: ${verdict.reason}`);
+  } else if (decision === 'unavailable') {
+    const verdict = verifyAncestorAutoPass({
+      pr: Number(opts.pr), expectedHead: opts.expectedHead!, cwd, run, readFile, overlappingLandings,
+      reviewResultsDir: deps.reviewResultsDir ?? join(dirname(taskAgentStatePath()), 'review-results'),
+      listDir: (dir) => readdirSync(dir),
+    });
+    accepted = verdict.ok;
+    if (verdict.ok) {
+      out.log(`✓ overlap-evidence: already-ancestor-auto — 겹친 최근 착지 ${overlappingLandings.length}개가 전부 head ${opts.expectedHead!.slice(0, 12)} 의 조상 · review pass|warn must-fix 0 (${verdict.reviewResult})`);
+    } else {
+      ancestorResyncNeeded = verdict.reason.startsWith('ancestor-auto-not-ancestor:');
+      if (ancestorResyncNeeded) {
+        const ref = resolveRemoteBranchRef(run, cwd, base);
+        const remote = run('git', ['ls-remote', ref.remote, `refs/heads/${ref.branch}`], { cwd });
+        const baseTip = remote.ok ? remote.out.trim().split(/\s+/u, 1)[0] ?? '' : '';
+        const local = run('git', ['rev-parse', '--verify', `refs/remotes/${ref.remote}/${ref.branch}`], { cwd });
+        const reviews = verifyAllSameHeadReviews({
+          pr: Number(opts.pr), expectedHead: opts.expectedHead!, readFile,
+          reviewResultsDir: deps.reviewResultsDir ?? join(dirname(taskAgentStatePath()), 'review-results'),
+          listDir: (dir) => readdirSync(dir),
+        });
+        const patch = reviews.ok && /^[a-f0-9]{40}$/iu.test(baseTip) && local.ok && local.out.trim() === baseTip
+          ? verifyVirtualRebasePatch({ cwd, baseTip, head: opts.expectedHead! })
+          : { ok: false as const, reason: reviews.ok ? 'base-stale-or-unmeasured' : reviews.reason };
+        accepted = patch.ok;
+        ancestorResyncNeeded = !accepted;
+        record('virtual-rebase', patch.ok, {
+          pr: Number(opts.pr), head: opts.expectedHead, baseTip: baseTip || null,
+          reason: patch.ok ? 'same-patch-id' : patch.reason,
+          reviewResult: reviews.ok ? reviews.reviewResult : null,
+        });
+        if (patch.ok) {
+          out.log(`✓ overlap-evidence: virtual-rebase — ${ref.remote}/${ref.branch} ${baseTip.slice(0, 12)} 와 head ${opts.expectedHead!.slice(0, 12)} 충돌 없음 · patch-id ${patch.patchId.slice(0, 12)} 동일 · review pass|warn must-fix 0 (${reviews.reviewResult})`);
+        } else refuse(`✗ virtual-rebase: ${patch.reason} · ${verdict.reason}`);
+      } else refuse(`✗ ancestor-auto: ${verdict.reason}`);
+    }
+  }
+  if (!accepted) {
+    if (ancestorResyncNeeded && !opts.dryRun) {
+      const marked = run('gh', ['pr', 'edit', String(opts.pr), '--add-label', PR_LABEL_NAMES.needsRebase], { cwd });
+      record('resync-marker', marked.ok, { pr: Number(opts.pr), reason: 'ancestor-auto-not-ancestor' });
+      if (!marked.ok) out.error('⚠ resync-marker: needs-rebase 라벨을 남기지 못했습니다');
+    }
+    out.error('✗ expected-head: overlap merge approval unavailable for the reviewed head');
+  }
+  return accepted;
+}
+
 const SOURCE_SPLIT_PR_LIST_LIMIT = 200;
 /**
  * merged 조회의 «폭주 방지» 절대 상한 — ⛔ 창을 덮는 값이 «아니라» 그 위의 천장이다.
@@ -1217,6 +1317,10 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     out.error('✗ heavy-remote: --pr ⊕ --expected-head 머리 고정 착지에서만 쓴다.');
     return 1;
   }
+  if (opts.heavyOnPodShadow && !opts.heavyRemote) {
+    out.error('✗ heavy-on-pod-shadow: --heavy-remote 머리 고정 착지에서만 쓴다.');
+    return 1;
+  }
 
   const readFile = deps.readFile ?? ((path: string) => readFileSync(path, 'utf8'));
   let title = opts.title;
@@ -1310,8 +1414,8 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
       out.error('✗ dry-run: --hold 는 머리 고정 읽기 전용 예행과 함께 사용할 수 없습니다.');
       return 1;
     }
-    if (opts.overlapEvidence !== undefined) {
-      out.error('✗ dry-run: --overlap-evidence 는 머리 고정 읽기 전용 예행에서 사용할 수 없습니다.');
+    if (opts.overlapEvidence !== undefined && !opts.overlapEvidence.trim()) {
+      out.error('✗ overlap-evidence: --overlap-evidence <file> 는 비어 있을 수 없습니다.');
       return 1;
     }
     const inspected = inspectPinnedPr(run, cwd, pr, opts.expectedHead!);
@@ -1322,8 +1426,55 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     for (const reason of reasons) out.log(`[dry-run] ✗ preflight: ${reason}`);
     if (reasons.includes('PR is draft')) out.log(`[dry-run] 선행: eln gh pr ready ${pr}`);
     if (reasons.length === 0) out.log('[dry-run] ✓ preflight: PR OPEN non-draft, matching PR/local HEAD and branch, clean worktree');
-    out.log('[dry-run] Remaining landing gates, freeze, overlap and merge: UNMEASURED; no PR or git state changed.');
-    return reasons.length === 0 ? 0 : 1;
+    if (reasons.length > 0) return 1;
+    // A dry-run may inspect the remote tip but must not update refs, FETCH_HEAD, objects or PR labels.
+    const readOnlyRun: CmdRunner = (command, args, options) => {
+      if ((command === 'git' && /^(fetch|pull|push|merge|commit|checkout|switch|worktree|update-ref|reset|apply|am|rebase)$/u.test(args[0] ?? ''))
+        || (command === 'gh' && args[0] === 'pr' && /^(edit|ready|merge|create|close|reopen)$/u.test(args[1] ?? ''))) {
+        return { ok: false, out: '', err: 'dry-run forbids mutation' };
+      }
+      return run(command, args, options);
+    };
+    const base = (deps.resolveBase ?? resolveDeliverableBase)(readOnlyRun, cwd, opts.base);
+    if (!base) { out.error('✗ base: 비교 base를 선택하지 못했습니다.'); return 1; }
+    const ref = resolveRemoteBranchRef(readOnlyRun, cwd, base);
+    const measuredBase = `refs/remotes/${ref.remote}/${ref.branch}`;
+    const remoteTip = readOnlyRun('git', ['ls-remote', ref.remote, `refs/heads/${ref.branch}`], { cwd });
+    const tip = remoteTip.ok ? remoteTip.out.trim().split(/\s+/u, 1)[0] : undefined;
+    const localTip = readOnlyRun('git', ['rev-parse', '--verify', measuredBase], { cwd });
+    if (!tip || !/^[a-f0-9]{40}$/iu.test(tip) || !localTip.ok || localTip.out.trim() !== tip) {
+      out.error(`✗ overlap-preflight: ${base} 최신 SHA를 로컬에서 읽지 못했다. 읽기 전용 예행은 ref를 갱신하지 않는다.`);
+      return 1;
+    }
+    const staged = stagedPaths(readOnlyRun, cwd);
+    if (staged === null) {
+      out.error('✗ overlap-preflight: PR 변경 파일을 읽지 못했다. 겹침을 미측정 상태로 둔다.');
+      return 1;
+    }
+    const changed = readOnlyRun('git', ['diff', '--name-only', '--no-renames', `${measuredBase}...HEAD`], { cwd });
+    if (!changed.ok) {
+      out.error('✗ overlap-preflight: PR 변경 파일을 읽지 못했다. 겹침을 미측정 상태로 둔다.');
+      return 1;
+    }
+    const changedPaths = unionPaths(staged.flatMap(({ path, originalPath }) => originalPath ? [path, originalPath] : [path]), parseNameOnlyList(changed.out));
+    const landings = collectResolvedBaseLandings(readOnlyRun, cwd, DEFAULT_GRANULARITY_SINCE, measuredBase);
+    if (landings === null) {
+      out.error('✗ overlap-preflight: 최근 착지 조회가 실패했다. 겹침을 미측정 상태로 둔다.');
+      return 1;
+    }
+    const overlappingLandings: string[] = [];
+    const overlapFound = emitLandingOverlapAdvisory(readOnlyRun, cwd, measuredBase, changedPaths, out, overlappingLandings, landings);
+    emitSiblingPrAdvisory(branch!, deps.listOpenPrs ?? (() => lookupOpenPrs(readOnlyRun, cwd)), out);
+    if (overlapFound && !verifyPinnedOverlapDecision({
+      opts, deps, run: readOnlyRun, cwd, base, readFile, overlappingLandings,
+      decision: 'unavailable', out, refuse: out.error,
+    })) {
+      out.log('[dry-run] Remaining landing gates, freeze and merge: UNMEASURED; no PR or git state changed.');
+      return 1;
+    }
+    out.log(`[dry-run] ✓ overlap: ${overlapFound ? 'evidence accepted' : 'no recent overlapping landing'}`);
+    out.log('[dry-run] Remaining landing gates, freeze and merge: UNMEASURED; no PR or git state changed.');
+    return 0;
   }
   if (opts.overlapEvidence !== undefined && (!pinned || !opts.overlapEvidence.trim())) {
     out.error('✗ overlap-evidence: --overlap-evidence <file> 는 --pr ⊕ --expected-head 머리 고정 착지에서만 쓴다.');
@@ -1592,7 +1743,12 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
   }
   // Pinned landings reject a known non-ancestor before local or remote heavy gates.
   // Unpinned landings keep their existing gate and advisory order.
-  let changedPaths = pinned ? currentChangePaths(run, cwd, staged, base, out) : [];
+  const initialChangedPaths = pinned ? currentChangePaths(run, cwd, staged, base, out, true) : [];
+  if (initialChangedPaths === null) {
+    out.error('✗ overlap-preflight: PR 변경 파일을 읽지 못했다. 겹침을 미측정 상태로 두고 무거운 게이트를 시작하지 않는다.');
+    return 1;
+  }
+  let changedPaths: string[] = initialChangedPaths;
   let hold = !!opts.hold;
   const checkOverlap = async (): Promise<number | undefined> => {
     const overlappingLandings: string[] = [];
@@ -1627,54 +1783,7 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
       });
     }
     hold = !!opts.hold || overlapDecision?.outcome === 'user-hold';
-    // TA-LAND-OVERLAP — 비대화형 «승인 불가»만 증거로 대신한다(사람의 hold 는 증거로 뒤집지 않는다) · 증거가 없거나 어긋나면 종전 거부 그대로.
-    let overlapEvidenceAccepted = false;
-    let ancestorResyncNeeded = false;
-    if (pinned && overlapDecision?.outcome === 'unavailable' && opts.overlapEvidence !== undefined) {
-      const ref = resolveRemoteBranchRef(run, cwd, base);
-      const verdict = verifyOverlapEvidence({
-        evidencePath: opts.overlapEvidence, pr: Number(opts.pr), expectedHead: opts.expectedHead!,
-        remote: ref.remote, branch: ref.branch, cwd, run, readFile,
-        reviewResultsDir: deps.reviewResultsDir ?? join(dirname(taskAgentStatePath()), 'review-results'),
-        listDir: (dir) => readdirSync(dir), reviewMtime: (path) => statSync(path).mtimeMs,
-        reviewRealPath: (path) => realpathSync(path), overlappingLandings,
-      });
-      overlapEvidenceAccepted = verdict.ok;
-      if (verdict.ok) {
-        out.log(verdict.mode === 'already-ancestor'
-          ? `✓ overlap-evidence: already-ancestor — 겹친 최근 착지 ${overlappingLandings.length}개가 전부 head ${opts.expectedHead!.slice(0, 12)} 의 조상 · review pass must-fix 0 (${verdict.reviewResult})`
-          : verdict.mode === 'base-advanced-disjoint'
-            ? `✓ overlap-evidence: base-advanced-disjoint — gate base ${verdict.gateBase.slice(0, 12)} ⊂ head ${opts.expectedHead!.slice(0, 12)} · ${ref.remote}/${ref.branch} ${verdict.baseTip.slice(0, 12)} 까지 ${verdict.windowCommits}개 커밋이 PR 파일을 안 건드린다 · review pass|warn must-fix 0 (${verdict.reviewResult})`
-            : `✓ overlap-evidence: ${ref.remote}/${ref.branch} ${verdict.baseTip.slice(0, 12)} ⊂ head ${opts.expectedHead!.slice(0, 12)} · gate passed on that base · review pass must-fix 0 (${verdict.reviewResult})`);
-      }
-      else refuse(`✗ overlap-evidence: ${verdict.reason}`);
-    } else if (pinned && overlapDecision?.outcome === 'unavailable') {
-      // 증거 파일이 없을 때 — 겹친 착지가 전부 머리의 조상이고 표준 자리의 리뷰가 pass|warn ⊕ must-fix 0 이면 통과(아니면 종전 거부).
-      const verdict = verifyAncestorAutoPass({
-        pr: Number(opts.pr), expectedHead: opts.expectedHead!, cwd, run, readFile, overlappingLandings,
-        reviewResultsDir: deps.reviewResultsDir ?? join(dirname(taskAgentStatePath()), 'review-results'),
-        listDir: (dir) => readdirSync(dir),
-      });
-      overlapEvidenceAccepted = verdict.ok;
-      if (verdict.ok) {
-        out.log(`✓ overlap-evidence: already-ancestor-auto — 겹친 최근 착지 ${overlappingLandings.length}개가 전부 head ${opts.expectedHead!.slice(0, 12)} 의 조상 · review pass|warn must-fix 0 (${verdict.reviewResult})`);
-      }
-      else {
-        refuse(`✗ ancestor-auto: ${verdict.reason}`);
-        ancestorResyncNeeded = verdict.reason.startsWith('ancestor-auto-not-ancestor:');
-      }
-    }
-    if (pinned && overlapDecision && overlapDecision.outcome !== 'user-merge' && !overlapEvidenceAccepted) {
-      // A clean GitHub PR can still be behind a recently landed overlapping head. Preserve the cue
-      // across hosts; the current steward tick acts only if it can also prove local run ownership.
-      if (ancestorResyncNeeded && !opts.dryRun) {
-        const marked = run('gh', ['pr', 'edit', String(opts.pr), '--add-label', PR_LABEL_NAMES.needsRebase], { cwd });
-        record('resync-marker', marked.ok, { pr: Number(opts.pr), reason: 'ancestor-auto-not-ancestor' });
-        if (!marked.ok) out.error('⚠ resync-marker: needs-rebase 라벨을 남기지 못했습니다');
-      }
-      out.error('✗ expected-head: overlap merge approval unavailable for the reviewed head');
-      return 1;
-    }
+    if (pinned && !verifyPinnedOverlapDecision({ opts, deps, run, cwd, base, readFile, overlappingLandings, decision: overlapDecision?.outcome, out, refuse })) return 1;
     return undefined;
   };
   if (pinned && (await checkOverlap()) !== undefined) return 1;
@@ -1724,6 +1833,18 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     verifiedHeavyBase = main;
     out.log(`✓ heavy-remote: host=${verdict.host ?? 'unknown'} head=${opts.expectedHead!.slice(0, 12)} main=${main.slice(0, 12)} source=${verdict.source} elapsed=${verdict.elapsedMs}ms`);
     out.log(`✓ typecheck-roots: ${JSON.stringify(verdict.rootPlan ?? { mode: 'not-applicable', roots: null, promoted: false, reason: 'no-root-plan-in-gate-output' })}`);
+    if (opts.heavyOnPodShadow) {
+      await runHeavyOnPodShadow({
+        enabled: true, pr: Number(opts.pr), head: opts.expectedHead!,
+        local: { measured: verdict.rootPlan != null, ok: verdict.ok, rootPlan: verdict.rootPlan ?? null },
+        runPod: async () => {
+          const runPod = deps.runLandingPodShadow ?? (await import('./pr-land-pod-shadow-job.js')).runLandingPodShadowJob;
+          return runPod({ head: opts.expectedHead!, main });
+        },
+        log: (category, event, data) => debug.log(category, event, { ...data, main, phase: 'initial' }),
+        warn: (message) => out.error(`⚠ heavy-on-pod-shadow: ${message}`),
+      });
+    }
   }
   // Call immediately before the first mergePrOutcome and again before every UNKNOWN retry.
   // A move during the wait is the same race as a move during the gate: rerun or fail closed.
@@ -1751,7 +1872,12 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
   };
   const recheckOverlapAtBase = async (currentBase: string): Promise<number | undefined> => {
     if (currentBase === overlapCheckedBase) return undefined;
-    changedPaths = currentChangePaths(run, cwd, staged, base, out);
+    const refreshedPaths = currentChangePaths(run, cwd, staged, base, out, true);
+    if (refreshedPaths === null) {
+      out.error('✗ overlap-preflight: 움직인 base의 PR 변경 파일을 읽지 못했다. 재게이트하지 않는다.');
+      return 1;
+    }
+    changedPaths = refreshedPaths;
     const refused = await checkOverlap();
     if (refused !== undefined) return refused;
     overlapCheckedBase = currentBase;
@@ -2294,6 +2420,36 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
 
 export function registerPrCommands(program: Command, deps: PrLandDeps = {}, queueDeps: L8ShadowQueueDeps = {}): void {
   const pr = program.command('pr').description('PR landing commands');
+  const prToolRun = deps.run ?? defaultCmdRunner;
+  const prToolOut = deps.out ?? liveOut;
+  const prToolExit = deps.setExitCode ?? ((code: number) => { process.exitCode = code; });
+  pr.command('census')
+    .description('열린 PR 전체·골 문서만·2일 무커밋 draft·미닫힌 superseded 집계')
+    .option('--cwd <path>', '저장소 경로')
+    .action((opts: { cwd?: string }) => {
+      const result = censusOpenPrs(readOpenPrs(prToolRun, { cwd: opts.cwd, includeDraftCommitDates: true }));
+      prToolOut.log(JSON.stringify(result));
+      if (result.status === 'unknown') prToolExit(1);
+    });
+  pr.command('open-guard')
+    .description('새 PR 전에 같은 파일 OPEN PR·골 문서만·자리별 상한 검사')
+    .option('--cwd <path>', '작업 트리 경로')
+    .option('--base <ref>', '비교 base ref', 'origin/main')
+    .option('--seat <seat>', 'PR 소유 자리(OP|TC|MK|UX)')
+    .option('--cell <id>', '릴리스 칸 id (같은 칸 OPEN PR 검사)')
+    .option('--seat-cap <number>', '자리별 열린 PR 경고 상한', '30')
+    .action((opts: { cwd?: string; base: string; seat?: string; cell?: string; seatCap: string }) => {
+      const cwd = opts.cwd ?? process.cwd();
+      const diff = prToolRun('git', ['-C', cwd, 'diff', '--name-only', '-z', `${opts.base}...HEAD`]);
+      const files = diff.ok ? diff.out.split('\0').filter(Boolean) : null;
+      const patch = prToolRun('git', ['-C', cwd, 'diff', '--unified=0', `${opts.base}...HEAD`]);
+      const inventory = readOpenPrs(prToolRun, { cwd, ...(files ? { candidateFiles: files } : {}) });
+      const result = guardNewPr({ files: patch.ok ? files : null, seat: opts.seat as Seat | undefined, seatCap: Number(opts.seatCap), cellId: opts.cell, hunks: patch.ok ? parseDiffHunks(patch.out) : undefined }, inventory);
+      // Inspection never spends the three-creation unmeasured allowance.
+      // Only pr-manager records an actual new-PR attempt in that ledger.
+      prToolOut.log(JSON.stringify(result));
+      if (result.status !== 'allow') prToolExit(1);
+    });
   const queue = pr.command('queue').description('Shadow merge queue (never lands PRs)');
   const queueAction = async (action: () => Promise<unknown>) => {
     try {
@@ -2314,6 +2470,7 @@ export function registerPrCommands(program: Command, deps: PrLandDeps = {}, queu
     .option('--pr <number>', '기존 PR 번호 고정 (--expected-head 와 함께)')
     .option('--expected-head <sha>', '리뷰된 PR 머리 SHA 고정 (--pr 와 함께)')
     .option('--heavy-remote', '머리 고정 착지의 무거운 게이트를 node-b·node-c 중 빈 호스트에서 실행; head⊕main 증거가 없거나 실패하면 거부(로컬 폴백 없음)')
+    .option('--heavy-on-pod-shadow', '--heavy-remote 판정을 유지하고 같은 head/main의 Pod 타입·변경 시험 결과를 비교만 한다')
     .option('--dry-run', '변경 없이 landing 계획만 출력')
     .option('--hold', 'PR을 생성 또는 갱신한 뒤 병합하지 않고 쌓아 둔다')
     .option('--title <title>', 'PR title')

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.
@@ -179,7 +179,7 @@ export function ensurePrLandHeavyRemote(input: HeavyRemoteInput, deps: HeavyRemo
     try {
       outcome = (deps.runRemote ?? runOnRemote)({
         repo: input.repo, host, mirror: settings.mirror, commit: input.head,
-        refs: [input.main], hostCap: settings.hostCap, installPwa: true,
+        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.