elanous 0.2.21 → 0.2.23

package/src/self-implement/orchestrator.ts

@@ -31,7 +31,7 @@ export {
   type PrEvidenceInput,
 } from './pr-evidence-artifact.js';
 import { judgePredictionAccuracy } from './judge-prediction-accuracy.js';
-import { measureReviewFindingRecurrence, type ReviewFindingRecurrence } from './review-finding-recurrence.js';
+import { classifyPodReviewBudgetResidue, measureReviewFindingRecurrence, type ReviewFindingRecurrence } from './review-finding-recurrence.js';
 import { createHash } from 'node:crypto';
 import { appendFileSync, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync } from 'node:fs';
 import { writeGoalDocumentAtomic } from './goal-document-write.js';
@@ -64,7 +64,7 @@ import { GoalRunStore, insertGoalRunRecord, type GoalPriorRuns } from './goal-ru
 import { writeGoalRunRecordFragment } from './goal-execution-records.js';
 import { getUserConfig } from '../user-config.js';
 import { appendRunLedgerEntry, loadRunLedger, parseRunShardIdentity, queryRunChain, type RunChainShardSibling, type RunLedgerEntry, type RunLedgerWriter, type RunOriginData, type RunShardIdentity } from './run-ledger.js';
-import { classifyMergeHoldStop, forgetRunStop, readRunStopRecord, recordRunStop, runStopRecorded } from './run-stop.js';
+import { classifyMergeHoldStop, forgetRunStop, isRunStopClass, readRunStopRecord, recordRunStop, runStopRecorded } from './run-stop.js';
 import { autohealFromStop, parseAutohealMode, type AutohealActions, type AutohealResult } from './stop-autoheal.js';
 import { emitSessionEvent, type SessionEventInput } from '../context-bus/session-events.js';
 import { decideLineageSupersede, lineageSupersedeCloseComment, type LineageSupersedeOpenDraft } from './lineage-supersede.js';
@@ -108,7 +108,7 @@ import { elanousStateRoot } from '../autopilot/state-paths.js';
 import { addNextMdReleaseNote, harnessReleaseNote, parseReleaseNoteSection, releaseNotesDir, renderReleaseNoteSection, writeReleaseNote, type ReleaseNoteFragment, type ReleaseNoteSection } from '../release-loop/release-note.js';
 import { landingFreezeMessage } from '../release-loop/landing-freeze.js';
 import { admitLandingMerge, owningRepoRoot } from './frozen-merges.js';
-import { recordFollowUpOnMerge, type FollowUpMergeInput, type FollowUpSeams } from './follow-up-goals.js';
+import { recordFollowUpOnBlocked, recordFollowUpOnMerge, type FollowUpBlockedInput, type FollowUpMergeInput, type FollowUpSeams } from './follow-up-goals.js';
 
 /** Merge result and exit stay untouched: a draft failure is one debug line. */
 async function draftFollowUpAfterMerge(input: FollowUpMergeInput, followUp: FollowUpSeams | undefined): Promise<void> {
@@ -128,10 +128,29 @@ async function draftFollowUpAfterMerge(input: FollowUpMergeInput, followUp: Foll
     debug.log('self-implement.follow-up', 'draft-failed', { prNumber: input.prNumber, error: error instanceof Error ? error.message : String(error) });
   }
 }
+
+async function draftFollowUpAfterBlocked(input: FollowUpBlockedInput, followUp: FollowUpSeams | undefined): Promise<void> {
+  try {
+    await recordFollowUpOnBlocked(input, {
+      ...(followUp ? {
+        ...(followUp.mode ? { mode: followUp.mode } : {}),
+        ...(followUp.readDrafts ? { readDrafts: followUp.readDrafts } : {}),
+        ...(followUp.appendDraft ? { appendDraft: followUp.appendDraft } : {}),
+        ...(followUp.enqueue ? { enqueue: followUp.enqueue } : {}),
+        ...(followUp.cellOwner ? { cellOwner: followUp.cellOwner } : {}),
+        ...(followUp.stateRoot ? { stateRoot: followUp.stateRoot } : {}),
+      } : {}),
+      log: (category, event, data) => { debug.log(category, event, data); },
+    });
+  } catch (error) {
+    debug.log('self-implement.follow-up', 'draft-failed', { ending: 'blocked', runId: input.runId, prNumber: input.prNumber ?? 0, stage: input.stage, error: error instanceof Error ? error.message : String(error) });
+  }
+}
 import { plannedSelfImplBranch } from '../harness/worktree-branch-prefix.js';
 export { slugifyFeature } from '../harness/worktree-branch-prefix.js';
 import { AUTO_REVIEW_LABEL, resolveAutoReviewLabels } from './context-capsule.js';
 import { GOAL_TYPES, extractVerbatimOriginalAsk, leadingGoalMetadata, parseAskFile, parseGoalType, type GoalType } from './goal-author.js';
+import { renderRoundSummaryCard, type RoundSummaryEntry } from './round-summary-card.js';
 import { resolveAdaptiveMaxReworkDecision, resolveEscalateTier, resolveEscalateTarget, buildReworkFeature, failIndicator, isRepeatedUnverifiedOnlyGateFailure, unverifiedRepeatKey, appendReworkHistory, truncateReworkHistoryByItem, applyReworkBudgetDecision, parseContractConflictRelaxation, parseReworkBudgetDecision, resolveReworkBudgetCarry, stripReworkBudgetHeaders, countConsecutiveMustFixIds, mergeReworkNotes, resolveReworkKind, type ReworkPlanRevision, type ReworkNotePart } from './rework-policy.js';
 import type { SupervisionReworkSource } from './supervision-vocabulary.js';
 import { classifyReworkBudgetShadow } from './classify-shadow.js';
