elanous 0.2.31 → 0.2.34

package/src/task-agent/postland-card.ts

@@ -1,7 +1,8 @@
+import { spawnSync } from 'node:child_process';
 import { debug } from '../debug/log.js';
 import { listChecklist, setItemIfSnapshot, type Checklist } from '../release-loop/checklist.js';
 import { judgeLandedCell, parseJudgeSignals, type GreenVerdict } from '../release-loop/landed-to-green.js';
-import { cardPrNumber, readTaskAgentState, taskAgentStatePath, updateTaskCard, type TaskCard } from './task-hand.js';
+import { HAND_MOVE_HISTORY_EVENT, LIVE_MOVE_HISTORY_EVENT, LIVE_MOVE_RESULT_EVENT, cardPrNumber, readTaskAgentState, taskAgentStatePath, updateTaskCard, type TaskCard } from './task-hand.js';
 import { isGoalOnlyPr } from './judge.js';
 
 export interface LandedTaskPr { number: number; url: string; headRefOid: string; state: string; baseRefName: string; mergedAt: string; files?: Array<{ path: string }> }
@@ -142,3 +143,81 @@ export function closeMergedTaskCard(pr: LandedTaskPr, cwd: string, deps: Postlan
   log('task-agent', 'postland-card-closed', { pr: pr.number, card: card.id, version, id: item.id, outcome: complete ? 'complete' : 'partial', verdict });
   return item.id;
 }
+
+const defaultGit = (cwd: string, args: string[]): { status: number; stdout: string; stderr: string } => {
+  const run = spawnSync('git', args, { cwd, encoding: 'utf8' });
+  return { status: run.status ?? 1, stdout: run.stdout ?? '', stderr: run.stderr ?? '' };
+};
+
+export type HandMergeReconcileOutcome =
+  | { outcome: 'reconciled'; card: string; status: 'landed-by-hand' | 'landed'; pr: number; head: string; mergeSha: string; mergedAt: string }
+  | { outcome: 'not-reconciled'; reason: 'pr-not-merged' | 'no-merge-sha' | 'no-bound-card' | 'ambiguous-card' | 'card-not-failed' | 'not-ancestor-of-main' | 'card-binding-changed-before-write' };
+
+export interface HandMergeReconcileDeps {
+  statePath?: string;
+  mainRef?: string;
+  updateCard?: typeof updateTaskCard;
+  git?: (cwd: string, args: string[]) => { status: number; stdout: string; stderr: string };
+  log?: typeof debug.log;
+}
+
+/**
+ * TA-CARD-MERGE-RECONCILE — 실패 카드에 묶인 PR을 사람이 손수 병합했을 때만 카드를 정산한다.
+ * MERGED + merge SHA가 `${mainRef}`(기본 `origin/main`) 조상일 때 status=landed-by-hand(또는 merge 커밋이
+ * land attempt head와 일치하면 landed)로 `updateTaskCard` 파일-락 트랜잭션 하나로 갱신하고,
+ * 이전 status·사유는 history `hand-move` 줄에 보존한다. OPEN·비조상·묶임 없음은 카드를 그대로 둔다.
+ */
+export function reconcileHandMergedCard(pr: LandedTaskPr & { mergeCommit?: string }, cwd: string, deps: HandMergeReconcileDeps = {}): HandMergeReconcileOutcome {
+  const log = deps.log ?? debug.log.bind(debug);
+  if (pr.state !== 'MERGED' || !pr.url) return { outcome: 'not-reconciled', reason: 'pr-not-merged' };
+  const mergeSha = pr.mergeCommit ?? '';
+  if (!/^[a-f0-9]{40}$/i.test(mergeSha)) return { outcome: 'not-reconciled', reason: 'no-merge-sha' };
+  const path = deps.statePath ?? taskAgentStatePath();
+  const tasks = readTaskAgentState<{ tasks?: Record<string, TaskCard> }>(path).tasks ?? {};
+  const cards = Object.values(tasks).filter((card) => card.taLand && cardPrNumber(card) === pr.number
+    && typeof card.pr === 'object' && card.pr.url?.replace(/\/+$/, '') === pr.url.replace(/\/+$/, ''));
+  if (cards.length !== 1) {
+    log('task-agent', 'postland-card-hand-skipped', { pr: pr.number, reason: cards.length ? 'ambiguous-card' : 'no-bound-card' });
+    return { outcome: 'not-reconciled', reason: cards.length ? 'ambiguous-card' : 'no-bound-card' };
+  }
+  const card = cards[0]!;
+  if (card.status !== 'failed') {
+    log('task-agent', 'postland-card-hand-skipped', { pr: pr.number, card: card.id, reason: 'card-not-failed', status: card.status });
+    return { outcome: 'not-reconciled', reason: 'card-not-failed' };
+  }
+  const mainRef = deps.mainRef ?? 'origin/main';
+  if ((deps.git ?? defaultGit)(cwd, ['merge-base', '--is-ancestor', mergeSha, mainRef]).status !== 0) {
+    log('task-agent', 'postland-card-hand-skipped', { pr: pr.number, card: card.id, reason: 'not-ancestor-of-main', mainRef });
+    return { outcome: 'not-reconciled', reason: 'not-ancestor-of-main' };
+  }
+  const at = new Date().toISOString();
+  let reconciled: { status: 'landed-by-hand' | 'landed' } | undefined;
+  // The card lock keeps the settlement atomic with its binding checks: a card that flipped off
+  // `failed` mid-flight is left untouched for its owning path to finish.
+  (deps.updateCard ?? updateTaskCard)(path, card.id, (current, currentTasks) => {
+    const matching = Object.values(currentTasks).filter((candidate) => candidate.taLand && cardPrNumber(candidate) === pr.number
+      && typeof candidate.pr === 'object' && candidate.pr.url?.replace(/\/+$/, '') === pr.url.replace(/\/+$/, ''));
+    if (matching.length !== 1 || matching[0]?.id !== card.id) return undefined;
+    if (!current || current.status !== 'failed' || cardPrNumber(current) !== pr.number || typeof current.pr !== 'object'
+      || current.pr.url?.replace(/\/+$/, '') !== pr.url.replace(/\/+$/, '')) return undefined;
+    const status = (current.landAttempts ?? []).some((attempt) => attempt.pr === pr.number
+      && attempt.head.toLowerCase() === mergeSha.toLowerCase()) ? 'landed' : 'landed-by-hand';
+    const priorReason = [...current.history].reverse().find((event) => event.event !== LIVE_MOVE_HISTORY_EVENT
+      && event.event !== LIVE_MOVE_RESULT_EVENT && event.event !== HAND_MOVE_HISTORY_EVENT)?.detail ?? '사유 기록 없음';
+    const detail = status === 'landed'
+      ? `PR #${pr.number} 병합 정산: merge ${mergeSha}가 land attempt head와 일치 — status landed; 이전 status: failed; 이전 사유: ${priorReason}`
+      : `PR #${pr.number} 손 병합 정산: merge ${mergeSha}가 ${mainRef} 조상 — status landed-by-hand; 이전 status: failed; 이전 사유: ${priorReason}`;
+    reconciled = { status };
+    return { ...current,
+      status,
+      prTerminal: { pr: pr.number, url: pr.url, head: mergeSha, state: 'MERGED' as const, at },
+      history: [...current.history, { at, event: HAND_MOVE_HISTORY_EVENT, pr: pr.number, head: mergeSha, detail }],
+    };
+  });
+  if (!reconciled) {
+    log('task-agent', 'postland-card-hand-pending', { pr: pr.number, card: card.id, reason: 'card-binding-changed-before-write' });
+    return { outcome: 'not-reconciled', reason: 'card-binding-changed-before-write' };
+  }
+  log('task-agent', 'postland-card-hand-reconciled', { pr: pr.number, card: card.id, status: reconciled.status, mergeSha, mainRef });
+  return { outcome: 'reconciled', card: card.id, status: reconciled.status, pr: pr.number, head: pr.headRefOid, mergeSha, mergedAt: pr.mergedAt };
+}

