elanous 0.2.32 → 0.2.34

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

@@ -18,7 +18,12 @@ import type {
 import { renderToolBlock } from './block.js';
 import { renderToolInline } from './inline.js';
 
-const SUPPORTED_TOOLS = new Set<ToolRenderName>([
+/** 접힌 결과 요약 첫 조각은 `MsgPost` 하나뿐이라 이름 확장을 `dispatch.ts` 안에 둔다.
+ *  `types.ts:ToolRenderName` 은 나머지 도구의 공용 계약 그대로 두고, 이 파일의 내부
+ *  시그니처만 넓힌다(블록·인라인 렌더는 `ToolRenderModel.kind` 문자열만 본다). */
+type ToolRenderKind = ToolRenderName | 'MsgPost';
+
+const SUPPORTED_TOOLS = new Set<ToolRenderKind>([
   'Bash',
   'Read',
   'Grep',
@@ -35,9 +40,10 @@ const SUPPORTED_TOOLS = new Set<ToolRenderName>([
   'WebSearch',
   'WebFetch',
   'GetDashboardState',
+  'MsgPost',
 ]);
 
-export function isToolRenderSupported(name: string): name is ToolRenderName | 'update_plan' | 'update_goal' {
+export function isToolRenderSupported(name: string): name is ToolRenderKind | 'update_plan' | 'update_goal' {
   return normalizeToolRenderName(name) !== null;
 }
 
@@ -48,6 +54,9 @@ export function renderToolCallEvent(
   if (config.displayMode !== 'inline-to-block') return null;
   const kind = normalizeToolRenderName(call.name);
   if (!kind) return null;
+  // Keep the generic running block: a MsgPost error must still fall back to
+  // the same generic result block that was used before this summary slice.
+  if (kind === 'MsgPost') return null;
   const model: ToolRenderModel = {
     kind,
     status: 'running',
@@ -75,9 +84,18 @@ export function renderToolResultVariants(
   if (config.displayMode !== 'inline-to-block') return null;
   const kind = normalizeToolRenderName(call.name);
   if (!kind) return null;
+  // Only successful MsgPost results enter the compact renderer. Returning
+  // null for errors lets the dashboard formatter use its existing generic
+  // result path, including its expanded argument/result view.
+  if (kind === 'MsgPost' && extractErrorText(call.result)) return null;
   const model = buildToolRenderModel(kind, call, config);
   const collapsed = renderToolBlock(model, config.blockMaxLines, config.foldMode, config.expandHint);
-  const expanded = renderToolBlock(model, Number.POSITIVE_INFINITY);
+  // ⭐ MsgPost 는 접힌 행에서 본문을 빼고 펼친 행에서만 싣는다 ⇒ 같은 model 로는 두 변형을
+  //   만들 수 없어, 펼친 쪽만 본문 포함 model 을 따로 세운다(다른 도구는 종전과 동일 model).
+  const expandedModel = kind === 'MsgPost'
+    ? buildToolRenderModel(kind, call, config, { includeMsgPostBody: true })
+    : model;
+  const expanded = renderToolBlock(expandedModel, Number.POSITIVE_INFINITY);
   const variants: ToolRenderResultVariants = {
     collapsed,
     expanded: arraysEqual(collapsed, expanded) ? null : expanded,
@@ -88,22 +106,28 @@ export function renderToolResultVariants(
   return variants;
 }
 
-function normalizeToolRenderName(name: string): ToolRenderName | null {
+interface ToolRenderModelOptions {
+  /** 펼친 변형만 `message.body` 를 싣는다 — 접힌 행에는 본문·전체 JSON 이 남지 않는다. */
+  includeMsgPostBody?: boolean;
+}
+
+function normalizeToolRenderName(name: string): ToolRenderKind | null {
   if (name === 'update_plan' || name === 'UpdatePlan') return 'UpdatePlan';
   if (name === 'update_goal' || name === 'UpdateGoal') return 'UpdateGoal';
-  return SUPPORTED_TOOLS.has(name as ToolRenderName) ? (name as ToolRenderName) : null;
+  return SUPPORTED_TOOLS.has(name as ToolRenderKind) ? (name as ToolRenderKind) : null;
 }
 
 function buildToolRenderModel(
-  kind: ToolRenderName,
+  kind: ToolRenderKind,
   call: ToolRenderResult,
   config?: ToolRenderConfig,
+  options?: ToolRenderModelOptions,
 ): ToolRenderModel {
   const resultRecord = asRecord(call.result);
   const errorText = extractErrorText(call.result);
   const bodyLines = errorText
     ? errorText.split('\n')
-    : buildToolBodyLines(kind, call.args, call.result, resultRecord);
+    : buildToolBodyLines(kind, call.args, call.result, resultRecord, options);
   const status = errorText ? 'error' : 'success';
   const model: ToolRenderModel = {
     kind,
@@ -119,7 +143,7 @@ function buildToolRenderModel(
 }
 
 function summarizeCollapsedToolResult(
-  kind: ToolRenderName,
+  kind: ToolRenderKind,
   status: 'success' | 'error',
   resultRecord: Record<string, unknown> | null,
   bodyLines: string[],
@@ -206,10 +230,12 @@ function summarizeCollapsedToolResult(
 }
 
 function summarizeToolCallForRender(
-  kind: ToolRenderName,
+  kind: ToolRenderKind,
   args: Record<string, unknown>,
   result?: unknown,
 ): string {
+  // ⭐ MsgPost — 행위(`post`)·수신자·(결과가 있으면) id 셋만. 본문은 부르지도 읽지도 않는다.
+  if (kind === 'MsgPost') return summarizeMsgPostCall(args, result);
   if (kind === 'UpdatePlan') {
     const plan = Array.isArray(args.plan) ? args.plan : [];
     const current = plan.find((step) => asRecord(step)?.status === 'in_progress');
@@ -230,6 +256,29 @@ function summarizeToolCallForRender(
   return summarizeToolCall(kind, args);
 }
 
+/** MsgPost 머리글 — 행위(`post`)·수신자·id. 펼치기 전에도 세 가지가 한 줄에 다 있다. */
+function summarizeMsgPostCall(args: Record<string, unknown>, result?: unknown): string {
+  const to = typeof args.to === 'string' ? args.to.trim() : '';
+  const id = msgPostMessage(asRecord(result))?.id;
+  const route = to ? `post → ${to}` : 'post';
+  return typeof id === 'string' || typeof id === 'number' ? `${route} #${id}` : route;
+}
+
+/** 결과 페이로드의 `message` 레코드. 모양을 못 읽으면 `null` — 없는 필드를 지어내지 않는다. */
+function msgPostMessage(resultRecord: Record<string, unknown> | null): Record<string, unknown> | null {
+  return asRecord(resultRecord?.message);
+}
+
+/** MsgPost 결과 본문. 접힌 행은 비우고 펼친 변형에는 원래 결과 전체를 한 번만 싣는다. */
+function buildMsgPostBodyLines(
+  resultRecord: Record<string, unknown> | null,
+  includeMsgPostBody: boolean,
+): string[] {
+  if (!includeMsgPostBody) return [];
+  if (!resultRecord) return [];
+  return JSON.stringify(resultRecord, null, 2).split('\n');
+}
+
 function summarizeSpecialToolCall(kind: ToolRenderName, args: Record<string, unknown>): string | null {
   if (kind === 'AstGrep') {
     const pattern = typeof args.pattern === 'string' ? args.pattern : '';
@@ -292,14 +341,17 @@ function summarizeStructuralSearchRender(kind: ToolRenderName, bodyText: string
 }
 
 function buildToolBodyLines(
-  kind: ToolRenderName,
+  kind: ToolRenderKind,
   args: Record<string, unknown>,
   result: unknown,
   resultRecord: Record<string, unknown> | null,
+  options?: ToolRenderModelOptions,
 ): string[] {
   const syntheticGuard = extractSyntheticGuardSummary(result);
   if (syntheticGuard) return [syntheticGuard];
 
+  if (kind === 'MsgPost') return buildMsgPostBodyLines(resultRecord, options?.includeMsgPostBody === true);
+
   if (kind === 'Edit' || kind === 'Write') {
     const edit = resultRecord?.edit && isEditResult(resultRecord.edit) ? resultRecord.edit : null;
     const output = typeof resultRecord?.output === 'string' ? resultRecord.output : null;

package/src/cli/control-cli.ts

@@ -13,7 +13,8 @@ import { RESOURCE_KINDS, type ResourceKind } from '../control-plane/ledger.js';
 import { runControlJoin, type ControlJoinOptions } from './control-join-cli.js';
 import type { ResourceView } from '../control-plane/ledger.js';
 import { issueMemberToken, revokeMemberToken, listMemberTokens } from '../control-plane/member-tokens.js';
-import { collectControlStatus } from '../control/control-status.js';
+import { collectControlStatus, readControlHqLease } from '../control/control-status.js';
+import { getUserConfig } from '../user-config.js';
 
 function controlPort(flag?: string): number {
   const raw = flag ?? (process.env.ELANOUS_CONTROL_PORT?.trim() || undefined);
@@ -97,8 +98,9 @@ export async function runResourcesQuery(options: { where?: string; kind?: string
   }
 }
 
-export async function runControlServe(options: { port?: string; host?: string; followLease?: boolean; bucket?: string;
+export async function runControlServe(options: { port?: string; host?: string; followLease?: boolean; followHqLease?: boolean; bucket?: string;
   read?: (bucket: string) => RoleLeaseRead | Promise<RoleLeaseRead>; machine?: string;
+  readHq?: typeof readControlHqLease; hqHostName?: string;
   /** 시험 seam — 이 신호로 멈춘다. ⛔ 시험이 `process.emit('SIGTERM')` 로 멈추면 같은 프로세스의 다른 SIGTERM 처리기
    *  (로그 저장소가 «남은 처리기가 없으면 자기에게 진짜 SIGTERM 을 다시 보낸다»)가 깨어 **시험 러너가 죽었다**
    *  (📏 09-27 0.2.3 게이트: 전체 한 프로세스면 이 시험 자리에서 rc 143 · 조각으로 나누면 완주). */
@@ -108,12 +110,26 @@ export async function runControlServe(options: { port?: string; host?: string; f
   let bucket: string | undefined;
   try {
     port = controlPort(options.port);
+    if (options.followLease && options.followHqLease) throw new Error('GCS 임대와 HQ 임대는 동시에 따를 수 없음');
     if (options.followLease) bucket = resolveRoleBucket(options.bucket);
   } catch (error) { console.error(reasonFor(error)); process.exitCode = 2; return; }
-  const machine = resolveMachineName({ option: options.machine }).machine;
-  const leaseView = bucket === undefined ? undefined : createLeaseHolderView({
+  const machine = options.followHqLease ? '' : resolveMachineName({ option: options.machine }).machine;
+  // HQ's holder identity is hq.hostName. A caller-controlled role machine alias cannot grant primary writes.
+  let hqHostName: string | undefined;
+  if (options.followHqLease) {
+    try { hqHostName = options.hqHostName ?? getUserConfig().hq?.hostName; }
+    catch { /* Unknown local identity must remain fail closed at the write boundary. */ }
+  }
+  const leaseView = bucket !== undefined ? createLeaseHolderView({
     machine, read: () => (options.read ?? readRoleLeaseAsync)(bucket),
-  });
+  }) : options.followHqLease ? createLeaseHolderView({
+    machine: hqHostName ?? '', read: () => {
+      const { record, expired } = (options.readHq ?? readControlHqLease)();
+      return hqHostName && record && expired === false
+        ? { kind: 'present' as const, doc: { holder: record.holder, generation: record.generation, state: 'held' as const, renewedAt: record.renewedAt } }
+        : { kind: 'unmeasured' as const, why: 'HQ lease missing or expired' };
+    },
+  }) : undefined;
   let server: ReturnType<typeof startControlServer>;
   try { server = startControlServer({ port, hostname: options.host, ...(leaseView ? { leaseView, requireKnownLeaseForWrites: true } : {}) }); }
   catch (error) { console.error(`관제부 시작 실패: ${reasonFor(error)}`); process.exitCode = 2; return; }
@@ -130,7 +146,7 @@ export async function runControlServe(options: { port?: string; host?: string; f
       if (options.signal.aborted) { stop(); return; }
       options.signal.addEventListener('abort', stop, { once: true });
     }
-    console.log(`관제부 ${new URL(server.url).host} · 토큰 ${join(effectiveInstanceRoot(), 'control', 'tokens.json')}${bucket === undefined ? '' : ` · 임대 따름 · ${bucket} · 나=${machine}`}`);
+    console.log(`관제부 ${new URL(server.url).host} · 토큰 ${join(effectiveInstanceRoot(), 'control', 'tokens.json')}${bucket !== undefined ? ` · 임대 따름 · ${bucket} · 나=${machine}` : options.followHqLease ? ` · HQ 임대 따름 · 나=${hqHostName ?? '미확인'}` : ''}`);
   });
 }
 
@@ -199,8 +215,9 @@ export function registerControlCommands(program: Command): void {
     .option('--port <n>', '리스닝 포트(0=임시 포트)')
     .option('--host <addr>', '루프백 또는 tailnet 바인드 주소')
     .option('--follow-lease', '임대 보유자일 때만 쓰기')
+    .option('--follow-hq-lease', 'HQ 임대 보유자일 때만 쓰기')
     .option('--bucket <bucket>', 'GCS 임대 버킷')
-    .action((options: { port?: string; host?: string; followLease?: boolean; bucket?: string }) => runControlServe(options));
+    .action((options: { port?: string; host?: string; followLease?: boolean; followHqLease?: boolean; bucket?: string }) => runControlServe(options));
   control.command('member').description('합류 기계의 자원을 포그라운드에서 등록·심박')
     .option('--resource <kind:name=url>', '등록할 자원', (value: string, previous: string[]) => [...previous, value], [] as string[])
     .option('--interval <seconds>', '심박 간격(초)')

package/src/cli/guardian-cli.ts

@@ -19,6 +19,16 @@ async function guardianPlan(): Promise<{ db: Database; plan: GuardianPlan }> {
 
 export function registerGuardianCommands(program: Command): void {
   const guardian = program.command('guardian').description('크론 수호자 그림자 관측(기존 크론·알림 무변경)');
+  guardian.command('grok-expiry').description('현재 호스트 Grok 구독 만료 시각과 4시간 경보 상태 출력')
+    .action(async () => {
+      const { readGrokSubscriptionExpiry } = await import('../grok/credential.js');
+      const { grokExpiryAlertLine, grokExpiryStatusLine } = await import('../domains/guardian-tick.js');
+      const now = new Date();
+      const expiresAt = readGrokSubscriptionExpiry();
+      console.log(grokExpiryStatusLine({ now, expiresAt }));
+      const alert = grokExpiryAlertLine({ now, expiresAt });
+      if (alert) console.log(alert);
+    });
   guardian.command('tick').description('현재 시각에 발화했을 잡을 관측(잡은 실행하지 않음)')
     .action(async () => {
       const { guardianTick } = await import('../domains/guardian-tick.js');

package/src/cli/light-entry-route.ts

@@ -0,0 +1,35 @@
+export type LightCliRoute = 'msg' | 'release' | 'tasks' | 'pty' | 'logs' | 'config';
+
+const VALUE_FLAGS = new Set(['--config-dir', '--test-state-dir']);
+
+/** Select only read-heavy command paths whose CLI module can stand alone. */
+export function selectLightCliRoute(args: readonly string[]): LightCliRoute | undefined {
+  const command: string[] = [];
+  let index = 0;
+  while (index < args.length && args[index]!.startsWith('-')) {
+    const flag = args[index]!;
+    index += 1;
+    if ([...VALUE_FLAGS].some(value => flag.startsWith(`${value}=`))) continue;
+    if (VALUE_FLAGS.has(flag)) {
+      if (index >= args.length || args[index]!.startsWith('-')) return undefined;
+      index += 1;
+      continue;
+    }
+    // Only flags removed by the pre-import isolation helpers can safely
+    // precede a light route. Other root flags keep their original parser.
+    if (flag !== '--test' && !flag.startsWith('--test=')) return undefined;
+  }
+  for (const token of args.slice(index)) {
+    if (token.startsWith('-')) break;
+    command.push(token);
+  }
+
+  if (command[0] === 'msg' && (command[1] === 'list' || command[1] === 'ack' || command[1] === 'watch')) return 'msg';
+  // --reveal has an audit-log contract owned by the full CLI.
+  if (command[0] === 'config' && command[1] === 'get' && !args.some(arg => arg === '--reveal' || arg.startsWith('--reveal='))) return 'config';
+  if (command[0] === 'release' && command[1] === 'checklist' && command[2] === 'status') return 'release';
+  if (command[0] === 'tasks' && command[1] === 'show') return 'tasks';
+  if (command[0] === 'pty' && (command[1] === 'list' || command[1] === 'state')) return 'pty';
+  if (command[0] === 'logs') return 'logs';
+  return undefined;
+}

package/src/cli/llm-detect-cli.ts

@@ -2,6 +2,7 @@ import type { Command } from 'commander';
 import type { LLMProvider } from '../llm.js';
 import { detectProviders, type DetectedProvider } from '../llm/provider-detect.js';
 import { probeProvider, type ProviderProbeResult } from '../llm/provider-probe.js';
+import { openrouterSource } from '../registry/discovery/sources/openrouter.js';
 import {
   getUserConfig, reloadUserConfig, saveUserConfig, userConfigPath,
   type UserConfig,
@@ -20,6 +21,7 @@ export interface LlmDetectDeps {
   config?: () => UserConfig;
   save?: (config: UserConfig) => void;
   output?: (line: string) => void;
+  discoverUpstageModels?: () => Promise<string[] | null>;
 }
 
 export interface LlmDetectResult {
@@ -29,6 +31,15 @@ export interface LlmDetectResult {
   /** Why a selected provider was not written (an explicit llm.provider is never overwritten). */
   notApplied?: string;
   error?: string;
+  /** OpenRouter /models candidates; null means discovery was unavailable, not an empty catalogue. */
+  upstageCandidates?: string[] | null;
+}
+
+async function discoverUpstageModels(): Promise<string[] | null> {
+  const result = await openrouterSource.run({ timeoutMs: 3_000 });
+  if (!result.ok) return null;
+  return result.models.map(({ id }) => id).filter((id) => /^upstage\/[^/]+$/.test(id))
+    .map((id) => `openrouter/${id}`).sort();
 }
 
 /** Discovery alone cannot validate credentials. Only a successful probe can select a provider. */
@@ -76,6 +87,13 @@ export async function runLlmDetect(
     }
   }
 
+  let upstageCandidates: string[] | null | undefined;
+  if (!options.apply && (!options.probe || selected === 'openrouter')
+    && rows.some((row) => row.provider === 'openrouter' && row.available && row.auth === 'apikey')) {
+    try { upstageCandidates = await (deps.discoverUpstageModels ?? discoverUpstageModels)(); }
+    catch { upstageCandidates = null; }
+  }
+
   let applied = false;
   let notApplied: string | undefined;
   const previous = config.llm?.provider ?? 'auto';
@@ -91,7 +109,8 @@ export async function runLlmDetect(
     }
     applied = true;
   }
-  const result: LlmDetectResult = { candidates: rows, selected, applied, ...(notApplied ? { notApplied } : {}) };
+  const result: LlmDetectResult = { candidates: rows, selected, applied,
+    ...(upstageCandidates !== undefined ? { upstageCandidates } : {}), ...(notApplied ? { notApplied } : {}) };
   if (options.json) output(JSON.stringify(result));
   else {
     if (rows.length === 0) output('No LLM providers detected.');
@@ -111,6 +130,9 @@ export async function runLlmDetect(
       }
     }
     if (options.probe && !selected) output('No provider passed the probe; configuration unchanged.');
+    if (upstageCandidates !== undefined) output(upstageCandidates === null
+      ? 'Upstage candidates: catalogue unavailable'
+      : `Upstage candidates: ${upstageCandidates.join(', ') || '(none in OpenRouter /models)'}`);
     if (applied) output(`Applied llm.provider=${selected} — revert: elanous config set llm.provider auto`);
     if (notApplied) output(notApplied);
   }

package/src/cli/pr-cli.ts

@@ -58,10 +58,11 @@ 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 { verifyAllSameHeadReviews, verifyAncestorAutoPass, verifyOverlapEvidence, verifyOverlapEvidenceVirtualRebase } from './pr-land-overlap-evidence.js';
+import { resolveOverlapEvidencePath, verifyAllSameHeadReviews, verifyAncestorAutoPass, verifyOverlapEvidence, verifyOverlapEvidenceVirtualRebase } from './pr-land-overlap-evidence.js';
 import type { VerifyOverlapEvidenceInput } from './pr-land-overlap-evidence.js';
 import { verifyVirtualRebasePatch } from './pr-land-virtual-rebase.js';
 import { observeDirectPrLandRefusal, observePrLandRefusal } from './pr-land-refusal.js';
+import { planPrLandRecovery } from './pr-land-recovery.js';
 import { ensurePrLandHeavyRemote, type HeavyRemoteInput, type HeavyRemoteResult } from './pr-land-heavy-remote.js';
 import { readPrBaseNameWithRetry } from './pr-land-base-read.js';
 import { runHeavyOnPodShadow } from './pr-land-pod-shadow.js';
@@ -117,6 +118,8 @@ export const PR_LAND_MERGEABLE_UNKNOWN_WAIT_MS = 5_000;
 
 export interface PrLandDeps {
   manager?: PrManager;
+  /** Confirmed merge cleanup; failures are observed and never undo the merge. */
+  onMergedSupersede?: (number: number, cwd: string) => Promise<void>;
   /** 병합 재시도 사이 대기(시험 주입용 · 기본 실제 대기). */
   sleep?: (ms: number) => Promise<void>;
   run?: CmdRunner;
@@ -271,14 +274,14 @@ export async function decideOverlapLanding(input: {
 
 const liveOut = { log: (message: string) => console.log(message), error: (message: string) => console.error(message) };
 
-function runPrLandTypecheckGate(out: { log: (message: string) => void; error: (message: string) => void }, cwd: string = process.cwd()): boolean {
+function runPrLandTypecheckGate(out: { log: (message: string) => void; error: (message: string) => void }, cwd: string): boolean {
   let failed = false;
   const exit = ((code: number): never => {
     failed = code !== 0;
     throw new Error(`ci-typecheck-changed exited ${code}`);
   });
   try {
-    runChangedTypecheckGate({ log: out.log, warn: out.error, error: out.error, exit, cwd });
+    runChangedTypecheckGate({ log: out.log, warn: out.error, error: out.error, exit, cwd: resolve(cwd), allowMissingCheckoutDependencies: true });
   } catch (error) {
     if (!failed) throw error;
   }
@@ -1087,7 +1090,7 @@ export function verifyPinnedOverlapDecision(input: {
   if (decision === 'unavailable' && opts.overlapEvidence !== undefined) {
     const ref = resolveRemoteBranchRef(run, cwd, base);
     const evidenceInput: VerifyOverlapEvidenceInput = {
-      evidencePath: opts.overlapEvidence, pr: Number(opts.pr), expectedHead: opts.expectedHead!,
+      evidencePath: resolveOverlapEvidencePath(opts.overlapEvidence, cwd), 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,
@@ -1318,6 +1321,19 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
   const refuse = (message: string, context: { isDraft?: boolean } = {}): void => {
     out.error(message);
     observePrLandRefusal(message, context);
+    const pr = Number(opts.pr);
+    if (Number.isSafeInteger(pr) && pr > 0 && opts.expectedHead) {
+      try {
+        const plan = planPrLandRecovery({ refusal: message, pr, head: opts.expectedHead, isDraft: context.isDraft });
+        debug.log('pr.land', 'recover-shadow', {
+          pr, head: opts.expectedHead, label: plan.evidence.label, route: plan.evidence.route,
+          outcome: plan.outcome, action: plan.result.action, reason: plan.result.reason,
+          delayMs: plan.result.delayMs ?? null, execution: 'none',
+        });
+      } catch {
+        // Recovery observation must never replace the original landing refusal.
+      }
+    }
   };
   const refuseDirect = (message: string): void => {
     out.error(message);
@@ -1885,14 +1901,22 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     const baseRead = await readPrBaseNameWithRetry({
       pr: String(opts.pr), cwd, run,
       sleep: deps.sleep ?? ((ms) => new Promise<void>((resolve) => setTimeout(resolve, ms))),
+      onUnreadable: (attempt, stderr) => {
+        if (stderr?.trim()) out.error(`⚠ heavy-remote: gh pr view base read attempt ${attempt}/3 stderr: ${stderr.trim()}`);
+      },
     });
     const baseName = baseRead.baseRefName;
     record('heavy-remote-pr-base-read', baseName !== null, {
       pr: Number(opts.pr), baseRefName: baseName, attempts: baseRead.attempts,
     });
+    if (baseName === null) {
+      record('heavy-remote-pr-base', false, { pr: Number(opts.pr), baseRefName: null, attempts: baseRead.attempts, reason: 'unreadable' });
+      refuseDirect(`✗ heavy-remote: PR base 조회 불가 (${baseRead.attempts}회) — 통과한 head/main 쌍을 확인하지 못했다. 병합하지 않는다.`);
+      return 1;
+    }
     if (baseName !== 'main') {
-      record('heavy-remote-pr-base', false, { pr: Number(opts.pr), baseRefName: baseName, attempts: baseRead.attempts });
-      refuseDirect(`✗ heavy-remote: PR base=${baseName ?? 'unreadable'} ≠ main — 재타기팅된 PR은 통과한 head/main 쌍이 아니다. 병합하지 않는다.`);
+      record('heavy-remote-pr-base', false, { pr: Number(opts.pr), baseRefName: baseName, attempts: baseRead.attempts, reason: 'non-main' });
+      refuseDirect(`✗ heavy-remote: PR base=${baseName} ≠ main — 재타기팅된 PR은 통과한 head/main 쌍이 아니다. 병합하지 않는다.`);
       return 1;
     }
     return undefined;
@@ -1951,7 +1975,8 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     }
     return recheckOverlapAtBase(currentBase);
   };
-  const typecheckOk = opts.heavyRemote || (deps.runTypecheckGate ?? ((o) => runPrLandTypecheckGate(o, cwd)))(out);
+  // The production gate must receive this land invocation's --cwd, never the launching shell's cwd.
+  const typecheckOk = opts.heavyRemote || (deps.runTypecheckGate ? deps.runTypecheckGate(out) : runPrLandTypecheckGate(out, cwd));
   record('typecheck', typecheckOk);
   if (!typecheckOk) {
     // ⛔⭐ 「왜 막혔나」를 «단정하지 않는다» — 이 게이트는 불리언만 돌려주므로 여기서는 이유를 모른다.
@@ -2374,6 +2399,13 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
   }
   if (opts.forceFreeze) debug.log('release-loop.freeze', 'force-merge', { pr: prNumber, reason: opts.forceFreeze.trim() });
   record('merge', true, { result: merged.kind, ...(merged.remoteBranchDeletion ? { remoteBranchDeletion: merged.remoteBranchDeletion.detail } : {}) });
+  if (Number.isSafeInteger(prNumber) && prNumber > 0 && deps.onMergedSupersede) {
+    try { await deps.onMergedSupersede(prNumber, cwd); }
+    catch (error) {
+      try { debug.log('drafts.cleanup', 'same-cell-hook-failed', { merged: prNumber, error: String(error) }, { level: 'warn' }); }
+      catch { /* a cleanup observation cannot undo a confirmed merge */ }
+    }
+  }
   // INFLIGHT-REGISTRY — 착지하면 비행 중 등록부의 그 런 줄을 지운다(색인 실패는 착지를 막지 않는다).
   try {
     const statePath = deps.taskStatePath ?? taskAgentStatePath();
@@ -2437,12 +2469,30 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
       out.log(`✓ heavy-remote: post-merge host=${post.host ?? 'unknown'} head=${opts.expectedHead!.slice(0, 12)} main=${firstParent.slice(0, 12)} source=${post.source}`);
     }
   }
-  const baseRef = upsert.reused
+  const finalBaseRead = upsert.reused && opts.heavyRemote
+    ? await readPrBaseNameWithRetry({
+      pr: upsert.url, cwd, run,
+      sleep: deps.sleep ?? ((ms) => new Promise<void>((resolve) => setTimeout(resolve, ms))),
+      onUnreadable: (attempt, stderr) => {
+        if (stderr?.trim()) out.error(`⚠ heavy-remote: final gh pr view base read attempt ${attempt}/3 stderr: ${stderr.trim()}`);
+      },
+    })
+    : undefined;
+  const baseRef = upsert.reused && !opts.heavyRemote
     ? run('gh', ['pr', 'view', upsert.url, '--json', 'baseRefName', '--jq', '.baseRefName'], { cwd })
     : undefined;
-  const landingBase = baseRef
-    ? (baseRef.ok && baseRef.out.trim() ? baseRef.out.trim() : '<base unavailable>')
-    : base;
+  const landingBase = finalBaseRead
+    ? finalBaseRead.baseRefName ?? '<base unavailable>'
+    : baseRef
+      ? (baseRef.ok && baseRef.out.trim() ? baseRef.out.trim() : '<base unavailable>')
+      : base;
+  if (finalBaseRead?.baseRefName && finalBaseRead.baseRefName !== 'main') {
+    out.error(`✗ heavy-remote: PR base=${finalBaseRead.baseRefName} ≠ main — 병합된 base를 확인했습니다.`);
+    return 1;
+  }
+  if (finalBaseRead?.baseRefName === null) {
+    out.log(`⚠ heavy-remote: final PR base 조회 불가 (${finalBaseRead.attempts}회) — 병합 결과를 실패 처리하지 않습니다.`);
+  }
   out.log(`✓ merge: squash ${upsert.url} → ${landingBase}`);
   if (landingBase === '<base unavailable>') {
     out.log('⚠ local HEAD does not contain the landed result; the landed base is unavailable, so no branch command can be provided.');
@@ -2458,6 +2508,20 @@ export function registerPrCommands(program: Command, deps: PrLandDeps = {}, queu
   const prToolRun = deps.run ?? defaultCmdRunner;
   const prToolOut = deps.out ?? liveOut;
   const prToolExit = deps.setExitCode ?? ((code: number) => { process.exitCode = code; });
+  const supersedeMerged = deps.onMergedSupersede ?? (async (number: number, cwd: string): Promise<void> => {
+    const { supersedeMergedGoalDrafts } = await import('../harness/harness-cli-command.js');
+    await supersedeMergedGoalDrafts(number, cwd, undefined, undefined, { onlyExplicitSameCell: true });
+  });
+  pr.command('supersede-drafts')
+    .description('확인된 병합 PR의 명시 Supersedes 같은 칸 draft만 정리')
+    .requiredOption('--pr <number>', '병합 PR 번호')
+    .option('--cwd <path>', '저장소 경로')
+    .action(async (opts: { pr: string; cwd?: string }) => {
+      const number = Number(opts.pr);
+      if (!Number.isSafeInteger(number) || number < 1) { prToolOut.error('✗ supersede-drafts: 올바른 --pr 번호 필요'); prToolExit(1); return; }
+      try { await supersedeMerged(number, opts.cwd ?? process.cwd()); }
+      catch (error) { prToolOut.error(`✗ supersede-drafts: ${String(error)}`); prToolExit(1); }
+    });
   pr.command('census')
     .description('열린 PR 전체·골 문서만·2일 무커밋 draft·미닫힌 superseded 집계')
     .option('--cwd <path>', '저장소 경로')
@@ -2532,7 +2596,7 @@ export function registerPrCommands(program: Command, deps: PrLandDeps = {}, queu
         const { registerStandaloneLogSink } = await import('../domains/standalone-log-sink.js');
         await registerStandaloneLogSink('pr-land');
       } catch { /* fail-open */ }
-      const code = await runPrLand(opts, deps);
+      const code = await runPrLand(opts, { ...deps, onMergedSupersede: supersedeMerged });
       if (code !== 0) (deps.setExitCode ?? ((exitCode: number) => { process.exitCode = exitCode; }))(code);
     });
   pr.command('granularity')

package/src/cli/pr-land-base-read.ts

@@ -14,6 +14,7 @@ export async function readPrBaseNameWithRetry(input: {
   cwd: string;
   run: CmdRunner;
   sleep: (ms: number) => Promise<void>;
+  onUnreadable?: (attempt: number, stderr: string | undefined) => void;
 }): Promise<PrBaseReadResult> {
   for (let attempt = 1; attempt <= PR_LAND_BASE_READ_RETRIES + 1; attempt += 1) {
     const viewed = input.run('gh', ['pr', 'view', input.pr, '--json', 'baseRefName,url'], { cwd: input.cwd });
@@ -28,6 +29,7 @@ export async function readPrBaseNameWithRetry(input: {
     } catch { /* Retry unreadable responses; do not treat them as main. */ }
 
     if (baseRefName !== null) return { baseRefName, attempts: attempt };
+    input.onUnreadable?.(attempt, viewed.err);
     if (attempt <= PR_LAND_BASE_READ_RETRIES) await input.sleep(PR_LAND_BASE_READ_RETRY_DELAY_MS);
   }
   return { baseRefName: null, attempts: PR_LAND_BASE_READ_RETRIES + 1 };