elanous 0.2.20 → 0.2.22

package/src/self-implement/orchestrator.ts

@@ -72,6 +72,7 @@ import { basename, isAbsolute, join, relative, resolve, sep } from 'node:path';
 import { homedir } from 'node:os';
 import { enqueueControlMemo, readSoftStopRequestStatus, type SoftStopRequestRead } from '../harness/control-inbox.js';
 import { debug } from '../debug/log.js';
+import { enterJourneyNode, exitJourneyNode, journeyJoinFields, withJourneyNode } from '../self-dev/graph-journey-nodes.js';
 import { classifyGateEnvDeficit, DEFAULT_GATE_ENV_RETRY, GATE_ENV_DEFICIT_HARVESTABLE_MARK, type GateEnvDeficitKind } from './gate-env-retry.js';
 import { recordFailureEvent } from './heal-intake.js';
 import { classifyReworkCapExhaustion, type ReworkCapHealDecision } from './heal-triage.js';
@@ -433,7 +434,7 @@ function resolveDefaultBranchTarget(
  * 🔑 실패일 때만 두 칸을 더한다 — 성공 경로 payload 를 바꾸면 기존 소비자가 흔들린다.
  *   `moduleLoadFailure` 는 ***「산출이 상했다」와 「그 순간 트리가 불일치했다」***를 가르는 값이다.
  */
-type PostSyncStatus = 'merged' | 'llm-resolved';
+type PostSyncStatus = 'merged' | 'llm-resolved' | 'deterministic-resolved';
 
 type PostSyncGatePolicy = {
   exempted: boolean;
@@ -494,7 +495,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,
@@ -975,6 +976,8 @@ export interface SelfImplementSeams {
   readSoftStopRequestStatus?: (spaceId: string) => SoftStopRequestRead;
   /** Parent harness space whose durable stop marker is read. Tests inject this; production uses `getHarnessSpace()`. */
   parentSoftStopSpaceId?: string;
+  /** Real, created worktree's soft-stop target; observation only, never guesses a space. */
+  onSoftStopSpaceReady?: (spaceId: string) => void;
   /** disposable worktree 생성 → 경로·브랜치 ⊕ **어디서 갈랐나**(관측용).
    *  ⚠️ 관측 3필드는 **선택**이다 — 시임은 주입점이고, 테스트 더블에게 git SHA 를 지어내라고
    *  요구하면 계약이 아니라 부담이 된다. 실 시임(`defaultSeams`)은 항상 채운다.
@@ -2253,6 +2256,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;
@@ -2359,7 +2364,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);
 
@@ -2402,6 +2418,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)` 과 같은 길이라 표시가 앞부분을 버리지 않는다. */
@@ -2662,6 +2685,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(),
@@ -2879,6 +2903,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
@@ -3635,7 +3660,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.
@@ -3805,6 +3830,8 @@ export async function runSelfImplement(opts: SelfImplementOptions): Promise<Self
     const attemptOrdinal = readRunAttemptOrdinal(runId);
     const identified = {
       ...graphIdentity,
+      // HARNESS-FULL-GRAPH — 앞단 여정 걸음(runId 없음)과 이 런의 걸음을 잇는 조인 키.
+      ...journeyJoinFields(),
       ...data,
       attemptOrdinal,
     };
@@ -4958,7 +4985,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) {
@@ -5019,6 +5046,9 @@ async function runSelfImplementInner(
   //   그래서 getHarnessSpace() 만 보면 운영에서 늘 undefined 이고 정지 확인이 «한 번도» 안 돈다(#20040 착지 직후 실측).
   //   `self send <space> --stop` 이 겨냥하는 것은 자식의 공간 = 워크트리 이름이다(아래 activeChildInboxId 와 같은 식 · dev-cli.ts recordRestart 폴백과 같다).
   const parentSoftStopSpaceId = s.parentSoftStopSpaceId || getHarnessSpace()?.id || normalizeSpaceId(basename(wt.path)) || undefined;
+  if (parentSoftStopSpaceId) {
+    try { s.onSoftStopSpaceReady?.(parentSoftStopSpaceId); } catch { /* UI registration must not break execution */ }
+  }
   const readParentSoftStop = s.readSoftStopRequestStatus ?? readSoftStopRequestStatus;
   const honorParentSoftStop = (
     beforeNode: 'gate' | 'review' | 'rework' | 'open-pr',
@@ -5194,6 +5224,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[] = [];
@@ -5783,11 +5814,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) {
@@ -5867,10 +5898,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');
@@ -5907,10 +5938,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}`]);
@@ -5934,7 +5965,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);
@@ -5946,7 +5977,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 } : {}),
@@ -6102,7 +6133,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 } : {}),
@@ -6818,7 +6849,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) => {
@@ -7339,6 +7370,7 @@ async function runSelfImplementInner(
     lastReviewContext = reviewContext;
     reviewIntent = buildReviewIntent(reviewContext);
 
+    reviewedHeadCommit = undefined;
     if (s.reviewDiff) {
       try {
         const stoppedBeforeReview = honorParentSoftStop('review');
@@ -7348,7 +7380,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;
@@ -7587,6 +7630,7 @@ 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);
@@ -7672,7 +7716,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;
@@ -7717,9 +7761,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);
@@ -7872,7 +7916,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 } : {}),
@@ -7894,6 +7938,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,
@@ -7943,7 +7992,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 {
@@ -7961,7 +8010,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)) {
@@ -8011,12 +8060,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).
@@ -8028,13 +8077,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.
@@ -8088,7 +8137,14 @@ async function runSelfImplementInner(
       }
       const defaultBranch = resolveDefaultBranchTarget(s.defaultBranchRef ?? defaultBranchRef, wt.path).target ?? undefined;
       progress('merged', formatAutoMergeSuccessMessage({ prNumber: pr.number, mergedBase, defaultBranch }));
-      await runPostMergeCleanup(s.postMergeCleanup, wt.path, wt.branch, opts.goalFile, mergedBase && defaultBranch && displayBranchName(mergedBase) === displayBranchName(defaultBranch) ? defaultBranch : undefined, observe);
+      // HARNESS-FULL-GRAPH — 회수도 그래프 노드(cleanup)다. 결과 = completed | preserved | failed.
+      let cleanupOutcome = 'completed';
+      enterJourneyNode('cleanup', { provenance: 'post-merge', runId });
+      await withJourneyNode('cleanup', { provenance: 'post-merge', runId }, () => runPostMergeCleanup(s.postMergeCleanup, wt.path, wt.branch, opts.goalFile, mergedBase && defaultBranch && displayBranchName(mergedBase) === displayBranchName(defaultBranch) ? defaultBranch : undefined, (event, data) => {
+        if (event.startsWith('post-merge-cleanup-')) cleanupOutcome = event.slice('post-merge-cleanup-'.length);
+        observe(event, data);
+      }));
+      exitJourneyNode('cleanup', { provenance: 'post-merge', runId, outcome: cleanupOutcome });
       const mergedLedger = (() => {
         try { return loadRunLedger(runId); } catch { return null; }
       })();
@@ -8117,10 +8173,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).

package/src/self-implement/seams.ts

@@ -972,6 +972,8 @@ export interface DefaultSeamsOptions {
   signal?: AbortSignal;
   /** Parent-surface progress receiver supplied by the dev pipeline. */
   onProgress?: SelfImplementSeams['onProgress'];
+  /** Relay the actual worktree soft-stop target to the invoking surface. */
+  onSoftStopSpaceReady?: SelfImplementSeams['onSoftStopSpaceReady'];
   /** ⑤ HITL — PR 승인 게이트. ★fail-closed: 생략 시 PR 안 열림(자동 승인 없음). 실전 필수. */
   approvePr?: SelfImplementSeams['approvePr'];
   /** gate 스텝(기본 ['test']). */
@@ -984,7 +986,7 @@ export interface DefaultSeamsOptions {
   runAndroidUnitTestGate?: (io: { args: readonly string[]; cwd: string }) => number;
   runIosUnitTestGate?: (io: { args: readonly string[]; cwd: string }) => number;
   /** Source-policy gate adapter for focused seam tests. */
-  runHarnessPolicyGates?: typeof runHarnessPolicyGates;
+  runHarnessPolicyGates?: (input: Parameters<typeof runHarnessPolicyGates>[0]) => Awaited<ReturnType<typeof runHarnessPolicyGates>> | ReturnType<typeof runHarnessPolicyGates>;
   runExposeGate?: typeof runExposeGate;
   /** Dependency-wide validation adapter for focused seam tests. */
   runDependencyChangeGate?: typeof runDependencyChangeGate;
@@ -1018,6 +1020,8 @@ export interface DefaultSeamsOptions {
    *  agent-substrate·staged 하니스와 동일 엔진) 배선. 미주입 시 reviewDiff 미노출(gate 통과=바로 병합결정·
    *  리뷰 스킵). dev-harness 의 llmReview 와 동일 형태(streamLLM 래퍼). */
   llmReview?: (prompt: string) => Promise<string>;
+  /** Optional independent reviewer for reviewDiff only; other judgment calls retain llmReview. */
+  subscriptionReviewLLM?: (prompt: string) => Promise<string>;
   /**
    * 이 리뷰 심이 파일을 스스로 읽을 수 있나. **선택 선언** — 안 주면 reviewDiff 가 칸을 만들지 않고
    * 오케스트레이터 관측은 `'unknown'` 이다(`false` 와 같은 값으로 접지 않는다).
@@ -1394,6 +1398,7 @@ export function defaultSeams(o: DefaultSeamsOptions = {}): SelfImplementSeams {
   };
   return {
     ...(o.onProgress ? { onProgress: o.onProgress } : {}),
+    ...(o.onSoftStopSpaceReady ? { onSoftStopSpaceReady: o.onSoftStopSpaceReady } : {}),
     ...(escalateGoalClarifications ? { escalateGoalClarifications } : {}),
     queryChildProviderErrors,
     persistPrBodyArtifact: (input) => createArtifactStore().put('block', input.body, {
@@ -2070,7 +2075,7 @@ export function defaultSeams(o: DefaultSeamsOptions = {}): SelfImplementSeams {
       //   tsc-깨짐(F1 refFacts 미정의)을 결정론 차단. 변경 전체(.ts·테스트 포함)를 tsc 로 검사(변경 경로만 카운트).
       const tc = changedFileTypecheck(cwd, changedAll);
       debug.log('self-implement', 'gate.tsc', { checked: tc.checked, passed: tc.passed, errors: tc.errors, exempted: tc.exempted, noInspectionReason: tc.noInspectionReason }, { level: tc.passed ? 'info' : 'warn' });
-      const policy = (o.runHarnessPolicyGates ?? runHarnessPolicyGates)({ cwd, changedFiles: changedAll });
+      const policy = await (o.runHarnessPolicyGates ?? runHarnessPolicyGates)({ cwd, changedFiles: changedAll });
       debug.log('self-implement', 'gate.policy', {
         passed: policy.passed, failures: policy.failures.map((failure) => failure.gate), skipped: policy.skipped,
       });
@@ -2527,7 +2532,7 @@ export function defaultSeams(o: DefaultSeamsOptions = {}): SelfImplementSeams {
               ...(ctx.round !== undefined ? { round: ctx.round } : {}),
             },
           } : {}),
-        }, o.llmReview!);
+        }, o.subscriptionReviewLLM ?? o.llmReview!);
         debug.log('self-implement', 'review.done', {
           verdict: rr.verdict, reviewed: rr.reviewed ?? false, mustFix: rr.mustFix.length, shouldFix: rr.shouldFix.length,
           gateEvidenceLines: evidenceNote?.split(/\r?\n/).length ?? 0,

package/src/self-implement/self-implement-cli.ts

@@ -111,6 +111,7 @@ export function singleRunAsJobResult(feature: string, r: SelfImplementResultWith
     ...(r.harvestable === true && r.branch ? { harvestable: true } : {}),
     ...(r.worktreePath ? { worktreePath: r.worktreePath } : {}),
     ...(r.prUrl ? { prUrl: r.prUrl } : {}),
+    ...(r.prNumber !== undefined ? { prNumber: r.prNumber } : {}),
     // TA-LIVE-REVIEW-POD — 작업 트리 없는 런(Pod)의 live review 가 «런이 낸 PR 머리»를 확인하는 근거.
     ...(r.checkedHeadCommit !== undefined ? { checkedHeadCommit: r.checkedHeadCommit } : {}),
     ...(r.merged !== undefined ? { merged: r.merged } : {}),
@@ -121,6 +122,9 @@ export function singleRunAsJobResult(feature: string, r: SelfImplementResultWith
     ...(r.decomposeProposal ? { decomposeProposal: r.decomposeProposal } : {}),
     ...(r.goalPlanRevision ? { goalPlanRevision: r.goalPlanRevision } : {}),
     ...(r.salvage !== undefined ? { salvage: r.salvage } : {}),
+    ...(r.review?.reviewed === true && r.review.verdict === 'pass'
+      && r.reviewedHeadCommit && /^[0-9a-f]{40}$/i.test(r.reviewedHeadCommit)
+      ? { selfReview: { verdict: r.review.verdict, head: r.reviewedHeadCommit } } : {}),
     ...(r.review?.reviewed !== undefined ? { reviewed: r.review.reviewed } : {}),
     ...(r.review?.failureReason !== undefined ? { reviewReason: r.review.failureReason } : {}),
     // ⭐ 대표 지시(2026-09-08) — 걸음을 슈퍼바이저까지 나른다.

package/src/self-implement/self-implement-runtime.ts

@@ -55,6 +55,13 @@ interface SelfImplementRuntimeDeps {
 }
 let runtimeDeps: SelfImplementRuntimeDeps = {};
 
+// TUI-only observer. The tool call id is furnished by the actual dispatcher;
+// other surfaces and calls without an id cannot register a stop target.
+let softStopSpaceObserver: ((toolCallId: string, spaceId: string) => void) | null = null;
+export function setSelfImplementSoftStopSpaceObserver(observer: typeof softStopSpaceObserver): void {
+  softStopSpaceObserver = observer;
+}
+
 /** 자식 헤드리스 elanous 의 config/state 격리 + 구현 대기 상한을 주입. */
 export function setSelfImplementRuntimeDeps(d: SelfImplementRuntimeDeps | null): void {
   runtimeDeps = d ?? {};
@@ -711,6 +718,11 @@ export const selfImplementRuntime: ToolRuntime<SelfImplementRuntimeRequest, Self
       ...(runtimeDeps.implementMaxWaitSec ? { implementMaxWaitSec: runtimeDeps.implementMaxWaitSec } : {}),
       ...(approvePr ? { approvePr } : {}),
       onProgress: resolveHarnessProgressSink(ctx),
+      ...(ctx.surface === 'tui' && ctx.toolCallId && softStopSpaceObserver ? {
+        onSoftStopSpaceReady: (spaceId: string) => {
+          try { softStopSpaceObserver?.(ctx.toolCallId!, spaceId); } catch { /* UI observer cannot break harness */ }
+        },
+      } : {}),
     });
 
     const runnableDocumentReferences = documentReferences.filter(({ result }) => result.kind !== 'outside-repository');

package/src/session-runtime/index.ts

@@ -162,6 +162,8 @@ export interface SessionPostureSnapshot {
 
 export interface SessionRuntimeDispatchDeps {
   signal?: AbortSignal;
+  /** Current LLM tool call, for correlating a foreground harness stop target with the TUI call. */
+  toolCallId?: string;
   userText?: string;
   modelFamily?: ModelFamily;
   /** Parent Agent capability context for an inline runtime fallback. */
@@ -183,7 +185,7 @@ export interface SessionRuntimeDispatchDeps {
   // scheduler-retirement R1 의 LLM tool unwire 후 모두 no-op stub 였고
   // 본 PR 에서 정식 폐기.
   getToolRuntime(name: string): ToolRuntime<Record<string, unknown>, ToolRunResult> | undefined;
-  dispatchToolRuntime(name: string, args: Record<string, unknown>): Promise<unknown>;
+  dispatchToolRuntime(name: string, args: Record<string, unknown>, toolCallId?: string): Promise<unknown>;
   dispatchPluginTool(name: string, args: Record<string, unknown>): Promise<
     { ok: true; result: unknown } | { ok: false; error: string }
   >;
@@ -2166,7 +2168,7 @@ export async function dispatchSessionRuntimeTool(
   //    registered runtimes) and drops `pathPolicy` on the floor.
   const nativeRuntime = nativeRule?.preferRuntime ? deps.getToolRuntime(name) : undefined;
   if (nativeRuntime) {
-    const result = await deps.dispatchToolRuntime(name, normalizedArgs);
+    const result = await deps.dispatchToolRuntime(name, normalizedArgs, deps.toolCallId);
     rememberCandidateListingResult(name, normalizedArgs, result, scopedAnalysis, deps.searchPlannerState);
     return result;
   }
@@ -2201,7 +2203,7 @@ export async function dispatchSessionRuntimeTool(
   if (rt) {
     const isPtyTool = name.startsWith('PtyShell') || name.startsWith('pty_shell');
     if (!isPtyTool || deps.ptyDashboardOn) {
-      const result = await deps.dispatchToolRuntime(name, normalizedArgs);
+      const result = await deps.dispatchToolRuntime(name, normalizedArgs, deps.toolCallId);
       rememberCandidateListingResult(name, normalizedArgs, result, scopedAnalysis, deps.searchPlannerState);
       return result;
     }

package/src/shell-env-bootstrap.ts

@@ -55,11 +55,22 @@ import { basename } from 'node:path';
 import { debug } from './debug/log.js';
 
 const TIMEOUT_MS = 3000;
+// An interactive shell (`-i`) ignores SIGTERM, so the default timeout signal never ends it: the
+// capture then blocks until the rc files finish. 10-08 TUI-BOOT-60: a stale pyenv rehash lock made
+// every `zsh -l -i` wait 60 s, and the «3 s» capture held the TUI boot for ~65 s. SIGKILL makes the
+// timeout real.
+const TIMEOUT_SIGNAL = 'SIGKILL' as const;
 const POSIX_SHELLS = new Set(['zsh', 'bash', 'fish', 'sh', 'dash', 'ksh']);
 
 let cached: Record<string, string> | null = null;
 let captured = false;
 
+// Both the daemon warm path (nexus/index.ts) and PTY's first synchronous capture
+// pass through here. Keep the existing capture events intact; these are additive timings.
+function logBootPhase(phase: string, start: number, outcome: string): void {
+  debug.log('boot.phase', phase, { ms: performance.now() - start, outcome });
+}
+
 /** Parse `KEY=VALUE\n` output from `printenv`. Tolerates values that
  *  themselves contain `=`; does not attempt to unescape newlines
  *  (bash/zsh `printenv` emits them literally, which is fine for
@@ -116,26 +127,33 @@ function acceptCapture(stdout: string): Record<string, string> | null {
 }
 
 export function runPrintenvCapture(): Record<string, string> | null {
+  const seedStart = performance.now();
   const seed = captureSeed();
+  logBootPhase('login-env.seed', seedStart, seed ? 'ready' : 'unavailable');
   if (!seed) return null;
   const { shell, seedEnv } = seed;
 
+  const shellStart = performance.now();
   let res: ReturnType<typeof spawnSync>;
   try {
     res = spawnSync(shell, ['-l', '-i', '-c', 'printenv'], {
       env: seedEnv,
       encoding: 'utf8',
       timeout: TIMEOUT_MS,
+      killSignal: TIMEOUT_SIGNAL,
       stdio: ['ignore', 'pipe', 'pipe'],
       // Don't inherit our stdio — rc files that run `clear` or issue
       // OSC sequences would corrupt our TUI output otherwise.
     });
   } catch {
+    logBootPhase('login-env.shell', shellStart, 'error');
     return null;
   }
-  if (res.status !== 0 && res.status !== null) return null;
-  if (res.signal) return null;
-  return acceptCapture(typeof res.stdout === 'string' ? res.stdout : '');
+  // ETIMEDOUT with status 0 = the shell outlived the timeout; never trust a late capture.
+  const parsed = !res.error && (res.status === 0 || res.status === null) && !res.signal
+    ? acceptCapture(typeof res.stdout === 'string' ? res.stdout : '') : null;
+  logBootPhase('login-env.shell', shellStart, parsed ? 'ok' : 'failed');
+  return parsed;
 }
 
 /** Fill the login-env cache off the event loop (daemon boot). The first web-terminal spawn otherwise ran the
@@ -144,15 +162,25 @@ export function runPrintenvCapture(): Record<string, string> | null {
 export async function warmCapturedEnv(spawn: typeof Bun.spawn = Bun.spawn): Promise<boolean> {
   if (captured) return cached !== null;
   if (process.env.ELANOUS_SKIP_LOGIN_ENV === '1' || process.env.TERM_PROGRAM === 'monad-agent-nested') return false;
+  const seedStart = performance.now();
   const seed = captureSeed();
+  logBootPhase('login-env.seed', seedStart, seed ? 'ready' : 'unavailable');
   if (!seed) return false;
   const start = Date.now();
+  const shellStart = performance.now();
   try {
     const proc = spawn([seed.shell, '-l', '-i', '-c', 'printenv'], { env: seed.seedEnv as Record<string, string>, stdin: 'ignore', stdout: 'pipe', stderr: 'ignore' });
-    const timer = setTimeout(() => proc.kill(), TIMEOUT_MS);
-    const [out, code] = await Promise.all([new Response(proc.stdout as ReadableStream).text(), proc.exited]);
+    // A grandchild (e.g. a pyenv rehash) can keep the stdout pipe open after the shell is killed,
+    // so the timeout settles the race itself instead of waiting for EOF.
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    const timedOut = new Promise<null>((resolve) => {
+      timer = setTimeout(() => { proc.kill(TIMEOUT_SIGNAL); resolve(null); }, TIMEOUT_MS);
+    });
+    const finished = Promise.all([new Response(proc.stdout as ReadableStream).text(), proc.exited]);
+    const result = await Promise.race([finished, timedOut]);
     clearTimeout(timer);
-    const parsed = code === 0 ? acceptCapture(out) : null;
+    const parsed = result && result[1] === 0 ? acceptCapture(result[0]) : null;
+    logBootPhase('login-env.shell', shellStart, parsed ? 'ok' : result ? 'failed' : 'timeout');
     if (captured) return cached !== null; // a synchronous capture won the race
     if (!parsed) return false;
     cached = parsed;
@@ -160,6 +188,7 @@ export async function warmCapturedEnv(spawn: typeof Bun.spawn = Bun.spawn): Prom
     debug.log('shell.envbootstrap.capture', 'warmed', { ok: true, ms: Date.now() - start, keyCount: Object.keys(parsed).length });
     return true;
   } catch {
+    logBootPhase('login-env.shell', shellStart, 'error');
     return false;
   }
 }