elanous 0.2.29 → 0.2.32

package/src/cli/pr-land-virtual-rebase.ts

@@ -0,0 +1,108 @@
+/**
+ * Read-only virtual rebase proof for a reviewed PR head. The merge tree is written
+ * into a disposable object directory, never into the repository object store.
+ */
+import { spawnSync } from 'node:child_process';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { delimiter, resolve, join } from 'node:path';
+import { tmpdir } from 'node:os';
+
+const SHA40 = /^[a-f0-9]{40}$/iu;
+type Verdict = { ok: true; oldBase: string; patchId: string }
+  | { ok: false; reason: string };
+
+type MergeTreeInput = { cwd: string; baseTip: string; head: string };
+
+/** The callback may read the tree while its temporary objects exist. */
+function withDisposableMergeTree<T>(input: MergeTreeInput, consume: (mergedTree: string, env: NodeJS.ProcessEnv) => T):
+  { ok: true; value: T } | { ok: false; reason: string } {
+  const { cwd, baseTip, head } = input;
+  const gitObjects = spawnSync('git', ['rev-parse', '--git-path', 'objects'], { cwd, encoding: 'utf8' });
+  if (gitObjects.status !== 0 || !gitObjects.stdout.trim()) return { ok: false, reason: 'object-directory-unmeasured' };
+  const alternate = resolve(cwd, gitObjects.stdout.trim());
+  let temporary: string;
+  try { temporary = mkdtempSync(join(tmpdir(), 'elanous-virtual-rebase-')); }
+  catch { return { ok: false, reason: 'temporary-object-directory-unmeasured' }; }
+  const env = {
+    ...process.env,
+    GIT_OBJECT_DIRECTORY: temporary,
+    GIT_ALTERNATE_OBJECT_DIRECTORIES: [alternate, process.env.GIT_ALTERNATE_OBJECT_DIRECTORIES].filter(Boolean).join(delimiter),
+  };
+  try {
+    const result = spawnSync('git', ['merge-tree', '--write-tree', baseTip, head], {
+      cwd, env, encoding: 'utf8', maxBuffer: 32 * 1024 * 1024,
+    });
+    const mergedTree = result.status === 0 && !result.error ? result.stdout.trim() : '';
+    if (!SHA40.test(mergedTree)) return { ok: false, reason: 'merge-tree-conflict-or-unmeasured' };
+    return { ok: true, value: consume(mergedTree, env) };
+  } catch {
+    return { ok: false, reason: 'virtual-rebase-unmeasured' };
+  } finally {
+    rmSync(temporary, { recursive: true, force: true });
+  }
+}
+
+export function verifyVirtualRebasePatch(input: MergeTreeInput): Verdict {
+  const { cwd, baseTip, head } = input;
+  if (!SHA40.test(baseTip) || !SHA40.test(head)) return { ok: false, reason: 'invalid-sha' };
+  const git = (args: string[], env?: NodeJS.ProcessEnv, stdin?: string) => spawnSync('git', args, {
+    cwd, env, input: stdin, encoding: 'utf8', maxBuffer: 32 * 1024 * 1024,
+  });
+  const checked = (args: string[], env?: NodeJS.ProcessEnv) => {
+    const result = git(args, env);
+    return result.status === 0 && !result.error ? result.stdout.trim() : undefined;
+  };
+  const oldBase = checked(['merge-base', baseTip, head]);
+  if (!oldBase || !SHA40.test(oldBase)) return { ok: false, reason: 'merge-base-unmeasured' };
+  if (oldBase === head) return { ok: false, reason: 'head-has-no-patch' };
+  const merged = withDisposableMergeTree(input, (mergedTree, env): Verdict => {
+    const binaryBlob = (sha: string, inEnv?: NodeJS.ProcessEnv): 'binary' | 'text' | 'unmeasured' => {
+      if (/^0+$/u.test(sha)) return 'text';
+      const size = checked(['cat-file', '-s', sha], inEnv);
+      if (!size || !/^\d+$/u.test(size) || Number(size) > 32 * 1024 * 1024) return 'unmeasured';
+      const result = spawnSync('git', ['cat-file', 'blob', sha], {
+        cwd, env: inEnv, maxBuffer: 32 * 1024 * 1024,
+      });
+      if (result.status !== 0 || result.error || !Buffer.isBuffer(result.stdout)) return 'unmeasured';
+      const blob = result.stdout;
+      if (blob.includes(0) || blob.some((byte) => byte < 32 && byte !== 9 && byte !== 10 && byte !== 13)) return 'binary';
+      try { new TextDecoder('utf-8', { fatal: true }).decode(blob); }
+      catch { return 'binary'; }
+      return 'text';
+    };
+    const changed = (from: string, to: string, inEnv?: NodeJS.ProcessEnv) => {
+      const names = checked(['diff', '--name-status', '-M', '-C', '--find-copies-harder', from, to], inEnv);
+      const numstat = checked(['diff', '--numstat', from, to], inEnv);
+      if (names === undefined || numstat === undefined) return { ok: false as const, reason: 'diff-unmeasured' };
+      if (!names) return { ok: false as const, reason: 'empty-patch' };
+      if (names.split('\n').some((line) => /^[RC][0-9]*\t/u.test(line))) return { ok: false as const, reason: 'rename-or-copy' };
+      if (numstat.split('\n').some((line) => /^-\t-\t/u.test(line))) return { ok: false as const, reason: 'binary-patch' };
+      const raw = checked(['diff', '--raw', '--no-abbrev', '-z', from, to], inEnv);
+      if (raw === undefined) return { ok: false as const, reason: 'diff-unmeasured' };
+      const fields = raw.split('\0').filter(Boolean);
+      if (fields.length === 0 || fields.length % 2 !== 0) return { ok: false as const, reason: 'diff-blob-unmeasured' };
+      for (let i = 0; i < fields.length; i += 2) {
+        const entry = /^:[0-7]{6} [0-7]{6} ([a-f0-9]{40,64}) ([a-f0-9]{40,64}) [A-Z][0-9]*$/iu.exec(fields[i]!);
+        if (!entry) return { ok: false as const, reason: 'diff-blob-unmeasured' };
+        for (const sha of [entry[1]!, entry[2]!]) {
+          const kind = binaryBlob(sha, inEnv);
+          if (kind !== 'text') return { ok: false as const, reason: kind === 'binary' ? 'binary-patch' : 'diff-blob-unmeasured' };
+        }
+      }
+      const diff = checked(['diff', '--no-ext-diff', '--no-renames', '--binary', from, to], inEnv);
+      if (!diff) return { ok: false as const, reason: 'diff-unmeasured' };
+      const patched = git(['patch-id', '--stable'], inEnv, `${diff}\n`);
+      const patchId = patched.status === 0 && !patched.error ? patched.stdout.trim().split(/\s+/u)[0] : undefined;
+      return patchId && SHA40.test(patchId)
+        ? { ok: true as const, patchId }
+        : { ok: false as const, reason: 'patch-id-unmeasured' };
+    };
+    const original = changed(oldBase, head);
+    if (!original.ok) return original;
+    const virtual = changed(baseTip, mergedTree, env);
+    if (!virtual.ok) return virtual;
+    if (original.patchId !== virtual.patchId) return { ok: false, reason: 'patch-id-different' };
+    return { ok: true, oldBase, patchId: original.patchId };
+  });
+  return merged.ok ? merged.value : merged;
+}

