elanous 0.2.15 → 0.2.16

package/src/cli/logs-cli.ts

@@ -715,7 +715,7 @@ export function podObservationGapNotice(
     .some((prefix) => category.startsWith(prefix));
   const categories = [...(query.categories ?? []), ...(query.exactCategories ?? [])];
   if (!categories.some(childCategory) && !(categories.length === 0 && (query.events?.length ?? 0) > 0)) return null;
-  return `안내: 이 창에 Pod 에서 돈 런 ${podRuns}개 — Pod 자식의 관측은 이 logs.db 에 수집되지 않는다(POD-OBS). 원장으로 본다: elanous self run-ledger <runId>`;
+  return `안내: 이 창에 Pod 에서 돈 런 ${podRuns}개 — Pod 자식의 관측은 «발사한 트리의 파생 우주» logs.db 로 회수된다(POD-OBS) — 전체: elanous logs --all --include-test · 런 하나: elanous self run-ledger <runId>`;
 }
 
 /** Select ledger roots independently of DB existence; --all includes registered roots with no logs.db. */
@@ -1038,6 +1038,24 @@ export function otherInstanceHint(matches: readonly { name: string; count: numbe
   return `  ↳ 다른 인스턴스에는 있다 — ${found}\n    전체를 보려면: elanous logs --all --include-test${filters ? ` ${filters}` : ''}`;
 }
 
+/** POD-OBS(10-06): 결과가 «0이 아닌데 적을 때»도 조용하지 않게 — 다른 우주에 더 많으면 경고한다.
+ *  실측: 24h `pre-pr-sync` 운영 1건 vs 발사 트리 파생 우주 276건(Pod 자식 재방출은 부모 하니스의 우주에 쌓인다). */
+export function otherInstanceMajorityWarning(
+  shown: number,
+  matches: readonly { name: string; count: number }[],
+  opts: LogsCliOpts,
+): string | null {
+  const elsewhere = matches.reduce((sum, match) => sum + match.count, 0);
+  if (shown <= 0 || elsewhere <= shown) return null;
+  const top = [...matches].sort((a, b) => b.count - a.count);
+  const named = top.slice(0, 3).map((match) => `${match.name} ${match.count}건`).join(' · ');
+  const more = top.length > 3 ? ` 외 ${top.length - 3}곳` : '';
+  const filters = requeryFilterArgs(opts);
+  return `⚠ 여기 ${shown}건 · 다른 우주에 ${elsewhere}건이 더 있다 — ${named}${more}\n`
+    + '    (Pod 자식 관측은 발사한 트리의 파생 우주에 쌓인다 · 이 수만 보고 «적다»로 읽지 말 것)\n'
+    + `    전체를 보려면: elanous logs --all --include-test${filters ? ` ${filters}` : ''}`;
+}
+
 export function buildQuery(opts: LogsCliOpts): { query: LogQuery; error?: string } {
   const q: LogQuery = {};
   if (opts.level) {
@@ -1789,6 +1807,30 @@ export async function runLogsCli(opts: LogsCliOpts, deps: RunLogsCliDeps = {}):
       }
       const coverageHint = runCoverageHint(out.map(({ row }) => row));
       if (coverageHint) console.error(coverageHint);
+      // 좁힌 조회(이벤트·카테고리)만 — 넓은 조회까지 매번 전 우주를 열지 않는다.
+      if (out.length > 0 && ((query.events?.length ?? 0) > 0 || (query.categories?.length ?? 0) > 0
+        || (query.exactCategories?.length ?? 0) > 0)) {
+        const matches = probeOtherInstanceMatches(opts, query, resolved.targets.map((target) => target.dbPath));
+        // 표시 상한(--limit)이 아니라 «여기» 실제 일치 수와 비교한다(상한 100 을 «100건»으로 말하지 않는다).
+        let here: number | null = null;
+        try {
+          here = Math.max(out.length, (deps.countMatching ?? ((candidate: LogQuery) => opened.reduce(
+            (count, { store }) => count + store.countMatching(candidate), 0)))(query));
+        } catch (error) {
+          // 셈을 못 했으면 경고하지 않는다 — 잘린 표시 수를 «여기 N건»으로 말하지 않는다.
+          debug.log('logs.cli', 'other-instance-count-failed', { shown: out.length, error: error instanceof Error ? error.message : String(error) });
+        }
+        const majority = here === null ? null : otherInstanceMajorityWarning(here, matches, opts);
+        if (majority) {
+          console.error(majority);
+          debug.log('logs.cli', 'other-instance-majority', {
+            shown: out.length,
+            here,
+            elsewhere: matches.reduce((sum, match) => sum + match.count, 0),
+            instances: matches.length,
+          });
+        }
+      }
       if (out.length === 0) {
         console.error('(일치하는 로그 없음)');
         const instanceHint = otherInstanceHint(

package/src/cli/pr-cli.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync } from 'node:fs';
+import { existsSync, readFileSync, statSync } from 'node:fs';
 import { basename, join, relative, resolve } from 'node:path';
 import { createInterface } from 'node:readline';
 import type { Command } from 'commander';
@@ -19,6 +19,7 @@ import { runModelHardcodeGate } from '../../scripts/ci-model-hardcode-gate.js';
 import { runDaemonPortGate } from '../../scripts/ci-daemon-port-gate.js';
 import { runPublicLeakGate } from '../../scripts/ci-public-leak-gate.js';
 import { exportLeakCheck, publicExportChangedFiles, type ExportLeakCheck } from '../../scripts/ci-public-export-leak-gate.js';
+import { exportImportCheck, type ExportImportCheck } from '../../scripts/ci-public-export-import-gate.js';
 import { checkCommands, extractElanousCommands, type Finding as DocsCliFinding } from '../../scripts/docs-cli-check.js';
 import { runTestInterferenceGate } from '../../scripts/ci-test-interference-gate.js';
 import { isGoalDocumentFileName } from '../self-implement/goal-document.js';
@@ -111,6 +112,8 @@ export interface PrLandDeps {
   runPublicLeakGate?: (changedFiles: readonly string[], out: { log: (message: string) => void; error: (message: string) => void }) => number;
   /** Test seam — the post-transform export leak check on changed files. */
   runExportLeakCheck?: (changedFiles: readonly string[], cwd: string) => ExportLeakCheck;
+  /** Test seam — included files must not import a module the public export excludes. */
+  runExportImportCheck?: (changedFiles: readonly string[], cwd: string) => ExportImportCheck | Promise<ExportImportCheck>;
   /** 공개 문서의 `elanous …` 호출 ↔ 실제 `--help` 대조(경고 전용) — 바뀐 공개 문서 경로를 받아 어긋남 목록을 돌려준다. */
   runDocsCliCheck?: (docFiles: readonly string[]) => DocsCliFinding[];
   /** 변경 시험 파일 간 간섭 검사 심(시험 주입용). */
@@ -231,14 +234,14 @@ export async function decideOverlapLanding(input: {
 
 const liveOut = { log: (message: string) => console.log(message), error: (message: string) => console.error(message) };
 
-function runPrLandTypecheckGate(out: { log: (message: string) => void; error: (message: string) => void }): boolean {
+function runPrLandTypecheckGate(out: { log: (message: string) => void; error: (message: string) => void }, cwd: string = process.cwd()): boolean {
   let failed = false;
   const exit = ((code: number): never => {
     failed = code !== 0;
     throw new Error(`ci-typecheck-changed exited ${code}`);
   });
   try {
-    runChangedTypecheckGate({ log: out.log, warn: out.error, error: out.error, exit });
+    runChangedTypecheckGate({ log: out.log, warn: out.error, error: out.error, exit, cwd });
   } catch (error) {
     if (!failed) throw error;
   }
@@ -290,7 +293,67 @@ export function runPrLandExportLeakCheck(changedFiles: readonly string[], cwd: s
   return exportLeakCheck(changedFiles, top.status === 0 && String(top.stdout ?? '').trim() ? String(top.stdout).trim() : cwd);
 }
 
+/** Included files importing an excluded module — scripts/ci-public-export-import-gate.ts. cwd is the tree being landed. */
+export function runPrLandExportImportCheck(changedFiles: readonly string[], cwd: string): Promise<ExportImportCheck> {
+  const top = runGitCommand(cwd, ['rev-parse', '--show-toplevel'], { encoding: 'utf-8' });
+  return exportImportCheck(changedFiles, top.status === 0 && String(top.stdout ?? '').trim() ? String(top.stdout).trim() : cwd);
+}
+
+/** Blocks the landing when a changed public file imports a module the public export excludes. */
+export async function exportImportBlock(
+  changedFiles: readonly string[] | undefined,
+  check: () => ExportImportCheck | Promise<ExportImportCheck>,
+  out: { log: (message: string) => void; error: (message: string) => void },
+): Promise<boolean> {
+  if (!changedFiles || changedFiles.length === 0) return true;
+  let result: ExportImportCheck;
+  try { result = await check(); } catch { result = { measured: false, hits: [], unseen: 0, detail: '검사 실행 실패' }; }
+  const blocked = !result.measured || result.hits.length > 0;
+  record('public-export-import', !blocked, { measured: result.measured, hits: result.hits.length, unseen: result.unseen });
+  debug.log('pr.land', 'import-gate', { blocked, hits: result.hits.map(({ file, target }) => ({ file, target })), measured: result.measured, unseen: result.unseen });
+  if (!result.measured) {
+    out.error(`✗ public-export-import: 못 쟀다 — 막는다(${result.detail ?? '?'})`);
+    return false;
+  }
+  if (result.unseen > 0) out.log(`⚠ public-export-import: 비리터럴 지정자 ${result.unseen}곳은 못 봄`);
+  if (result.hits.length === 0) {
+    out.log('✓ public-export-import: 바뀐 공개 파일이 공개 내보내기에서 제외된 모듈을 import 하지 않는다.');
+    return true;
+  }
+  out.error(`✗ public-export-import: 공개 파일이 공개 내보내기에서 제외된 모듈을 import 한다 (${result.hits.length}곳) — 공개본 빌드가 여기서 깨진다:`);
+  for (const hit of result.hits.slice(0, 20)) out.error(`   ${hit.file}:${hit.line} → ${hit.target}`);
+  if (result.hits.length > 20) out.error(`   … 외 ${result.hits.length - 20}곳`);
+  return false;
+}
+
 /** Blocks changed public files that leak or cannot be measured. */
+/**
+ * MARKER-GUARD — a changed file that still holds merge-conflict markers is refused before landing.
+ * A file counts only when it has both a `<<<<<<< ` and a `>>>>>>> ` line (`=======` alone is a Markdown underline).
+ * 10-06 02:4x: a hand landing put three marker lines into release/next.md on main (hotfix #24333).
+ */
+export function conflictMarkerFiles(changedFiles: readonly string[] | undefined, cwd: string, read: (path: string) => string | undefined = (path) => {
+  // No size cutoff: a large file with markers must still be refused (ACP must-fix). A deleted file reads as undefined.
+  try { const full = resolve(cwd, path); return existsSync(full) && statSync(full).isFile() ? readFileSync(full, 'utf8') : undefined; }
+  catch { return undefined; }
+}): string[] {
+  return (changedFiles ?? []).filter((path) => {
+    const text = read(path);
+    return text !== undefined && /^<{7} /m.test(text) && /^>{7} /m.test(text);
+  });
+}
+
+export function conflictMarkerBlock(changedFiles: readonly string[] | undefined, cwd: string,
+  out: { log: (message: string) => void; error: (message: string) => void }, read?: (path: string) => string | undefined): boolean {
+  const hits = read ? conflictMarkerFiles(changedFiles, cwd, read) : conflictMarkerFiles(changedFiles, cwd);
+  if (hits.length) {
+    debug.log('pr.land', 'conflict-markers-blocked', { files: hits });
+    out.error(`✗ conflict-markers: 충돌 표시(<<<<<<< · >>>>>>>)가 남은 파일 ${hits.length}개 — ${hits.join(', ')} · 표시를 풀고 다시 착지하라`);
+    return false;
+  }
+  return true;
+}
+
 export function exportLeakBlock(
   changedFiles: readonly string[] | undefined,
   check: () => ExportLeakCheck,
@@ -401,8 +464,10 @@ function runPrLandDocsCliCheck(root: string): (docFiles: readonly string[]) => D
   return (docFiles) => checkCommands(docFiles.flatMap((f) => extractElanousCommands(f, readFileSync(join(root, f), 'utf8'))));
 }
 
-function runPrLandMockModuleRestoreGate(out: { log: (message: string) => void; error: (message: string) => void }): boolean {
-  return runMockModuleRestoreGate({ args: [], log: out.log, error: out.error }) === 0;
+function runPrLandMockModuleRestoreGate(out: { log: (message: string) => void; error: (message: string) => void }, cwd: string = process.cwd()): boolean {
+  const top = runGitCommand(cwd, ['rev-parse', '--show-toplevel'], { encoding: 'utf-8', env: { ...process.env, GIT_DIR: undefined, GIT_WORK_TREE: undefined, GIT_COMMON_DIR: undefined } as NodeJS.ProcessEnv });
+  const root = top.status === 0 && String(top.stdout ?? '').trim() ? String(top.stdout).trim() : cwd;
+  return runMockModuleRestoreGate({ args: [], cwd: root, log: out.log, error: out.error }) === 0;
 }
 
 // 🚨 안드로이드 축 — `bun test` 우주 «밖»이라 다른 게이트가 원리상 못 본다.
@@ -415,8 +480,9 @@ function runPrLandMockModuleRestoreGate(out: { log: (message: string) => void; e
 function runPrLandAndroidGate(
   out: { log: (message: string) => void; error: (message: string) => void },
   changedFiles: readonly string[] = [],
+  cwd: string = process.cwd(),
 ): boolean {
-  return runAndroidUnitTestGate({ args: ['--changed-files', ...changedFiles], log: out.log, error: out.error }) === 0;
+  return runAndroidUnitTestGate({ args: ['--changed-files', ...changedFiles], cwd, log: out.log, error: out.error }) === 0;
 }
 
 /** ⛔ 보호는 «호출부»에 둔다 — 주입된 게이트가 던져도 같은 계약이 서야 한다.
@@ -1320,7 +1386,7 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     }
   }
 
-  const typecheckOk = (deps.runTypecheckGate ?? runPrLandTypecheckGate)(out);
+  const typecheckOk = (deps.runTypecheckGate ?? ((o) => runPrLandTypecheckGate(o, cwd)))(out);
   record('typecheck', typecheckOk);
   if (!typecheckOk) {
     // ⛔⭐ 「왜 막혔나」를 «단정하지 않는다» — 이 게이트는 불리언만 돌려주므로 여기서는 이유를 모른다.
@@ -1347,7 +1413,7 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     out.log('✓ isolation-gate: scripts/ci-isolation-hardcode-gate.ts PASS — no new homedir+.elanous hardcoding.');
   }
 
-  const mockModuleRestore = gateVerdict('mock-module-restore-gate', deps.runMockModuleRestoreGate ?? runPrLandMockModuleRestoreGate, out);
+  const mockModuleRestore = gateVerdict('mock-module-restore-gate', deps.runMockModuleRestoreGate ?? ((o) => runPrLandMockModuleRestoreGate(o, cwd)), out);
   record('mock-module-restore-gate', mockModuleRestore.ok, { measured: mockModuleRestore.measured });
   if (!mockModuleRestore.ok) {
     out.error('✗ mock-module-restore-gate: scripts/ci-mock-module-restore-gate.ts blocked pr land because changed tests introduce mock.module without R-TST23 restoration.');
@@ -1361,7 +1427,7 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
   //   근본은 훈계가 아니라 ***분포***였다: 스크립트에 박힌 이름 중 «가장 흔한» 것이 ***낡은 것***이라
   //   옆 파일을 베끼면 낡은 이름을 물려받는다. ⇒ 이 자가 «신규»만 막는다(ratchet).
   //   ⚠️ `.github/workflows` 가 없어 `pr land` 가 «유일한» 강제점이다.
-  const modelHardcode = gateVerdict('model-hardcode-gate', deps.runModelHardcodeGate ?? ((o) => runModelHardcodeGate({ log: o.log, error: o.error, args: [] }) === 0), out);
+  const modelHardcode = gateVerdict('model-hardcode-gate', deps.runModelHardcodeGate ?? ((o) => runModelHardcodeGate({ log: o.log, error: o.error, args: [], cwd }) === 0), out);
   record('model-hardcode-gate', modelHardcode.ok, { measured: modelHardcode.measured });
   if (!modelHardcode.ok) {
     out.error('✗ model-hardcode-gate: scripts/ci-model-hardcode-gate.ts blocked pr land because changed files hardcode a model id — derive it from tierModel()/config instead.');
@@ -1382,15 +1448,17 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
 
   const changedPaths = currentChangePaths(run, cwd, staged, base, out);
   nextMdWarning(body ?? '', changedPaths, out);
+  if (!conflictMarkerBlock(changedPaths, cwd, out)) return 1;
   publicLeakWarning(changedPaths, deps.runPublicLeakGate ?? ((files, sink) => runPrLandPublicLeakGate(files, sink, cwd, base)), out);
   if (!exportLeakBlock(changedPaths, () => (deps.runExportLeakCheck ?? runPrLandExportLeakCheck)(changedPaths ?? [], cwd), opts.allowPublicLeak === true, out, cwd)) return 1;
+  if (!await exportImportBlock(changedPaths, () => (deps.runExportImportCheck ?? runPrLandExportImportCheck)(changedPaths ?? [], cwd), out)) return 1;
   if (publicDocPaths(changedPaths, () => true).length > 0) {
     const top = run('git', ['rev-parse', '--show-toplevel'], { cwd });
     const docsRoot = top.ok && top.out.trim() ? top.out.trim() : cwd;
     docsCliWarning(publicDocPaths(changedPaths, (f) => existsSync(join(docsRoot, f))), deps.runDocsCliCheck ?? runPrLandDocsCliCheck(docsRoot), out);
   }
   const testInterference = await testInterferenceGateVerdict(
-    deps.runTestInterferenceGate ?? ((o, files) => runTestInterferenceGate({ args: ['--changed-files', ...files], log: o.log })),
+    deps.runTestInterferenceGate ?? ((o, files) => runTestInterferenceGate({ args: ['--changed-files', ...files], log: o.log, cwd })),
     changedPaths,
     out,
   );
@@ -1400,7 +1468,7 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     'android-gate',
     deps.runAndroidGate
       ? (o) => deps.runAndroidGate!(o, changedPaths)
-      : (o) => runPrLandAndroidGate(o, changedPaths),
+      : (o) => runPrLandAndroidGate(o, changedPaths, cwd),
     out,
   );
   record('android-gate', androidGate.ok, { measured: androidGate.measured });
@@ -1418,7 +1486,7 @@ export async function runPrLand(opts: PrLandOpts = {}, deps: PrLandDeps = {}): P
     'ios-gate',
     deps.runIosGate
       ? (o) => deps.runIosGate!(o, changedPaths)
-      : (o) => runIosUnitTestGate({ args: ['--changed-files', ...changedPaths], log: o.log, error: o.error }) === 0,
+      : (o) => runIosUnitTestGate({ args: ['--changed-files', ...changedPaths], cwd, log: o.log, error: o.error }) === 0,
     out,
   );
   record('ios-gate', iosGate.ok, { measured: iosGate.measured });

package/src/cli/release-cli.ts

@@ -631,7 +631,7 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
       if (!opts.dryRun && !mayWriteLedger('release place', false, scheduleLedgerRoot())) return;
       const priority = opts.priority ?? item.priority;
       if (!priority) throw new CliUserError(`우선순위가 없는 칸: ${id} — --priority P0|P1|P2 를 지정하라`);
-      const result = placeCell({ id, title: item.title, owner: item.owner, priority: priority as PlacementPriority, predecessors: item.predecessors ?? [], deadlineVersion: item.deadlineVersion, ceoMinutes: item.ceoMinutes, ceoDate: item.ceoDate }, { schedules: rows, dryRun: opts.dryRun, by: who ?? 'cli' });
+      const result = placeCell({ id, title: item.title, owner: item.owner, priority: priority as PlacementPriority, predecessors: item.predecessors ?? [], deadlineVersion: item.deadlineVersion, ceoMinutes: item.ceoMinutes, ceoDate: item.ceoDate, ...(item.accelerator === true ? { accelerator: true } : {}) }, { schedules: rows, dryRun: opts.dryRun, by: who ?? 'cli' });
       console.log(`${opts.dryRun ? '· 드라이런' : '✅'} ${id} ${result.from ?? '-'} → ${result.version} · ${result.reason}${result.displaced.length ? ` · P2 이월 ${result.displaced.map((row) => row.id).join(', ')}` : ''}`);
     });
   release.command('rebalance').description('마감 2시간 전 미시작 칸을 다음 판으로')
@@ -740,11 +740,12 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
   withContext(checklist.command('add <id> <title>').description('칸 추가')).option('--owner <owner>', '담당').option('--kind <kind>', 'screen = 다섯 화면 짝 칸 · 근거에 짝: PWA … · 데스크톱 … · 폴드 … · 아이폰 … · 아이패드 … 한 줄')
     .option('--priority <priority>', 'P0|P1|P2').option('--deadline-version <v>', '마감 판').option('--predecessor <id...>', '선행 칸 id')
     .option('--ceo-minutes <minutes>', '대표 손 분량(분)').option('--ceo-date <date>', '대표 손 날짜 YYYY-MM-DD (없으면 판 착지일 KST)')
+    .option('--accelerator', '가속 등급 — 다른 칸의 처리량을 올리는 칸(자율성·효율성·동시성). 생략하면 등급 없음')
     .option('--allow-duplicate-id', '다른 판에 같은 id 가 있어도 경고 후 추가')
-    .action((id: string, title: string, opts: { owner?: string; kind?: string; priority?: string; deadlineVersion?: string; predecessor?: string[]; ceoMinutes?: string; ceoDate?: string; allowDuplicateId?: boolean }, cmd: Command) => {
+    .action((id: string, title: string, opts: { owner?: string; kind?: string; priority?: string; deadlineVersion?: string; predecessor?: string[]; ceoMinutes?: string; ceoDate?: string; accelerator?: boolean; allowDuplicateId?: boolean }, cmd: Command) => {
     const { version, json } = context(cmd);
     if (!mayWrite(cmd)) return;
-    const data = addItem(version, { id, title, ...(opts.owner !== undefined ? { owner: opts.owner } : {}), ...(opts.kind !== undefined ? { kind: opts.kind as ChecklistKind } : {}), ...(opts.priority !== undefined ? { priority: opts.priority as PlacementPriority } : {}), ...(opts.deadlineVersion !== undefined ? { deadlineVersion: opts.deadlineVersion } : {}), ...(opts.predecessor !== undefined ? { predecessors: opts.predecessor } : {}), ...(opts.ceoMinutes !== undefined ? { ceoMinutes: ceoMinutes(opts.ceoMinutes) } : {}), ...(opts.ceoDate !== undefined ? { ceoDate: opts.ceoDate } : {}) }, { allowDuplicateId: opts.allowDuplicateId });
+    const data = addItem(version, { id, title, ...(opts.owner !== undefined ? { owner: opts.owner } : {}), ...(opts.kind !== undefined ? { kind: opts.kind as ChecklistKind } : {}), ...(opts.priority !== undefined ? { priority: opts.priority as PlacementPriority } : {}), ...(opts.deadlineVersion !== undefined ? { deadlineVersion: opts.deadlineVersion } : {}), ...(opts.predecessor !== undefined ? { predecessors: opts.predecessor } : {}), ...(opts.ceoMinutes !== undefined ? { ceoMinutes: ceoMinutes(opts.ceoMinutes) } : {}), ...(opts.ceoDate !== undefined ? { ceoDate: opts.ceoDate } : {}), ...(opts.accelerator ? { accelerator: true } : {}) }, { allowDuplicateId: opts.allowDuplicateId });
     if (json) console.log(JSON.stringify(data)); else console.log(`✅ ${id} 추가`);
   });
   withContext(checklist.command('set <id>').description('칸 상태·근거·담당·처분 갱신'))
@@ -752,13 +753,14 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
     .option('--disposition <disposition>', 'move|known-issue|block').option('--kind <kind>', 'screen = 다섯 화면 짝 칸 · 근거에 짝: PWA … · 데스크톱 … · 폴드 … · 아이폰 … · 아이패드 … 한 줄')
     .option('--priority <priority>', 'P0|P1|P2').option('--deadline-version <v>', '마감 판').option('--predecessor <id...>', '선행 칸 id')
     .option('--ceo-minutes <minutes>', '대표 손 분량(분)').option('--ceo-date <date>', '대표 손 날짜 YYYY-MM-DD')
-    .action((id: string, opts: { status?: string; evidence?: string; owner?: string; disposition?: string; kind?: string; priority?: string; deadlineVersion?: string; predecessor?: string[]; ceoMinutes?: string; ceoDate?: string }, cmd: Command) => {
+    .option('--accelerator', '가속 등급 부여').option('--no-accelerator', '가속 등급 해제(기본은 없음)')
+    .action((id: string, opts: { status?: string; evidence?: string; owner?: string; disposition?: string; kind?: string; priority?: string; deadlineVersion?: string; predecessor?: string[]; ceoMinutes?: string; ceoDate?: string; accelerator?: boolean }, cmd: Command) => {
       const { version, json } = context(cmd);
       if (opts.status !== undefined && !['green', 'yellow', 'red', 'done'].includes(opts.status)) throw new CliUserError(`잘못된 상태: ${opts.status}`, 'green|yellow|red|done');
       if (opts.disposition !== undefined && !['move', 'known-issue', 'block'].includes(opts.disposition)) throw new CliUserError(`잘못된 처분: ${opts.disposition}`, 'move|known-issue|block');
-      if (opts.status === undefined && opts.evidence === undefined && opts.owner === undefined && opts.disposition === undefined && opts.kind === undefined && opts.priority === undefined && opts.deadlineVersion === undefined && opts.predecessor === undefined && opts.ceoMinutes === undefined && opts.ceoDate === undefined) throw new CliUserError('갱신할 칸을 지정하라', '--status · --evidence · --owner · --disposition · --kind · --priority · --deadline-version · --predecessor · --ceo-minutes · --ceo-date 중 하나');
+      if (opts.status === undefined && opts.evidence === undefined && opts.owner === undefined && opts.disposition === undefined && opts.kind === undefined && opts.priority === undefined && opts.deadlineVersion === undefined && opts.predecessor === undefined && opts.ceoMinutes === undefined && opts.ceoDate === undefined && opts.accelerator === undefined) throw new CliUserError('갱신할 칸을 지정하라', '--status · --evidence · --owner · --disposition · --kind · --priority · --deadline-version · --predecessor · --ceo-minutes · --ceo-date · --accelerator · --no-accelerator 중 하나');
       if (!mayWrite(cmd)) return;
-      const data = setItem(version, id, { ...(opts.status !== undefined ? { status: opts.status as ChecklistStatus } : {}), ...(opts.evidence !== undefined ? { evidence: opts.evidence } : {}), ...(opts.owner !== undefined ? { owner: opts.owner } : {}), ...(opts.disposition !== undefined ? { disposition: opts.disposition as ChecklistDisposition } : {}), ...(opts.kind !== undefined ? { kind: opts.kind as ChecklistKind } : {}), ...(opts.priority !== undefined ? { priority: opts.priority as PlacementPriority } : {}), ...(opts.deadlineVersion !== undefined ? { deadlineVersion: opts.deadlineVersion } : {}), ...(opts.predecessor !== undefined ? { predecessors: opts.predecessor } : {}), ...(opts.ceoMinutes !== undefined ? { ceoMinutes: ceoMinutes(opts.ceoMinutes) } : {}), ...(opts.ceoDate !== undefined ? { ceoDate: opts.ceoDate } : {}) }, process.env.ELANOUS_TRACK || 'cli');
+      const data = setItem(version, id, { ...(opts.status !== undefined ? { status: opts.status as ChecklistStatus } : {}), ...(opts.evidence !== undefined ? { evidence: opts.evidence } : {}), ...(opts.owner !== undefined ? { owner: opts.owner } : {}), ...(opts.disposition !== undefined ? { disposition: opts.disposition as ChecklistDisposition } : {}), ...(opts.kind !== undefined ? { kind: opts.kind as ChecklistKind } : {}), ...(opts.priority !== undefined ? { priority: opts.priority as PlacementPriority } : {}), ...(opts.deadlineVersion !== undefined ? { deadlineVersion: opts.deadlineVersion } : {}), ...(opts.predecessor !== undefined ? { predecessors: opts.predecessor } : {}), ...(opts.ceoMinutes !== undefined ? { ceoMinutes: ceoMinutes(opts.ceoMinutes) } : {}), ...(opts.ceoDate !== undefined ? { ceoDate: opts.ceoDate } : {}), ...(opts.accelerator !== undefined ? { accelerator: opts.accelerator ? true : null } : {}) }, process.env.ELANOUS_TRACK || 'cli');
       const item = data.items.find((entry) => entry.id === id);
       const why = item?.kind === 'screen' && item.status === 'green' ? parityGap(item.evidence) : null;
       if (why) {
@@ -897,13 +899,14 @@ export function registerReleaseCommands(program: Command, releaseRunDeps: Unatte
       console.log(renderReleaseNotes(draftReleaseNotes(readLandedCommits(o.from, o.to), o.from, o.to)));
     });
   release.command('cut-branch')
-    .description('원래 컷에 main 의 수리 커밋만 얹은 release/<v> 가지를 만들고 push')
+    .description('원래 컷에 main 의 수리 커밋만 얹은 release/<v> 가지를 만들고 push. --append 는 이미 있는 가지에 fast-forward 로만 더 얹는다')
     .requiredOption('--version <v>', '릴리스 판(x.y.z)')
     .requiredOption('--base <sha>', '원래 컷 SHA')
     .requiredOption('--pick <sha...>', '차례로 얹을 main 커밋 SHA')
+    .option('--append', '이미 있는 release/<v> 를 출발점으로 fast-forward push(강제 push 없음)')
     .option('--dry-run', '가지·worktree·push 없이 계획만 출력')
     .option('--json', '결과 한 줄 JSON(stdout)')
-    .action(async (o: { version: string; base: string; pick: string[]; dryRun?: boolean; json?: boolean }) => {
+    .action(async (o: { version: string; base: string; pick: string[]; append?: boolean; dryRun?: boolean; json?: boolean }) => {
       await jsonAction(o.json, async (log) => cutReleaseBranch({ ...o, log }), () => true);
     });
   const runAction = async (o: { version: string; cutCommit?: string; dryRun?: boolean; ifReady?: boolean; forceFreeze?: boolean; json?: boolean }, logRun = console.log): Promise<boolean | AutoStartDeferral | undefined> => {

package/src/cli/self-update.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, realpathSync, readlinkSync, readdirSync, statSync, rmSync, symlinkSync, renameSync } from 'node:fs';
+import { existsSync, mkdirSync, readFileSync, realpathSync, readlinkSync, readdirSync, statSync, rmSync, symlinkSync, renameSync, writeFileSync, lstatSync } from 'node:fs';
 import { resolve, join, basename, dirname } from 'node:path';
 import { homedir, platform, userInfo } from 'node:os';
 import { spawnSync } from 'node:child_process';
@@ -18,6 +18,10 @@ export interface SelfUpdateOptions {
   skipPwaBuild?: boolean;
   /** 설치된 릴리스에서만 사용한다. 체크아웃 갱신에는 적용하지 않는다. */
   version?: string;
+  /** 판 사이 dev 빌드 설치 — versions/<판>-dev.<sha12> · install.json channel:'dev'. 사람 승인 명령. */
+  dev?: boolean;
+  /** install.json 의 이전 versionDir 로 current 를 되돌린다. 이전이 없으면 거부. */
+  rollback?: boolean;
 }
 
 export interface SelfUpdateDeps {
@@ -45,6 +49,15 @@ export interface SelfUpdateDeps {
   out?: { log: (s: string) => void; error: (s: string) => void };
   /** 판올림 성공 알림(주입 안 하면 sendOutbound 'report' · 시험에선 안 보냄). */
   notice?: (text: string) => void;
+  /**
+   * 설치 루트(versions · current · install.json). 주입하지 않으면 ~/.local/share/elanous.
+   * 시험은 임시 루트만 넘긴다 — 실물 심링크·재시작을 만지지 않는다.
+   */
+  installRoot?: string;
+  /** 패키지 버전(package.json). 주입하지 않으면 체크아웃 package.json. */
+  packageVersion?: (checkout: string) => string;
+  /** 재시작을 실제로 호출해도 되는지. NODE_ENV=test · ELANOUS_TEST_HOME 이면 기본 false. */
+  allowLiveRestart?: boolean;
 }
 
 export interface SelfUpdateResult {
@@ -63,6 +76,12 @@ export interface SelfUpdateResult {
   prune?: VersionPruneOutcome;
   /** 재시작 뒤 건강 — ok · rolled-back(직전 판으로 되돌려 회복) · rollback-failed · no-rollback-target. */
   health?: 'ok' | 'rolled-back' | 'rollback-failed' | 'no-rollback-target' | 'unmeasured';
+  /** --dev 설치 또는 --rollback 이 옮긴 current 대상(versions/<name>). */
+  current?: string;
+  /** install.json channel. dev 설치면 'dev'. */
+  channel?: string;
+  /** --dev 가 남긴 이전 versionDir. */
+  previous?: string;
   rolledBackTo?: string;
   /** relay(`com.elanous.openai-relay`) 판정 — 넥서스와 «따로» 본다(T5 · 2026-09-24). */
   relay?: RelayUpdateOutcome;
@@ -182,6 +201,142 @@ export function rollbackTarget(versions: readonly string[], daemonSha: string, i
 
 const VERSIONS_DIR = () => join(homedir(), '.local/share/elanous/versions');
 
+/** 시험·ELANOUS_TEST_HOME 에서는 실물 재시작을 호출하지 않는다. */
+export function liveRestartBlocked(env: NodeJS.ProcessEnv = process.env): boolean {
+  return env.NODE_ENV === 'test' || Boolean(env.ELANOUS_TEST_HOME?.trim());
+}
+
+export interface InstallRecord {
+  version?: string;
+  versionDir?: string;
+  source?: string;
+  installedAt?: string;
+  commit?: string;
+  channel?: string;
+  previous?: string;
+}
+
+export function defaultInstallRoot(): string {
+  return join(homedir(), '.local/share/elanous');
+}
+
+export function readInstallRecord(root: string): InstallRecord | null {
+  try {
+    const parsed: unknown = JSON.parse(readFileSync(join(root, 'install.json'), 'utf8'));
+    if (typeof parsed !== 'object' || parsed === null) return null;
+    return parsed as InstallRecord;
+  } catch {
+    return null;
+  }
+}
+
+/** install.json 의 version·commit. 못 읽으면 둘 다 «unknown». */
+export function readInstalledIdentity(root: string = defaultInstallRoot()): { installedVersion: string; installedCommit: string } {
+  const record = readInstallRecord(root);
+  const version = typeof record?.version === 'string' && record.version.trim() ? record.version.trim() : '';
+  const commit = typeof record?.commit === 'string' && record.commit.trim() ? record.commit.trim() : '';
+  return { installedVersion: version || 'unknown', installedCommit: commit || 'unknown' };
+}
+
+const VERSION_DIR_NAME = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
+
+function versionDirName(versionDir: string | undefined): string | null {
+  if (typeof versionDir !== 'string') return null;
+  if (!/^versions\/[A-Za-z0-9][A-Za-z0-9._-]*$/.test(versionDir) || versionDir.includes('..')) return null;
+  return basename(versionDir);
+}
+
+/** 판 디렉터리에 실행 진입 파일이 있나(설치기가 실제로 내용을 깔았나). */
+export function installEntryExists(root: string, versionName: string): boolean {
+  return existsSync(join(root, 'versions', versionName, 'node_modules', 'elanous', 'bin', 'elanous.mjs'));
+}
+
+/** 판 이름 «<판>-<커밋12>» · «<판>-dev.<커밋12>» 에서 판·커밋을 읽는다(되돌림 메타 일치용). */
+export function parseVersionDirName(name: string): { version: string; commit: string } | null {
+  const m = /^(.+?)-(?:dev\.)?([0-9a-f]{12})(?:-dirty)?$/.exec(name);
+  return m ? { version: m[1]!, commit: m[2]! } : null;
+}
+
+/** current 심링크를 versions/<name> 으로 원자적으로 옮긴다. 대상 폴더가 없으면 거부. */
+export function relinkInstallCurrent(root: string, versionName: string): void {
+  if (!VERSION_DIR_NAME.test(versionName) || versionName.includes('..')) throw new Error(`잘못된 판 이름: ${versionName}`);
+  if (!existsSync(join(root, 'versions', versionName))) throw new Error(`판 디렉터리 없음: ${versionName}`);
+  // EDGE-RAIL-VERIFY(10-06 05:30 사고): 진입 파일이 없는 판으로는 current 를 옮기지 않는다(빈 판 → 전역 elanous·크론 전부 실패).
+  if (!installEntryExists(root, versionName)) throw new Error(`빈 판(진입 파일 없음): ${versionName} — current 를 옮기지 않는다`);
+  const tmp = join(root, `.current-dev-${process.pid}`);
+  rmSync(tmp, { force: true });
+  symlinkSync(`versions/${versionName}`, tmp);
+  renameSync(tmp, join(root, 'current'));
+}
+
+function checkoutPackageVersion(checkout: string): string {
+  const parsed = JSON.parse(readFileSync(join(checkout, 'package.json'), 'utf8')) as { version?: unknown };
+  if (typeof parsed.version !== 'string' || !parsed.version.trim()) throw new Error('package.json version 없음');
+  return parsed.version.trim();
+}
+
+/**
+ * 판 사이 dev 빌드 — versions/<판>-dev.<sha12> 를 만들고 current 를 옮긴다.
+ * install.json 에 channel:'dev' 와 이전 versionDir(previous) 를 남긴다. 실제 설치기·재시작은 부르지 않는다.
+ */
+export function installDevBuild(checkout: string, commit: string, deps: Pick<SelfUpdateDeps, 'installRoot' | 'packageVersion'> & { runInstaller?: () => { status: number | null; stderr: string } } = {}): { versionName: string; versionDir: string; previous: string; record: InstallRecord } {
+  const sha12 = commit.trim().toLowerCase().slice(0, 12);
+  if (!/^[0-9a-f]{12}$/.test(sha12)) throw new Error(`dev 설치 커밋이 12자가 아님: ${commit}`);
+  const root = deps.installRoot ?? defaultInstallRoot();
+  const prior = readInstallRecord(root);
+  const previous = versionDirName(prior?.versionDir) ? prior!.versionDir! : (typeof prior?.previous === 'string' ? prior.previous : '');
+  // EDGE-RAIL-VERIFY: 빈 디렉터리를 만들고 current 만 옮기던 길(10-06 05:30 사고)을 버리고, 정식 길과 같은 설치기로 내용을 깐다.
+  if (!deps.runInstaller) throw new Error('dev 설치기 없음 — 빈 판을 깔지 않는다');
+  // install.sh 는 current 를 «먼저» 옮기고 뒤에서 실패할 수 있다 — 실패·빈 판 어느 쪽이든 이전 판·install.json 으로 되돌린다.
+  const restore = (why: string, versionName: string | null): never => {
+    const previousName = versionDirName(previous);
+    if (previousName && installEntryExists(root, previousName)) relinkInstallCurrent(root, previousName);
+    if (prior) writeFileSync(join(root, 'install.json'), `${JSON.stringify(prior, null, 2)}\n`);
+    try { debug.log('self-update', 'dev-install-refused', { why, versionName, kept: previousName ?? null }); } catch { /* 관측 실패가 막지 않는다 */ }
+    throw new Error(`${why}: ${versionName ?? '?'} — current 를 이전 판(${previousName ?? '없음'})으로 유지`);
+  };
+  let result: { status: number | null; stderr: string };
+  try { result = deps.runInstaller(); }
+  catch (error) { return restore(`설치기 예외(${String(error).slice(0, 200)})`, null); }
+  const after = readInstallRecord(root);
+  const versionName = versionDirName(after?.versionDir);
+  if (result.status !== 0) return restore(`설치기 실패(rc=${result.status}: ${result.stderr.slice(0, 200)})`, versionName);
+  if (!versionName || !installEntryExists(root, versionName)) return restore('빈 판(진입 파일 없음)', versionName);
+  const versionDir = `versions/${versionName}`;
+  const record: InstallRecord = {
+    ...(after ?? {}),
+    versionDir,
+    channel: 'dev',
+    ...(previous && previous !== versionDir ? { previous } : {}),
+  };
+  writeFileSync(join(root, 'install.json'), `${JSON.stringify(record, null, 2)}\n`);
+  return { versionName, versionDir, previous, record };
+}
+
+/** install.json.previous 의 판으로 current 를 되돌린다. previous 가 없으면 거부(exit 2). */
+export function rollbackDevInstall(deps: Pick<SelfUpdateDeps, 'installRoot'> = {}): { ok: true; versionName: string; record: InstallRecord } | { ok: false; reason: string } {
+  const root = deps.installRoot ?? defaultInstallRoot();
+  const prior = readInstallRecord(root);
+  const previousName = versionDirName(prior?.previous);
+  if (!prior || !previousName) return { ok: false, reason: '이전 판(install.json previous)이 없다 — rollback 거부' };
+  if (!existsSync(join(root, 'versions', previousName))) return { ok: false, reason: `이전 판 디렉터리 없음: ${previousName}` };
+  const currentName = versionDirName(prior.versionDir);
+  relinkInstallCurrent(root, previousName);
+  const parsed = parseVersionDirName(previousName);
+  const record: InstallRecord = {
+    ...prior,
+    ...(parsed ? { version: parsed.version, commit: parsed.commit } : {}),
+    versionDir: `versions/${previousName}`,
+    channel: prior.channel === 'dev' ? undefined : prior.channel,
+    previous: currentName ? `versions/${currentName}` : undefined,
+    installedAt: new Date().toISOString(),
+  };
+  if (!record.channel) delete record.channel;
+  if (!record.previous) delete record.previous;
+  writeFileSync(join(root, 'install.json'), `${JSON.stringify(record, null, 2)}\n`);
+  return { ok: true, versionName: previousName, record };
+}
+
 /** `unmeasured` = 건강을 «잴 수» 없었다(REST 주소를 한 번도 못 얻음) — 「건강하지 않다」와 다르다. 되돌리지 않는다. */
 export interface VerifyRestartResult { ok: boolean; daemonSha?: string; reason?: string; unmeasured?: boolean }
 
@@ -399,9 +554,14 @@ export async function runReleaseUpdate(options: ReleaseUpdateOptions = {}, deps:
   }
   let previous = '';
   let previousBuild = '';
+  let replacedDev: { from: string; to: string } | null = null;
   try {
     const metadata: unknown = JSON.parse(readFileSync(join(prefix, 'install.json'), 'utf8'));
     previousBuild = installedBuild(metadata);
+    if (typeof metadata === 'object' && metadata !== null && (metadata as { channel?: unknown }).channel === 'dev') {
+      const fromDir = typeof (metadata as { versionDir?: unknown }).versionDir === 'string' ? (metadata as { versionDir: string }).versionDir : '';
+      replacedDev = { from: fromDir, to: '' };
+    }
     if (typeof metadata === 'object' && metadata !== null && 'versionDir' in metadata && typeof metadata.versionDir === 'string') {
       const dir = metadata.versionDir;
       if (/^versions\/[a-zA-Z0-9._-]+$/.test(dir) && !dir.includes('..')) previous = basename(dir);
@@ -418,6 +578,12 @@ export async function runReleaseUpdate(options: ReleaseUpdateOptions = {}, deps:
     const installedVersion = typeof metadata === 'object' && metadata !== null && 'version' in metadata && typeof metadata.version === 'string'
       ? metadata.version : null;
     if (!installedVersion) return fail(1, '설치판 확인 실패: install.json version 없음');
+    if (replacedDev) {
+      const toDir = typeof metadata === 'object' && metadata !== null && typeof (metadata as { versionDir?: unknown }).versionDir === 'string'
+        ? (metadata as { versionDir: string }).versionDir : installedVersion;
+      replacedDev = { from: replacedDev.from, to: toDir };
+      try { debug.log('self-update', 'dev-replaced', replacedDev); } catch { /* 관측 실패가 갱신을 막지 않는다 */ }
+    }
     const internalRevision = isTailnet(source) && version?.match(/^(.*)-([0-9a-f]{12})$/);
     if (version && installedVersion !== version && (!internalRevision || installedVersion !== internalRevision[1])) {
       return fail(1, `설치판 버전 불일치: 요청 ${version}, 설치 ${installedVersion}`);
@@ -491,6 +657,9 @@ export async function runUpdateForInstallation(
     out.log(options.json ? JSON.stringify(result) : `self-update: ${result.reason}`);
     return result;
   }
+  if (options.dev || options.rollback) {
+    return runSelfUpdate(options, { cliRoot, ...deps.checkout });
+  }
   if (options.version !== undefined) {
     const result: SelfUpdateResult = { exitCode: 2, installedVersion: null, decision: null, restarted: false, reason: '--version 은 릴리스 설치본에서만 사용 가능' };
     const out = deps.checkout?.out ?? console;
@@ -537,6 +706,15 @@ export async function runSelfUpdate(options: SelfUpdateOptions = {}, deps: SelfU
     return result;
   };
   const reject = (reason: string): SelfUpdateResult => emit({ exitCode: 2, installedVersion: null, decision: null, restarted: false, reason });
+  if (options.rollback) {
+    const rolled = rollbackDevInstall(deps);
+    if (!rolled.ok) return reject(rolled.reason);
+    return emit({
+      exitCode: 0, installedVersion: rolled.versionName, decision: null, restarted: false,
+      current: `versions/${rolled.versionName}`, previous: rolled.record.previous, channel: rolled.record.channel,
+      reason: `rollback: current → ${rolled.versionName}`,
+    });
+  }
   try {
     if (!existsSync(join(checkout, 'scripts/install.sh'))) return reject(`체크아웃 없음 또는 설치기 없음: ${checkout}`);
     const root = git(checkout, ['rev-parse', '--show-toplevel']);
@@ -546,6 +724,24 @@ export async function runSelfUpdate(options: SelfUpdateOptions = {}, deps: SelfU
     const dirty = git(checkout, ['diff', '--quiet', 'HEAD', '--']);
     if (dirty.status !== 0) return reject(dirty.status === 1 ? '추적 파일 변경: 체크아웃이 더러움' : `git diff 실패: ${dirty.stderr}`);
 
+    if (options.dev) {
+      try {
+        const installed = installDevBuild(checkout, head.stdout.trim(), { ...deps, runInstaller: () => run('bash', [join(checkout, 'scripts/install.sh'), '--no-modify-path'], checkout) });
+        return emit({
+          exitCode: 0,
+          installedVersion: installed.versionName,
+          decision: null,
+          restarted: false,
+          current: installed.versionDir,
+          channel: 'dev',
+          previous: installed.previous || undefined,
+          reason: `dev 설치: current → ${installed.versionName}`,
+        });
+      } catch (error) {
+        return emit({ exitCode: 1, installedVersion: null, decision: null, restarted: false, reason: `dev 설치 실패: ${error instanceof Error ? error.message : String(error)}` });
+      }
+    }
+
     const silence = { log: (_s: string) => {}, error: (_s: string) => {} };
     let decision: RestartNeededResult;
     try {
@@ -628,6 +824,9 @@ export async function runSelfUpdate(options: SelfUpdateOptions = {}, deps: SelfU
     const os = deps.os ?? platform();
     const command = os === 'darwin' ? 'launchctl' : os === 'linux' ? 'systemctl' : null;
     if (!command) return emit({ exitCode: 1, installedVersion, decision, restarted: false, prune, reason: `지원하지 않는 플랫폼: ${os}` });
+    if (deps.allowLiveRestart === false || (deps.allowLiveRestart !== true && liveRestartBlocked())) {
+      return emit({ exitCode: 0, installedVersion, decision, restarted: false, prune, reason: '테스트 가드: 실물 재시작 0' });
+    }
     const args = os === 'darwin' ? ['kickstart', '-k', `gui/${deps.uid ?? process.getuid?.() ?? userInfo().uid}/com.elanous.nexus`] : ['--user', 'restart', 'elanous-nexus'];
     try {
       const restarted = run(command, args, checkout);