package/src/task-agent/rejudge-on-head.ts

@@ -29,10 +29,13 @@
  * - 관측: `task-agent` · `rejudge-on-head {card, pr, fromHead, toHead, step, decision, reason}` — 수가 난 판단은 카드 history 에도
  *   한 줄(`event:'rejudge-on-head'` · 같은 머리·같은 단계·같은 판단은 한 번).
  */
-import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { closeSync, mkdirSync, openSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { randomUUID } from 'node:crypto';
 import { spawn, spawnSync } from 'node:child_process';
 import { tmpdir } from 'node:os';
 import { dirname, join } from 'node:path';
+import { planPrLandRecovery, type PrLandRecoveryPlan } from '../cli/pr-land-recovery.js';
+import { lastJsonObject, runGraph } from '../graph-runner/runner.js';
 import { debug } from '../debug/log.js';
 import { prodInstanceRoot } from '../instance/resolve.js';
 import { getUserConfig } from '../user-config.js';
@@ -44,7 +47,7 @@ import { recordLiveMoveHistory } from './live-move-history.js';
 import { runRepairCycle, type RepairLaunchRequest } from './repair-cycle.js';
 import { repairMustFixFromReview, repairReviewDigest } from './repair-review.js';
 import type { RepairCasOutcome, RepairCasRequest } from './repair-branch-cas.js';
-import { defaultLandPrHead, defaultPrHead, defaultReviewRepoCandidates, executeLiveLand, executeLiveReview, landRetryPending, type LiveMoveDeps, type LiveMoveResult, type PrHeadView, type ReviewRepoCandidate, type TaskAgentLiveMove } from './live-moves.js';
+import { configuredMsb1Worker, defaultLandPrHead, defaultPrHead, defaultReviewRepoCandidates, executeLiveLand, executeLiveReview, landRetryPending, remoteTaWorkerCommand, type LiveMoveDeps, type LiveMoveResult, type PrHeadView, type ReviewRepoCandidate, type TaskAgentLiveMove } from './live-moves.js';
 import { capturedLandReview, captureReviewResults, parseReviewResultOutput, pendingReviewResults, reviewResultPath, type ParsedReviewResult } from './review-result-capture.js';
 import { boundPrTerminal, cardPrNumber, LIVE_MOVE_RESULT_EVENT, readTaskCard, taskAgentStatePath, updateTaskCard, type TaskCard } from './task-hand.js';
 import { verifiedTrainLanding, type TrainLanding } from './train-landing.js';
@@ -98,6 +101,10 @@ export interface RejudgeDeps {
   notifyRepair?: (seat: string, body: string) => void;
   /** Shared new-launch budget for this `tasks rejudge --all` call. */
   repairBudget?: import('./repair-cycle.js').RepairTickBudget;
+  /** One review request across all candidates in one --all tick; standalone card rejudge is uncapped. */
+  reviewBudget?: { max: number; requested: number };
+  /** One land or queue attempt across all candidates in one --all tick. */
+  landBudget?: { max: number; requested: number };
   /** TA-REJUDGE-REBASE-LOOP — origin/main 을 PR 가지에 3-way merge 하고 일반 push. 시험은 주입한다. */
   catchUpMain?: (request: CatchUpRequest) => Promise<CatchUpResult>;
   log?: (category: string, event: string, data: Record<string, unknown>) => void;
@@ -265,12 +272,28 @@ export function regateRunArgs(entry: string, configDir: string, request: RegateR
   return [entry, '--config-dir', configDir, 'tasks', 'regate-run', '--card', request.card, '--pr', String(request.pr), '--head', request.head, '--repo', request.repoRoot, '--out', request.resultPath];
 }
 
-export async function defaultRequestRegate(request: RegateRequest, opts: { spawn?: DetachedSpawn; entry?: string; configDir?: string } = {}): Promise<void> {
+export async function defaultRequestRegate(request: RegateRequest, opts: { spawn?: DetachedSpawn; entry?: string; configDir?: string; remote?: import('./parent-host.js').ParentHostConfig | null } = {}): Promise<void> {
   const { spawnDetachedConfirmed, ELANOUS_CLI_ENTRY } = await import('../cli/tasks-cli.js');
   const { getElanousConfigDirOverride } = await import('../elanous-config-dir.js');
   const { effectiveInstanceRoot } = await import('../instance/resolve.js');
   const configDir = opts.configDir ?? getElanousConfigDirOverride() ?? effectiveInstanceRoot();
-  await spawnDetachedConfirmed(opts.spawn ?? (spawn as unknown as DetachedSpawn), process.execPath, regateRunArgs(opts.entry ?? ELANOUS_CLI_ENTRY, configDir, request), undefined, request.repoRoot);
+  const base = opts.spawn ?? (spawn as unknown as DetachedSpawn);
+  const remote = opts.remote === undefined ? (opts.spawn ? null : configuredMsb1Worker()) : opts.remote;
+  if (!remote) {
+    await spawnDetachedConfirmed(base, process.execPath, regateRunArgs(opts.entry ?? ELANOUS_CLI_ENTRY, configDir, request), undefined, request.repoRoot);
+    return;
+  }
+  // The remote worker writes its own result, then SSH carries only that JSON into the HQ result path.
+  const remoteResult = `/tmp/elanous-ta-regate-${randomUUID()}.json`;
+  const script = `${remoteTaWorkerCommand(remote, ['tasks', 'regate-run', '--card', request.card, '--pr', String(request.pr),
+    '--head', request.head, '--repo', remote.cwd, '--out', remoteResult])} >/dev/null; rc=$?; cat '${remoteResult}'; rm -f '${remoteResult}'; exit $rc`;
+  mkdirSync(dirname(request.resultPath), { recursive: true });
+  const fd = openSync(request.resultPath, 'w');
+  const toFile: DetachedSpawn = (command, args, options) =>
+    (base as unknown as (c: string, a: string[], o: unknown) => ReturnType<DetachedSpawn>)(command, args, { ...options, stdio: ['ignore', fd, 'ignore'] });
+  try {
+    await spawnDetachedConfirmed(toFile, 'ssh', ['-T', '-o', 'BatchMode=yes', '-o', 'ConnectTimeout=5', remote.host, script]);
+  } finally { closeSync(fd); }
 }
 
 /** 재게이트 결과 파일 — `tasks regate-run` 이 쓴다. */
@@ -513,6 +536,19 @@ export async function rejudgeCardOnHead(cardId: string, deps: RejudgeDeps): Prom
   }
   const step = (s: RejudgeStep, decision: string, reason: string, record: boolean, extra: Partial<RejudgeOutcome> = {}) =>
     emit({ card: card!.id, pr, fromHead, toHead, step: s, decision, reason, ...extra }, record);
+  const requestReview = async (candidate: TaskCard, reason: string, forceNewReview = false): Promise<void> => {
+    const budget = deps.reviewBudget;
+    if (budget && budget.requested >= budget.max) {
+      step('review', 'tick-cap', `review request cap ${budget.max} reached — next tick`, false);
+      return;
+    }
+    // Reserve before awaiting the worker so another candidate cannot launch a second request.
+    if (budget) budget.requested++;
+    const before = { reviewRequests: candidate.reviewRequests, landAttempts: candidate.landAttempts };
+    const result = await executeLiveReview(candidate, pr, { runId: candidate.runId ?? null, stopReason: reason, cwd, forceNewReview }, { ...live, ...(deps.log ? { log: deps.log } : {}) });
+    recordMove(statePath, candidate.id, candidate.runId, 'review', result, pr, before, now, deps.log);
+    step('review', result.executed ? 'review-requested' : 'review-request-failed', result.detail, true);
+  };
 
   // Adoption is a first judgement for the current head, even when the implementation run
   // already asked for a review. A captured failure needs repair; an accepted result must
@@ -526,10 +562,7 @@ export async function rejudgeCardOnHead(cardId: string, deps: RejudgeDeps): Prom
     } else if (!deps.liveMoves.has('review')) {
       step('review', 'would-review', 'adopted PR first judgement · review not enabled in HQ taskAgent.liveMoves — shadow', false);
     } else {
-      const before = { reviewRequests: card.reviewRequests, landAttempts: card.landAttempts };
-      const result = await executeLiveReview(card, pr, { runId: card.runId ?? null, stopReason: 'adopted-pr-first-judgement', cwd }, { ...live, ...(deps.log ? { log: deps.log } : {}) });
-      recordMove(statePath, card.id, card.runId, 'review', result, pr, before, now, deps.log);
-      step('review', result.executed ? 'review-requested' : 'review-request-failed', result.detail, true);
+      await requestReview(card, 'adopted-pr-first-judgement');
     }
     return outcomes;
   }