package/src/cli/pty-takeover-cli.ts

@@ -5,7 +5,7 @@ import { dirname, join, resolve } from 'node:path';
 import { runGitCommand } from '../git-fs/runner.js';
 import { debug } from '../debug/log.js';
 import { getPty, listPty, renamePty, requestPtyTakeover } from '../pty-shell/registry.js';
-import { describePtyRunState, readCheckoutHead, readCurrentInstallRecord, shortSha, type InstalledRecord, type PtyRunStateView } from '../pty-shell/tui-run-state.js';
+import { describePtyRunState, describeTurnCell, formatTurnCell, ptyTurnViewOfRow, readCheckoutHead, readCurrentInstallRecord, shortSha, UNKNOWN_TURN_CELL, type InstalledRecord, type PtyRunStateView, type PtyTurnCell } from '../pty-shell/tui-run-state.js';
 import { getPtyManifest, isProcessAlive, listPtyManifest, listPtyManifestRows, listPtyManifestRowsAt, ptyManifestDbPath, readPtyManifestFrame, reapDeadPtyManifest, reapDeadPtyManifestAt, reapStalePtyManifest, removePtyManifest, PTY_MANIFEST_CLOSED_TTL_MS, PTY_MANIFEST_STALE_MS, type PtyManifestExternalReapResult, type PtyManifestRow } from '../pty-shell/pty-manifest.js';
 import { readPtyEventsAfter, readPtyEventsAfterAt, type PtyEventLogReadResult, type PtyEventRow } from '../pty-shell/pty-event-log.js';
 import { resolvePtyRef, type PtyRefItem } from '../pty-shell/pty-ref.js';
@@ -27,7 +27,7 @@ import { isRunStatus } from '../self-implement/run-status-mapping.js';
 import { terminalTreeLabel } from '../pty-shell/terminal-tree.js';
 import { RemotesStore } from './remotes.js';
 import { bookmarkAttachDefaults } from './remote-resolve.js';
-import { classifyFrameState, type FrameState } from '../capture/frame-state-detect.js';
+import { classifyFrameState, reconcileFrameStateWithTurn, type FrameState } from '../capture/frame-state-detect.js';
 import { installMissingTool, waitForPtyCompletion, type ToolInstallDeps, type ToolInstallResult } from '../agent-mission/tool-install.js';
 
 interface PtyTakeoverCommandResult { readonly exitCode: 0 | 1 | 2; readonly message: string; readonly notice?: string; }
