elanous 0.2.0 → 0.2.5

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

@@ -41,13 +41,17 @@ import type { SelfImplementResult } from '../self-implement/orchestrator.js';
 import { buildDeliverableTargets } from './deliverable-target-wiring.js';
 import { observeDeliverables, type DeliverableObservationResult, type DeliverableObservationTarget } from '../harness/deliverable-observation.js';
 import { debug } from '../debug/log.js';
-import { getUserConfig } from '../user-config.js';
+import { getUserConfig, type UserConfig } from '../user-config.js';
+import { resolveChildLlmPreference, type ChildLlmPreferenceInput, type ResolvedChildLlmPreference } from '../self-implement/child-llm-preference.js';
 import { readCachedGrokQuota } from '../oauth/codex-account-store.js';
 import { queryAbandonedDraftPrs, type AbandonedDraftPr } from '../cli/logs-abandoned-draft-prs.js';
+import { branchLineageSlug } from '../cli/pr-lineage.js';
+import { decideDraft, type DraftTriagePr } from './draft-triage-rules.js';
 import { resolveLogTargets } from '../cli/logs-cli.js';
 import { LogStore } from '../mss/logging/log-store.js';
 import { collectObservedRunPhases, queryRunningRuns, type RunningRunAssessment, type RunningRunStatus, type RunningRunsResult } from '../self-implement/running-runs.js';
 import { queryFederatedUnfinishedRunLedgers, resolveFederatedRunLedgerDirectories } from '../self-implement/run-ledger.js';
+import { loadSelfDevRun, selfDevRunsDir } from './run-store.js';
 import { instanceStorePaths } from '../domains/fleet.js';
 import { dirname } from 'node:path';
 import { lookupEntrance, RECOMMENDED_ENTRANCE_ID_BY_SURFACE, recommendedEntranceNotice, type EntranceId } from './entrance-registry.js';