@@ -618,12 +651,7 @@ export async function rejudgeCardOnHead(cardId: string, deps: RejudgeDeps): Prom
 
   if (!reviews.length) {
     if (!deps.liveMoves.has('review')) step('review', 'would-review', 'remote run terminal proven · review not enabled in HQ taskAgent.liveMoves — shadow', false);
-    else {
-      const before = { reviewRequests: card.reviewRequests, landAttempts: card.landAttempts };
-      const result = await executeLiveReview(card, pr, { runId: card.runId ?? null, stopReason: 'remote-run-terminal', cwd }, { ...live, ...(deps.log ? { log: deps.log } : {}) });
-      recordMove(statePath, card.id, card.runId, 'review', result, pr, before, now, deps.log);
-      step('review', result.executed ? 'review-requested' : 'review-request-failed', result.detail, true);
-    }
+    else await requestReview(card, 'remote-run-terminal');
     return outcomes;
   }
 
@@ -642,10 +670,7 @@ export async function rejudgeCardOnHead(cardId: string, deps: RejudgeDeps): Prom
       if (pendingReviewResults(latest).some((entry) => entry.pr === pr && sameHead(entry.head, toHead))) {
         step('review', 'awaiting-review-result', 'exact-head review result pending', false);
       } else if (!latest.reviewRequests?.some((entry) => entry.pr === pr && sameHead(entry.head, toHead)) && deps.liveMoves.has('review')) {
-        const before = { reviewRequests: latest.reviewRequests, landAttempts: latest.landAttempts };
-        const result = await executeLiveReview(latest, pr, { runId: latest.runId ?? null, stopReason: 'queue-exact-head', cwd }, { ...live, ...(deps.log ? { log: deps.log } : {}) });
-        recordMove(statePath, latest.id, latest.runId, 'review', result, pr, before, now, deps.log);
-        step('review', result.executed ? 'review-requested' : 'review-request-failed', result.detail, true);
+        await requestReview(latest, 'queue-exact-head');
       } else step('review', 'not-landing', 'exact-head PASS/WARN mf0 review not captured', true);
       return outcomes;
     }