@@ -139,7 +158,7 @@ import { createReworkBudgetJudgment, REWORK_BUDGET_JUDGMENT, reworkBudgetEvidenc
 import { runWorkflowToCompletion } from '../workflow-runtime/executor.js';
 import { mapReworkVerdict, supervisionObservationFields } from './supervision-vocabulary.js';
 import { resolveRunOutcome } from './run-outcome.js';
-import { authorLimitationCountFromGoal, harvestEvidenceLines, harvestedEvidenceObservation, MAX_HARVESTED_EVIDENCE_CHARS, parseOffDiffEvidence, requiredEvidenceFromGoal, runRequiredEvidenceChecks, coverRequiredEvidence, type OffDiffEvidenceParse } from './off-diff-evidence.js';
+import { authorLimitationCountFromGoal, harvestEvidenceLines, harvestedEvidenceObservation, MAX_HARVESTED_EVIDENCE_CHARS, parseOffDiffEvidence, requiredEvidenceFromGoal, runRequiredEvidenceChecks, coverRequiredEvidence, formatUncoveredEvidenceFeedback, type OffDiffEvidenceParse } from './off-diff-evidence.js';
 import { pressDecisionSignals, type DecisionSignalPressResult } from './decision-signal-press.js';
 import { inspectDecisionObservations, inspectDecisionSignalKinds, inspectDecisionSignalObservations } from '../../scripts/ask-marker-check.js';
 
@@ -434,7 +453,7 @@ function resolveDefaultBranchTarget(
  * 🔑 실패일 때만 두 칸을 더한다 — 성공 경로 payload 를 바꾸면 기존 소비자가 흔들린다.
  *   `moduleLoadFailure` 는 ***「산출이 상했다」와 「그 순간 트리가 불일치했다」***를 가르는 값이다.
  */
-type PostSyncStatus = 'merged' | 'llm-resolved';
+type PostSyncStatus = 'merged' | 'llm-resolved' | 'deterministic-resolved';
 
 type PostSyncGatePolicy = {
   exempted: boolean;
@@ -495,7 +514,7 @@ function postSyncGatePolicy(
     && !introduced && childResponsibility === 'none'
     && syncStatus === 'llm-resolved';
   const exempted = !passed
-    && (timeoutOnly || (!introduced && childResponsibility === 'none' && syncStatus === 'merged'));
+    && (timeoutOnly || (!introduced && childResponsibility === 'none' && (syncStatus === 'merged' || syncStatus === 'deterministic-resolved')));
   return {
     exempted,
     exemptionWithheld,
@@ -817,6 +836,11 @@ function revertGuardTargetPaths(feature: string, goalDocument?: string): string[
   return [...new Set([...declaredRevertGuardPaths(feature), ...(originalAsk ? declaredRevertGuardPaths(originalAsk) : [])])];
 }
 
+/** 하니스가 작업 트리에 잠깐 쓰는 임시물 — 범위 판정·결정 카드에서 뺀다. */
+export function isHarnessTempArtifact(file: string): boolean {
+  return /(^|\/)\.elanous-typecheck-scope-[^/]+\.json$/.test(file);
+}
+
 export function detectDeclaredScopeDiff(input: {
   goalDocument?: string | null;
   changedFiles?: readonly string[] | null;
@@ -2256,6 +2280,8 @@ export interface SelfImplementResult {
   branch?: string;
   gate?: SelfImplementGateResult;
   review?: SelfImplementReview;
+  /** Worktree commit observed while this review ran; not inferred from the later PR head. */
+  reviewedHeadCommit?: string;
   completionDisposition?: SelfImplementCompletionDisposition;
   /** Explicit supervisor rework verdict retained independently of workflow execution verdicts. */
   supervisorVerdict?: ReworkBudgetVerdict;
@@ -2362,7 +2388,18 @@ function truncatePrTitle(text: string): string {
   return points.length <= 72 ? text : `${points.slice(0, 69).join('')}...`;
 }
 
-export function prTitle(feature: string): string {
+export function goalChecklistIds(feature: string, goalFile?: string): string[] {
+  const document = goalFile ? goalDocumentForReleaseNote(goalFile) : feature;
+  const declaration = document.split(/\r?\n/).find((line) => line.startsWith('- 칸 id: '));
+  const declared = declaration?.slice('- 칸 id: '.length).trim();
+  if (declared && declared !== 'not declared') {
+    return [...new Set(declared.split(' · ').map((id) => id.trim()).filter(Boolean))];
+  }
+  const firstLine = feature.split(/\r?\n/, 1)[0] ?? '';
+  return [...new Set(Array.from(firstLine.matchAll(/\b[A-Z][A-Z0-9]+-[A-Z0-9]+\b/g), (match) => match[0]))];
+}
+
+function prTitleWithoutChecklistId(feature: string): string {
   const proseTitle = parseAskProseTitle(feature);
   if (proseTitle) return truncatePrTitle(proseTitle);
 
@@ -2405,6 +2442,13 @@ export function prTitle(feature: string): string {
   return truncatePrTitle(firstFileName);
 }
 
+export function prTitle(feature: string, goalFile?: string): string {
+  const title = prTitleWithoutChecklistId(feature);
+  const id = goalChecklistIds(feature, goalFile)[0];
+  if (!id) return title;
+  return truncatePrTitle(title.startsWith(`${id}: `) ? title : `${id}: ${title}`);
+}
+
 const BLOCKED_DRAFT_PR_HUMAN_JUDGMENT_ANCHOR = '## 사람 판단 필요';
 
 /** 사람이 읽는 중단 사유 상한. 관측 `reason.slice(0, 240)` 과 같은 길이라 표시가 앞부분을 버리지 않는다. */
@@ -2665,6 +2709,7 @@ function prBody(feature: string, implSummary: string, gateLog?: string, review?:
     ? ['', '## 감독 수용 기준 완화', `- 대상: ${planRevision.relaxation.target}`, `- 이전: ${planRevision.relaxation.expected}`, `- 완화: ${planRevision.relaxation.replacement}`, `- 이유: ${planRevision.reason}`, `- 적용: ${planRevision.application?.status ?? 'failed'}${planRevision.application?.detail ? ` (${planRevision.application.detail})` : ''}`, ...(planRevision.disposition ? [`- 충돌 처분: ${planRevision.disposition}`] : [])]
     : [];
   return [
+    `칸: ${goalChecklistIds(feature, goalFile).join(' · ') || '없음'}`,
     '## 요청',
     ...(goalFile ? [`- 골 파일: ${formatGoalFileForPrBody(goalFile)}`] : []),
     feature.trim(),
@@ -2882,6 +2927,7 @@ export function formatBlockedDraftClassificationSection(
 
 function blockedDraftPrBody(feature: string, implSummary: string, state: BlockedDraftPrState, goalFile?: string): string {
   return [
+    `칸: ${goalChecklistIds(feature, goalFile).join(' · ') || '없음'}`,
     BLOCKED_DRAFT_PR_HUMAN_JUDGMENT_ANCHOR,
     state.salvageStatusExpected
       ? BLOCKED_DRAFT_PR_SALVAGE_STATUS_INSTRUCTION
@@ -3638,7 +3684,7 @@ export async function runSelfImplement(opts: SelfImplementOptions): Promise<Self
     }
     try {
       const pushed = opts.seams.preserveBlockedBranch
-        ? await opts.seams.preserveBlockedBranch({ cwd: worktreePath, branch, title: prTitle(opts.feature), commit: preSyncCommit })
+        ? await opts.seams.preserveBlockedBranch({ cwd: worktreePath, branch, title: prTitle(opts.feature, opts.goalFile), commit: preSyncCommit })
         : runGitCommand(worktreePath, ['push', '-u', 'origin', `${preSyncCommit}:refs/heads/${branch}`]).status === 0;
       if (!pushed) throw new Error('branch push failed');
       // The worktree is left untouched: a late merge may still be writing it. The harvest source is the pinned commit.
@@ -4846,6 +4892,7 @@ async function runSelfImplementInner(
   // ⛔ 승격이 꺼져 있으면 «심지 않는다» — 그러면 예산 관측도 안 난다(운영 원장이 오늘과 같다).
   if (graphAuthority.enabled) onGraphTemplateResolved(graphTemplate);
   // ⛔ 선택을 «전부» 싣는다 — 얹힌 것만 실으면 「왜 안 얹혔나」를 사후에 못 묻는다.
+  let reviewRepeat: number | undefined;
   /** ⭐ ③ «다이나믹» — 라운드마다 runtime 오버레이를 다시 고른다.
    *  ⛔ **매번 «기준 선언»에서 다시 얹는다** — 이전 라운드 결과 위에 겹쳐 얹으면
    *    「이 걸음을 무엇이 만들었나」가 «누적»이 되어 사후에 못 푼다.
@@ -4853,7 +4900,19 @@ async function runSelfImplementInner(
   const applyRuntimeOverlays = (round: number): void => {
     if (!graphAuthority.enabled) return;
     // ⛔ 「지금 아는 것」만 준다 — 없는 값을 0 으로 지어내지 않는다(key-absent 가 그것을 말한다).
-    const runtimeOverlayState = { attempts: round, ...(opts.goalId === undefined ? {} : { goal_id: opts.goalId }) };
+    let stopClass: import('./run-stop.js').RunStopClass | undefined;
+    try {
+      const { runId } = identity ?? resolveRunIdentity({ explicit: opts.runId });
+      const entries = loadRunLedger(runId);
+      const lastStop = entries?.slice().reverse().find((entry) => entry.event === 'stop');
+      if (lastStop && isRunStopClass(lastStop.data.class)) stopClass = readRunStopRecord(lastStop)?.class;
+    } catch { /* Unreadable STOP-RECORD is unknown, not an invented class. */ }
+    const runtimeOverlayState = {
+      attempts: round,
+      ...(opts.goalId === undefined ? {} : { goal_id: opts.goalId }),
+      ...(stopClass === undefined ? {} : { stop_class: stopClass }),
+      ...(reviewRepeat === undefined ? {} : { review_repeat: reviewRepeat }),
+    };
     const decision = decideTemplate({
       goalType: graphGoalType,
       authority: graphAuthority,
@@ -4963,7 +5022,7 @@ async function runSelfImplementInner(
     role: describeRole({ role: 'executor', executorKind: 'self' }),
     entry: siEntry, capabilities: [...siCaps.active], enhanceActive,
   });
-  progress('start', `🔨 self-implement 시작 — ${prTitle(opts.feature)}`);
+  progress('start', `🔨 self-implement 시작 — ${prTitle(opts.feature, opts.goalFile)}`);
 
   let sessionId: string | undefined;
   if (opts.parentSessionId && s.forkSession) {
@@ -5188,6 +5247,7 @@ async function runSelfImplementInner(
   let offDiffEvidence: OffDiffEvidenceParse = { items: [], discardedMissingVerify: 0, discardedEmptyClaim: 0, missingResult: 0, orphanResult: 0, truncatedResult: 0, anchoredEvidence: 0 };
   let evidenceSource: 'diff-added-lines' | 'harvested' | 'summary-tail' = 'summary-tail';
   // ⛔⭐ 하니스가 센 증거 충족도 — **로그에만 남기면 판정자가 못 본다**(원장 `JDG-S4`·`JDG-S5`).
+  let uncoveredFeedbackUsed = false;
   let evidenceCoverage: {
     required: number;
     covered: number;
@@ -5202,6 +5262,7 @@ async function runSelfImplementInner(
   /** GATE-ENV-RETRY: 재시도 뒤에도 남은 환경 결손의 종류. 정의되면 이 라운드의 gate 실패는 «수확 대기»로 끝난다. */
   let gateEnvDeficitKind: GateEnvDeficitKind | undefined;
   let review: SelfImplementReview | undefined;
+  let reviewedHeadCommit: string | undefined;
   /** Review-budget leftovers and the body that carried them, so a later merge drafts from the same text. */
   let preparedReviewBudgetPrBody: string | undefined;
   const reviewMustFixCountHistory: number[] = [];
@@ -5314,6 +5375,7 @@ async function runSelfImplementInner(
   // 직전 gate 실패 라운드의 미검증 집합(정렬 키). 통과하면 비운다 — «연속» 반복만 센다.
   let lastGateUnverifiedKey: string | undefined;
   const reworkHistory: string[] = [];
+  const roundSummaryEntries: RoundSummaryEntry[] = [];
   const supervisorDecisionHistory: Array<{ round: number; verdict: ReworkBudgetVerdict; reason: string }> = [];
   let judgedEffectiveMax: number | undefined;
   let lastReworkVerdict: ReworkBudgetVerdict | undefined;
@@ -5791,11 +5853,11 @@ async function runSelfImplementInner(
             throw new Error(`worktree not found: ${wt.path}`);
           }
           if (s.preserveBlockedBranch) {
-            pushed = await s.preserveBlockedBranch({ cwd: wt.path, branch: wt.branch, title: prTitle(opts.feature) });
+            pushed = await s.preserveBlockedBranch({ cwd: wt.path, branch: wt.branch, title: prTitle(opts.feature, opts.goalFile) });
             if (!pushed) throw new Error('브랜치 push가 성공하지 않았음');
           } else {
             preservationErrorStep = 'commit';
-            const commit = commitWorktree(wt.path, prTitle(opts.feature));
+            const commit = commitWorktree(wt.path, prTitle(opts.feature, opts.goalFile));
             if (!commit.ok && !/nothing to commit/.test(commit.out)) throw new Error(commit.out);
             committed = commit.ok;
             if (runGitCommand(wt.path, ['remote', 'get-url', 'origin']).status === 0) {
@@ -5875,10 +5937,10 @@ async function runSelfImplementInner(
       let salvageError: string | undefined;
       try {
         if (s.preserveBlockedBranch) {
-          if (!await s.preserveBlockedBranch({ cwd: wt.path, branch: salvageBranch, title: prTitle(opts.feature) })) throw new Error('수확 가지 push가 성공하지 않았음');
+          if (!await s.preserveBlockedBranch({ cwd: wt.path, branch: salvageBranch, title: prTitle(opts.feature, opts.goalFile) })) throw new Error('수확 가지 push가 성공하지 않았음');
         } else {
           if (!existsSync(wt.path)) throw new Error(`worktree not found: ${wt.path}`);
-          const commit = commitWorktree(wt.path, prTitle(opts.feature));
+          const commit = commitWorktree(wt.path, prTitle(opts.feature, opts.goalFile));
           if (!commit.ok && !/nothing to commit/.test(commit.out)) throw new Error(`로컬 커밋 실패: ${commit.out}`);
           const push = runGitCommand(wt.path, ['push', 'origin', `HEAD:refs/heads/${salvageBranch}`]);
           if (push.status !== 0) throw new Error(push.stderr || push.stdout || 'git push failed');
@@ -5915,10 +5977,10 @@ async function runSelfImplementInner(
       let pushed = false;
       try {
         if (s.preserveBlockedBranch) {
-          pushed = await s.preserveBlockedBranch({ cwd: wt.path, branch: wt.branch, title: prTitle(opts.feature) });
+          pushed = await s.preserveBlockedBranch({ cwd: wt.path, branch: wt.branch, title: prTitle(opts.feature, opts.goalFile) });
         } else {
           if (commitFirst) {
-            const commit = commitWorktree(wt.path, prTitle(opts.feature));
+            const commit = commitWorktree(wt.path, prTitle(opts.feature, opts.goalFile));
             if (!commit.ok && !/nothing to commit/.test(commit.out)) throw new Error(`로컬 브랜치 커밋 실패: ${commit.out}`);
           }
           const push = runGitCommand(wt.path, ['push', '-u', 'origin', `HEAD:refs/heads/${wt.branch}`]);
@@ -5942,7 +6004,7 @@ async function runSelfImplementInner(
     if (stage === 'review-blocked' && podReviewBlockedDraft) {
       let commitError: string | undefined;
       try {
-        const commit = commitWorktree(wt.path, prTitle(opts.feature));
+        const commit = commitWorktree(wt.path, prTitle(opts.feature, opts.goalFile));
         if (!commit.ok && !/nothing to commit/.test(commit.out)) commitError = commit.out.trim() || 'git commit failed';
       } catch (error) {
         commitError = safeErrorDescription(error);
@@ -5954,7 +6016,7 @@ async function runSelfImplementInner(
     let pr: { url: string; number: number };
     try {
       pr = await withStepTimeout(s.openPr({
-        title: prTitle(opts.feature),
+        title: prTitle(opts.feature, opts.goalFile),
         body: assembled.body,
         head: wt.branch,
         ...(opts.base ? { base: opts.base } : {}),
@@ -6077,7 +6139,7 @@ async function runSelfImplementInner(
     'missing-cited-path': refutations.filter(({ kind }) => kind === 'missing-cited-path').length,
     'found-cited-path': refutations.filter(({ kind }) => kind === 'found-cited-path').length,
   });
-  const acceptReviewBudget = async (unresolvedMustFix: readonly string[], hasNonReviewResidualWork: boolean) => {
+  const acceptReviewBudget = async (unresolvedMustFix: readonly string[], hasNonReviewResidualWork: boolean, repeatedPod = false) => {
     const decision = decideReworkSalvage({
       hardCapBlockedExtend: false,
       reviewBudgetExhausted: true,
@@ -6097,7 +6159,7 @@ async function runSelfImplementInner(
       }, { level: 'warn' });
       return { decision };
     }
-    const followUpMustFix = `\n\n## Follow-up must-fix (${decision.unresolvedMustFix.length})\n${decision.unresolvedMustFix.map((finding) => `- ${finding}`).join('\n')}`;
+    const followUpMustFix = `\n\n## Follow-up must-fix (${decision.unresolvedMustFix.length})\n${decision.unresolvedMustFix.map((finding) => `- ${repeatedPod ? '[repeated] ' : ''}${finding}`).join('\n')}`;
     const releaseNote = releaseNoteForRun(opts.goalFile, opts.feature);
     // openPr's default seam delegates to PrManager.upsertPr, which stages, commits,
     // and pushes this worktree after the note is written and before creating the PR.
@@ -6110,7 +6172,7 @@ async function runSelfImplementInner(
     );
     preparedReviewBudgetPrBody = preparedPrBody.body;
     const pr = await withStepTimeout(s.openPr({
-      title: prTitle(opts.feature),
+      title: prTitle(opts.feature, opts.goalFile),
       body: preparedPrBody.body,
       head: wt.branch,
       ...(opts.base ? { base: opts.base } : {}),
@@ -6343,6 +6405,7 @@ async function runSelfImplementInner(
           }
         }
         const before = effectiveMax;
+        const gateBaselineOnly = baselineOnlyGate();
         const budgetDecision = applyReworkBudgetDecision(
           effectiveMax,
           parsedDecision,
@@ -6351,7 +6414,13 @@ async function runSelfImplementInner(
           priorHistory.length,
           consecutiveUnresolvedBudget >= 2 ? false : shadowStop,
           supervisorDecisionHistory.at(-1)?.verdict,
+          gateBaselineOnly,
         );
+        if (reworkKind === 'gate' && parsedDecision?.verdict === 'SUFFICIENT' && gateBaselineOnly && budgetDecision.exit === 'proceed') {
+          debug.log('self-implement.rework-budget', 'gate-sufficient-proceed', {
+            runId, round, preexisting: gate!.baselineFailures!.filter(({ attribution }) => attribution === 'preexisting').length, introduced: 0,
+          });
+        }
         effectiveMax = budgetDecision.effectiveMax;
         if (parsedDecision) {
           if (diagnosisRefutations) {
@@ -6552,12 +6621,14 @@ async function runSelfImplementInner(
             if (isReviewRework(reworkKind)) {
               if (reflectRejectedAudit.length && review) review.shouldFix = [...review.shouldFix, ...reflectRejectedAudit];
               const pr = await preserveBlockedArtifacts({ stage: 'review-blocked', verdict: parsedDecision.verdict, reason: parsedDecision.reason, gate, decomposition: terminalDecomposition, salvageStatusExpected: false });
+              await draftFollowUpAfterBlocked({ runId, prNumber: pr?.number, stage: 'review-blocked', unresolvedMustFix: review?.mustFix, decompositionPieces: terminalDecomposition?.pieces?.map((p) => p.feature), feature: opts.feature, cellId: opts.goalId, goalFile: opts.goalFile }, s.followUp);
               const quotaExhaustionAssessment = quotaExhaustionAssessmentForRun();
               return { ok: false, node: 'rework', ...terminal, ...supervisorOutcome, sessionId, worktreePath: wt.path, branch: wt.branch, gate, review, quotaExhaustionAssessment, ...(lastSupervisorReason ? { supervisorReason: lastSupervisorReason } : {}), ...reviewBlockedResult(pr), detail: `${blockedDraftPrFailure ? `${blockedDraftPrFailure}; ` : ''}rework judged unconvergeable after ${round} rework round(s): ${parsedDecision.reason}` };
             }
             const baselineStop = noRetryBaseline();
             const reason = baselineStop.terminationReason ?? parsedDecision.reason;
             const pr = await preserveBlockedArtifacts({ stage: 'gate-failed', verdict: parsedDecision.verdict, reason, gate, decomposition: terminalDecomposition, salvageStatusExpected: false });
+            await draftFollowUpAfterBlocked({ runId, prNumber: pr?.number, stage: 'gate-failed', decompositionPieces: terminalDecomposition?.pieces?.map((p) => p.feature), feature: opts.feature, cellId: opts.goalId, goalFile: opts.goalFile }, s.followUp);
             const quotaExhaustionAssessment = quotaExhaustionAssessmentForRun();
             return { ok: false, stage: 'gate-failed', node: 'rework', ...terminal, ...supervisorOutcome, ...baselineStop, sessionId, worktreePath: wt.path, branch: wt.branch, gate, quotaExhaustionAssessment, ...(lastSupervisorReason ? { supervisorReason: lastSupervisorReason } : {}), ...(pr ? { prUrl: pr.url, prNumber: pr.number } : {}), detail: baselineStop.terminationReason ?? `rework judged unconvergeable after ${round} rework round(s): ${parsedDecision.reason}` };
           }
@@ -6581,10 +6652,12 @@ async function runSelfImplementInner(
         if (isReviewRework(reworkKind)) {
           if (reflectRejectedAudit.length && review) review.shouldFix = [...review.shouldFix, ...reflectRejectedAudit];
           const pr = await preserveBlockedArtifacts({ stage: 'review-blocked', verdict: lastReworkVerdict, reason, gate, salvageStatusExpected: false });
+          await draftFollowUpAfterBlocked({ runId, prNumber: pr?.number, stage: 'review-blocked', unresolvedMustFix: review?.mustFix, feature: opts.feature, cellId: opts.goalId, goalFile: opts.goalFile }, s.followUp);
           return { ok: false, node: 'rework', ...terminal, sessionId, worktreePath: wt.path, branch: wt.branch, gate, review, quotaExhaustionAssessment: quotaExhaustionAssessmentForRun(), ...(lastSupervisorVerdict === 'CONTRACT-CONFLICT' ? { supervisorVerdict: lastSupervisorVerdict } : {}), ...reviewBlockedResult(pr), detail: blockedDraftPrFailure ?? reason };
         }
         const baselineStop = noRetryBaseline();
         const pr = await preserveBlockedArtifacts({ stage: 'gate-failed', verdict: lastReworkVerdict, reason: baselineStop.terminationReason ?? reason, gate, salvageStatusExpected: false });
+        await draftFollowUpAfterBlocked({ runId, prNumber: pr?.number, stage: 'gate-failed', feature: opts.feature, cellId: opts.goalId, goalFile: opts.goalFile }, s.followUp);
         return { ok: false, stage: 'gate-failed', node: 'rework', ...terminal, ...baselineStop, sessionId, worktreePath: wt.path, branch: wt.branch, gate, quotaExhaustionAssessment: quotaExhaustionAssessmentForRun(), ...(lastSupervisorVerdict === 'CONTRACT-CONFLICT' ? { supervisorVerdict: lastSupervisorVerdict } : {}), ...(pr ? { prUrl: pr.url, prNumber: pr.number } : {}), detail: baselineStop.terminationReason ?? reason };
       }
       const terminal = resolveRunOutcome({ termination: 'budget-exhausted', ...(lastReworkVerdict ? { lastVerdict: lastReworkVerdict } : {}) });
@@ -6597,14 +6670,38 @@ async function runSelfImplementInner(
       if (isReviewRework(reworkKind)) {
         if (reflectRejectedAudit.length && review) review.shouldFix = [...review.shouldFix, ...reflectRejectedAudit];
         const reason = `review must-fix unresolved after ${round - 1} rework round(s)`;
-        // Pod keeps review-blocked work as a labelled draft (or aborts with the preserved branch) instead of
-        // accepting the review budget into a non-draft PR — restored after #24341 (0.2.16 gate shard 5).
-        if (!podReviewBlockedDraft) {
+        const podResidue = podReviewBlockedDraft
+          ? classifyPodReviewBudgetResidue(currentBlockingFindings, previousBlockingFindings)
+          : undefined;
+        // ⛔ 사양 v2(OP 18:1x (a)): Pod 는 «전부 내용 해시(id) 반복»일 때만 수락한다 — 키로만 반복된 지적은 draft.
+        //   수락은 draft→non-draft ⊕ followUpMustFix 기록까지다. 병합 판단은 언제나 hitl(자동 병합 없음 · #25941
+        //   `review-warn-with-must-fix` 와 같은 방향 — must-fix 가 남은 런은 어느 출구로도 자동 병합하지 않는다).
+        const podAcceptable = podResidue?.status === 'all-repeated' && podResidue.keyOnlyRepeatedIds.length === 0;
+        const podDecision = (accepted: boolean) => {
+          if (!podResidue) return;
+          debug.log('self-implement.review-budget', 'pod-accept-decision', {
+            runId, status: podResidue.status, repeatedCount: podResidue.repeatedIds.length,
+            newCount: podResidue.newIds.length, keyOnlyRepeatedCount: podResidue.keyOnlyRepeatedIds.length,
+            accepted, merge: 'hitl',
+          });
+        };
+        if (!podReviewBlockedDraft || podAcceptable) {
           const acceptance = await acceptReviewBudget(
             review?.mustFix ?? [],
             reworkParts.some((part) => part.source === 'supervisor'),
+            podReviewBlockedDraft,
           );
+          podDecision(acceptance.decision.action === 'accept');
           if (acceptance.decision.action === 'accept') {
+            if (podReviewBlockedDraft) {
+              observe('merge-decision', {
+                autoMerge: autoMergeEnabled(opts), reviewed: review?.reviewed === true, verdict: review?.verdict ?? 'none',
+                decision: 'hitl', reason: 'review-budget-follow-up-required',
+                mustFixCount: acceptance.decision.unresolvedMustFix.length,
+                followUpMustFix: acceptance.decision.unresolvedMustFix,
+                ...(acceptance.pr ? { prNumber: acceptance.pr.number } : {}),
+              });
+            }
             if (acceptance.pr) {
               await draftFollowUpAfterMerge({
                 prNumber: acceptance.pr.number,
@@ -6633,7 +6730,7 @@ async function runSelfImplementInner(
               detail: `${reason}; accepted with ${acceptance.decision.unresolvedMustFix.length} follow-up must-fix item(s)`,
             };
           }
-        }
+        } else podDecision(false);
         const pr = await preserveBlockedArtifacts({ stage: 'review-blocked', reason, gate, salvageStatusExpected: true });
         const salvage = blockedDraftNoChanges || blockedDraftPrFailure ? 'parked' : await salvageHardCap(canSalvage, pr);
         const disposition = { ...terminal, ...(salvage ? { salvage } : {}) };
@@ -6666,9 +6763,20 @@ async function runSelfImplementInner(
         }, { level: 'warn' });
       }
     }
-    const feature = round === 0
-      ? round0Feature
+    const reworkFeature = round === 0 ? ''
       : buildReworkFeature(opts.feature, round, effectiveMax, reworkPromptNote, stripReworkBudgetHeaders(diagnosis), appliedLastRound, refutableFindings, pendingPlanRevision, reworkKind, buildRefutationGuidance(), escalationJudgement);
+    const card = round === 0 ? '' : renderRoundSummaryCard(roundSummaryEntries);
+    const feature = round === 0 ? round0Feature : reworkFeature + (card ? `\n\n${card}` : '');
+    if (card) {
+      const latest = roundSummaryEntries[roundSummaryEntries.length - 1]!;
+      const lastKey = latest.failedIds?.length ? JSON.stringify([...new Set(latest.failedIds)].sort()) : undefined;
+      const repeatedWithRound = lastKey === undefined ? undefined : roundSummaryEntries.slice(0, -1)
+        .find((entry) => entry.failedIds?.length && JSON.stringify([...new Set(entry.failedIds)].sort()) === lastKey)?.round;
+      const omittedRounds = Number(/…\(앞 라운드 (\d+)개 생략\)/.exec(card)?.[1] ?? 0);
+      observe('round-card', { round, entries: roundSummaryEntries.length, chars: card.length,
+        ...(repeatedWithRound === undefined ? {} : { repeatedWithRound }), omittedRounds,
+      }, { category: 'self-dev.rework' });
+    }
     const refutationGuidanceEligible = round > 0 && refutableFindings.length > 0;
     const dispatchedRefutationGuidance = refutationGuidancePresented(feature, refutationGuidanceEligible);
     pendingPlanRevision = undefined;
@@ -6826,7 +6934,7 @@ async function runSelfImplementInner(
             && targets.some((target) => changedFileIsInsideDeclaredTarget(path, target)));
         if (eligible.length) {
           inspectStaleReverts(revertGuardTargetPaths(opts.feature, goalDocument));
-          const message = `self-implement: ${prTitle(opts.feature)}`;
+          const message = `self-implement: ${prTitle(opts.feature, opts.goalFile)}`;
           let outcome: { ok: boolean; out: string };
           try {
             outcome = (s.commitFinishedChildWork ?? ((cwd, paths, title) => {
@@ -6988,7 +7096,9 @@ async function runSelfImplementInner(
     if (opts.goalFile) {
       let goalDocument: string | undefined;
       try { goalDocument = readFileSync(opts.goalFile, 'utf8'); } catch { /* unknown scope */ }
-      const scope = detectDeclaredScopeDiff({ goalDocument, changedFiles: gateRouteFiles?.filter(file => !harnessSeededPaths.includes(file)), nameCap: gateRouteFiles?.length });
+      // 🩸 10-09: 범위 타입검사 임시 tsconfig(.elanous-typecheck-scope-*.json · scoped-typecheck-config.ts)가 옛 가지에 커밋된 뒤 지워지면
+      //   «추적 파일 삭제» 라 impact=critical → 결정 카드가 «irreversible» 로 대표에게 갔다(D-20·35·43·80). 하니스 임시물은 범위 판정 밖이다.
+      const scope = detectDeclaredScopeDiff({ goalDocument, changedFiles: gateRouteFiles?.filter(file => !harnessSeededPaths.includes(file) && !isHarnessTempArtifact(file)), nameCap: gateRouteFiles?.length });
       if (scope.status === 'known' && scope.outsideCount !== null && scope.outsideCount > 0) {
         const result: ExecutionClarificationResult = await (s.askExecutionClarification ?? askAtExecution)({
           id: 'execution_scope', decision: 'Changing files outside the authored target paths',
@@ -7249,6 +7359,10 @@ async function runSelfImplementInner(
         return { ok: false, stage: 'gate-failed', node: 'rework', ...resolveRunOutcome({ termination: 'abandoned' }), sessionId, worktreePath: wt.path, branch: wt.branch, gate, quotaExhaustionAssessment: quotaExhaustionAssessmentForRun(), ...(pr ? { prUrl: pr.url, prNumber: pr.number } : {}), detail: reason };
       }
       lastGateUnverifiedKey = unverifiedRepeatKey(gate.unverified);
+      roundSummaryEntries.push({ round, kind: 'gate', tried: impl.summary.replace(/\s+/g, ' ').trim().slice(0, 200),
+        failedIds: gate.baselineFailures?.map(({ name, file, attribution }) => `${name}@${file ?? '?'} (${attribution})`),
+        filesTouched: gateRouteFiles,
+      });
       round++;
       continue;
       }
@@ -7347,6 +7461,7 @@ async function runSelfImplementInner(
     lastReviewContext = reviewContext;
     reviewIntent = buildReviewIntent(reviewContext);
 
+    reviewedHeadCommit = undefined;
     if (s.reviewDiff) {
       try {
         const stoppedBeforeReview = honorParentSoftStop('review');
@@ -7356,7 +7471,18 @@ async function runSelfImplementInner(
         }
         onNodeEntry(node('review'), round);
         progress('reviewing', '내부 리뷰 (리뷰어 비평)…');
+        const readReviewHead = s.headCommit ?? ((cwd: string) => {
+          const commit = runGitCommand(cwd, ['rev-parse', '--verify', 'HEAD'], { encoding: 'utf8', timeout: 10_000 });
+          return commit.status === 0 ? commit.stdout.trim() : undefined;
+        });
+        const headBeforeReview = readReviewHead(wt.path);
+        const statusBeforeReview = runGitCommand(wt.path, ['status', '--porcelain'], { encoding: 'utf8', timeout: 10_000 });
         review = await withStepTimeout(s.reviewDiff(wt.path, reviewContext), T.review, 'review');
+        const statusAfterReview = runGitCommand(wt.path, ['status', '--porcelain'], { encoding: 'utf8', timeout: 10_000 });
+        reviewedHeadCommit = review.reviewed && headBeforeReview && /^[0-9a-f]{40}$/i.test(headBeforeReview)
+          && statusBeforeReview.status === 0 && statusBeforeReview.stdout.trim() === ''
+          && statusAfterReview.status === 0 && statusAfterReview.stdout.trim() === ''
+          && headBeforeReview === readReviewHead(wt.path) ? headBeforeReview : undefined;
       } catch (error) {
         finalizeSupervisorDeliveries(error instanceof StepTimeoutError ? 'next-round-review-timeout' : 'next-round-review-failed');
         throw error;
@@ -7390,7 +7516,11 @@ async function runSelfImplementInner(
         ...(review.failureReason !== undefined ? { failureReason: review.failureReason } : {}),
         ...(reviewArtifactPath ? { artifactPath: reviewArtifactPath } : {}),
       });
-      if (review.reviewed) reviewMustFixCountHistory.push(review.mustFix.length);
+      if (review.reviewed) {
+        reviewMustFixCountHistory.push(review.mustFix.length);
+        // The next runtime overlay sees completed review rounds, not consecutive repeats of one finding.
+        reviewRepeat = reviewMustFixCountHistory.length - 1;
+      }
       progress('reviewed', review.reviewed
         ? `리뷰: ${review.verdict} (must-fix ${review.mustFix.length}·should-fix ${review.shouldFix.length}) · 추이 ${reviewMustFixCountHistory.join('→')} (${reviewMustFixTrend()})`
         : `리뷰 미실행${review.failureReason !== undefined ? ` (${review.failureReason})` : ''}`);
@@ -7520,6 +7650,9 @@ async function runSelfImplementInner(
           break;
         }
         appliedLastRound = [...effectiveMustFix];
+        roundSummaryEntries.push({ round, kind: 'review', tried: impl.summary.replace(/\s+/g, ' ').trim().slice(0, 200),
+          failedIds: effectiveMustFix.map(stableMustFixId), filesTouched: runFacts.changedFiles,
+        });
         refutableFindings = reviewMustFixFindings.filter(({ item }) => effectiveMustFix.includes(item));
         const reviewFindingKeys = effectiveMustFix
           .map(reviewFindingKey)
@@ -7569,6 +7702,18 @@ async function runSelfImplementInner(
         continue;
       }
     }
+    if (gate.passed && autoMergeEnabled(opts) && evidenceCoverage?.uncoveredCount && !uncoveredFeedbackUsed && round < effectiveMax) {
+      const uncovered = [...evidenceCoverage.uncovered];
+      const nextRound = round + 1;
+      setReworkPart('review', formatUncoveredEvidenceFeedback(uncovered));
+      uncoveredFeedbackUsed = true;
+      debug.log('self-implement.evidence', 'uncovered-feedback', { uncovered, round: nextRound });
+      bufferPrComment(round, 'author', `Round ${round}: child implementation completed.`, [
+        `Child completion: ${impl.summary.trim() || '(summary unavailable)'}`,
+      ]);
+      round = nextRound;
+      continue;
+    }
     bufferPrComment(round, 'author', `Round ${round}: child implementation completed.`, [
       `Child completion: ${impl.summary.trim() || '(summary unavailable)'}`,
     ]);
@@ -7595,12 +7740,18 @@ async function runSelfImplementInner(
     ? { completionDisposition }
     : {};
   const reviewReal = !!review?.reviewed;
+  const reviewedHeadResult = reviewReal && reviewedHeadCommit ? { reviewedHeadCommit } : {};
   const reviewDiffComplete = review?.diffTruncated === false;
   const requiredEvidenceMissing = evidenceCoverage !== undefined && evidenceCoverage.uncoveredCount > 0;
   const { latestSignalIncomplete } = signalIncompleteState(roundClassifications);
   const autoMerge = autoMergeEnabled(opts);
   const gateTimeoutUnmeasured = isTimeoutOnlyUnmeasuredGate(gate.reflectGateFacts);
-  let canAuto = !gateTimeoutUnmeasured && autoMerge && reviewReal && review!.verdict !== 'fail' && reviewDiffComplete && !requiredEvidenceMissing && !latestSignalIncomplete && !decisionSignalRed;
+  // ⛔⭐ AUTOMERGE-WARN-MUSTFIX(0.2.24): 판정이 warn 이어도 must-fix 가 «남아» 있으면 자동 병합하지 않는다.
+  //   루프 «안»은 `verdict === 'fail'` 일 때만 재작업하므로, warn ⊕ must-fix≥1 은 루프를 그대로 빠져나와
+  //   종전 `verdict !== 'fail'` 만 보던 이 자리에서 auto 가 됐다(#25914 · #25934 · #25918 실물).
+  //   ⭐ 반사가 must-fix 를 «전부» 기각하면 위에서 `review.mustFix = []` 로 비우므로 그 길은 종전 그대로다.
+  const reviewMustFixCount = review?.mustFix?.length ?? 0;
+  let canAuto = !gateTimeoutUnmeasured && autoMerge && reviewReal && review!.verdict !== 'fail' && reviewMustFixCount === 0 && reviewDiffComplete && !requiredEvidenceMissing && !latestSignalIncomplete && !decisionSignalRed;
   // ⭐⭐ 통과의 «이유»를 둘로 가른다 — ⛔ 막지는 «않는다»(대표 판단 2026-08-11: ⓐ 문면만).
   //   📏 근거(`JDG-T36` · merge-decision 300건 전수): `verifyByBreaking` 이 실린 8건의 auto 중 ***5건***이
   //     ***ran=true 인데 distinguishes=0***(아무것도 안 가르는 자기검증)이었고, 그 다섯이 «전부»
@@ -7619,6 +7770,7 @@ async function runSelfImplementInner(
         : latestSignalIncomplete ? 'signal-incomplete'
         : !reviewReal ? 'no-real-review'
           : review!.verdict === 'fail' ? 'review-must-fix'
+          : reviewMustFixCount > 0 ? 'review-warn-with-must-fix'
             : review!.diffTruncated === true ? 'review-diff-truncated'
               : 'review-diff-budget-unknown';
   let mergeSkipReason = canAuto ? undefined : mergeReason;
@@ -7626,6 +7778,7 @@ async function runSelfImplementInner(
   const mergeDecisionObservation = {
     autoMerge, reviewed: reviewReal, verdict: review?.verdict ?? 'none',
     decision: canAuto ? 'auto' : 'hitl', reason: mergeReason,
+    mustFixCount: reviewMustFixCount,
     ...mergeDecisionEvidenceCoverage(evidenceCoverage),
     ...(evidenceCoverage ? {
       evidenceSource,
@@ -7680,7 +7833,7 @@ async function runSelfImplementInner(
       try { goalDocument = readFileSync(opts.goalFile, 'utf8'); } catch { /* no documented targets */ }
     }
     inspectStaleReverts(revertGuardTargetPaths(opts.feature, goalDocument));
-    s.commitWork(wt.path, prTitle(opts.feature));
+    s.commitWork(wt.path, prTitle(opts.feature, opts.goalFile));
     // ⛔⭐ resume 경로와 «같은» 해석기를 쓴다 — 두 자리가 갈리면 같은 원인이 다른 얼굴로 나온다.
     const resolvedTarget = resolveDefaultBranchTarget(s.defaultBranchRef ?? defaultBranchRef, wt.path);
     const mergeTarget = resolvedTarget.target;
@@ -7725,9 +7878,9 @@ async function runSelfImplementInner(
         && await preserveMergeHarvest(sync.reason, sync.inputChars);
       return { ok: false, stage: 'merge-conflict', node: 'main-sync', ...resolveRunOutcome({ termination: 'abandoned' }), ...decisionSignalResult, sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...(harvestable ? { harvestable: true } : {}), detail: harvestable ? sync.reason === 'conflict-input-too-large' ? `충돌 큼 — 사람 수확 (${wt.branch}, 입력 ${sync.inputChars}자)` : `충돌 해결 중단 — 사람 수확 (${wt.branch})` : `pre-PR main sync ${sync.status}` };
     }
-    if (sync.status === 'llm-resolved' || sync.status === 'merged') {
+    if (sync.status === 'llm-resolved' || sync.status === 'merged' || sync.status === 'deterministic-resolved') {
       preservationBase = opts.base ?? mergeTarget;
-      progress('gating', sync.status === 'llm-resolved'
+      progress('gating', sync.status === 'llm-resolved' || sync.status === 'deterministic-resolved'
         ? `${mergeTarget} 충돌해결됨 — ${formatLlmMergeOutcome(sync)} — 통합 결과 full 재-gate…`
         : `${mergeTarget} 정합됨 — 통합 결과 full 재-gate…`);
       onNodeEntry('regate', round);
@@ -7880,7 +8033,7 @@ async function runSelfImplementInner(
   let pr: { url: string; number: number };
   try {
     pr = await withStepTimeout(s.openPr({
-      title: prTitle(opts.feature),
+      title: prTitle(opts.feature, opts.goalFile),
       body: preparedPrBody.body,
       head: wt.branch,
       ...(opts.base ? { base: opts.base } : {}),
@@ -7902,6 +8055,11 @@ async function runSelfImplementInner(
     progress('aborted', formatPrOpenFailedProgress(location, prErrorFirstLine));
     throw new Error(`${location}\n${prError}`);
   }
+  // PR creation may commit generated body/release notes or sync the base after review. Never bind an old review to that new head.
+  if (reviewedHeadCommit) {
+    const current = runGitCommand(wt.path, ['rev-parse', '--verify', 'HEAD'], { encoding: 'utf8', timeout: 10_000 });
+    if (current.status !== 0 || current.stdout.trim() !== reviewedHeadCommit) delete reviewedHeadResult.reviewedHeadCommit;
+  }
   observe('pr-opened', {
     url: pr.url,
     number: pr.number,
@@ -7951,7 +8109,7 @@ async function runSelfImplementInner(
     }
     recordMergeDecision();
     progress('pr-opened', `OP 승인 대기 (#${pr.number}): ${releaseHoldPath}`);
-    return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), mergeReason, prUrl: pr.url, prNumber: pr.number, detail: `OP approval required: ${releaseHoldPath}` };
+    return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...reviewedHeadResult, mergeReason, prUrl: pr.url, prNumber: pr.number, detail: `OP approval required: ${releaseHoldPath}` };
   }
   if (!releasePathInspectionError && labels?.includes(AUTO_REVIEW_LABEL)) {
     try {
@@ -7969,7 +8127,7 @@ async function runSelfImplementInner(
       : 'release-path-inspection-failed';
     recordMergeDecision();
     progress('pr-opened', `OP 승인 대기 (#${pr.number}): PR 경로 조회 실패`);
-    return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), mergeReason, prUrl: pr.url, prNumber: pr.number };
+    return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...reviewedHeadResult, mergeReason, prUrl: pr.url, prNumber: pr.number };
   }
 
   if (canAuto && (s.mergePr || opts.mergeByHost)) {
@@ -8019,12 +8177,12 @@ async function runSelfImplementInner(
       //    판정(mergeReason)이 아니라 «집행 직전 가드»가 막았으므로 그 사실을 값으로 말한다.
       //    ⛔ 안 그러면 마지막 줄이 침묵하고, 그건 이 착지가 없애려던 상태다(리뷰 must-fix 2R).
       const guardSkipReason = mergeSkipReason ?? (guardFailure ? 'merge-guard-unevaluated' : 'docs-deletion-threshold');
-      return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), mergeReason: guardSkipReason, prUrl: pr.url, prNumber: pr.number, detail };
+      return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...reviewedHeadResult, mergeReason: guardSkipReason, prUrl: pr.url, prNumber: pr.number, detail };
     }
     if (opts.mergeByHost) {
       observe('merge-ready', { number: pr.number, checkedHeadCommit });
       progress('pr-opened', `호스트 재게이트 대기 (#${pr.number})`);
-      return { ok: true, stage: 'merge-ready', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), checkedHeadCommit: checkedHeadCommit!, prUrl: pr.url, prNumber: pr.number };
+      return { ok: true, stage: 'merge-ready', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...reviewedHeadResult, checkedHeadCommit: checkedHeadCommit!, prUrl: pr.url, prNumber: pr.number };
     }
     // Landing freeze: the in-flight marker is written before the freeze is read, so a `freeze on` racing this merge waits.
     // The resume sweep merges from the repository that owns the run worktree (the worktree itself may be cleaned up).
@@ -8036,13 +8194,13 @@ async function runSelfImplementInner(
     };
     const landing = admitLandingMerge(heldEntry, undefined, {}, { prNumber: pr.number, repoRoot: owningRepoRoot(wt.path) ?? wt.path, ...(checkedHeadCommit ? { headCommit: checkedHeadCommit } : {}) });
     if (landing.kind === 'held' && !(checkedHeadCommit && /^[0-9a-f]{40}$/i.test(checkedHeadCommit))) {
-      return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), mergeReason: 'merge-guard-unevaluated', prUrl: pr.url, prNumber: pr.number, detail: 'freeze: checked head SHA unavailable; PR left ready for review' };
+      return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...reviewedHeadResult, mergeReason: 'merge-guard-unevaluated', prUrl: pr.url, prNumber: pr.number, detail: 'freeze: checked head SHA unavailable; PR left ready for review' };
     }
     if (landing.kind !== 'merge') {
       const detail = landing.kind === 'held' ? landingFreezeMessage(landing.freeze) : 'freeze lifted; a resume sweep is merging this PR';
       debug.log('harness.merge', 'frozen', { pr: pr.number, ...(landing.kind === 'held' ? { reason: landing.freeze.reason, until: landing.freeze.until } : { resumedElsewhere: true }) });
       progress('pr-opened', `#${pr.number} ready · ${detail}`);
-      return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), mergeReason: landing.kind === 'held' ? 'frozen' : 'resumed-elsewhere', prUrl: pr.url, prNumber: pr.number, detail };
+      return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...reviewedHeadResult, mergeReason: landing.kind === 'held' ? 'frozen' : 'resumed-elsewhere', prUrl: pr.url, prNumber: pr.number, detail };
     }
     // The marker and claim live until the merge call itself settles — a step timeout does not stop a merge already
     // sent — and anything that throws before the merge call is made releases them.
@@ -8132,10 +8290,10 @@ async function runSelfImplementInner(
     //    그대로 두면 마지막 산출 줄이 «침묵»한다 — 이 착지가 없애려던 바로 그 상태다(리뷰 must-fix).
     //    ⇒ 판정이 아니라 «집행»에서 막힌 것이므로 그 사실을 별도 값으로 말한다.
     const mergeAttemptSkipReason = mergeSkipReason ?? 'merge-attempt-failed';
-    return { ok: true, stage: 'pr-opened', node: 'merge', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), mergeReason: mergeAttemptSkipReason, merged: false, prUrl: pr.url, prNumber: pr.number, ...(m.detail ? { detail: m.detail } : {}) };
+    return { ok: true, stage: 'pr-opened', node: 'merge', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...reviewedHeadResult, mergeReason: mergeAttemptSkipReason, merged: false, prUrl: pr.url, prNumber: pr.number, ...(m.detail ? { detail: m.detail } : {}) };
   }
   progress('pr-opened', `✅ PR 개설 (#${pr.number})`);
-  return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...(lastSupervisorReason ? { supervisorReason: lastSupervisorReason } : {}), ...(mergeSkipReason ? { mergeReason: mergeSkipReason } : {}), prUrl: pr.url, prNumber: pr.number };
+  return { ok: true, stage: 'pr-opened', node: 'open-pr', ...resolveRunOutcome({ termination: 'completed' }), ...decisionSignalResult, ...preservedCompletionResult, ...(completionStatus ? { completionStatus } : {}), sessionId, worktreePath: wt.path, branch: wt.branch, gate, ...(review ? { review } : {}), ...reviewedHeadResult, ...(lastSupervisorReason ? { supervisorReason: lastSupervisorReason } : {}), ...(mergeSkipReason ? { mergeReason: mergeSkipReason } : {}), prUrl: pr.url, prNumber: pr.number };
 }
 
 /** 결정적 요청 거부 — 같은 요청을 다시 보내면 «같은» 답이 온다(BACKLOG B6).