elanous 0.2.14 → 0.2.16

package/src/self-dev/draft-sweep.ts

@@ -1,6 +1,6 @@
 import { CLAIM_IDLE_HOURS, PR_LABELS, STALLED_DRAFT_HOURS } from '../github/pr-labels.js';
 import { debug } from '../debug/log.js';
-import { decideDraft, type DraftTriagePr } from './draft-triage-rules.js';
+import { decideDraft, sameGoalPr, type DraftTriagePr } from './draft-triage-rules.js';
 
 export interface SweepDraft extends DraftTriagePr {
   readonly title: string;
@@ -33,6 +33,18 @@ export interface DraftSweepAdapters {
   getLatestFileChanges?(draft: SweepDraft, repository: string): Promise<Readonly<Record<string, string>> | undefined>;
   /** Optional merge-time file inventory for the existing all-files-landed decision. */
   getPrFiles?(repository: string, number: number): Promise<readonly string[] | undefined>;
+  /**
+   * Review and gate posture for the daily count. Omitted means unknown — not harvestable and not blocked.
+   * `review: 'pass'` is a review PASS; `mustFix` means must-fix remains; `gate: 'pass'` is a green gate.
+   */
+  getReviewGate?(draft: SweepDraft, repository: string): Promise<SweepReviewGate | undefined>;
+}
+
+/** Review PASS and gate posture used only by the daily old-draft count. */
+export interface SweepReviewGate {
+  readonly review?: 'pass' | 'fail';
+  readonly mustFix?: boolean;
+  readonly gate?: 'pass' | 'fail';
 }
 
 export interface DraftSweepOptions {
@@ -67,9 +79,23 @@ export interface DraftSweepResult {
   claimed?: number;
   /** Running claims older than the idle window, including those kept by liveness. */
   claimExpired?: number;
+  /**
+   * One line per sweep: harness drafts older than 24h, split into closable (a same-goal landing exists),
+   * harvestable (review PASS and gate pass), and blocked (must-fix remains).
+   */
+  daily?: DraftSweepDaily;
   error?: string;
 }
 
+/** Daily old-draft census. `date` is the sweep clock's UTC calendar day. */
+export interface DraftSweepDaily {
+  readonly date: string;
+  readonly over24h: number;
+  readonly closable: number;
+  readonly harvestable: number;
+  readonly blocked: number;
+}
+
 const stateLabels = PR_LABELS.filter((label) => label.axis === 'state');
 const label = (action: 'mark-stalled' | 'close', name?: string): string => {
   const match = PR_LABELS.find((entry) => entry.axis === 'state' && entry.sweep.action === action && (name === undefined || entry.name.endsWith(name)));
@@ -115,7 +141,7 @@ export async function supersedeDraftsOnMerge(input: {
     const mergedFiles = await adapters.getPrFiles?.(repository, merged.number);
     const landed = { ...merged, changedFiles: mergedFiles };
     for (const draft of drafts) {
-      if (draft.number !== merged.number && !liveBranches.has(draft.branch)
+      if (draft.number !== merged.number && draft.branch.startsWith('self-impl/') && !liveBranches.has(draft.branch)
         && Date.parse(draft.createdAt) < Date.parse(merged.mergedAt)) {
         statuses.set(draft.number, await adapters.getRunStatus(draft, repository));
         if (draft.changedFiles?.length && adapters.getLatestFileChanges) {
@@ -125,7 +151,7 @@ export async function supersedeDraftsOnMerge(input: {
     }
     for (const listedDraft of drafts) {
       const draft = { ...listedDraft, latestFileChanges: latestChanges.get(listedDraft.number) };
-      if (draft.number === merged.number || liveBranches.has(draft.branch)
+      if (draft.number === merged.number || !draft.branch.startsWith('self-impl/') || liveBranches.has(draft.branch)
         || Date.parse(draft.createdAt) >= Date.parse(merged.mergedAt)) {
         kept.push(draft.number);
         continue;
@@ -134,7 +160,6 @@ export async function supersedeDraftsOnMerge(input: {
         mergedTwins: [landed], liveBranches, ageHours: NaN });
       if (decision.action !== 'close' || !decision.reason.startsWith(`superseded-by #${merged.number}`)
         || PR_LABELS.filter((entry) => entry.axis === 'state' && draft.labels.includes(entry.name)).length > 1
-        || (draft.labels.length === 0 && !draft.branch.startsWith('self-impl/'))
         || closeAttempts >= DRAFT_SWEEP_CLOSE_CAP) {
         kept.push(draft.number);
         continue;
@@ -144,7 +169,8 @@ export async function supersedeDraftsOnMerge(input: {
       try {
         // Label first: a failed label write must never strand a closed, unlabelled PR outside open-draft sweeps.
         if (!draft.labels.includes(supersededLabel)) await adapters.setLabels(repository, draft.number, { add: supersededLabel, remove });
-        await adapters.closeDraft(repository, draft.number, `Draft sweep: superseded-by #${merged.number}. Branch preserved.`);
+        await adapters.closeDraft(repository, draft.number,
+          `Draft sweep: superseded-by #${merged.number} (https://github.com/${repository}/pull/${merged.number}). Branch preserved.`);
         closed.push(draft.number);
       } catch (failure) {
         kept.push(draft.number);
@@ -171,6 +197,46 @@ async function collectPages<T>(fetch: (page: number, perPage: number) => Promise
   throw new Error('PR listing exceeded pagination limit');
 }
 
+/** First line of a failure, with no stack — the draft-cleanup loop log shows this line as-is. */
+export function sweepFailureReason(error: unknown): string {
+  const message = error instanceof Error ? error.message : String(error);
+  const line = message.split(/\r?\n/).map((part) => part.trim()).find((part) => part.length > 0 && !/^\s*at\s/.test(part));
+  return line && line.length > 0 ? line : 'sweep failed';
+}
+
+function harnessDraft(draft: SweepDraft): boolean {
+  return draft.branch.startsWith('self-impl/') || draft.labels.some((name) => name.startsWith('elanous:'));
+}
+
+/**
+ * Census of harness drafts older than 24h. Same-goal landing uses `sameGoalPr` unchanged.
+ * A draft counts as closable when a same-goal merged PR exists, harvestable when review PASS and the gate passed,
+ * and blocked when must-fix remains. Unknown review/gate is neither harvestable nor blocked.
+ */
+export function draftSweepDaily(
+  drafts: readonly SweepDraft[],
+  merged: readonly SweepMergedPr[],
+  now: Date,
+  reviewGate: ReadonlyMap<number, SweepReviewGate | undefined>,
+): DraftSweepDaily {
+  const cutoff = now.getTime() - STALLED_DRAFT_HOURS * 3_600_000;
+  let over24h = 0;
+  let closable = 0;
+  let harvestable = 0;
+  let blocked = 0;
+  for (const draft of drafts) {
+    if (!harnessDraft(draft)) continue;
+    const created = Date.parse(draft.createdAt);
+    if (!Number.isFinite(created) || created > cutoff) continue;
+    over24h += 1;
+    if (merged.some((pr) => pr.number !== draft.number && sameGoalPr(draft, pr))) closable += 1;
+    const posture = reviewGate.get(draft.number);
+    if (posture?.mustFix === true) blocked += 1;
+    else if (posture?.review === 'pass' && posture.gate === 'pass') harvestable += 1;
+  }
+  return { date: now.toISOString().slice(0, 10), over24h, closable, harvestable, blocked };
+}
+
 /** A failed inventory or liveness lookup is never treated as proof that a draft can be closed. */
 export async function runDraftSweep({ repository, adapters, apply = false, now = new Date() }: DraftSweepOptions): Promise<DraftSweepResult> {
   const result: DraftSweepResult = { repository, apply, complete: false, entries: [], counts: {} };
@@ -181,10 +247,12 @@ export async function runDraftSweep({ repository, adapters, apply = false, now =
   };
   const finish = (): DraftSweepResult => {
     debug.log('drafts.cleanup', 'summary', result.counts);
+    if (result.daily) debug.log('harness.drafts', 'daily', result.daily);
+    if (!result.complete && result.error) debug.log('drafts.cleanup', 'failed', { reason: sweepFailureReason(result.error) });
     return result;
   };
-  let drafts: SweepDraft[];
-  let merged: SweepMergedPr[];
+  let drafts: SweepDraft[] = [];
+  let merged: SweepMergedPr[] = [];
   let liveBranches: ReadonlySet<string> | undefined;
   try {
     [drafts, merged, liveBranches] = await Promise.all([
@@ -196,7 +264,8 @@ export async function runDraftSweep({ repository, adapters, apply = false, now =
     if (drafts.some((pr) => !Number.isInteger(pr.number) || !pr.branch || !Array.isArray(pr.labels) || !Number.isFinite(Date.parse(pr.createdAt)))
       || merged.some((pr) => !Number.isInteger(pr.number) || !pr.branch)) throw new Error('Invalid PR inventory');
   } catch (error) {
-    result.error = String(error);
+    result.error = sweepFailureReason(error);
+    if (drafts.length > 0) result.daily = draftSweepDaily(drafts, merged, now, new Map());
     return finish();
   }
   let statuses: Map<number, string | undefined>;
@@ -218,9 +287,19 @@ export async function runDraftSweep({ repository, adapters, apply = false, now =
       }
     }
   } catch (error) {
-    result.error = String(error);
+    result.error = sweepFailureReason(error);
     return finish();
   }
+  let reviewGate = new Map<number, SweepReviewGate | undefined>();
+  if (adapters.getReviewGate) {
+    try {
+      for (const draft of drafts) reviewGate.set(draft.number, await adapters.getReviewGate(draft, repository));
+    } catch (error) {
+      result.error = sweepFailureReason(error);
+      return finish();
+    }
+  }
+  result.daily = draftSweepDaily(drafts, merged, now, reviewGate);
   result.complete = true;
   let closes = 0;
   let unobserved = 0;
@@ -330,7 +409,8 @@ export async function runDraftSweep({ repository, adapters, apply = false, now =
       if (action === 'close') {
         await adapters.closeDraft(repository, draft.number, decision.reason === 'stale-unobserved'
           ? `Draft sweep: run unobserved — no run record reachable here, no host worktree for this branch, idle ≥${STALLED_DRAFT_HOURS}h. Closed as stalled. Branch preserved; reopen to restore.`
-          : `Draft sweep: ${decision.reason}. Branch preserved.`);
+          : `Draft sweep: ${decision.reason}${decision.reason.startsWith('superseded-by #')
+            ? ` (https://github.com/${repository}/pull/${decision.reason.slice('superseded-by #'.length).match(/^\d+/)![0]})` : ''}. Branch preserved.`);
       }
       entry.applied = labelsChanged || action === 'close';
     } catch (error) {

package/src/self-dev/draft-triage-rules.ts

@@ -38,6 +38,21 @@ const PROTECTED_LABELS: ReadonlySet<string> = new Set<string>([...PR_LABELS
 const goalId = (branch: string): string | undefined => /(?:^|[-/])goalid-([a-f0-9]+)(?=-|\/|$)/i.exec(branch)?.[1]?.toLowerCase();
 export const branchStem = (branch: string): string | undefined => /^self-impl\/(.+)-[a-f0-9]{8}-r[a-f0-9]+$/i.exec(branch)?.[1];
 const slot = (body?: string): string | undefined => /^칸:\s*(.+?)\s*$/m.exec(body ?? '')?.[1];
+const goalText = (body?: string): string | undefined => /^골:\s*(\S.*?)\s*$/m.exec(body ?? '')?.[1];
+// Auto titles name only files («src/harness: harness-queue.ts») — different goals share them, so they never identify a goal.
+export const isAutoTitle = (title: string): boolean =>
+  /^[\w./-]+:\s*[^\s,]+\.[a-z0-9]+(?:\s*,\s*[^\s,]+\.[a-z0-9]+)*$/i.test(title.trim());
+
+/** Same goal (TC 10-05): ① both carry a goal identifier → compare it ② otherwise exact title ⊕ both harness drafts ⊕ same branch stem, never an auto title ③ else false. */
+export function sameGoalPr(a: DraftTriagePr, b: DraftTriagePr): boolean {
+  const idA = goalId(a.branch), idB = goalId(b.branch);
+  if (idA && idB) return idA === idB;
+  const textA = goalText(a.body), textB = goalText(b.body);
+  if (textA && textB) return textA === textB;
+  if (!a.title || a.title !== b.title || isAutoTitle(a.title)) return false;
+  const stemA = branchStem(a.branch);
+  return Boolean(stemA && a.branch.startsWith('self-impl/') && b.branch.startsWith('self-impl/') && stemA === branchStem(b.branch));
+}
 const referencesDraft = (text: string, number: number): boolean =>
   new RegExp(`(?:\\(수확\\s*#${number}\\s*\\)|\\bsuperseded\\s*#${number}(?!\\d))`, 'i').test(text);
 const landingCommentReferencesDraft = (text: string, number: number): boolean =>
@@ -55,28 +70,30 @@ export function decideDraft({ draft, runStatus, mergedTwins, openDrafts, ageHour
     return { action: 'keep', reason: 'live' };
   }
   const lineage = goalId(draft.branch);
-  const twin = mergedTwins.find((pr) => pr.number !== draft.number && (
-    (draft.title && pr.title === draft.title) || (lineage && goalId(pr.branch) === lineage)
-  ));
-  if (twin) return { action: 'close', reason: `superseded-by #${twin.number}` };
+  const draftSlot = slot(draft.body);
   const stem = branchStem(draft.branch);
+  const compatible = (pr: DraftTriagePr): boolean =>
+    !(lineage && goalId(pr.branch) && goalId(pr.branch) !== lineage)
+    && !(draftSlot && slot(pr.body) && slot(pr.body) !== draftSlot);
+  const twin = mergedTwins.find((pr) => pr.number !== draft.number && compatible(pr) && sameGoalPr(draft, pr));
+  if (twin) return { action: 'close', reason: `superseded-by #${twin.number}` };
   const createdAt = Date.parse(draft.createdAt ?? '');
   const newer = stem && draft.title && Number.isFinite(createdAt) ? openDrafts
-    ?.filter((pr) => pr.number !== draft.number && pr.title === draft.title && branchStem(pr.branch) === stem
+    ?.filter((pr) => pr.number !== draft.number && pr.title === draft.title && branchStem(pr.branch) === stem && sameGoalPr(draft, pr)
       && Number.isFinite(Date.parse(pr.createdAt ?? '')) && Date.parse(pr.createdAt!) > createdAt)
     .sort((a, b) => Date.parse(b.createdAt!) - Date.parse(a.createdAt!) || b.number - a.number)[0] : undefined;
   if (newer) return { action: 'close', reason: `duplicate-of-open #${newer.number}` };
-  const harvest = mergedTwins.find((pr) => pr.number !== draft.number && (
+  const harvest = mergedTwins.find((pr) => pr.number !== draft.number && compatible(pr) && (
     [pr.mergeCommitMessage, pr.body].some((text) => text && referencesDraft(text, draft.number))
     || pr.landingVerifiedComments?.some((text) => landingCommentReferencesDraft(text, draft.number))
   ));
   if (harvest) return { action: 'close', reason: `superseded-by #${harvest.number} (harvest #${draft.number})` };
   const created = Date.parse(draft.createdAt ?? '');
   const files = draft.changedFiles;
-  const draftSlot = slot(draft.body);
   const later = mergedTwins.filter((pr) => pr.number !== draft.number && Number.isFinite(created)
     && Number.isFinite(Date.parse(pr.mergedAt ?? '')) && Date.parse(pr.mergedAt!) > created
-    && ((lineage && goalId(pr.branch) === lineage) || (draftSlot && slot(pr.body) === draftSlot)));
+    && compatible(pr) && ((lineage && goalId(pr.branch) === lineage)
+      || (draftSlot && slot(pr.body) === draftSlot) || (stem && branchStem(pr.branch) === stem)));
   if (files?.length && files.every((file) => {
     const changed = Date.parse(draft.latestFileChanges?.[file] ?? '');
     return Number.isFinite(changed) && changed >= created && later.some((pr) =>

package/src/self-dev/entrance-registry.ts

@@ -1,6 +1,6 @@
 import { findNativeTool, isNativeToolModelExposed } from '../native-tool-catalog.js';
 
-export type EntranceStatus = 'live' | 'retired';
+export type EntranceStatus = 'live' | 'retired' | 'closed';
 
 export type EntranceStampability = 'stampable' | 'structurally-unstampable' | 'unknown';
 
@@ -181,12 +181,14 @@ const ENTRANCE_DECLARATIONS = [
   //       `dev --ask` 와 ***같은*** `runAskLaunchFlow` 를 탄다. 두 문의 차이는 `entrance` 태그뿐이다.
   //     ⇒ 판정값이 `'verified' | 'unknown'` 둘뿐이라 「구조적 부재」를 적을 칸이 없다. `unknown` 으로 둔다.
   //     ⛔ 그러니 이 `unknown` 을 「미완」으로 읽지 마라 — 그 구분은 이 주석이 canonical 이다.
-  { id: 'cli-dev-ask', surface: 'cli', status: 'live', verification: { actualMission: 'verified', legacyParity: 'unknown' } },
+  // OLD-DOOR-CLOSE — a direct `dev --ask` from a terminal or seat session refuses.
+  // Harness-internal calls still pass, marked with the ONEDOOR-1 entrance stamp.
+  { id: 'cli-dev-ask', surface: 'cli', status: 'closed', verification: { actualMission: 'verified', legacyParity: 'unknown' } },
   // `elanous drive` 는 `elanous dev` 의 Commander alias 로 살아 있고, buildDriveAliasDevSpec 이 entrance 를
   // `cli-drive` 로 넘기며 completion 을 `worktree-only` 로 못 박는다. 그래서 별도 무인 권한 축이 아니다.
   { id: 'cli-drive', surface: 'cli', status: 'live' },
-  { id: 'cli-self-implement', surface: 'cli', status: 'live' },
-  { id: 'cli-self-orchestrate', surface: 'cli', status: 'live' },
+  { id: 'cli-self-implement', surface: 'cli', status: 'closed' },
+  { id: 'cli-self-orchestrate', surface: 'cli', status: 'closed' },
   // ⭐ 2026-08-22 · 🅣 — ***사람이 «돌려 보고» 적은 판정***이다(⛔ 도구가 추측한 값이 아니다).
   //   actualMission: 그 입구로 실제 골을 «끝까지» 돌렸다 — 17발 · 자동 병합 5 · 회수 착지 7.
   //     📏 원장 각인이 그것을 말한다: `"entrance":"cli-harness-ask"` (아침엔 0건이었다).
@@ -331,6 +333,7 @@ export function summarizeEntrances(registry: readonly EntranceDeclaration[] = EN
   readonly total: number;
   readonly live: number;
   readonly retired: number;
+  readonly closed: number;
   readonly bySurface: ReadonlyArray<{ surface: EntranceSurface; total: number; retired: number }>;
 } {
   const surfaces = [...new Set(registry.map((e) => e.surface))];
@@ -338,6 +341,7 @@ export function summarizeEntrances(registry: readonly EntranceDeclaration[] = EN
     total: registry.length,
     live: registry.filter((e) => e.status === 'live').length,
     retired: registry.filter((e) => e.status === 'retired').length,
+    closed: registry.filter((e) => e.status === 'closed').length,
     bySurface: surfaces.map((surface) => ({
       surface,
       total: registry.filter((e) => e.surface === surface).length,
@@ -350,12 +354,12 @@ export function summarizeEntrances(registry: readonly EntranceDeclaration[] = EN
 export function renderLaunchEntrances(registry: readonly EntranceDeclaration[] = ENTRANCE_REGISTRY): string {
   const summary = summarizeEntrances(registry);
   const rows = listEntrancesWithModelExposure(registry)
-    .map((e) => `  ${e.status === 'retired' ? '🪦' : '✅'} ${e.surface.padEnd(7)} ${e.id} (${e.stampability}) verification=actualMission:${e.verification.actualMission},legacyParity:${e.verification.legacyParity} imprintEvidence=${e.imprintEvidence} evidenceSource=${e.stampabilityEvidenceSource} evidenceSourceFilePath=${e.evidenceSourceFilePath ?? 'missing'} modelExposed=${e.modelExposed ?? 'missing'}`);
+    .map((e) => `  ${e.status === 'retired' ? '🪦' : e.status === 'closed' ? '닫힘' : '✅'} ${e.surface.padEnd(7)} ${e.id} (${e.stampability}) verification=actualMission:${e.verification.actualMission},legacyParity:${e.verification.legacyParity} imprintEvidence=${e.imprintEvidence} evidenceSource=${e.stampabilityEvidenceSource} evidenceSourceFilePath=${e.evidenceSourceFilePath ?? 'missing'} modelExposed=${e.modelExposed ?? 'missing'}`);
   const surfaces = summary.bySurface
     .map((s) => `${s.surface}=${s.total}${s.retired > 0 ? `(은퇴 ${s.retired})` : ''}`)
     .join(' · ');
   return [
-    `launch entrances: ${summary.total} (live ${summary.live} · retired ${summary.retired})`,
+    `launch entrances: ${summary.total} (live ${summary.live} · retired ${summary.retired} · closed ${summary.closed})`,
     `  표면별: ${surfaces}`,
     ...rows,
   ].join('\n');

package/src/self-dev/old-door.ts

@@ -0,0 +1,73 @@
+/**
+ * OLD-DOOR-CLOSE — the three outside doors refuse a direct call.
+ *
+ * `elanous dev --ask`, `elanous self implement`, and `elanous self orchestrate`
+ * stay callable from inside the harness. The harness marks those calls with
+ * the same stamp ONEDOOR-1 uses for a door (`ELANOUS_HARNESS_ENTRANCE`) or with
+ * the explicit internal flag `--harness-internal`. A terminal or seat session
+ * carries neither, so it exits non-zero and is told where to go.
+ */
+import type { LaunchDoor } from '../harness/launch-stamp.js';
+
+export const OLD_DOORS = ['dev-ask', 'self-implement', 'self-orchestrate'] as const;
+export type OldDoor = (typeof OLD_DOORS)[number];
+
+/** Same env ONEDOOR-1 already stamps onto a harness launch. */
+export const OLD_DOOR_STAMP_ENV = 'ELANOUS_HARNESS_ENTRANCE';
+/** Same meaning as the env, for a caller that can pass an argument but not an env. */
+export const OLD_DOOR_STAMP_FLAG = '--harness-internal';
+
+const STAMP_BY_DOOR: Readonly<Record<OldDoor, readonly string[]>> = {
+  'dev-ask': ['dev-ask', 'cli-dev-ask', 'cli-drive', 'harness-say', 'cli-harness-say', 'harness-ask', 'cli-harness-ask', 'queue-tick', 'agent-mission', 'daemon-tool'],
+  'self-implement': ['self-implement', 'cli-self-implement', 'nl-self-implement', 'daemon-self-implement', 'daemon-tool', 'harness-say', 'cli-harness-say', 'harness-ask', 'cli-harness-ask', 'queue-tick', 'agent-mission'],
+  'self-orchestrate': ['self-orchestrate', 'cli-self-orchestrate', 'nl-self-orchestrate', 'cli-harness-orchestrate', 'harness-say', 'cli-harness-say', 'harness-ask', 'cli-harness-ask', 'queue-tick', 'agent-mission', 'daemon-tool'],
+};
+
+export interface OldDoorRefusal {
+  readonly door: OldDoor;
+  readonly caller: 'outside';
+  readonly exitCode: 1;
+  readonly message: string;
+}
+
+export function oldDoorStampAccepted(door: OldDoor, stamp: string | undefined | null): boolean {
+  const value = stamp?.trim();
+  if (!value) return false;
+  return (STAMP_BY_DOOR[door] as readonly string[]).includes(value);
+}
+
+/** A harness-internal call carries the stamp in the environment or on the argv. Anything else is outside. */
+export function isOldDoorInternalCall(
+  door: OldDoor,
+  env: NodeJS.ProcessEnv = process.env,
+  argv: readonly string[] = process.argv,
+): boolean {
+  if (argv.includes(OLD_DOOR_STAMP_FLAG)) return true;
+  return oldDoorStampAccepted(door, env[OLD_DOOR_STAMP_ENV]);
+}
+
+/** Env a harness parent sets so the child door stays open. */
+export function oldDoorInternalEnv(door: LaunchDoor | OldDoor): Record<string, string> {
+  return { [OLD_DOOR_STAMP_ENV]: door };
+}
+
+const REPLACEMENT: Readonly<Record<OldDoor, string>> = {
+  'dev-ask': 'elanous harness ask <goal.md>',
+  'self-implement': 'elanous harness say "<sentence>"',
+  'self-orchestrate': 'elanous harness say "<sentence>"',
+};
+
+const DOOR_LABEL: Readonly<Record<OldDoor, string>> = {
+  'dev-ask': 'elanous dev --ask',
+  'self-implement': 'elanous self implement',
+  'self-orchestrate': 'elanous self orchestrate',
+};
+
+/** One line: the closed door, the harness door to use, and a command of the same meaning. */
+export function oldDoorRefusalMessage(door: OldDoor): string {
+  return `${DOOR_LABEL[door]} 는 닫혔습니다 — harness say / harness ask 로. 예: ${REPLACEMENT[door]}`;
+}
+
+export function refuseOldDoor(door: OldDoor): OldDoorRefusal {
+  return { door, caller: 'outside', exitCode: 1, message: oldDoorRefusalMessage(door) };
+}

package/src/self-dev/orchestrate.ts

@@ -260,12 +260,23 @@ export interface SelfDevJobResult {
    *  (merged / pr-opened / gate-failed / review-blocked / pr-declined). */
   stage?: string;
   branch?: string;
+  /** Child confirmed the finished implementation was pushed for manual harvest. */
+  harvestable?: true;
   worktreePath?: string;
   prUrl?: string;
   prNumber?: number;
   merged?: boolean;
   /** Child commit SHA, when observed by the Pod/host. */
   checkedHeadCommit?: string;
+  /**
+   * This run's own `--base` (not main). A non-main completion mode
+   * (worktree-only, draft, `--base` other than main) lands commits here.
+   */
+  base?: string;
+  /** Child finished with GOAL-COMPLETE (`ok=true`). Distinct from a main merge. */
+  ok?: boolean;
+  /** Commits this child added against its own `--base`. 0 is not completion progress. */
+  commitsAheadOfBase?: number;
   /** A dependency is done but its result is not on main; no child was launched. */
   blockReason?: 'parent-unlanded';
   parentPrNumber?: number;
@@ -405,6 +416,7 @@ export type ResumeDisposition = 'skip' | 'rerun' | 'rerun-duplicate-risk';
  */
 export function classifyResumeDisposition(result: SelfDevJobResult): ResumeDisposition {
   if (hasDelivered(result)) return 'skip';
+  if (result.harvestable === true && result.branch) return 'skip';
   if (result.stage === 'pr-opened') return 'rerun-duplicate-risk';
   if (result.merged === false) return 'rerun';
   if (result.status !== 'done') return 'rerun';
@@ -621,6 +633,7 @@ export function classifyFailure(
   ) {
     return 'awaiting-human';
   }
+  if (result.harvestable === true && result.branch) return 'main-sync-blocked';
   if (result.status === 'done' && !hasDelivered(result)) return convergedFailureKind();
   // ⭐ 상류가 죽어 «취소»된 조각 — 종전엔 status 가 failed 도 done 도 아니라 null 로 사라졌다.
   //   ⛔ 이것을 못 보면 「무엇이 상류를 기다리는가」를 슈퍼바이저가 영영 모른다.
@@ -1479,6 +1492,7 @@ export function orchestrateSelfDev(opts: OrchestrateSelfDevOptions): Promise<Sel
           ...(resumeDisposition ? { resumeDisposition } : {}),
           ...(disp?.stage ? { stage: disp.stage } : {}),
           ...(disp?.branch ? { branch: disp.branch } : {}),
+          ...(disp?.harvestable === true && disp.branch ? { harvestable: true } : {}),
           ...(disp?.worktreePath ? { worktreePath: disp.worktreePath } : {}),
           ...(disp?.prUrl ? { prUrl: disp.prUrl } : {}),
           ...(disp?.prNumber !== undefined ? { prNumber: disp.prNumber } : {}),
@@ -1526,7 +1540,7 @@ export function orchestrateSelfDev(opts: OrchestrateSelfDevOptions): Promise<Sel
         const rm = opts.removeWorktree ?? defaultRemoveWorktree;
         let removed = 0;
         for (const r of out) {
-          if (!r.worktreePath || r.prUrl) continue;
+          if (!r.worktreePath || r.prUrl || r.harvestable) continue;
           try { rm(r.worktreePath); removed++; } catch { /* fail-soft */ }
         }
         if (removed > 0) debug.log('self-dev.orchestrate', 'teardown', { removed });

package/src/self-dev/review-provider-fallback.ts

@@ -73,13 +73,18 @@ export function buildReviewProviderAttempts(
   const out: ReviewProviderAttempt[] = [primary];
   const seen = new Set([primary.model]);
   for (const f of fallbacks) {
-    if (!f.model.trim() || seen.has(f.model)) continue;
+    if (!f.model.trim() || seen.has(f.model) || (primary.provider && f.provider?.name === primary.provider.name)) continue;
     seen.add(f.model);
     out.push(f);
   }
   return out;
 }
 
+/** A distinct provider is available even when the optional config list is empty. */
+export function defaultReviewFallbackModel(primaryProvider?: string): string {
+  return resolveModelAlias(primaryProvider === 'grok' ? 'claude' : 'grok')!;
+}
+
 export interface ReviewFallbackObservation {
   readonly attempt: number;
   readonly total: number;

package/src/self-dev/run-supervisor.ts

@@ -10,6 +10,14 @@ import { sweepFrozenMerges } from '../self-implement/frozen-merges.js';
 export interface SupervisorRound {
   round: number;
   landed: number;
+  /**
+   * Pieces that finished (`ok=true`) with at least one new commit against
+   * this run's own `--base` — not a main merge. Omitted on rounds that
+   * never measured it, so older history stays comparable.
+   */
+  baseCompleted?: number;
+  /** The run's own `--base` those completions were counted against. */
+  base?: string;
   actionable: number;
   reviewMustFixTrend?: SupervisorDecision['reviewMustFixTrend'];
 }
@@ -22,6 +30,7 @@ export type SupervisorStopReason =
   | 'parent-signals-red'
   | 'needs-human'
   | 'no-actionable-work'
+  | 'harvestable-awaiting-human'
   | 'handed-off-to-salvage'
   | 'max-rounds'
   | 'no-progress'
@@ -39,6 +48,7 @@ export const SUPERVISOR_STOP_REASONS = [
   'parent-signals-red',
   'needs-human',
   'no-actionable-work',
+  'harvestable-awaiting-human',
   'handed-off-to-salvage',
   'max-rounds',
   'no-progress',
@@ -105,9 +115,25 @@ export function countLanded(results: readonly SelfDevJobResult[]): number {
   return results.filter(hasDelivered).length;
 }
 
+/** One base label for the round. Mixed or missing bases stay unnamed. */
+export function roundBase(results: readonly SelfDevJobResult[]): string | undefined {
+  const bases = [...new Set(results.flatMap((result) => result.base === undefined ? [] : [result.base]))];
+  return bases.length === 1 ? bases[0] : undefined;
+}
+
+/**
+ * Finished pieces (`ok=true`) that added at least one commit against this
+ * run's own `--base`. A main merge is not required, and a commit without
+ * `ok=true` is not completion.
+ */
+export function countBaseCompleted(results: readonly SelfDevJobResult[]): number {
+  return results.filter((result) => result.ok === true && (result.commitsAheadOfBase ?? 0) >= 1).length;
+}
+
 export function madeProgress(prev: SupervisorRound | undefined, next: SupervisorRound): boolean {
   if (!prev) return true;
   if (next.landed > 0) return true;
+  if ((next.baseCompleted ?? 0) > (prev.baseCompleted ?? 0)) return true;
   if (next.actionable < prev.actionable) return true;
   return next.reviewMustFixTrend === 'improving';
 }
@@ -191,8 +217,16 @@ export function decideNextRun(input: {
   const t = triageRun(activeResults, deployFindings, observation === 'failed');
   const round = history.length;
   const landed = countLanded(results);
+  const baseCompleted = countBaseCompleted(results);
+  const completionBase = roundBase(results);
   const actionable = countActionable(t);
-  const thisRound: SupervisorRound = { round, landed, actionable, reviewMustFixTrend };
+  const thisRound: SupervisorRound = {
+    round,
+    landed,
+    ...(baseCompleted > 0 || completionBase !== undefined ? { baseCompleted, ...(completionBase === undefined ? {} : { base: completionBase }) } : {}),
+    actionable,
+    reviewMustFixTrend,
+  };
   const goalPlanRevisionObservation = formatGoalPlanRevisionObservation(results);
   const withGoalPlanRevisionObservation = (why: string): string => goalPlanRevisionObservation
     && goalPlanRevisionObservation !== GOAL_PLAN_REVISION_OBSERVATION_UNAVAILABLE
@@ -226,6 +260,16 @@ export function decideNextRun(input: {
     };
   }
 
+  const harvestable = results.filter((result) => result.harvestable === true && !!result.branch);
+  if (harvestable.length > 0) {
+    return {
+      ...base,
+      action: 'stop',
+      stopReason: 'harvestable-awaiting-human',
+      why: withGoalPlanRevisionObservation(`구현 완료 · 수확 대기 — ${harvestable.map((result) => result.branch).join(' · ')}`),
+    };
+  }
+
   if (deliverableMergeCompleteness === 'complete') {
     return {
       ...base,
@@ -364,7 +408,7 @@ export function decideNextRun(input: {
         ...base,
         action: 'stop',
         stopReason: 'no-progress',
-        why: withNoProgressGoalPlanRevisionObservation(`${stallRounds}라운드 연속 제자리 — 착지도 안 늘고 남은 조각도 안 줄었다(${actionable}). 골·불변식을 의심할 자리`),
+        why: withNoProgressGoalPlanRevisionObservation(`${stallRounds}라운드 연속 제자리 — base=${completionBase ?? 'main'} 기준 완료 ${baseCompleted} · 착지 ${landed} · 남은 조각도 안 줄었다(${actionable}). 골·불변식을 의심할 자리`),
       };
     }
   }
@@ -390,9 +434,12 @@ export function appendRound(
   reviewMustFixTrend?: SupervisorDecision['reviewMustFixTrend'],
 ): SupervisorRound[] {
   const t = triageRun(results.filter((result) => result.salvage !== 'launched'));
+  const baseCompleted = countBaseCompleted(results);
+  const base = roundBase(results);
   return [...history, {
     round: history.length,
     landed: countLanded(results),
+    ...(baseCompleted > 0 || base !== undefined ? { baseCompleted, ...(base === undefined ? {} : { base }) } : {}),
     actionable: countActionable(t),
     ...(reviewMustFixTrend === undefined ? {} : { reviewMustFixTrend }),
   }];