@@ -654,8 +679,13 @@ export async function rejudgeCardOnHead(cardId: string, deps: RejudgeDeps): Prom
     const reviewResult = latest.reviewRequests?.find((entry) => entry.pr === pr && sameHead(entry.head, toHead) && entry.resultPath)?.resultPath;
     if (!reviewResult) { step('land', 'not-landing', 'exact-head review JSON path missing', true); return outcomes; }
     const before = { reviewRequests: latest.reviewRequests, landAttempts: latest.landAttempts };
+    if (deps.landBudget && deps.landBudget.requested >= deps.landBudget.max) {
+      step('land', 'tick-cap', `land attempt cap ${deps.landBudget.max} reached — next tick`, false);
+      return outcomes;
+    }
     const queued = await executeLiveLand(latest, pr, { runId: latest.runId ?? null, cycleId: `queue:${latest.id}:${toHead}`, cwd,
       review, reviewResultPath: reviewResult }, { ...live, landQueueConfig: queueMode, ...(deps.log ? { log: deps.log } : {}) });
+    if (deps.landBudget && queued.executed) deps.landBudget.requested++;
     recordMove(statePath, latest.id, latest.runId, 'propose-land', queued, pr, before, now, deps.log);
     step('land', queued.queued ? 'queued' : queued.ok && !queued.executed ? 'queue-skipped' : 'queue-refused', queued.detail, true);
     return outcomes;