@@ -1441,6 +1441,10 @@ interface PtyListJsonRow extends PtyWebAddress {
    *    그 값은 거의 항상 몇 초이고 「얼마나 오래 있었나」를 못 답한다.
    *  ⚠️ `startedAt` 이 0(미상)이면 이 칸을 «비운다» — 「0분」과 「못 잼」은 다른 값이다. */
   readonly ageMs?: number;
+  /** ⭐ H10 — TUI 가 스스로 적은 턴(화면 추정 아님) ⊕ 그 상태 경과 초. 턴 기록 없는 행·원격 행은 `state:'unknown'`. */
+  readonly turn: PtyTurnCell;
+  /** ⭐ H10 — 기동 판(실행판 sha) ⊕ 낡음. 판 기록 없는 행·판독 실패는 null. */
+  readonly build: { readonly version: string; readonly sha: string; readonly source: string; readonly stale: boolean | null; readonly staleReason: string } | null;
 }
 
 function defaultRunTermination(runId: string, opts: { includeTest: boolean }, log: (event: string, data: Record<string, unknown>) => void): RunTermination {
@@ -1457,7 +1461,7 @@ function ptyAgeField(startedAt: number, now: number): { ageMs?: number } {
   return ageMs >= 0 ? { ageMs } : {};
 }
 
-function ptyListJsonRow(row: PtyManifestRow, instance: string, sourceRoot: PtyManifestSourceRoot, deps: PtyTakeoverCommandDeps, opts: { includeTest: boolean }, pwa?: NexusPwaResolution): PtyListJsonRow {
+function ptyListJsonRow(row: PtyManifestRow, instance: string, sourceRoot: PtyManifestSourceRoot, deps: PtyTakeoverCommandDeps, opts: { includeTest: boolean }, pwa?: NexusPwaResolution, installed: () => InstalledRecord = () => deps.readInstalledBuild?.() ?? {}): PtyListJsonRow {
   // ⛔⭐ 리뷰 should-fix (2026-08-19): 기준 시각을 «한 번만» 읽는다.
   //   종전엔 proof(updatedAgeMs)와 ageMs 가 각각 `deps.now?.()` 를 불러, 한 행의 두 값이
   //   ***«다른 순간»을 가리킬 수 있었다***. 두 값을 나란히 놓고 판정하는 것이 이 축의 용도인데
@@ -1498,9 +1502,56 @@ function ptyListJsonRow(row: PtyManifestRow, instance: string, sourceRoot: PtyMa
     runTerminationSource: resolution?.source ?? 'unknown',
     runStoreIo: resolution?.runStoreIo ?? 'not-checked',
     ownerRunUsage,
+    ...ptyListRunFields(row, deps, observedAt, installed),
   };
 }
 
+/** `pty list --json` 의 턴·판 칸 — ⛔ 키는 «언제나» 싣는다(값으로만 갈린다 · 모르면 unknown/null).
+ *  ⭐ 턴은 행의 자기보고 값만 읽는다 — 판 판독(설치본·git)이 실패해도 기록된 턴은 버리지 않는다. */
+function ptyListRunFields(row: PtyManifestRow, deps: PtyTakeoverCommandDeps, observedAt: number, installed: () => InstalledRecord): Pick<PtyListJsonRow, 'turn' | 'build'> {
+  const turn = describeTurnCell(ptyTurnViewOfRow(row), observedAt);
+  try {
+    if (!row.build) return { turn, build: null };
+    // 판독 예외 계약: 판 sha 는 기록값이라 그대로 두고 낡음만 «모른다»(stale=null · unknown) ⊕ `list-build-read-failed` 관측.
+    //   그 밖의 뜻밖 예외는 판을 null 로(아래 catch) — 어느 쪽이든 기록된 턴은 버리지 않는다.
+    const run = describePtyRunState(row, {
+      readInstalled: installed,
+      readCheckoutHead: (codeRoot) => {
+        try { return deps.readCheckoutHead?.(codeRoot); } catch (error) {
+          deps.log('list-build-read-failed', { ptyId: row.id, source: 'checkout-head', error: error instanceof Error ? error.message : String(error) });
+          return undefined;
+        }
+      },
+    });
+    return { turn, build: run.build ? { version: run.build.version, sha: run.build.sha, source: run.build.source, stale: run.stale, staleReason: run.staleReason } : null };
+  } catch (error) {
+    deps.log('list-build-read-failed', { ptyId: row.id, source: 'describe', error: error instanceof Error ? error.message : String(error) });
+    return { turn, build: null };
+  }
+}
+
+/** 목록 한 번에 설치본 기록을 «한 번만» 읽는다. 예외는 «모른다»({}) ⊕ `list-build-read-failed`(목록당 한 줄) — 목록·턴 칸을 깨지 않는다. */
+function listInstalledReader(deps: PtyTakeoverCommandDeps): () => InstalledRecord {
+  let once: InstalledRecord | undefined;
+  return () => {
+    if (once === undefined) {
+      try { once = deps.readInstalledBuild?.() ?? {}; } catch (error) {
+        once = {};
+        deps.log('list-build-read-failed', { source: 'installed', error: error instanceof Error ? error.message : String(error) });
+      }
+    }
+    return once;
+  };
+}
+
+/** 글 표의 판 칸 — 판독이 어떻게 실패해도 그 행(과 뒤따르는 턴 칸)을 깨지 않는다: 판 칸만 비우고 관측 한 줄. */
+function safeListRunColumn(row: PtyManifestRow | undefined, deps: PtyTakeoverCommandDeps, installed: () => InstalledRecord): string {
+  try { return formatListRunColumn(row, deps, installed); } catch (error) {
+    deps.log('list-build-read-failed', { ptyId: row?.id ?? '', source: 'run-column', error: error instanceof Error ? error.message : String(error) });
+    return '';
+  }
+}
+
 function federatedManifestTargets(
   targets: readonly { name: string; dbPath: string }[],
   currentDbPath: string,
@@ -1771,6 +1822,9 @@ function remotePtyListJsonRow(row: RemoteTerminalListItem): PtyListJsonRow {
     runTerminationSource: 'unknown',
     runStoreIo: 'not-checked',
     ownerRunUsage: 'unknown',
+    // 원격 응답은 턴·판을 안 싣는다 — «모른다»로(로컬과 같은 키).
+    turn: UNKNOWN_TURN_CELL,
+    build: null,
   };
 }
 
@@ -1893,9 +1947,11 @@ function runPtyListJson(deps: PtyTakeoverCommandDeps, opts: { all?: boolean; inc
   }
   // Keep the existing list contract: rows whose selected PTY/owner process is dead are not listable.
   const pwa = deps.resolveNexusPwa?.();
+  // 설치본 기록은 목록 한 번에 한 번만 읽는다(행마다 다시 읽으면 I/O 와 행 사이 불일치). 실패는 «모른다» ⊕ 관측 한 줄.
+  const installed = listInstalledReader(deps);
   const payload = rows
     .filter(({ row }) => row.alive && (row.ptyPid > 0 ? deps.isProcessAlive!(row.ptyPid) : deps.isProcessAlive!(row.ownerPid)))
-    .map(({ row, instance, sourceRoot }) => ptyListJsonRow(row, instance, sourceRoot, deps, { includeTest: opts.includeTest === true }, pwa));
+    .map(({ row, instance, sourceRoot }) => ptyListJsonRow(row, instance, sourceRoot, deps, { includeTest: opts.includeTest === true }, pwa, installed));
   deps.log('list', { count: payload.length, federated: opts.all === true, includeTest: opts.includeTest === true, json: true });
   return { exitCode: 0, message: JSON.stringify(payload, null, 2), ...(payload.length === 0 ? { notice: ptyListEmptyNotice(opts) } : {}) };
 }
@@ -1966,12 +2022,15 @@ export function runPtyList(
   const pwa = deps.resolveNexusPwa?.();
   // 판 칸(맨 끝) — 설치본 기록은 목록 한 번에 한 번만 읽는다.
   //    설치본 판독기가 없는 구성(시험 deps)은 이 칸을 안 낸다 — 기계마다 다른 값이 목록에 새지 않게.
-  const manifestRowById = new Map((deps.readInstalledBuild ? deps.listManifestRows?.() ?? [] : []).map((row) => [row.id, row] as const));
-  let installedOnce: InstalledRecord | undefined;
-  const installed = (): InstalledRecord => (installedOnce ??= deps.readInstalledBuild?.() ?? {});
+  //    ⭐ H10 턴 칸은 판독기와 «무관하게» TUI ref 마다 낸다(기계마다 다른 값이 아니다) — 행을 못 얻으면 `turn=?`.
+  let manifestRows: readonly PtyManifestRow[] = [];
+  try { manifestRows = deps.listManifestRows?.() ?? []; } catch { manifestRows = []; }
+  const manifestRowById = new Map(manifestRows.map((row) => [row.id, row] as const));
+  const listedAt = deps.now?.() ?? Date.now();
+  const installed = listInstalledReader(deps);
   const rendered = refs.map((ref) => {
     const provenance = (deps.resolveWorktreeProvenance ?? resolvePtyWorktreeProvenance)(ref.workdir);
-    return { known: ptyPurposeKnown(provenance, ref.purpose), line: `${ref.id}\t${ref.kind}\t${ref.nickname ?? '-'}\t${ref.source}\t${ref.alive ? 'alive' : 'dead'}\t${ref.mode ?? '?'}\t${ref.workdir ?? '-'}\t${ref.runId ?? '-'}${ownerRunUsageById.has(ref.id) ? `\t${ownerRunUsageById.get(ref.id)}` : ''}\t${formatTerminalOrigin(ref)}\t${formatPtyPurpose(provenance, ref.purpose)}${pwa ? `\t${formatPtyWebAddress(ptyWebAddress(ref.id, pwa))}` : ''}${formatListRunColumn(manifestRowById.get(ref.id), deps, installed)}` };
+    return { known: ptyPurposeKnown(provenance, ref.purpose), line: `${ref.id}\t${ref.kind}\t${ref.nickname ?? '-'}\t${ref.source}\t${ref.alive ? 'alive' : 'dead'}\t${ref.mode ?? '?'}\t${ref.workdir ?? '-'}\t${ref.runId ?? '-'}${ownerRunUsageById.has(ref.id) ? `\t${ownerRunUsageById.get(ref.id)}` : ''}\t${formatTerminalOrigin(ref)}\t${formatPtyPurpose(provenance, ref.purpose)}${pwa ? `\t${formatPtyWebAddress(ptyWebAddress(ref.id, pwa))}` : ''}${safeListRunColumn(manifestRowById.get(ref.id), deps, installed)}${formatListTurnColumn(ref.kind, manifestRowById.get(ref.id), listedAt)}` };
   });
   return {
     exitCode: 0,
@@ -2067,24 +2126,30 @@ export async function runPtyState(ref: string, deps: PtyTakeoverCommandDeps = li
     if (run.turn === 'unknown' && run.build === null) return { exitCode: 1, message: formatSnapshotResult(acquired.id, acquired.control) };
     const screenUnavailable = acquired.control.reason ?? acquired.control.status;
     deps.log('state-screen-unavailable', { ptyId: acquired.id, reason: screenUnavailable, turn: run.turn });
-    return formatPtyStateResult(acquired.id, { state: 'unknown', label: null }, run, deps.now?.() ?? Date.now(), json, screenUnavailable);
+    return formatPtyStateResult(acquired.id, { state: 'unknown', label: null }, run, deps.now?.() ?? Date.now(), json, deps, screenUnavailable);
   }
   const verdict = classifyFrameState(acquired.control.screen ?? '');
   const at = deps.now?.() ?? Date.now();
   if (run.turn === 'unknown' || run.stale === null) deps.log('state-run-unknown', { ptyId: acquired.id, turn: run.turn, staleReason: run.staleReason, hasBuild: run.build !== null });
-  return formatPtyStateResult(acquired.id, { state: verdict.state, label: verdict.matchedLabel }, run, at, json);
+  return formatPtyStateResult(acquired.id, { state: verdict.state, label: verdict.matchedLabel }, run, at, json, deps);
 }
 
-function formatPtyStateResult(id: string, screen: { state: string; label?: string | null }, run: PtyRunStateView, at: number, json: boolean, screenUnavailable?: string): PtyTakeoverCommandResult {
+// ⭐ H10 조각 1 — `state` 는 «하나»다: TUI 가 스스로 적은 턴이 있으면 그것이 바쁜가/한가한가를 정하고(`stateSource=turn`),
+//   화면 추정은 턴을 모를 때·턴과 모순 없는 더 구체적인 상태(blocked·waiting·done)일 때만 쓴다(`stateSource=screen`).
+//   화면 원값은 `screenState`(JSON) · `guess=`(글, 갈렸을 때만)로 남긴다 — 둘이 갈린 순간은 `state-reconciled` 관측.
+function formatPtyStateResult(id: string, screen: { state: FrameState; label?: string | null }, run: PtyRunStateView, at: number, json: boolean, deps: PtyTakeoverCommandDeps, screenUnavailable?: string): PtyTakeoverCommandResult {
+  const reconciled = reconcileFrameStateWithTurn(screen.state, run.turn);
+  if (reconciled.overridden) deps.log('state-reconciled', { ptyId: id, turn: run.turn, screenState: reconciled.screenState, label: screen.label ?? null, state: reconciled.state });
+  const guess = reconciled.screenState !== reconciled.state && !screenUnavailable ? ` guess=${reconciled.screenState}` : '';
   return { exitCode: 0, message: json
     ? JSON.stringify({
-      id, state: screen.state, label: screen.label, at,
+      id, state: reconciled.state, stateSource: reconciled.source, screenState: reconciled.screenState, label: screen.label, at,
       ...(screenUnavailable ? { screenUnavailable } : {}),
       turn: run.turn, ...(run.turnAt !== undefined ? { turnAt: run.turnAt } : {}),
       build: run.build ? { version: run.build.version, sha: run.build.sha, source: run.build.source } : null,
       installed: run.installed, stale: run.stale, staleReason: run.staleReason,
     })
-    : `pty state: ${id} state=${screen.state} label=${screen.label ?? '-'}${screenUnavailable ? ` screen=unavailable(${screenUnavailable})` : ''} turn=${run.turn} build=${formatRunBuild(run)} installed=${shortSha(run.installed)} stale=${run.stale ?? 'unknown'}${run.stale === null ? '' : ` (${run.staleReason})`}` };
+    : `pty state: ${id} state=${reconciled.state} source=${reconciled.source}${guess} label=${screen.label ?? '-'}${screenUnavailable ? ` screen=unavailable(${screenUnavailable})` : ''} turn=${run.turn} build=${formatRunBuild(run)} installed=${shortSha(run.installed)} stale=${run.stale ?? 'unknown'}${run.stale === null ? '' : ` (${run.staleReason})`}` };
 }
 
 function ptyRunStateFor(id: string, deps: PtyTakeoverCommandDeps): PtyRunStateView {
@@ -2103,7 +2168,8 @@ function formatRunBuild(run: PtyRunStateView): string {
 
 /** `pty list` 한 칸 — 판을 적는 행(TUI)만. `run=<sha>` · 낡았으면 `,stale` · 옛 행 추정은 `run=?,stale`. */
 function formatListRunColumn(row: PtyManifestRow | undefined, deps: PtyTakeoverCommandDeps, installed: () => InstalledRecord): string {
-  if (!row || (!row.build && row.kind !== 'tui')) return '';
+  // 설치본 판독기가 없는 구성(시험 deps)은 이 칸을 안 낸다 — 기계마다 다른 값이 목록에 새지 않게.
+  if (!deps.readInstalledBuild || !row || (!row.build && row.kind !== 'tui')) return '';
   const run = describePtyRunState(row, {
     readInstalled: installed,
     ...(deps.readCheckoutHead ? { readCheckoutHead: deps.readCheckoutHead } : {}),
@@ -2112,6 +2178,14 @@ function formatListRunColumn(row: PtyManifestRow | undefined, deps: PtyTakeoverC
   return `\trun=${run.build?.sha ? shortSha(run.build.sha) : '?'}${run.stale === true ? ',stale' : ''}`;
 }
 
+/** ⭐ H10 «턴 칸» — ref 가 TUI 면 «언제나» 낸다: `turn=busy,42s` · `turn=idle,300s` · 행 없음·종류 불일치·기록 없음 `turn=?`.
+ *  OP·TF 가 화면(«Streaming…/완료»)을 긁지 않고 «지금 턴 중인가·얼마나 됐나»를 읽는다. 턴은 자기보고 값만 쓴다(설치본·git 무관). */
+function formatListTurnColumn(refKind: string, row: PtyManifestRow | undefined, now: number): string {
+  if (refKind !== 'tui') return '';
+  if (!row || row.kind !== 'tui') return '\tturn=?';
+  return `\tturn=${formatTurnCell(describeTurnCell(ptyTurnViewOfRow(row), now))}`;
+}
+
 export async function runPtyWait(ref: string, until: string, options: { readonly timeoutMs?: number; readonly pollMs?: number } = {}, deps: PtyTakeoverCommandDeps = liveDeps): Promise<PtyTakeoverCommandResult> {
   if (!WAITABLE_FRAME_STATES.includes(until as Exclude<FrameState, 'unknown'>)) return { exitCode: 2, message: `pty wait: --until must be one of ${WAITABLE_FRAME_STATES.join(', ')} (got ${until})` };
   const target = until as Exclude<FrameState, 'unknown'>;

package/src/cli/release-cli.ts

@@ -8,7 +8,7 @@
 //   elanous release run     --version <x.y.z> [--prerelease rc] [--main-cut | --cut-commit <sha>] [--publish-at <iso>] [--gate-executor <pod|host> [--gate-host <ssh-host>]] [--dry-run] [--json] [--if-ready]
 //   elanous release resume  --run <runId> --from <node> [--waive <node> --reason <text>] [--accepted-regressions <json>] [--gate-executor <pod|host> [--gate-host <ssh-host>]] [--json]
 //   elanous release auto-start [--window-minutes <n>] [--apply] [--json]
-//   elanous release rehearsal tick [--apply] [--checkout <dir>] [--json]
+//   elanous release rehearsal tick [--apply] [--checkout <dir>] [--shards <n>] [--remote <host>] [--json]
 //   elanous release preflight --version <x.y.z> [--publish-at <iso>] [--json]   (컷 30분 전 사전 점검 · 읽기 전용 · ⛔ 있으면 exit 1)
 //   elanous release cut-branch --version <x.y.z> --base <sha> --pick <sha>... [--dry-run]
 //
@@ -21,7 +21,7 @@ import { spawnSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { chmodSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, isAbsolute, join, relative, resolve, sep } from 'node:path';
 import type { Command } from 'commander';
 import { debug } from '../debug/log.js';
 import { effectiveInstanceRoot, releaseLedgerRoot } from '../instance/resolve.js';
@@ -32,7 +32,8 @@ import { addItem, cellsReferencingDoc, claimItem, decodeClaimHistoryEntry, devVe
 import * as features from '../release-loop/feature-store.js';
 import { evidencePlan, landedButYellow, type MergedChecklistPr } from '../release-loop/landed-but-yellow.js';
 import { formatSchedule, getSchedule, listSchedules, setSchedule } from '../release-loop/release-schedule.js';
-import { placeCell, rebalance, seatMove, type PlacementPriority } from '../release-loop/placement.js';
+import { mergedPrsLast24h, placeCell, planPullForward, pullForwardPlacementConfig, rebalance, seatMove, type PlacementPriority } from '../release-loop/placement.js';
+import { readTrafficSignal } from '../seat-loop/traffic-signal.js';
 import { parseRubric, readRubricItems, rubricGrade, rubricScore } from '../release-loop/rubric.js';
 import { writeStdoutJson } from './stdout-json.js';
 import { CliUserError } from './cli-user-error.js';
@@ -700,6 +701,63 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
       for (const row of blocked) console.log(`⛔ ${row.id} ${row.from} → ${row.to} 이월 거부 · ${row.reason}`);
       if (!decisions.length && !blocked.length) console.log('이월할 미시작 칸 없음');
     });
+  release.command('budget').description('판의 P0/P1 루브릭 S(0~3) 분포·합계·미기입 칸 조회(읽기 전용)')
+    .requiredOption('--version <v>', '조회할 판 또는 별칭')
+    .option('--json', '결과 JSON')
+    .action(async (opts: { version: string; json?: boolean }) => {
+      const version = checklistVersion(opts.version, checklistCodenames());
+      const byPriority = {
+        P0: { s: { 0: 0, 1: 0, 2: 0, 3: 0 }, total: 0, missing: 0 },
+        P1: { s: { 0: 0, 1: 0, 2: 0, 3: 0 }, total: 0, missing: 0 },
+      };
+      for (const item of readRubricItems(version, releaseLedgerRoot())) {
+        if (item.priority !== 'P0' && item.priority !== 'P1') continue;
+        const group = byPriority[item.priority];
+        const rubric = parseRubric(`${item.title}\n${item.evidence ?? ''}`);
+        if (rubric === null) group.missing++;
+        else { group.s[rubric.S as 0 | 1 | 2 | 3]++; group.total += rubric.S; }
+      }
+      const result = { version, byPriority, total: byPriority.P0.total + byPriority.P1.total, missing: byPriority.P0.missing + byPriority.P1.missing };
+      if (opts.json) await writeStdoutJson(`${JSON.stringify(result)}\n`);
+      else {
+        for (const [priority, group] of Object.entries(byPriority)) console.log(`${priority} · S 0:${group.s[0]} 1:${group.s[1]} 2:${group.s[2]} 3:${group.s[3]} · 합계 ${group.total} · S 미기입 ${group.missing}`);
+        console.log(`합계 ${result.total} · S 미기입 ${result.missing}`);
+      }
+    });
+  release.command('pull-forward').description('다음 판 P0/P1 칸을 지금 판으로 당길 계획만 조회')
+    .option('--dry-run', '원장 이동 없이 계획만 보기').option('--traffic <path>', 'OP traffic.json 경로')
+    .option('--checkout <dir>', '대상 저장소 체크아웃(기본 harness.defaultRepo 또는 현재 디렉터리)')
+    .option('--json', '구조화 계획 출력')
+    .action((opts: { dryRun?: boolean; traffic?: string; checkout?: string; json?: boolean }) => {
+      if (!opts.dryRun) throw new CliUserError('pull-forward는 --dry-run 계획만 지원한다');
+      const signal = readTrafficSignal(opts.traffic);
+      if (!signal || 'unreadable' in signal) throw new CliUserError('traffic.json을 읽지 못해 hold·신호 순서를 확인할 수 없다');
+      const checkout = resolve(opts.checkout ?? getUserConfig().harness?.defaultRepo ?? process.cwd());
+      if (!existsSync(checkout) || !statSync(checkout).isDirectory()) throw new CliUserError(`대상 저장소 체크아웃이 없다: ${checkout}`);
+      const root = spawnSync('git', ['-C', checkout, 'rev-parse', '--show-toplevel'], { encoding: 'utf8', timeout: 5_000 });
+      if (root.status !== 0 || !root.stdout?.trim() || realpathSync(root.stdout.trim()) !== realpathSync(checkout))
+        throw new CliUserError(`대상 저장소의 Git 체크아웃 루트가 아니다: ${checkout}`);
+      const checkoutReal = realpathSync(checkout);
+      const now = new Date();
+      const schedules = listSchedules(scheduleLedgerRoot());
+      const versions = [...new Set([...schedules.map((row) => row.version), ...features.assignedVersions()])];
+      const checklists = new Map(versions.map((version) => [version, listChecklist(version).items] as const));
+      const placement = pullForwardPlacementConfig();
+      const result = planPullForward({ now, schedules, checklists, released: features.releasedVersion(),
+        merged24h: mergedPrsLast24h(now), ...placement, signal,
+        targetPathExists: (path) => {
+          try {
+            const targetReal = realpathSync(join(checkout, path));
+            const inside = relative(checkoutReal, targetReal);
+            return inside !== '..' && !inside.startsWith(`..${sep}`)
+              && !isAbsolute(inside) && statSync(targetReal).isFile();
+          } catch { return false; }
+        } });
+      if (opts.json) return writeStdoutJson(`${JSON.stringify(result)}\n`);
+      for (const row of result.decisions) console.log(`· 드라이런 ${row.id} ${row.from} → ${row.version} · ${row.reason}`);
+      for (const row of result.blocked) console.log(`⛔ ${row.id} ${row.from} → ${row.to} 당김 보류 · ${row.reason}`);
+      if (!result.decisions.length && !result.blocked.length) console.log('당겨올 칸 없음');
+    });
   const ceoMinutes = (value: string): number => {
     if (!/^\d+$/.test(value) || !Number.isSafeInteger(Number(value))) throw new CliUserError('대표 손 분량은 0 이상의 정수 분이어야 한다');
     return Number(value);
@@ -783,13 +841,16 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
         if (opts.open && (local.version !== undefined || inherited?.version !== undefined)) throw new CliUserError('--open 과 --version 을 함께 쓸 수 없다');
         const json = local.json ?? inherited?.json;
         if (opts.owner !== undefined) parseOwner(opts.owner);
-        const released = opts.open ? (landedDeps.released ?? features.releasedVersion)() : '';
-        const openSnapshots = opts.open
-          ? (landedDeps.schedules ?? features.readSchedules)()
-            .filter(({ version }) => isReleaseVersion(version) && (!released || compareReleaseVersions(version, released) > 0))
-            .sort((a, b) => compareReleaseVersions(a.version, b.version))
-            .map(({ version }) => (landedDeps.checklist ?? listChecklist)(version)).filter((snapshot) => snapshot.items.length > 0)
+        const includeOpenHistory = opts.open || local.version !== undefined || inherited?.version !== undefined;
+        const released = includeOpenHistory ? (landedDeps.released ?? features.releasedVersion)() : '';
+        // readSchedules() initializes SQLite when the ledger does not exist. This query is read-only.
+        const schedules = includeOpenHistory
+          ? landedDeps.schedules?.() ?? (existsSync(join(releaseLedgerRoot(), 'release', 'features.sqlite')) ? features.readSchedules() : [])
           : [];
+        const openSnapshots = schedules
+          .filter(({ version }) => isReleaseVersion(version) && (!released || compareReleaseVersions(version, released) > 0))
+          .sort((a, b) => compareReleaseVersions(a.version, b.version))
+          .map(({ version }) => (landedDeps.checklist ?? listChecklist)(version)).filter((snapshot) => snapshot.items.length > 0);
         if (opts.open && !openSnapshots.length) {
           if (json) await writeStdoutJson('[]\n'); else console.log('열린 판 없음');
           return;
@@ -797,7 +858,9 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
         if (opts.applyEvidence && !opts.dryRun && !mayWrite(cmd)) return;
         const snapshots = opts.open ? openSnapshots : [(landedDeps.checklist ?? listChecklist)(context(cmd).version)];
         const now = (landedDeps.now ?? (() => new Date()))();
-        const updated = snapshots.flatMap(({ items }) => items
+        // --version 도 --open 과 같은 판 전체 최좌 수정일로 병합 PR 을 찾는다 — 선택 판 칸의 updatedAt 에 묶이면 그보다 오래 전에 병합된 PR 을 놓친다(LBY-VERSION-OPEN-MISMATCH · OPT #4059).
+        const sinceSnapshots = opts.open ? snapshots : [...openSnapshots, ...snapshots];
+        const updated = sinceSnapshots.flatMap(({ items }) => items
           .filter((item) => (item.status === 'yellow' || item.status === 'red') && (opts.owner === undefined || ownerMatches(item.owner, opts.owner)))
           .map((item) => Date.parse(item.updatedAt)).filter((at) => Number.isFinite(at)));
         const since = updated.length ? new Date(updated.reduce((earliest, at) => Math.min(earliest, at))).toISOString().slice(0, 10)
@@ -1141,15 +1204,16 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
     .option('--remote <host>', '게이트 호스트(기본 config gateRemote.host)')
     .option('--local', '원격 대신 이 기계에서 돌린다(원격 자식이 이것으로 다시 불린다)')
     .option('--shards <n>', '시험 분할 수', '4')
+    .option('--fixed-shard-distribution', 'self gate 에 그대로 전달 — RSS 사전 측정 없이 --shards N 조각에 정렬 라운드로빈 고정 배정(opt-in · 원격 자식 전달)')
     .option('--rehearsal-tui', '리허설 전용 TUI 화면 점검(원격 자식 전달)')
     .option('--json', '결과 한 줄 JSON(stdout) · 사람 줄은 stderr')
-    .action(async (o: { version: string; base?: string; head?: string; remote?: string; local?: boolean; shards: string; rehearsalTui?: boolean; json?: boolean }) => {
+    .action(async (o: { version: string; base?: string; head?: string; remote?: string; local?: boolean; shards: string; fixedShardDistribution?: boolean; rehearsalTui?: boolean; json?: boolean }) => {
       // The root strips `--local` from argv (remote-bookmark attach) before Commander sees it — same read as `self gate`.
       const local = !!o.local || process.argv.slice(2).includes('--local');
       await jsonAction(o.json, async (log) => {
         if (o.remote !== undefined && local) throw new Error('release light-rc: --remote and --local cannot be combined');
         const shards = Number(o.shards);
-        const result = await runLightRc(o.version, { base: o.base, head: o.head, remote: o.remote, local, shards, rehearsalTui: o.rehearsalTui, ledgerRoot: releaseRunDeps.ledgerRoot, log: (l) => console.error(l) }, lightRcDeps);
+        const result = await runLightRc(o.version, { base: o.base, head: o.head, remote: o.remote, local, shards, ...(o.fixedShardDistribution ? { fixedShardDistribution: true } : {}), rehearsalTui: o.rehearsalTui, ledgerRoot: releaseRunDeps.ledgerRoot, log: (l) => console.error(l) }, lightRcDeps);
         for (const line of formatLightRc(result)) log(line);
         return result;
       }, (r) => r.ok);
@@ -1237,12 +1301,14 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
     .description('15분 틱: 다음 판 컷 −7h · −150m RC 계획(기본 보기만)')
     .option('--apply', '도장 선점 후 해당 단계 실행')
     .option('--checkout <dir>', '깨끗한 git 체크아웃(기본 ELANOUS_REHEARSAL_GIT_CWD)')
+    .option('--shards <n>', '시험 분할 수')
+    .option('--remote <host>', '게이트 호스트')
     .option('--json', '결과 한 줄 JSON(stdout)')
-    .action(async (o: { apply?: boolean; checkout?: string; json?: boolean }) => {
+    .action(async (o: { apply?: boolean; checkout?: string; shards?: string; remote?: string; json?: boolean }) => {
       await jsonAction(o.json, async (log) => {
         const ledgerRoot = scheduleLedgerRoot();
         if (o.apply && !mayWriteLedger('release rehearsal tick', false, ledgerRoot)) throw new Error('release rehearsal tick: ledger write denied');
-        const result = await runRehearsalTick({ apply: o.apply, checkout: o.checkout, ledgerRoot }, rehearsalDeps);
+        const result = await runRehearsalTick({ apply: o.apply, checkout: o.checkout, shards: o.shards === undefined ? undefined : Number(o.shards), remote: o.remote, ledgerRoot }, rehearsalDeps);
         log(`· 리허설 ${result.status}${'version' in result ? ` ${result.version}` : ''}${result.status === 'due' ? ` · 실행 ${result.run ?? '-'} · 건너뜀 ${result.supersede.join(', ') || '-'}` : ''}`);
         return result;
       }, (result) => !result.notificationFailures && !result.stamps?.some((stamp) => !['ok', 'superseded'].includes(stamp.outcome)));