@@ -81,6 +85,7 @@ export interface DevCliOpts {
   allowGoalLintErrors?: boolean;
   ground?: boolean;
   target?: string;
+  yes?: boolean;
   plan?: boolean;
   implement?: boolean;
   elanous?: boolean;
@@ -100,6 +105,7 @@ export interface DevCliOpts {
   worktree?: boolean;
   openPr?: boolean;
   autoMerge?: boolean;
+  mergeByHost?: boolean;
   autoReview?: boolean;
   branch?: string;
   draft?: boolean;
@@ -111,7 +117,6 @@ export interface DevCliOpts {
   childLlmModel?: string;
   childLlmEffort?: string;
   roleLlm?: string[];
-  graph?: boolean;
   correlation?: string;
   parentCorrelationId?: string;
   evidence?: string;
@@ -178,6 +183,8 @@ export interface DevSelfRunSuperviseOptions {
   hasTerminalDraftTriage?: (runId: string, timeoutMs?: number) => boolean;
   queryTerminalDraftTriages?: (runIds: readonly string[], timeoutMs?: number) => Set<string>;
   startDraftTriageBudgetMs?: number;
+  queryDraftPrInventory?: (repository: string, timeoutMs: number) => DraftPrInventory | undefined;
+  queryTerminalRunStatuses?: (runIds: readonly string[], timeoutMs: number) => Readonly<Record<string, string>> | undefined;
   nowMs?: () => number;
   printDecision?: (line: string) => void;
 }
@@ -190,12 +197,56 @@ export interface DevSelfRunExecution {
 
 interface DraftTriage {
   closed: number[];
-  kept: number | null;
+  kept: number[] | null;
   closeFailed: number[];
   skippedNotDraft: number[];
 }
 
-export type DraftPrViewState = { isDraft: boolean; state: string } | null;
+export type DraftPrViewState = { isDraft: boolean; state: string; headRefName?: string } | null;
+
+export interface DraftPrInventory {
+  readonly open: readonly (DraftTriagePr & { url: string; openedAtMs: number; runId?: string | null })[];
+  readonly merged: readonly DraftTriagePr[];
+  readonly complete: boolean;
+}
+
+/** A paginated GitHub snapshot. A partial page or failed response must never authorize a close. */
+export function queryDraftPrInventory(repository: string, timeoutMs: number): DraftPrInventory | undefined {
+  if (IN_TEST_PROCESS() || timeoutMs <= 0 || !/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(repository)) return undefined;
+  const deadline = Date.now() + timeoutMs;
+  const fetch = (state: 'open' | 'closed'): unknown[] | undefined => {
+    const rows: unknown[] = [];
+    for (let page = 1; ; page += 1) {
+      const remaining = deadline - Date.now();
+      if (remaining <= 0) return undefined;
+      const response = spawnSync('gh', ['api', `repos/${repository}/pulls?state=${state}&per_page=100&page=${page}`, '-H', 'Accept: application/vnd.github+json'], { encoding: 'utf8', timeout: remaining, maxBuffer: 16 * 1024 * 1024 });
+      if (response.status !== 0) return undefined;
+      const parsed: unknown = JSON.parse(response.stdout);
+      if (!Array.isArray(parsed)) return undefined;
+      rows.push(...parsed);
+      if (parsed.length < 100) return rows;
+    }
+  };
+  try {
+    const open = fetch('open');
+    const closed = fetch('closed');
+    if (!open || !closed) return undefined;
+    const parse = (row: unknown): (DraftTriagePr & { url: string; openedAtMs: number; runId?: string | null }) | undefined => {
+      if (!row || typeof row !== 'object') return undefined;
+      const pr = row as { number?: unknown; title?: unknown; html_url?: unknown; created_at?: unknown; head?: { ref?: unknown }; labels?: Array<{ name?: unknown }> };
+      const openedAtMs = Date.parse(String(pr.created_at));
+      const url = typeof pr.html_url === 'string' ? draftPrTargetFromUrl(pr.html_url) : null;
+      if (!Number.isInteger(pr.number) || typeof pr.title !== 'string' || !url || url.repository !== repository || url.number !== pr.number || typeof pr.head?.ref !== 'string' || !Number.isFinite(openedAtMs) || !Array.isArray(pr.labels) || pr.labels.some((label) => typeof label?.name !== 'string')) return undefined;
+      return { number: pr.number as number, title: pr.title, url: pr.html_url as string, branch: pr.head.ref, openedAtMs, labels: pr.labels.map((label) => label.name as string) };
+    };
+    if ([...open, ...closed].some((row) => !parse(row) || (typeof (row as { draft?: unknown }).draft !== 'boolean') || (typeof (row as { merged_at?: unknown }).merged_at !== 'string' && (row as { merged_at?: unknown }).merged_at !== null))) return undefined;
+    return {
+      open: open.filter((row) => (row as { draft?: boolean }).draft === true).map((row) => parse(row)!),
+      merged: closed.filter((row) => (row as { merged_at?: string | null }).merged_at != null).map((row) => parse(row)!),
+      complete: true,
+    };
+  } catch { return undefined; }
+}
 
 interface DraftPrTarget {
   repository: string;
@@ -244,18 +295,18 @@ function defaultViewDraftPr(prUrl: string, timeoutMs?: number): DraftPrViewState
   if (IN_TEST_PROCESS()) return null;
   const target = draftPrTargetFromUrl(prUrl);
   if (!target) return null;
-  const view = spawnSync('gh', ['pr', 'view', String(target.number), '--repo', target.repository, '--json', 'isDraft,state'], { encoding: 'utf8', ...(timeoutMs === undefined ? {} : { timeout: timeoutMs }) });
+  const view = spawnSync('gh', ['pr', 'view', String(target.number), '--repo', target.repository, '--json', 'isDraft,state,headRefName'], { encoding: 'utf8', ...(timeoutMs === undefined ? {} : { timeout: timeoutMs }) });
   if (view.status !== 0) return null;
   try {
-    const parsed = JSON.parse(view.stdout) as { isDraft?: unknown; state?: unknown };
-    return typeof parsed.isDraft === 'boolean' && typeof parsed.state === 'string' ? { isDraft: parsed.isDraft, state: parsed.state } : null;
+    const parsed = JSON.parse(view.stdout) as { isDraft?: unknown; state?: unknown; headRefName?: unknown };
+    return typeof parsed.isDraft === 'boolean' && typeof parsed.state === 'string'
+      ? { isDraft: parsed.isDraft, state: parsed.state, ...(typeof parsed.headRefName === 'string' ? { headRefName: parsed.headRefName } : {}) }
+      : null;
   } catch {
     return null;
   }
 }
 
-const START_DRAFT_TRIAGE_HANDOFF = '하니스 시작 트리아지: 이 런은 종결 트리아지 없이 끝났다 · 이 draft 가 이 런의 유일한 사람 판단 대상';
-
 export function collectRunDraftPrUrls(observed: readonly Pick<SelfImplementResult, 'prUrl' | 'merged'>[]): string[] {
   const latest = new Map<string, { index: number; merged: boolean }>();
   observed.forEach((candidate, index) => {
@@ -393,7 +444,7 @@ export function renderSupervisorDecisionLine(decision: Pick<SupervisorDecision,
   return `[supervisor] ${verb}${reason} — ${decision.why}`;
 }
 
-export const START_DRAFT_TRIAGE_LEDGER_QUERY = { all: true, includeTest: true, since: '7d' } as const;
+export const START_DRAFT_TRIAGE_LEDGER_QUERY = { all: true, includeTest: true } as const;
 export const DEFAULT_START_DRAFT_TRIAGE_BUDGET_MS = 10_000;
 
 export type ProductionQueryResult<T> =
@@ -593,6 +644,26 @@ export function queryTerminalDraftTriageRunIds(runIds: Iterable<string>): string
   return [...queryTerminalDraftTriages(runIds)];
 }
 
+export function queryTerminalRunStatuses(runIds: readonly string[]): Record<string, string> {
+  const requested = new Set(runIds);
+  const statuses: Record<string, string> = Object.create(null) as Record<string, string>;
+  const { targets, error } = resolveLogTargets({ all: true, includeTest: true });
+  if (error) throw new Error(error);
+  for (const target of targets) {
+    const store = LogStore.openReadOnly(target.dbPath);
+    try {
+      for (const row of store.queryAll({ exactCategories: ['self-implement'], events: ['run-terminal'] })) {
+        const data = row.data ? JSON.parse(row.data) as { runId?: unknown; runStatus?: unknown } : null;
+        if (typeof data?.runId === 'string' && requested.has(data.runId)) {
+          // The terminal event itself proves the run ended, including older records without runStatus.
+          statuses[data.runId] = typeof data.runStatus === 'string' ? data.runStatus : 'completed';
+        }
+      }
+    } finally { store.close(); }
+  }
+  return statuses;
+}
+
 /** Rotates candidates deterministically so repeated launches share no fixed first candidate. */
 export function rotateDraftTriageRuns<T>(candidates: readonly T[], runId: string | undefined): T[] {
   if (!runId || candidates.length < 2) return [...candidates];
@@ -605,29 +676,18 @@ export function rotateDraftTriageRuns<T>(candidates: readonly T[], runId: string
   return [...candidates.slice(offset), ...candidates.slice(0, offset)];
 }
 
-function queryTerminalDraftTriagesWithinBudget(runIds: readonly string[], timeoutMs: number): Set<string> | undefined {
-  if (IN_TEST_PROCESS()) return queryTerminalDraftTriages(runIds);
-  const result = unwrapProductionQuery(runProductionQuery<string[]>(import.meta.url, 'queryTerminalDraftTriageRunIds', [runIds], timeoutMs));
-  return result === undefined ? undefined : new Set(result);
-}
-
-function defaultHasTerminalDraftTriage(runId: string, timeoutMs: number): boolean | undefined {
-  if (IN_TEST_PROCESS()) return queryTerminalDraftTriage(runId);
-  return unwrapProductionQuery(runProductionQuery<boolean>(import.meta.url, 'queryTerminalDraftTriage', [runId], timeoutMs));
-}
-
 export function startDraftTriage(
   currentRunId: string | undefined,
   supervise?: DevSelfRunSuperviseOptions,
 ): void {
-  const skipped: Record<'running' | 'probableRunning' | 'unknown' | 'alreadyTriaged' | 'noRunId', number> = {
-    running: 0, probableRunning: 0, unknown: 0, alreadyTriaged: 0, noRunId: 0,
-  };
+  const decisions = { live: 0, superseded: 0, staleEndedRun: 0, recent: 0, humanApproval: 0 };
+  const statusesObserved: Record<string, number> = {};
   const considered: string[] = [];
   const closed: number[] = [];
   const closeFailed: number[] = [];
   const kept: number[] = [];
   const errors: string[] = [];
+  const unobservedDrafts: number[] = [];
   const nowMs = supervise?.nowMs ?? Date.now;
   const startedAtMs = nowMs();
   const budgetMs = supervise?.startDraftTriageBudgetMs ?? DEFAULT_START_DRAFT_TRIAGE_BUDGET_MS;
@@ -682,13 +742,61 @@ export function startDraftTriage(
     }
     if (draftResult.kind === 'error') throw new Error(draftResult.error);
     const drafts = draftResult.value;
+    const repositories = new Set(drafts.flatMap((draft) => draft.url ? [draftPrTargetFromUrl(draft.url)?.repository].filter((repo): repo is string => !!repo) : []));
+    if (!IN_TEST_PROCESS() && remainingMs() > 0) {
+      const repo = spawnSync('gh', ['repo', 'view', '--json', 'nameWithOwner', '--jq', '.nameWithOwner'], { encoding: 'utf8', timeout: remainingMs() });
+      if (repo.status === 0 && /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/.test(repo.stdout.trim())) repositories.add(repo.stdout.trim());
+      else if (repositories.size === 0) { budgetUnprocessedUnknown = true; unobservedRuns = null; return; }
+    }
+    if (repositories.size === 0 && supervise?.queryDraftPrInventory) repositories.add('{owner}/{repo}');
+    const inventories: Array<{ repository: string; snapshot: DraftPrInventory }> = [];
+    if (!IN_TEST_PROCESS() && repositories.size === 0) {
+      budgetUnprocessedUnknown = true;
+      unobservedRuns = null;
+      return;
+    }
+    for (const repository of repositories) {
+      if (budgetExhausted()) {
+        const pendingRuns = new Set(drafts.flatMap((draft) => draft.runId ? [draft.runId] : []));
+        noteUnprocessed(pendingRuns);
+        unobservedRuns = pendingRuns.size;
+        return;
+      }
+      const snapshot = measureStage('draftList', () => (supervise?.queryDraftPrInventory ?? queryDraftPrInventory)(repository, remainingMs()));
+      if (snapshot?.complete && snapshot.open.every((draft) => draftPrTargetFromUrl(draft.url)?.repository === repository) && snapshot.merged.every((pr) => Number.isInteger(pr.number))) inventories.push({ repository, snapshot });
+      else if (!IN_TEST_PROCESS()) {
+        const pendingRuns = new Set(drafts.flatMap((draft) => draft.runId ? [draft.runId] : []));
+        noteUnprocessed(pendingRuns);
+        unobservedRuns = pendingRuns.size || null;
+        budgetUnprocessedUnknown = pendingRuns.size === 0;
+        return;
+      }
+    }
+    const inventoryDrafts = inventories.flatMap(({ snapshot }) => snapshot.open);
+    const ledgerRunByUrl = new Map(drafts.filter((draft) => draft.url && draft.runId).map((draft) => [draft.url!, draft.runId!]));
+    const inventoryByUrl = new Map(inventoryDrafts.map((draft) => [draft.url, draft]));
     const byRun = new Map<string, AbandonedDraftPr[]>();
-    for (const draft of drafts) {
-      if (!draft.runId) { skipped.noRunId += 1; continue; }
-      if (draft.runId === currentRunId) continue;
-      const group = byRun.get(draft.runId) ?? [];
-      if (!group.some((candidate) => candidate.number === draft.number)) group.push(draft);
-      byRun.set(draft.runId, group);
+    for (const draft of [...drafts, ...inventoryDrafts]) {
+      const runId = draft.runId ?? (draft.url ? ledgerRunByUrl.get(draft.url) : undefined);
+      if (!runId || runId === currentRunId || (inventoryByUrl.has(draft.url ?? '') && !inventoryByUrl.get(draft.url ?? '')?.branch.startsWith('self-impl/'))) continue;
+      const group = byRun.get(runId) ?? [];
+      if (!group.some((candidate) => candidate.url === draft.url)) group.push({ ...draft, ...inventoryByUrl.get(draft.url ?? '') } as AbandonedDraftPr);
+      byRun.set(runId, group);
+    }
+    for (const draft of inventoryDrafts) {
+      if (!draft.branch.startsWith('self-impl/') || draft.runId || ledgerRunByUrl.has(draft.url)) continue;
+      if (budgetExhausted()) { budgetUnprocessedUnknown = true; unobservedRuns = null; return; }
+      const candidate = /(?:^|[-/])(run-[0-9a-f-]{16,})(?:-|$)/i.exec(draft.branch)?.[1];
+      const goalRun = candidate ? loadSelfDevRun(candidate, selfDevRunsDir()) : null;
+      if (!goalRun || !goalRun.supervisorStopReason || !goalRun.results.some((result) => result.prNumber === draft.number || result.prUrl === draft.url)) {
+        decisions.recent += 1;
+        unobservedDrafts.push(draft.number);
+        statusesObserved.unobserved = (statusesObserved.unobserved ?? 0) + 1;
+        continue;
+      }
+      const group = byRun.get(candidate!) ?? [];
+      if (!group.some((entry) => entry.url === draft.url)) group.push({ ...draft, runId: candidate } as AbandonedDraftPr);
+      byRun.set(candidate!, group);
     }
     const byRunEntries = rotateDraftTriageRuns([...byRun.entries()], currentRunId);
     if (byRunEntries.length === 0) return;
@@ -707,64 +815,56 @@ export function startDraftTriage(
     }
     // ⭐ seam 이 «범위 메타데이터 없는» 예전 모양을 줘도 받는다 — 그때는 「모른다」(null)이지 0이 아니다.
     const runningRuns = 'result' in runningRunsQuery ? runningRunsQuery.result : runningRunsQuery;
+    if (runningRuns.pty?.unreadable?.length || runningRuns.ledger?.unreadableLedgerCount || runningRuns.ledger?.indeterminateLedgerDirectoryCount) {
+      noteUnprocessed(byRun.keys());
+      unobservedRuns = byRun.size;
+      return;
+    }
     runningRunsUnqueriedUniverseCount = 'unqueriedUniverseCount' in runningRunsQuery
       ? runningRunsQuery.unqueriedUniverseCount
       : null;
     runningRunsQueried = true;
     const statuses = new Map(runningRuns.entries.map(({ runId, status }) => [runId, status]));
-    const protectedCandidates = new Map<string, AbandonedDraftPr[]>();
-    for (const [runId, runDrafts] of byRunEntries) {
-      const status: RunningRunStatus | undefined = statuses.get(runId);
-      if (status === 'running') { skipped.running += 1; continue; }
-      if (status === 'probable-running') { skipped.probableRunning += 1; continue; }
-      if (status !== 'ended-unclosed') { skipped.unknown += 1; continue; }
-      protectedCandidates.set(runId, runDrafts);
+    const liveBranches = new Set(byRunEntries.flatMap(([id, drafts]) => {
+      const status = statuses.get(id);
+      return status === 'running' || status === 'probable-running' ? drafts.map((draft) => draft.branch).filter((branch) => typeof branch === 'string' && branch.length > 0) : [];
+    }));
+    for (const [id, drafts] of byRunEntries) {
+      const status = statuses.get(id);
+      if (status === 'running' || status === 'probable-running') {
+        decisions.live += drafts.length;
+        statusesObserved[status] = (statusesObserved[status] ?? 0) + drafts.length;
+      }
+    }
+    const protectedCandidates = new Map(byRunEntries.filter(([id]) => statuses.get(id) !== 'running' && statuses.get(id) !== 'probable-running'));
+    let terminalStatuses: Readonly<Record<string, string>> = {};
+    if (protectedCandidates.size > 0 && remainingMs() > 0) {
+      const ids = [...protectedCandidates.keys()];
+      // The old terminal-triage seam remains observable, but its result no longer exempts
+      // already-triaged drafts from later supersession and staleness checks.
+      if (supervise?.queryTerminalDraftTriages || supervise?.hasTerminalDraftTriage) {
+        measureStage('terminalTriage', () => supervise.queryTerminalDraftTriages
+          ? supervise.queryTerminalDraftTriages(ids, remainingMs())
+          : ids.forEach((id) => supervise.hasTerminalDraftTriage!(id, remainingMs())));
+      }
+      if (budgetExhausted()) { noteUnprocessed(protectedCandidates.keys()); return; }
+      const lookup = supervise?.queryTerminalRunStatuses ?? ((runIds: readonly string[], timeout: number) => IN_TEST_PROCESS()
+        ? {} : unwrapProductionQuery(runProductionQuery<Record<string, string>>(import.meta.url, 'queryTerminalRunStatuses', [runIds], timeout)));
+      const resolved = measureStage('terminalTriage', () => lookup(ids, remainingMs()));
+      if (resolved === undefined && !IN_TEST_PROCESS()) { noteUnprocessed(protectedCandidates.keys()); return; }
+      terminalStatuses = resolved ?? {};
     }
     if (protectedCandidates.size === 0) return;
     if (budgetExhausted()) {
       noteUnprocessed(protectedCandidates.keys());
       return;
     }
-    const terminalTriageByRun = new Map<string, boolean>();
-    const hasTerminalTriage = (runId: string): boolean | undefined => {
-      const cached = terminalTriageByRun.get(runId);
-      if (cached !== undefined) return cached;
-      const terminalTriage = measureStage('terminalTriage', () => invokeWithinBudget((timeoutMs) => supervise?.hasTerminalDraftTriage?.(runId, timeoutMs) ?? defaultHasTerminalDraftTriage(runId, timeoutMs)));
-      if (terminalTriage !== undefined) terminalTriageByRun.set(runId, terminalTriage);
-      return terminalTriage;
-    };
-    const useBatchTerminalTriage = supervise?.queryTerminalDraftTriages !== undefined || supervise?.hasTerminalDraftTriage === undefined;
-    if (useBatchTerminalTriage) {
-      const runIds = [...protectedCandidates.keys()];
-      const triagedRunIds = measureStage('terminalTriage', () => invokeWithinBudget((timeoutMs) => supervise?.queryTerminalDraftTriages?.(runIds, timeoutMs)
-        ?? queryTerminalDraftTriagesWithinBudget(runIds, timeoutMs)));
-      if (triagedRunIds === undefined) {
-        noteUnprocessed(runIds);
-        return;
-      }
-      for (const runId of runIds) terminalTriageByRun.set(runId, triagedRunIds.has(runId));
-    }
-    const candidates = new Map<string, AbandonedDraftPr[]>();
-    const protectedEntries = [...protectedCandidates.entries()];
-    for (const [index, [runId, runDrafts]] of protectedEntries.entries()) {
-      if (budgetExhausted()) {
-        noteUnprocessed(protectedEntries.slice(index).map(([id]) => id));
-        break;
-      }
-      const terminalTriage = hasTerminalTriage(runId);
-      if (terminalTriage === undefined) { noteUnprocessed(protectedEntries.slice(index).map(([id]) => id)); break; }
-      if (terminalTriage) { skipped.alreadyTriaged += 1; continue; }
-      candidates.set(runId, runDrafts);
-    }
-    const candidateEntries = [...candidates.entries()];
+    const candidateEntries = [...protectedCandidates.entries()];
     for (const [index, [runId, runDrafts]] of candidateEntries.entries()) {
       if (budgetExhausted()) {
         noteUnprocessed(candidateEntries.slice(index).map(([id]) => id));
         break;
       }
-      const terminalTriage = hasTerminalTriage(runId);
-      if (terminalTriage === undefined) { noteUnprocessed(candidateEntries.slice(index).map(([id]) => id)); break; }
-      if (terminalTriage) { skipped.alreadyTriaged += 1; continue; }
       considered.push(runId);
       const view = supervise?.viewDraftPr ?? defaultViewDraftPr;
       const openDrafts: AbandonedDraftPr[] = [];
@@ -779,37 +879,28 @@ export function startDraftTriage(
         }
       }
       if (budgetExhausted()) { noteUnprocessed(candidateEntries.slice(index).map(([id]) => id)); break; }
-      const retained = openDrafts.at(-1);
-      if (!retained?.url) continue;
-      kept.push(retained.number);
-      const closeDraft = supervise?.closeDraftPr ?? defaultCloseDraftPr;
-      let closedForRun = 0;
-      for (const draft of openDrafts.slice(0, -1)) {
+      const status = statuses.get(runId);
+      const resolvedStatus = (status === undefined || status === 'unknown') ? terminalStatuses[runId] ?? (runId.startsWith('run-') && runDrafts.every((draft) => draft.runId === runId) && loadSelfDevRun(runId, selfDevRunsDir())?.supervisorStopReason ? 'stopped' : status) : status;
+      statusesObserved[resolvedStatus ?? 'unobserved'] = (statusesObserved[resolvedStatus ?? 'unobserved'] ?? 0) + runDrafts.length;
+      for (const draft of openDrafts) {
         if (budgetExhausted()) { noteUnprocessed([runId]); break; }
+        const repository = draftPrTargetFromUrl(draft.url!)?.repository;
+        const inventory = inventories.find((entry) => entry.repository === repository)?.snapshot;
+        const enriched = { ...draft, branch: draft.branch ?? '', ...inventoryByUrl.get(draft.url!) };
+        if ((!inventory || !inventoryByUrl.has(draft.url!)) && !IN_TEST_PROCESS()) { unobservedDrafts.push(draft.number); continue; }
+        const decision = decideDraft({ draft: enriched, runStatus: resolvedStatus, mergedTwins: inventory?.merged ?? [], ageHours: (nowMs() - draft.openedAtMs) / 3_600_000, liveBranches });
+        if (decision.reason.startsWith('superseded-by')) decisions.superseded += 1;
+        else if (decision.reason === 'stale-ended-run') decisions.staleEndedRun += 1;
+        else if (decision.reason.startsWith('label:')) decisions.humanApproval += 1;   // approval-waiting or human «keep»
+        else if (decision.reason === 'live') decisions.live += 1;
+        else decisions.recent += 1;
+        if (decision.action === 'keep') { kept.push(draft.number); continue; }
         try {
-          const didClose = invokeWithinBudget((timeoutMs) => closeDraft(draft.url!, `하니스 시작 트리아지: 종결 기록 없이 끝난 런 ${runId} — 최신 산출 #${retained.number} 로 대체됨`, timeoutMs));
+          const didClose = invokeWithinBudget((timeoutMs) => (supervise?.closeDraftPr ?? defaultCloseDraftPr)(draft.url!, `하니스 시작 트리아지: ${decision.reason}`, timeoutMs));
           if (didClose === undefined) { noteUnprocessed([runId]); break; }
-          if (didClose) {
-            closed.push(draft.number);
-            closedForRun += 1;
-          } else {
-            closeFailed.push(draft.number);
-            noteError(`close draft #${draft.number} failed`);
-          }
-        } catch (caught) {
-          closeFailed.push(draft.number);
-          noteError(caught);
-        }
-      }
-      if (budgetExhausted()) { noteUnprocessed(candidateEntries.slice(index).map(([id]) => id)); break; }
-      if (closedForRun > 0) {
-        try {
-          const didComment = invokeWithinBudget((timeoutMs) => (supervise?.commentDraftPr ?? defaultCommentDraftPr)(retained.url!, START_DRAFT_TRIAGE_HANDOFF, timeoutMs));
-          if (didComment === undefined) { noteUnprocessed(candidateEntries.slice(index).map(([id]) => id)); break; }
-          if (!didComment) noteError(`comment retained draft #${retained.number} failed`);
-        } catch (caught) {
-          noteError(caught);
-        }
+          if (didClose) closed.push(draft.number);
+          else { closeFailed.push(draft.number); noteError(`close draft #${draft.number} failed`); }
+        } catch (caught) { closeFailed.push(draft.number); noteError(caught); }
       }
     }
   } catch (caught) {
@@ -821,7 +912,7 @@ export function startDraftTriage(
         + stageDurationsMs.terminalTriage
         + stageDurationsMs.runningRuns
         + stageDurationsMs.draftView;
-      debug.log('self-implement', 'draft-triage-start', { runId: currentRunId ?? null, considered, closed, kept, closeFailed, skipped, budgetUnprocessed: budgetUnprocessedUnknown ? null : budgetUnprocessedRunIds.size, unobservedRuns, budgetExhausted: budgetUnprocessedUnknown || budgetExhausted(), elapsedMs, runningRunsQueried, runningRunsQueriedRunIds, runningRunsUnqueriedUniverseCount, draftListDurationMs: stageDurationsMs.draftList, terminalTriageDurationMs: stageDurationsMs.terminalTriage, runningRunsDurationMs: stageDurationsMs.runningRuns, draftViewDurationMs: stageDurationsMs.draftView, unaccountedDurationMs: elapsedMs - stageDurationMs, ...(errors.length === 0 ? {} : { error: errors.join('; ') }) });
+      debug.log('self-implement', 'draft-triage-start', { runId: currentRunId ?? null, considered, closed, kept, closeFailed, decisions, statusesObserved, unobservedDrafts, budgetUnprocessed: budgetUnprocessedUnknown ? null : budgetUnprocessedRunIds.size, unobservedRuns, budgetExhausted: budgetUnprocessedUnknown || budgetExhausted(), elapsedMs, runningRunsQueried, runningRunsQueriedRunIds, runningRunsUnqueriedUniverseCount, draftListDurationMs: stageDurationsMs.draftList, terminalTriageDurationMs: stageDurationsMs.terminalTriage, runningRunsDurationMs: stageDurationsMs.runningRuns, draftViewDurationMs: stageDurationsMs.draftView, unaccountedDurationMs: elapsedMs - stageDurationMs, ...(errors.length === 0 ? {} : { error: errors.join('; ') }) });
     } catch { /* fail-open */ }
   }
 }
@@ -858,41 +949,58 @@ export async function executeDevSelfRun(
     const view = supervise?.viewDraftPr ?? defaultViewDraftPr;
     const closeDraft = supervise?.closeDraftPr ?? defaultCloseDraftPr;
     const commentDraft = supervise?.commentDraftPr ?? defaultCommentDraftPr;
-    const openDrafts: string[] = [];
+    const openDrafts: Array<{ url: string; lineage: string | null }> = [];
     const skippedNotDraft: number[] = [];
     for (const prUrl of drafts) {
       let live: DraftPrViewState = null;
       try { live = view(prUrl); } catch { live = null; }
-      if (live?.isDraft === true && live.state === 'OPEN') openDrafts.push(prUrl);
-      else {
+      if (live?.isDraft === true && live.state === 'OPEN') {
+        openDrafts.push({ url: prUrl, lineage: live.headRefName ? branchLineageSlug(live.headRefName) : null });
+      } else {
         const number = prNumberFromUrl(prUrl);
         if (number !== null) skippedNotDraft.push(number);
       }
     }
-    const keptUrl = converged ? undefined : openDrafts.at(-1);
-    const kept = keptUrl === undefined ? null : prNumberFromUrl(keptUrl);
+    const keptByLineage = new Map<string, string>();
+    if (!converged) {
+      for (const draft of openDrafts) {
+        if (draft.lineage !== null) keptByLineage.set(draft.lineage, draft.url);
+      }
+    }
+    const keptDrafts = converged ? [] : openDrafts.filter(({ url, lineage }) => lineage === null || keptByLineage.get(lineage) === url);
+    const kept = keptDrafts.length === 0 ? null : keptDrafts.flatMap(({ url }) => {
+      const number = prNumberFromUrl(url);
+      return number === null ? [] : [number];
+    });
     const closed: number[] = [];
     const closeFailed: number[] = [];
     const landed = mergedNumbers.map((n) => `#${n}`).join(' ') || '없음';
-    for (const prUrl of openDrafts) {
-      if (prUrl === keptUrl) continue;
-      const number = prNumberFromUrl(prUrl);
+    for (const { url, lineage } of openDrafts) {
+      if (!converged && (lineage === null || keptByLineage.get(lineage) === url)) continue;
+      const number = prNumberFromUrl(url);
+      const keptInLineage = lineage === null ? null : prNumberFromUrl(keptByLineage.get(lineage)!);
       const comment = converged
         ? `하니스 종결 트리아지: 이 런이 수렴해 대체됨 — 착지 ${landed}`
-        : `하니스 종결 트리아지: 최신 산출 #${kept ?? 'unknown'} 로 대체됨`;
+        : `하니스 종결 트리아지: 최신 산출 #${keptInLineage ?? 'unknown'} 로 대체됨`;
       let ok = false;
-      try { ok = closeDraft(prUrl, comment); } catch { ok = false; }
+      try { ok = closeDraft(url, comment); } catch { ok = false; }
       if (number === null) continue;
       if (ok) closed.push(number);
       else closeFailed.push(number);
     }
-    if (keptUrl !== undefined) {
+    for (const { url, lineage } of keptDrafts) {
+      const keptLineage = [...keptByLineage.keys()].find((other) => other !== lineage);
+      if (lineage !== null && keptLineage !== undefined) {
+        try { debug.log('self-dev.triage', 'kept-distinct-piece', { pr: prNumberFromUrl(url), lineage, keptLineage }); } catch { /* fail-open */ }
+      }
       const rounds = Math.max(1, executedRounds);
-      const handoff = closeFailed.length === 0
-        ? '이 draft 가 이 골의 유일한 사람 판단 대상'
-        : `닫지 못한 draft 도 남아 있다: ${closeFailed.map((n) => `#${n}`).join(' ')}`;
+      const handoff = closeFailed.length > 0
+        ? `닫지 못한 draft 도 남아 있다: ${closeFailed.map((n) => `#${n}`).join(' ')}`
+        : lineage === null ? '브랜치 계보 미확인 — 사람 판단 대상'
+          : keptDrafts.length === 1 ? '이 draft 가 이 골의 유일한 사람 판단 대상'
+            : '이 draft 가 이 계보의 사람 판단 대상';
       const comment = `하니스 종결 트리아지: 멈춘 사유 ${supervisorStopReason ?? 'unsupervised'} · 라운드 ${rounds} · 착지한 조각 PR ${landed} · ${handoff}`;
-      try { commentDraft(keptUrl, comment); } catch { /* fail-open */ }
+      try { commentDraft(url, comment); } catch { /* fail-open */ }
     }
     draftTriage = { closed, kept, closeFailed, skippedNotDraft };
   };
@@ -902,7 +1010,7 @@ export async function executeDevSelfRun(
     if (!supervise) return { result };
 
     const asSupervisorJobResult = (currentFeature: string, current: SelfImplementResult) => singleRunAsJobResult(currentFeature, current);
-    const initialJob = asSupervisorJobResult(feature, result);
+    const initialJob = singleRunAsJobResult(feature, result);
     const wiring = supervise.deliverableDocument === undefined
       ? undefined
       : buildDeliverableTargets(supervise.deliverableDocument, ['single'], 'all', '127.0.0.1');
@@ -1115,6 +1223,7 @@ export async function executeDevSelfRun(
       };
       debug.log('self-implement', 'run-terminal', {
         ...terminalData,
+        runId: supervise?.runId ?? result?.runId ?? null,
         supervised: supervise !== undefined,
         ...(supervisorStopReason === undefined ? {} : { supervisorStopReason }),
         ...(draftTriage === undefined ? {} : { draftTriage }),
@@ -1442,53 +1551,58 @@ export function defaultChildLlmModel(provider: string): string {
 
 export type ChildLlmConfigSnapshot = { provider?: string; model?: string };
 
-function requireChildLlmConfigObject(value: unknown, field: 'tools' | 'selfImplement' | 'childLlm'): Record<string, unknown> {
-  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
-    throw new DevPipelineError(
-      field === 'childLlm'
-        ? 'tools.selfImplement.childLlm 형식 오류: object 여야 합니다'
-        : `tools.selfImplement.childLlm 형식 오류: ${field} 는 object 여야 합니다`,
-    );
-  }
-  return value as Record<string, unknown>;
+/** 해석된 선호를 발사 관측에 남긴다. chain 은 provider 이름만. 파일 안에서만 쓴다. */
+function logResolvedChildLlmPreference(resolved: ResolvedChildLlmPreference): void {
+  debug.log('harness.child-llm-preference', 'resolved', {
+    mode: resolved.mode,
+    chain: resolved.chain.map((entry) => entry.provider),
+    source: resolved.source,
+    budgetGate: resolved.budgetGate,
+  });
+}
+
+/** 발사 인자가 없을 때의 첫 칸. auto 도 지금은 chain[0] — 예산을 보고 고르는 것은 P15.
+ *  provider 없는 칸은 스냅샷이 아니다. model-only 거절은 발사 경계가 따로 한다. */
+function childLlmSnapshotFromPreference(resolved: ResolvedChildLlmPreference): ChildLlmConfigSnapshot | undefined {
+  const first = resolved.chain[0];
+  if (!first?.provider?.trim()) return undefined;
+  return {
+    provider: first.provider,
+    ...(first.model !== undefined ? { model: first.model } : {}),
+  };
+}
+
+/** 파싱된 설정을 그대로 해석 입력으로 쓴다. raw 재검사는 하지 않는다 —
+ *  buildUserConfig 가 경고 후 버린 값을 다시 읽어 발사를 막지 않기 위해서다. */
+function childLlmPreferenceInputFromUserConfig(config: UserConfig): ChildLlmPreferenceInput {
+  return config;
 }
 
-function readChildLlmConfigString(value: unknown, flag: '--child-llm-provider' | '--child-llm-model'): string | undefined {
-  if (value === undefined) return undefined;
-  if (typeof value !== 'string') {
-    throw new DevPipelineError(`${flag} 알 수 없음: ${String(value)}`);
+/** 기존 `{ model }` 만 있는 고정 설정. mode 는 auto 로 남기고, 발사만 종전 문면으로 거절한다. */
+function rejectModelOnlyChildLlmConfig(config: UserConfig): void {
+  const childLlm = config.tools.selfImplement.childLlm;
+  if (childLlm?.model !== undefined && !childLlm.provider?.trim() && !childLlm.mode && !(childLlm.chain && childLlm.chain.length > 0)) {
+    throw new DevPipelineError('--child-llm-provider 필요(--child-llm-model과 함께)');
   }
-  return value;
 }
 
-/** 실제 설정을 읽는 기본 리더. 전역 `llm.provider` 는 부모 축이라 여기 쓰지 않는다.
- *  부재만 `undefined`. 읽기 실패·잘못된 타입은 조용히 접지하지 않고 거절한다. */
+/** 실제 설정을 해석 함수로 읽는다. 전역 `llm.provider` 는 부모 축이라 여기 쓰지 않는다.
+ *  부재·빈 사슬·버린 비객체 설정은 `undefined`(기본으로 발사). 읽기 실패는 조용히 접지하지 않고 거절한다. */
 export function readChildLlmConfigFromUserConfig(): ChildLlmConfigSnapshot | undefined {
-  let raw: Record<string, unknown>;
+  const read = () => getUserConfig();
+  let config: UserConfig;
   try {
-    raw = getUserConfig().raw;
+    config = read();
   } catch (err) {
     if (err instanceof DevPipelineError) throw err;
     throw new DevPipelineError(
       `tools.selfImplement.childLlm 읽기 실패: ${err instanceof Error ? err.message : String(err)}`,
     );
   }
-  const tools = raw.tools;
-  if (tools === undefined) return undefined;
-  const toolsObj = requireChildLlmConfigObject(tools, 'tools');
-  const selfImplement = toolsObj.selfImplement;
-  if (selfImplement === undefined) return undefined;
-  const selfImplementObj = requireChildLlmConfigObject(selfImplement, 'selfImplement');
-  const childLlm = selfImplementObj.childLlm;
-  if (childLlm === undefined) return undefined;
-  const snapshot = requireChildLlmConfigObject(childLlm, 'childLlm');
-  const provider = readChildLlmConfigString(snapshot.provider, '--child-llm-provider');
-  const model = readChildLlmConfigString(snapshot.model, '--child-llm-model');
-  if (provider === undefined && model === undefined) return undefined;
-  return {
-    ...(provider !== undefined ? { provider } : {}),
-    ...(model !== undefined ? { model } : {}),
-  };
+  rejectModelOnlyChildLlmConfig(config);
+  const resolved = resolveChildLlmPreference(childLlmPreferenceInputFromUserConfig(config));
+  logResolvedChildLlmPreference(resolved);
+  return childLlmSnapshotFromPreference(resolved);
 }
 
 function resolveChildLlmFromParts(
@@ -1516,9 +1630,13 @@ function resolveChildLlmFromParts(
 }
 
 export function buildChildLlmSelection(
-  opts: Pick<DevCliOpts, 'childLlmProvider' | 'childLlmModel' | 'childLlmEffort'>,
+  opts: Pick<DevCliOpts, 'childLlmProvider' | 'childLlmModel' | 'childLlmEffort'> & {
+    /** 발사 인자가 있을 때 관측용 선호를 읽는다. 없으면 getUserConfig. 기존 두 인자 시그니처는 그대로다. */
+    readPreference?: () => UserConfig;
+  },
   readChildLlmConfig: () => ChildLlmConfigSnapshot | undefined = readChildLlmConfigFromUserConfig,
 ): ChildLlmSelection | undefined {
+  const readResolvedPreference = opts.readPreference ?? (() => getUserConfig());
   const provider = opts.childLlmProvider;
   const model = opts.childLlmModel;
   const hasFlag = provider !== undefined || model !== undefined || opts.childLlmEffort !== undefined;
@@ -1533,6 +1651,9 @@ export function buildChildLlmSelection(
   };
   if (hasFlag) {
     const selected = resolveChildLlmFromParts(provider, model, 'flag');
+    if (selected) {
+      try { logResolvedChildLlmPreference(resolveChildLlmPreference(childLlmPreferenceInputFromUserConfig(readResolvedPreference()))); } catch { /* 관측이 발사를 막지 않는다 */ }
+    }
     return selected ? withEffort(selected) : undefined;
   }
   const configured = readChildLlmConfig();
@@ -1562,7 +1683,7 @@ const DEV_PATH_ALLOWED: Record<DevPath, readonly string[]> = {
   'interactive': ['implement', 'roleLlm'],
   'elanous-tui': ['hold', 'readyTimeoutMs', 'goal', 'maxSteps', 'pollMs', 'model', 'observeOnly', 'isolatedRoot', 'cwd', 'worktree', 'roleLlm', 'allowNoEvidence', 'allowSupersededGoal', 'allowGoalLintErrors'],
   'shell-drive': ['goal', 'maxSteps', 'pollMs', 'model', 'cwd', 'worktree', 'roleLlm', 'allowNoEvidence', 'allowSupersededGoal', 'allowGoalLintErrors'],
-  'self-mission': ['openPr', 'autoMerge', 'autoReview', 'draft', 'maxWait', 'activityGrace', 'supervise', 'superviseRounds', 'childLlmProvider', 'childLlmModel', 'childLlmEffort', 'correlation', 'graph', 'ground', 'target', 'context', 'contextText', 'allowNoEvidence', 'allowSupersededGoal', 'allowGoalLintErrors'],
+  'self-mission': ['openPr', 'autoMerge', 'mergeByHost', 'autoReview', 'draft', 'maxWait', 'activityGrace', 'supervise', 'superviseRounds', 'childLlmProvider', 'childLlmModel', 'childLlmEffort', 'correlation', 'graph', 'ground', 'target', 'yes', 'context', 'contextText', 'allowNoEvidence', 'allowSupersededGoal', 'allowGoalLintErrors'],
   'agent-mission-pty': ['branch', 'evidence', 'docDir', 'docGlob', 'testPath', 'maxRounds', 'commit', 'deliverable', 'screens', 'roleLlm', 'allowNoEvidence', 'allowSupersededGoal', 'allowGoalLintErrors'],
   'acp': ['context', 'contextText', 'roleLlm', 'allowNoEvidence', 'allowSupersededGoal', 'allowGoalLintErrors'],
 };
@@ -1592,7 +1713,8 @@ export function explicitDevOptionNames(command: {
     if (seen.has(name)) continue;
     if (command.getOptionValueSource(name) !== 'cli') continue;
     if (command.getOptionValue !== undefined
-      && !isProgrammaticOptionProvided(name, command.getOptionValue(name))) continue;
+      && !isProgrammaticOptionProvided(name, command.getOptionValue(name))
+      && !(name === 'autoMerge' && command.getOptionValue(name) === false)) continue;
     seen.add(name);
     names.push(name);
   }
@@ -1751,14 +1873,17 @@ export function buildDevCliSpec(
       chat: { forceNew: true, enableTools: true, goalLoop: true },
     };
   }
-  if (opts.openPr === false && opts.autoMerge === true) {
+  if (opts.mergeByHost === true && (process.env.ELANOUS_SUBSTRATE !== 'pod' || !process.env.ELANOUS_POD_NAME || !process.env.ELANOUS_POD_NAMESPACE)) {
+    throw new DevPipelineError('--merge-by-host 는 Pod 자식 전용입니다 (호스트 재게이트 인계가 없는 로컬 실행 거부)');
+  }
+  if (opts.openPr === false && (opts.autoMerge === true || opts.mergeByHost === true)) {
     throw new DevPipelineError('--no-open-pr 와 --auto-merge 는 동시 사용 불가 — PR 없이 병합할 수 없음');
   }
 
   const supportsCompletion = path === 'self-mission' || path === 'plan-staged';
   const completion: DevCompletion | undefined = opts.openPr === false
     ? 'worktree-only'
-    : opts.autoMerge === true
+    : opts.autoMerge === true || opts.mergeByHost === true
       ? 'auto-merge'
       : opts.autoMerge === false
         ? 'pr'
@@ -1776,6 +1901,7 @@ export function buildDevCliSpec(
     ...(opts.allowGoalLintErrors === true ? { allowGoalLintErrors: true } : {}),
     ...(opts.branch ? { branch: opts.branch } : {}),
     ...(opts.target !== undefined ? { target: opts.target } : {}),
+    ...(opts.yes === true ? { assumeYes: true } : {}),
     ...((path === 'self-mission' || path === 'plan-staged' || path === 'agent-mission-pty')
       ? { base: opts.base ?? DEFAULT_BRANCH_WORKTREE_BASE }
       : (opts.base ? { base: opts.base } : {})),
@@ -1784,7 +1910,12 @@ export function buildDevCliSpec(
   if (opts.base !== undefined) Object.defineProperty(spec, 'baseExplicit', { value: true, enumerable: true });
   if (supportsCompletion && completion !== undefined) {
     spec.completion = completion;
-    spec.completionSource = 'request';
+    // ⛔ 출처는 «사람이 친 플래그»일 때만 request 다(2026-09-26 베어 Ubuntu 26.04 실측 · UX 15′).
+    //   TUI `/harness ask` 의 분리 발사(`dev --file`)는 아무 플래그도 안 쳤는데 request 로 찍혀, 원격 없는 저장소의
+    //   «워크트리로 자동 강등»(`resolveTargetRemoteCompletion`)이 안 걸리고 거부됐다. 목록이 없으면(프로그램 호출) 종전대로 request.
+    const typed = explicitOptionNames === undefined
+      || explicitOptionNames.some((name) => name === 'autoMerge' || name === 'openPr');
+    spec.completionSource = typed ? 'request' : 'default';
   }
   if (path === 'plan-staged') return { ...spec, plan: true };
   if (path === 'elanous-tui') {
@@ -1833,7 +1964,7 @@ export function buildDevCliSpec(
   }
 
   if (path === 'self-mission') {
-    const childLlm = buildChildLlmSelection(opts);
+    const childLlm = buildChildLlmSelection({ ...opts, readPreference: () => getUserConfig() });
     // 잔량 조회(약 3초)는 한 발사에 한 번만 — 자식·부모가 같은 값을 쓴다.
     let grokQuotaOnce: ReturnType<typeof readCachedGrokQuota> | undefined;
     const readGrokQuotaOnce = () => (grokQuotaOnce ??= readGrokQuota());
@@ -1843,9 +1974,9 @@ export function buildDevCliSpec(
     warnParentLlmQuota(parentProvider, readGrokQuotaOnce);
     const self = {
       ...(opts.draft === false ? { draft: false } : {}),
+      ...(opts.mergeByHost === true ? { mergeByHost: true } : {}),
       ...(childLlm ? { childLlm } : {}),
       ...(opts.correlation !== undefined ? { correlationId: opts.correlation } : {}),
-      ...(opts.graph !== undefined ? { graphAuthoritative: opts.graph } : {}),
       ...(opts.maxWait !== undefined ? { maxWaitSec: parsePositiveInt(opts.maxWait, '--max-wait') } : {}),
       ...(opts.activityGrace !== undefined ? { activityGraceSec: parseActivityGraceSec(opts.activityGrace) } : {}),
       ...(opts.ground !== undefined ? { ground: opts.ground } : {}),