@@ -778,12 +808,7 @@ export async function rejudgeCardOnHead(cardId: string, deps: RejudgeDeps): Prom
   // ② 리뷰 — 지금 머리로 요청한 적이 없으면 다시(같은 머리는 한 번 · 상한은 ① 의 머리 수가 이미 막았다).
   if (!reviews.some((entry) => sameHead(entry.head, toHead))) {
     if (!deps.liveMoves.has('review')) step('review', 'would-review', 'review not enabled in taskAgent.liveMoves — shadow', false);
-    else {
-      const before = { reviewRequests: card.reviewRequests, landAttempts: card.landAttempts };
-      const result = await executeLiveReview(card, pr, { runId: card.runId ?? null, stopReason: 'rejudge-on-head', cwd }, { ...live, ...(deps.log ? { log: deps.log } : {}) });
-      recordMove(statePath, card.id, card.runId, 'review', result, pr, before, now, deps.log);
-      step('review', result.executed ? 'review-requested' : 'review-request-failed', result.detail, true);
-    }
+    else await requestReview(card, 'rejudge-on-head');
     return outcomes;
   }
   const latest = readTaskCard(card.id, statePath) ?? card;
@@ -828,10 +853,15 @@ export async function rejudgeCardOnHead(cardId: string, deps: RejudgeDeps): Prom
     return outcomes;
   }
   const before = { reviewRequests: latest.reviewRequests, landAttempts: latest.landAttempts };
+  if (deps.landBudget && deps.landBudget.requested >= deps.landBudget.max) {
+    step('land', 'tick-cap', `land attempt cap ${deps.landBudget.max} reached — next tick`, false);
+    return outcomes;
+  }
   // 주기 id — base-stale 재게이트 뒤의 land 는 새 base 를 붙여 앞 land 의 주기 표시(모듈 전역)와 갈린다 · gateAt 이 앞 base-stale 시도를 소비한다.
   const cycleId = `rejudge:${card.id}:${toHead}${regate.staleBase ? `:${regate.baseCommit.slice(0, 12)}` : ''}`;
   const landed = await executeLiveLand(latest, pr, { runId: card.runId ?? null, cycleId, cwd, review, reviewResultPath: reviewResult, overlapEvidence, gateAt: regate.at },
     { ...live, ...(deps.log ? { log: deps.log } : {}) });
+  if (deps.landBudget && landed.executed) deps.landBudget.requested++;
   // LAND-ORDER-LEDGER — executeLiveLand 직후 원장 한 줄(같은 pr+head 는 한 줄만). 쓰기가 실패해도 land 결과는 그대로(삼킨다).
   const landOrderLog = (event: 'appended' | 'append-failed') => { try { log('task-agent.land-order', event, { pr, head: toHead }); } catch { /* fail-soft */ } };
   try {
@@ -844,6 +874,38 @@ export async function rejudgeCardOnHead(cardId: string, deps: RejudgeDeps): Prom
     landOrderLog('append-failed');
   }
   recordMove(statePath, card.id, card.runId, 'propose-land', landed, pr, before, now, deps.log);
+  if (landed.executed && !landed.ok && /^✗/.test(landed.detail)) {
+    const context = { refusal: landed.detail, pr, head: toHead };
+    const preliminary = planPrLandRecovery(context);
+    if (preliminary.result.action === 'request-review' || preliminary.result.action === 'wait-retry') {
+      const entry = preliminary.result.action;
+      try {
+        const graphPath = entry === 'request-review' ? '../../graphs/units/task-agent-recover-review.yaml' : '../../graphs/units/task-agent-recover-wait.yaml';
+        const graph = await runGraph(join(import.meta.dir, graphPath), {
+          input: { ask: `TA land refusal for PR #${pr}`, context, prior: {} },
+          pinChildUniverse: true,
+          deps: { root: dirname(statePath) },
+        });
+        const output = lastJsonObject(graph.nodes.find((node) => node.nodeId === 'recover')?.output);
+        const plan = graph.status === 'done' && graph.unitCalls?.[0]?.entry === entry
+          && graph.unitCalls[0].exit === 'rework' ? output as unknown as PrLandRecoveryPlan | undefined : undefined;
+        const action = plan?.result?.action;
+        const matched = plan?.outcome === 'rework' && plan.result.pr === pr && plan.result.head === toHead
+          && action === preliminary.result.action && plan.evidence?.refusal === context.refusal.slice(0, 500)
+          && (action !== 'wait-retry' || plan.result.delayMs === 30_000);
+        if (!matched) step('land', 'recover-untrusted', `recover@1 ${entry} produced no pinned matching action`, true);
+        else if (action === 'request-review' && deps.liveMoves.has('review')) {
+          await requestReview(readTaskCard(card.id, statePath) ?? card, 'land-refusal-review-missing', true);
+        } else if (action === 'request-review') {
+          step('review', 'recover-review-disabled', 'recover@1 selected review but taskAgent.liveMoves excludes review', true);
+        } else if (action === 'wait-retry') {
+          step('land', 'recover-wait-retry', `recover@1 ${entry} selected existing retry admission after ${plan.result.delayMs}ms`, true);
+        } else step('land', 'recover-needs-human', `recover@1 ${entry}: ${plan.result.reason}`, true);
+      } catch (error) {
+        step('land', 'recover-failed', `recover@1 ${entry}: ${String(error).slice(0, 200)}`, true);
+      }
+    }
+  }
   // TA-LAND-RETRY-ON-INFRA — 실패한 시도는 갈래·사유·재시도 여부를 사유 줄에 싣는다(다음 틱이 왜 다시 하는지/안 하는지).
   const attempt = landed.landAttempt?.class
     ? ` · land-class ${landed.landAttempt.class} (${landed.landAttempt.reason}) · attempt ${landed.landAttempt.attempt} · ${landed.landAttempt.class === 'base-stale' ? 'base-stale → re-gate on a new base next tick (cap counts)' : landed.landAttempt.retryAllowed ? 'retry allowed on this head' : 'no retry on this head'}`
@@ -862,11 +924,35 @@ function recordMove(statePath: string, cardId: string, runId: string | undefined
 }
 
 /** 재판정 대상 카드 — 기존 리뷰 또는 HQ 가 종결 원장을 검증할 원격 부모 카드. */
-export function rejudgeCandidates(tasks: Readonly<Record<string, TaskCard>>): string[] {
+export function rejudgeCandidates(tasks: Readonly<Record<string, TaskCard>>, opts: {
+  now?: Date; maxAgeHours?: number; onAgeSkip?: (card: TaskCard, ageHours: number | null) => void;
+  /** Fresh remote PR heads; mf0 only gets priority when it matches this head. */
+  currentHeads?: ReadonlyMap<string, string>;
+} = {}): string[] {
+  const now = opts.now?.getTime() ?? Date.now();
+  const maxAgeHours = opts.maxAgeHours;
   return Object.values(tasks).filter((card) => {
     const pr = cardPrNumber(card);
-    return pr !== undefined && !boundPrTerminal(card) && ((card.reviewRequests ?? []).some((entry) => entry.pr === pr)
+    const eligible = pr !== undefined && !boundPrTerminal(card) && ((card.reviewRequests ?? []).some((entry) => entry.pr === pr)
       || (card.status === 'launched' && card.taLand === true && ((!!card.parentHost && !!card.runId && !!card.runChildId)
         || (card.adoptedPr?.pr === pr && typeof card.pr === 'object' && !!card.pr.url && sameUrl(card.adoptedPr.url, card.pr.url)))));
+    if (!eligible) return false;
+    if (maxAgeHours !== undefined) {
+      const created = Date.parse(card.createdAt);
+      const ageHours = Number.isFinite(created) ? Math.max(0, (now - created) / 3_600_000) : null;
+      if (ageHours === null || ageHours > maxAgeHours) { opts.onAgeSkip?.(card, ageHours); return false; }
+    }
+    return true;
+  }).sort((a, b) => {
+    const hasMf0 = (card: TaskCard): number => {
+      const pr = cardPrNumber(card);
+      const head = card.reviewRequests?.filter((entry) => entry.pr === pr).at(-1)?.head;
+      const currentHead = opts.currentHeads?.get(card.id);
+      return pr !== undefined && head && currentHead?.toLowerCase() === head.toLowerCase()
+        && capturedLandReview(card, pr, head)?.mustFixCount === 0 ? 1 : 0;
+    };
+    const ageOrder = (Number.isFinite(Date.parse(b.createdAt)) ? Date.parse(b.createdAt) : 0)
+      - (Number.isFinite(Date.parse(a.createdAt)) ? Date.parse(a.createdAt) : 0);
+    return hasMf0(b) - hasMf0(a) || ageOrder || a.id.localeCompare(b.id);
   }).map((card) => card.id);
 }

package/src/task-agent/repair-branch-cas.ts

@@ -24,7 +24,8 @@ export interface RepairCasRequest {
   result: RepairCommitResult;
   /** A previous push succeeded. Confirmation may inspect the remote and PR, but must never push again. */
   confirmationOnly?: boolean;
-  branch?: string;
+  /** PR branch captured when this repair was requested. A rename cannot retarget its push. */
+  branch: string;
   /** Persist a single-use push intent after bundle/ancestry checks and before the push side effect. */
   claimBeforePush?: () => boolean;
 }
@@ -99,6 +100,8 @@ export function applyRepairBundle(request: RepairCasRequest, deps: RepairCasDeps
   try { bytes = readFileSync(bundlePath); } catch { return fail('repair bundle unreadable'); }
   if (createHash('sha256').update(bytes).digest('hex') !== result.bundleSha256.toLowerCase()) return fail('repair bundle sha256 mismatch');
   if (!initial || !originRepo || initial.headRepo.toLowerCase() !== originRepo) return fail('PR head repository differs from git origin');
+  if (!request.branch || git(['check-ref-format', '--branch', request.branch]).status !== 0) return fail('bound repair branch name invalid');
+  if (initial.branch !== request.branch) return fail('bound repair branch changed');
   const alreadyApplied = initial?.head.toLowerCase() === result.commit.toLowerCase();
   if (!initial || initial.state !== 'OPEN' || initial.crossRepository || (!alreadyApplied && initial.head.toLowerCase() !== expectedHead.toLowerCase()))
     return fail('PR head CAS mismatch or PR unavailable');

package/src/task-agent/repair-cycle.ts

@@ -92,14 +92,15 @@ export async function repairModelAvailability(readInputs: () => Promise<Pick<Bud
   } catch { return { codexSubscription: false, grokSubscription: false }; }
 }
 
-/** Repair stays inside the dispatch tier. A missing legacy tier is high, with Sol allowed only on measured subscription quota. */
+/** Repair stays inside the dispatch tier. A missing legacy tier is mid ('중'); Sol is reserved for the 특 tier and measured-subscription 상 repairs. */
 export function alternateRepairModel(card: TaskCard, availability: RepairModelAvailability = { codexSubscription: false, grokSubscription: false }): { from: string; to: TaskChildLlm } {
   const last = card.repairs?.at(-1);
   const from = last?.toModel ?? (card.childLlm ? `${card.childLlm.provider}/${card.childLlm.model}` : 'unknown');
   const glm: TaskChildLlm = { provider: 'openrouter', model: 'openrouter/z-ai/glm-5.3' };
   const sol: TaskChildLlm = { provider: 'openai-codex', model: 'gpt-6-sol' };
   const grok: TaskChildLlm = { provider: 'grok', model: 'grok-4.6' };
-  const tier = card.tier ?? '상';
+  const luna: TaskChildLlm = { provider: 'openai-codex', model: 'gpt-6-luna' };
+  const tier = card.tier ?? '중';
   const pr = typeof card.pr === 'number' ? card.pr : card.pr?.number;
   const mixEven = ((pr ?? [...card.id].reduce((sum, ch) => sum + ch.charCodeAt(0), 0)) % 2) === 0;
   let to: TaskChildLlm;
@@ -108,6 +109,8 @@ export function alternateRepairModel(card: TaskCard, availability: RepairModelAv
   else if (tier === '상') to = availability.grokSubscription && from.includes('glm') ? grok
     : from.includes('glm-5.3-flash') ? glm
     : from.includes('glm-5.3') ? { provider: 'openrouter', model: 'openrouter/z-ai/glm-5.3-flash' } : glm;
+  else if (tier === '하') to = from.includes('glm-5.3-flash') ? luna : from.includes('glm-5.3')
+    ? { provider: 'openrouter', model: 'openrouter/z-ai/glm-5.3-flash' } : glm;
   else to = from.includes('glm-5.3-flash') ? glm : from.includes('glm-5.3')
     ? { provider: 'openrouter', model: 'openrouter/z-ai/glm-5.3-flash' } : glm;
   return { from, to };
@@ -192,7 +195,7 @@ export async function runRepairCycle(input: RepairCycleInput): Promise<RepairCyc
         const bundlePath = join(artifactDir, 'commit.bundle');
         let pushClaimed = false;
         applied = (input.apply ?? applyRepairBundle)({ repo, pr, expectedHead: latest.head,
-          bundlePath, result: result.result,
+          bundlePath, result: result.result, branch: latest.branch,
           claimBeforePush: () => {
             let claimed = false;
             updateTaskCard(statePath, card.id, (current) => current?.repairs?.some((entry) => entry.runId === latest.runId && entry.status === 'requested')
@@ -308,6 +311,16 @@ export async function runRepairCycle(input: RepairCycleInput): Promise<RepairCyc
       ? { ...current, repairs: current.repairs.map((entry) => entry.runId === runId ? { ...entry, status: 'failed' as const, detail: reason } : entry) } : undefined);
     return { decision: 'repair-failed', reason };
   }
+  // The request may throw before a worker exists. A post-launch observation
+  // failure must not turn an accepted worker into a failed launch.
+  try {
+    updateTaskCard(statePath, card.id, (current) => current?.repairs?.some((entry) => entry.runId === runId)
+      && !current.history.some((entry) => entry.event === 'harness.role-llm' && entry.runId === runId)
+      ? { ...current, history: [...current.history, { at: now.toISOString(), event: 'harness.role-llm', pr, head, runId,
+        detail: `repair child model ${to.provider}/${to.model}` }] } : undefined);
+  } catch (error) {
+    try { debug.log('task-agent', 'repair-role-llm-observation-failed', { card: card.id, pr, head, runId, error: String(error) }); } catch { /* fail-soft */ }
+  }
   try {
     if (input.observeLaunch) input.observeLaunch(judged.judgement.move, runId);
     else {

package/src/task-agent/run-identity.ts

@@ -6,7 +6,8 @@
  *   디스패처 배선은 RUN-IDENTITY-ADMIT).
  * - parse/validate: 목록 밖 값은 거부한다(조용히 다듬지 않는다).
  * - 출생 신분 자동(`deriveBirthIdentity`): 칸 우선순위(P0 = critical·special·protect ·
- *   P1 = normal · 그 외 normal)·대표 표시에서 단다.
+ *   P1 = normal · 그 외 normal)·대표 표시에서 단다. 권한(rights)은 명시 `--tag rights=…`만 기록한다
+ *   (RUN-IDENTITY-RIGHTS — 체크리스트에는 권한 근거가 없으므로 출생값으로 추정하지 않는다).
  * - 태그 덮기(`applyRunIdentityTags`): `tasks hand --tag k=v`(반복) 이 출생 신분을 덮는다.
  * - ⛔ 모르는 칸을 기본값으로 확정하지 않는다: 칸 조회가 실패하면 명시 태그만 담고 나머지는 «미기록».
  * - 태그 바꾸기 감사(`runTagChange` — task-hand.ts): 카드 history 에 `run-tag-change`
@@ -129,7 +130,8 @@ const CROWN_MARK = '\u{1F451}';
 
 /**
  * 출생 신분 자동 — «조회에 성공한» 칸의 우선순위(P0 = critical·special·protect · P1 = normal · 그 외 normal)·대표 표시에서 단다.
- * 권한(rights)은 출생에서 올리지 않는다(기본 s · 올림은 `--tag rights=…` 명시만).
+ * 권한(rights)은 추정하지 않는다(RUN-IDENTITY-RIGHTS): 체크리스트 출생 정보에는 권한 근거가 없으므로
+ * `--tag rights=…` 명시 태그로만 기록하고, 태그가 없으면 «미기록».
  * ⛔ 칸을 못 읽었으면 부르지 않는다 — 그때는 `{ origin }` 에 명시 태그만 얹는다(나머지 «미기록»).
  * ⛔ 읽은 칸이라도 `priority`·`title` 이 비면 그 값에서 파생되는 칸을 확정하지 않는다(«미기록»):
  *   class 는 priority 가 있어야 · care·protect 는 P0 이거나 대표 가 보이면 올리고, «안 올림»(standard·false)은
@@ -145,7 +147,6 @@ export function deriveBirthIdentity(cell: RunIdentityCell, origin: RunIdentityOr
   return {
     ...(priority !== undefined ? { class: critical ? 'critical' as const : 'normal' as const } : {}),
     ...(careKnown ? { care: raised ? 'special' as const : 'standard' as const, protect: raised } : {}),
-    rights: 's',
     origin,
   };
 }

package/src/task-agent/shadow.ts

@@ -15,6 +15,8 @@ import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { extname, join, relative, resolve } from 'node:path';
 import { debug } from '../debug/log.js';
+import { passJourneyNode } from '../self-dev/graph-journey-nodes.js';
+import { readJourneyEdge, recordJourneyEdge } from '../self-dev/graph-journey-route.js';
 import { readTaskAgentState, readTaskCard, taskAgentStatePath, TASK_CARD_PREFIX, type CompletionKind, type TaskCard } from './task-hand.js';
 import type { SupervisorJobResult, SupervisorStopReason } from '../self-dev/run-supervisor.js';
 import { executeNextAction, type ActionDeps, type DeliveryKind, type NextAction } from './actions.js';
@@ -327,14 +329,22 @@ export async function recordTaskAgentShadowMove(input: TaskAgentShadowInput, dep
       checklistId: delivery ? card?.checklistId ?? '' : '',
       ...(delivery ? { delivery } : {}),
     };
-    const liveRetry = !delivery && deps.command !== undefined && deps.loadGate !== undefined
-      && (LIVE_RETRY_MOVES as readonly string[]).includes(judgement.move) && liveMoves.has(judgement.move as TaskAgentLiveMove);
+    const retryMove = !delivery && (LIVE_RETRY_MOVES as readonly string[]).includes(judgement.move);
+    const route = retryMove ? readJourneyEdge('next-move', judgement.move,
+      { move: judgement.move, source: judgeInput.pr ? `pr:${judgeInput.pr}` : `run:${input.runId ?? 'unknown'}`, runId: input.runId }) : null;
+    const liveRetry = retryMove && route?.source === 'graph' && route.to === 'dispatch'
+      && deps.command !== undefined && deps.loadGate !== undefined && liveMoves.has(judgement.move as TaskAgentLiveMove);
     executorResult = await executeNextAction(action, {
       mode: delivery ? (deps.mode ?? 'shadow') : liveRetry ? 'live' : 'shadow',
       command: deps.command ?? (async () => { throw new Error('task-agent shadow path must not run commands'); }),
       observe: (_event, data) => { wouldDo = data.reason; },
       ...(liveRetry ? { liveMoves, retryLaunches, loadGate: deps.loadGate } : {}),
     });
+    if (liveRetry && executorResult === 'done' && route) {
+      passJourneyNode('next-move', { provenance: 'task-agent-terminal', outcome: judgement.move,
+        runId: input.runId ?? undefined, data: { source: judgeInput.pr ? `pr:${judgeInput.pr}` : `run:${input.runId ?? 'unknown'}`, pr: judgeInput.pr ?? null } });
+      recordJourneyEdge(route, 'dispatch');
+    }
   }
   const move: TaskAgentShadowMove = {
     runId: input.runId,