elanous 0.2.0 → 0.2.5

package/src/cli/tailscale-serve.ts

@@ -34,7 +34,7 @@ import { execFile } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname } from 'node:path';
 
-import { probeTailscale, type TailscaleProbe } from '../nexus/onboarding/tailscale-probe.js';
+import { probeTailscale, tailscaleExecEnv, type TailscaleProbe } from '../nexus/onboarding/tailscale-probe.js';
 
 export type TailscaleServeMode =
   | { kind: 'https-443' }
@@ -53,12 +53,9 @@ export interface TailscaleServeOpts {
   upstreamPort: number;
   /** Path component of the surfaced URL (default `/app/showroom/`). */
   urlPath?: string;
-  /** Whether to wrap `tailscale serve` invocations in `sudo -n`.
-   *  - Default `true` — required for `tls-terminated-tcp` mode on
-   *    macOS (binds a Tailscale-daemon-mediated TCP listener).
-   *  - Pass `false` for `https-443` legacy `pwa share enable` flow,
-   *    where the GUI Tailscale CLI typically handles permissions
-   *    interactively without sudo (matches pre-lift behavior). */
+  /** Mutation privilege policy: by default try without sudo, then retry
+   *  once with `sudo -n` only on a permission error. `true` uses sudo
+   *  immediately; `false` runs without sudo and never retries. */
   useSudo?: boolean;
   /** Test seam — replace `probeTailscale`. */
   probeFn?: () => Promise<TailscaleProbe>;
@@ -217,13 +214,10 @@ function buildDefaultServeCmd(useSudo: boolean): (
   args: readonly string[],
 ) => Promise<{ exitCode: number; stdout: string; stderr: string }> {
   return (binary, args) => new Promise((resolve) => {
-    // tls-terminated-tcp mode requires sudo on macOS; legacy
-    // https-443 mode usually works without sudo (the GUI Tailscale
-    // CLI handles privileged binds interactively). Caller chooses via
-    // `useSudo`.
+    // sudo 는 환경을 지우므로 `env TAILSCALE_BE_CLI=1` 로 넘긴다(tailscaleExecEnv 설명 참조).
     const cmd = useSudo ? 'sudo' : binary;
-    const argv = useSudo ? ['-n', binary, ...args] : [...args];
-    execFile(cmd, argv, { timeout: 15000 }, (err, stdout, stderr) => {
+    const argv = useSudo ? ['-n', 'env', 'TAILSCALE_BE_CLI=1', binary, ...args] : [...args];
+    execFile(cmd, argv, { timeout: 15000, env: tailscaleExecEnv() }, (err, stdout, stderr) => {
       if (!err) {
         resolve({ exitCode: 0, stdout: String(stdout ?? ''), stderr: String(stderr ?? '') });
         return;
@@ -235,7 +229,7 @@ function buildDefaultServeCmd(useSudo: boolean): (
       resolve({
         exitCode: code,
         stdout: String(stdout ?? ''),
-        stderr: String(stderr ?? (err as Error).message ?? ''),
+        stderr: String(stderr || (err as Error).message || ''),
       });
     });
   });
@@ -246,6 +240,29 @@ function isSudoFailure(res: { exitCode: number; stderr: string }): boolean {
   return /password is required|a password is required|sudo:.*password/i.test(res.stderr);
 }
 
+function isPermissionFailure(res: { exitCode: number; stderr: string }): boolean {
+  return res.exitCode !== 0
+    && /permission denied|operation not permitted|access denied|requires? (?:root|sudo|administrator)|must (?:be root|run as root)|EACCES|EPERM/i.test(res.stderr);
+}
+
+function mutationServeCmd(opts: Pick<TailscaleServeOpts, 'useSudo' | 'serveCmdFn'>): (
+  binary: string,
+  args: readonly string[],
+) => Promise<{ exitCode: number; stdout: string; stderr: string }> {
+  const serveCmdFn = opts.serveCmdFn;
+  const direct = serveCmdFn ?? buildDefaultServeCmd(false);
+  const sudo = serveCmdFn
+    ? (binary: string, args: readonly string[]) => serveCmdFn('sudo', ['-n', binary, ...args])
+    : buildDefaultServeCmd(true);
+  return async (binary, args) => {
+    if (opts.useSudo === true) return sudo(binary, args);
+    const result = await direct(binary, args);
+    return opts.useSudo === undefined && isPermissionFailure(result)
+      ? sudo(binary, args)
+      : result;
+  };
+}
+
 /** Build the `tailscale serve …` argv for the chosen mode. */
 function mountArgs(mode: TailscaleServeMode, upstreamPort: number): string[] {
   if (mode.kind === 'https-443') {
@@ -295,8 +312,7 @@ export async function mountTailscaleServe(
   const hostname = probe.magicDnsHost ?? probe.hostname ?? null;
   if (!hostname) return { ok: false, url: null, reason: 'magic-dns-unknown' };
   const binary = probe.binary ?? 'tailscale';
-  const useSudo = opts.useSudo !== false;
-  const serveCmd = opts.serveCmdFn ?? buildDefaultServeCmd(useSudo);
+  const serveCmd = mutationServeCmd(opts);
   const urlPath = opts.urlPath ?? DEFAULT_URL_PATH;
 
   // Singleton swap — when state describes a different mode/port,
@@ -385,8 +401,7 @@ export async function unmountTailscaleServe(
     return { ok: false, reason: 'tailscale-missing' };
   }
   const binary = probe.binary ?? 'tailscale';
-  const useSudo = opts.useSudo !== false;
-  const serveCmd = opts.serveCmdFn ?? buildDefaultServeCmd(useSudo);
+  const serveCmd = mutationServeCmd(opts);
   const offRes = await serveCmd(binary, unmountArgs(mode));
   if (offRes.exitCode !== 0) {
     if (isSudoFailure(offRes)) {
@@ -545,7 +560,7 @@ export async function cleanGhostTailscaleServe(
   // Do not reuse unmountTailscaleServe here: its legacy lifecycle contract
   // uses `serve reset`, which would remove unrelated live mappings. This
   // preflight has a stricter contract and turns off only the verified port.
-  const offRes = await serveCmd(binary, ['serve', '--tls-terminated-tcp', String(opts.port), 'off']);
+  const offRes = await mutationServeCmd(opts)(binary, ['serve', '--tls-terminated-tcp', String(opts.port), 'off']);
   if (offRes.exitCode !== 0) {
     return {
       ok: false,

package/src/cli/tasks-cli.ts

@@ -0,0 +1,176 @@
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import type { Command } from 'commander';
+import { getElanousConfigDir } from '../elanous-config-dir.js';
+import { readNexusRuntime } from '../nexus/runtime.js';
+import type { Task } from '../task-orchestrator/types.js';
+
+type TaskRow = Pick<Task, 'id' | 'title' | 'priority' | 'status' | 'createdAt' | 'approval' | 'generatedBy'>;
+
+export interface TasksCliDeps {
+  baseUrl?: string;
+  bearerToken?: string;
+  fetch?: typeof fetch;
+  output?: (line: string) => void;
+}
+
+const PRIORITY_RANK: Record<Task['priority'], number> = { urgent: 0, high: 1, medium: 2, low: 3 };
+const NEXUS_DOWN = '넥서스가 안 떠 있다 — `elanous nexus run`';
+
+function taskOrder(a: TaskRow, b: TaskRow): number {
+  return PRIORITY_RANK[a.priority] - PRIORITY_RANK[b.priority]
+    || a.createdAt - b.createdAt || a.id.localeCompare(b.id);
+}
+
+function taskSource(task: TaskRow): string {
+  return task.generatedBy?.kind === 'external'
+    ? `${task.generatedBy.provider}:${task.generatedBy.ref}` : '-';
+}
+
+function taskLine(task: TaskRow): string {
+  return [task.id, task.priority, task.status, task.approval?.state ?? '-', taskSource(task), task.title].join('\t');
+}
+
+function credentials(deps: TasksCliDeps): { baseUrl: string; token?: string } | null {
+  const port = deps.baseUrl !== undefined ? undefined : readNexusRuntime()?.httpPort;
+  const baseUrl = deps.baseUrl ?? (port ? `http://127.0.0.1:${port}` : undefined);
+  if (!baseUrl) return null;
+  // Same as `connector linear sync`: an isolated (--test) universe has no acp-token and its
+  // daemon accepts loopback callers without one — send the bearer only when there is one.
+  let token = deps.bearerToken;
+  if (token === undefined) {
+    try { token = readFileSync(join(getElanousConfigDir(), 'acp-token'), 'utf8').trim() || undefined; }
+    catch { token = undefined; }
+  }
+  return { baseUrl, ...(token ? { token } : {}) };
+}
+
+class NexusUnavailable extends Error {}
+
+async function request(deps: TasksCliDeps, auth: { baseUrl: string; token?: string }, path: string, method = 'GET'): Promise<Response> {
+  try {
+    return await (deps.fetch ?? fetch)(`${auth.baseUrl}${path}`, {
+      method,
+      headers: auth.token ? { Authorization: `Bearer ${auth.token}` } : {},
+    });
+  } catch {
+    // Fetch exceptions can include the URL or credentials; never forward their text.
+    throw new NexusUnavailable();
+  }
+}
+
+async function responseJson(response: Response): Promise<unknown> {
+  try { return await response.json(); }
+  catch { throw new Error('넥서스 응답 JSON이 유효하지 않다'); }
+}
+
+function httpError(response: Response): Error {
+  // Do not echo server-supplied error bodies: they may contain credentials.
+  return new Error(`HTTP ${response.status}`);
+}
+
+function handleError(error: unknown, out: (line: string) => void): void {
+  if (error instanceof NexusUnavailable) {
+    out(NEXUS_DOWN);
+    process.exitCode = 2;
+  } else {
+    out(error instanceof Error ? error.message : '태스크 요청 실패');
+    process.exitCode = 1;
+  }
+}
+
+export function registerTasksCommands(program: Command, deps: TasksCliDeps = {}): void {
+  let activeToken: string | undefined;
+  const output = deps.output ?? console.log;
+  const out = (line: string) => output(activeToken ? line.replaceAll(activeToken, '[redacted]') : line);
+  const authenticate = () => {
+    const auth = credentials(deps);
+    activeToken = auth?.token;
+    if (!auth) throw new NexusUnavailable();
+    return auth;
+  };
+  const tasks = program.command('tasks').alias('task').description('TOX 태스크 조회 및 승인');
+
+  tasks.command('list')
+    .description('우선순위와 생성 시각 순으로 태스크 보기')
+    .option('--status <s>', '상태로 필터')
+    .option('--provider <p>', '외부 출처로 필터')
+    .option('--json', 'JSON 출력')
+    .action(async (opts: { status?: string; provider?: string; json?: boolean }) => {
+      try {
+        activeToken = undefined;
+        const auth = authenticate();
+        const response = await request(deps, auth, '/v1/tasks');
+        if (!response.ok) throw httpError(response);
+        const body = await responseJson(response) as { tasks?: Array<Pick<TaskRow, 'id' | 'status'>> };
+        if (!Array.isArray(body?.tasks)) throw new Error('넥서스 태스크 목록 형식이 유효하지 않다');
+        const cards = body.tasks.filter((task) => !opts.status || task.status === opts.status);
+        // The list endpoint returns board cards without approval or provenance.
+        // Obtain those fields from the detail endpoint rather than displaying guesses.
+        const rows: TaskRow[] = [];
+        for (const card of cards) {
+          const detail = await request(deps, auth, `/v1/tasks/${encodeURIComponent(card.id)}`);
+          if (!detail.ok) throw httpError(detail);
+          const data = await responseJson(detail) as { task?: TaskRow };
+          if (!data?.task || data.task.id !== card.id) throw new Error('넥서스 태스크 상세 형식이 유효하지 않다');
+          if (!opts.provider || (data.task.generatedBy?.kind === 'external' && data.task.generatedBy.provider === opts.provider)) rows.push(data.task);
+        }
+        rows.sort(taskOrder);
+        if (opts.json) out(JSON.stringify(rows));
+        else {
+          out('id\t우선순위\t상태\t승인\t출처\t제목');
+          for (const row of rows) out(taskLine(row));
+        }
+      } catch (error) { handleError(error, out); }
+    });
+
+  tasks.command('show <id>')
+    .description('태스크 상세 보기')
+    .option('--json', 'JSON 출력')
+    .action(async (id: string, opts: { json?: boolean }) => {
+      try {
+        activeToken = undefined;
+        const auth = authenticate();
+        const response = await request(deps, auth, `/v1/tasks/${encodeURIComponent(id)}`);
+        if (!response.ok) throw httpError(response);
+        const data = await responseJson(response) as { task?: TaskRow };
+        if (!data?.task) throw new Error('넥서스 태스크 상세 형식이 유효하지 않다');
+        if (opts.json) out(JSON.stringify(data));
+        else {
+          out(taskLine(data.task));
+          out(JSON.stringify(data, null, 2));
+        }
+      } catch (error) { handleError(error, out); }
+    });
+
+  tasks.command('approve <id...>')
+    .description('외부 태스크 승인')
+    .action(async (ids: string[]) => {
+      try {
+        activeToken = undefined;
+        const auth = authenticate();
+        let failed = false;
+        for (const id of ids) {
+          try {
+            const response = await request(deps, auth, `/v1/tasks/${encodeURIComponent(id)}/approve`, 'POST');
+            if (!response.ok) {
+              out(`${id}\tfailed HTTP ${response.status}`);
+              failed = true;
+              continue;
+            }
+            const result = await responseJson(response) as { already?: boolean };
+            out(`${id}\t${result?.already ? 'already' : 'approved'}`);
+          } catch (error) {
+            if (error instanceof NexusUnavailable) {
+              out(`${id}\tfailed ${NEXUS_DOWN}`);
+              process.exitCode = 2;
+            } else {
+              out(`${id}\tfailed 응답 JSON이 유효하지 않다`);
+              failed = true;
+            }
+          }
+        }
+        if (failed && process.exitCode !== 2) process.exitCode = 1;
+      } catch (error) { handleError(error, out); }
+    });
+}

package/src/cli/test-state-dir-flag.ts

@@ -107,7 +107,7 @@ export function applyIsolatedRoot(dir: string): void {
       const { join } = require('node:path') as typeof import('node:path');
       if (!existsSync(join(dir, 'config.json'))) {
         const r = sync.syncTestConfig(dir);
-        console.log(`[test-isolation] 운영 config 물질화 → ${r.testConfigPath} (telegram=${r.telegramMode})`);
+        console.error(`[test-isolation] 운영 config 물질화 → ${r.testConfigPath} (telegram=${r.telegramMode})`);
       } else if (sync.isTestConfigStale(dir)) {
         console.error(`[test-isolation] ⚠️ 운영 config 가 테스트 사본보다 최신 — 'elanous config sync-test' 로 갱신 권장`);
       }

package/src/cli/usage-cli.ts

@@ -80,12 +80,18 @@ export function registerUsageCommand(program: Command, deps: UsageCliDeps = {}):
 
   usage
     .command('runs')
-    .description('저장된 llm-usage 로그를 런·모델·청구 경로별로 집계한다')
+    .description('저장된 llm-usage 로그를 런 또는 역할·호출 자리별로 집계한다')
     .option('--run <runId>', '런 ID 정확 일치')
+    .option('--by <axis>', '집계 축 (run | role)', 'run')
     .option(...LOGS_SINCE_OPTION)
     .option('--json', '집계 행 JSON 출력')
-    .action((opts: { run?: string; since?: string; json?: boolean }, command: Command) => {
+    .action((opts: { run?: string; by: string; since?: string; json?: boolean }, command: Command) => {
       const json = opts.json || command.optsWithGlobals<{ json?: boolean }>().json;
+      if (opts.by !== 'run' && opts.by !== 'role') {
+        out.log('⛔ --by 는 run | role');
+        exit(2);
+        return;
+      }
       const sinceMs = opts.since === undefined ? undefined : parseSince(opts.since);
       if (sinceMs === null) {
         out.log(`⛔ --since 파싱 불가: '${opts.since}' (30s/15m/2h/7d 또는 ISO)`);
@@ -98,14 +104,19 @@ export function registerUsageCommand(program: Command, deps: UsageCliDeps = {}):
       });
       const inputs = rows.map(usageData).filter((data): data is RunUsageInput => data !== null)
         .filter((data) => opts.run === undefined || data.runId === opts.run);
-      const report = rollupRunUsage(inputs);
+      const report = rollupRunUsage(inputs, { by: opts.by });
+      if (opts.by === 'role') report.sort((a, b) => b.calls - a.calls);
       if (json) {
         out.log(JSON.stringify(report, null, 2));
         return;
       }
       if (report.length === 0) { out.log('(일치하는 런 사용량 없음)'); return; }
       for (const row of report) {
-        out.log(`${row.runId}  ${row.model}  ${row.billingProvider}/${row.billing}  hosts=${row.hostIds.join(',') || '(none)'}  calls=${row.calls}  input=${row.inputTokens}  output=${row.outputTokens}  cacheRead=${row.cacheReadInputTokens}  cacheCreation=${row.cacheCreationInputTokens}  reasoning=${row.reasoningOutputTokens}  usdKnown=${row.usdKnown}  unknownCostCalls=${row.unknownCostCalls}  includedCalls=${row.includedCalls}  apiEquivalentUsd=${row.apiEquivalentUsd}`);
+        if (opts.by === 'role') {
+          out.log(`${row.role}  ${row.site}  ${row.model}  ${row.billingProvider}/${row.billing}  calls=${row.calls}  input=${row.inputTokens}  output=${row.outputTokens}  usdKnown=${row.usdKnown}  unknownCostCalls=${row.unknownCostCalls}  includedCalls=${row.includedCalls}  apiEquivalentUsd=${row.apiEquivalentUsd}`);
+        } else {
+          out.log(`${row.runId}  ${row.model}  ${row.billingProvider}/${row.billing}  hosts=${row.hostIds.join(',') || '(none)'}  calls=${row.calls}  input=${row.inputTokens}  output=${row.outputTokens}  cacheRead=${row.cacheReadInputTokens}  cacheCreation=${row.cacheCreationInputTokens}  reasoning=${row.reasoningOutputTokens}  usdKnown=${row.usdKnown}  unknownCostCalls=${row.unknownCostCalls}  includedCalls=${row.includedCalls}  apiEquivalentUsd=${row.apiEquivalentUsd}`);
+        }
       }
     });
 

package/src/cli/where-cli.ts

@@ -1,85 +1,52 @@
-// ── `elanous where` (P3 · 2026-07-26) ────────────────────────────────────────
-//
-// "지금 어느 우주인가 — **그리고 왜**". 이 트랙의 핵심 요구는 "격리가 편해지는 것"만이 아니라
-// **헷갈리지 않는 것**이었다. 그래서 결과(prod/test)뿐 아니라 **어느 층에서 결정됐는지**를 같이
-// 보여준다. 반대 실수("테스트인 줄 알았는데 prod")도 이 화면 하나로 잡힌다.
-//
-// 설계 = 내부 문서 `DESIGN-instance-leader-and-default-test-2026-07-26` §5c.
-
+// `elanous where`: 우주와 판정 근거를 실제 resolver 결과로 표시한다.
 import type { Command } from 'commander';
-import { observeLeaderAxes, isLeaderTree } from '../instance/leader.js';
+import { resolveSelfTree } from '../instance/leader.js';
 import { resolveCurrentInstance } from '../instance/current.js';
-import { treeDerivedTestEnabled, effectiveInstanceRoot, normRoot, type InstanceResolution } from '../instance/resolve.js';
-
+import { effectiveInstanceRoot, normRoot, type InstanceResolution } from '../instance/resolve.js';
 import { getElanousConfigDir } from '../elanous-config-dir.js';
 
 const LAYER_LABEL: Record<InstanceResolution['layer'], string> = {
-  'explicit-flag': '1층 · 명시 플래그',
-  'parent-stamp': '2층 · 부모 스탬프(env)',
-  'tree-derived': '3층 · 트리 파생',
-  default: '4층 · 기본값',
+  'explicit-flag': '명시 루트',
+  'parent-stamp': '부모 스탬프',
+  installed: '설치본',
+  'tree-derived': '소스 트리(격리)',
+  default: '소스 트리 밖 실행(격리)',
 };
 
-/** 순수 렌더 — 테스트가 문자열로 계약을 고정할 수 있게 분리. */
-export function renderWhere(r: InstanceResolution, extra: {
-  selfTree: string; authority: string | null; isLeader: boolean | null;
-  configDir: string; treeDerivedEnabled: boolean;
-}): string {
-  const L: string[] = [];
-  L.push('━━ 지금 어느 우주인가 ━━');
-  L.push(`  인스턴스   : ${r.kind === 'prod' ? '🔴 prod (운영)' : '🟢 test (격리)'}`);
-  L.push(`  뿌리       : ${r.root}`);
-  L.push(`  config-dir : ${extra.configDir}${normRoot(extra.configDir) === normRoot(r.root) ? '  ✓ 같은 뿌리' : '  ⚠️ 뿌리와 다름(축 어긋남)'}`);
-  L.push('');
-  L.push(`  왜         : ${LAYER_LABEL[r.layer]} — ${r.why}`);
-  L.push('');
-  L.push('  ── 판정 입력 ──');
-  L.push(`  이 트리    : ${extra.selfTree}`);
-  L.push(`  리더 권위  : ${extra.authority ?? '(미지정)'}${extra.isLeader === null ? ' · 판정 보류' : extra.isLeader ? ' · 이 트리가 리더' : ' · 비-리더'}`);
-  L.push(`  트리 파생  : ${extra.treeDerivedEnabled ? 'ON' : 'OFF (기본)'}`);
-  if (r.wouldBeIfTreeDerived) {
-    L.push('');
-    L.push(`  ⓘ 트리 파생을 켜면 → ${r.wouldBeIfTreeDerived.kind} · ${r.wouldBeIfTreeDerived.root}`);
-    L.push(`     (${r.wouldBeIfTreeDerived.why}) · config \`instance.treeDerivedTest\` 로 켭니다`);
-  }
-  return L.join('\n');
+export function renderWhere(r: InstanceResolution, extra: { selfTree: string; configDir: string }): string {
+  return [
+    '━━ 지금 어느 우주인가 ━━',
+    `  인스턴스   : ${r.kind === 'prod' ? '🔴 prod (운영)' : '🟢 test (격리)'}`,
+    `  뿌리       : ${r.root}`,
+    `  config-dir : ${extra.configDir}${normRoot(extra.configDir) === normRoot(r.root) ? '  ✓ 같은 뿌리' : '  ⚠️ 뿌리와 다름(축 어긋남)'}`,
+    `  왜         : ${LAYER_LABEL[r.layer]} — ${r.why}`,
+    `  실행 트리  : ${extra.selfTree}`,
+  ].join('\n');
 }
 
 export interface WhereDeps {
   out?: { log: (s: string) => void };
   cwd?: () => string;
-  treeDerivedEnabled?: () => boolean;
   configDir?: () => string;
 }
 
 export function registerWhereCommand(program: Command, deps: WhereDeps = {}): void {
   const out = deps.out ?? { log: (s: string) => console.log(s) };
   program.command('where')
-    .description('지금 이 프로세스가 어느 인스턴스(prod/test)에 속하는지 **와 그 이유**를 보여준다 (READ-ONLY)')
+    .description('지금 이 프로세스가 어느 인스턴스(prod/test)에 속하는지와 그 이유를 보여준다 (READ-ONLY)')
     .option('--json', 'JSON 출력')
     .action((o: { json?: boolean }) => {
       const cwd = (deps.cwd ?? (() => process.cwd()))();
-      const axes = observeLeaderAxes();
-      // ⚠️ 스위치는 **raw prod config.json** 에서 직접 읽는다 — `getUserConfig()` 를 쓰면
-      //    config 경로 해석이 리졸버를 되불러 재귀한다(P3 self review). 여기서는 미리보기
-      //    전용이라 raw 읽기로 충분하고, 3층 실배선(P3b)에서 스위치 소스를 확정한다.
-      // ★ 리졸버와 **같은 스위치**를 쓴다 — 진단이 실제 해석과 갈리면 거짓 보고가 된다
-      //   (스위치 ON 인데 where 만 test 라고 말하는 상황 · self review 지적).
-      const treeDerivedEnabled = (deps.treeDerivedEnabled ?? treeDerivedTestEnabled)();
       const configDir = (deps.configDir ?? getElanousConfigDir)();
-      const r = resolveCurrentInstance({
-        cwd: () => cwd,
-        treeDerivedEnabled: () => treeDerivedEnabled,
-      });
-      // 진단 정합 가드 — 화면이 말하는 뿌리와 **실제 스토어가 쓰는 뿌리**가 같아야 한다.
+      const r = resolveCurrentInstance({ cwd: () => cwd });
       const actualRoot = effectiveInstanceRoot();
       const mismatch = normRoot(actualRoot) !== normRoot(r.root) ? actualRoot : null;
+      const selfTree = resolveSelfTree();
       if (o.json) {
-        // ⚠️ 경고를 JSON 앞에 찍으면 파싱이 깨진다 — **필드로** 싣는다.
-        out.log(JSON.stringify({ ...r, selfTree: axes.self, authority: axes.authority, isLeader: isLeaderTree(axes), configDir, treeDerivedEnabled, actualRoot, mismatch }, null, 2));
+        out.log(JSON.stringify({ ...r, selfTree, configDir, actualRoot, mismatch }, null, 2));
         return;
       }
       if (mismatch) out.log(`  ⚠️ 진단 불일치 — 해석=${r.root} 이나 실제 스토어 뿌리=${mismatch} (버그로 보고해 주세요)`);
-      out.log(renderWhere(r, { selfTree: axes.self, authority: axes.authority, isLeader: isLeaderTree(axes), configDir, treeDerivedEnabled }));
+      out.log(renderWhere(r, { selfTree, configDir }));
     });
 }

package/src/code-edit/diff-render.ts

@@ -26,7 +26,7 @@ import { normalizeTabs } from '../panes/syntax-color.js';
 import { computeInlineWordDiff, hasIntraLineChange, type WordDiffPart } from '../panes/word-diff.js';
 import type { EditResult, StructuredPatchHunk } from './types.js';
 import {
-  detectLanguage, highlightCode, type HighlightedLines, type SyntaxToken,
+  detectLanguage, highlightCode, type SyntaxToken,
 } from './syntax-highlight.js';
 
 export type DiffColorTier = 'auto' | 'truecolor' | '256' | 'ansi16';
@@ -55,16 +55,8 @@ export interface DiffRenderOptions {
   syntax?: boolean;
   /** R2 — palette selection. */
   colorTier?: DiffColorTier;
-  /** R2 — when true (default), background lightness may switch the
-   *  palette to a light-friendly variant. */
-  adaptiveBg?: boolean;
   /** R2 — explicit terminal background override. */
   isLight?: boolean;
-  /** R2 — syntax highlight only the concatenated hunk text instead of
-   *  the full file. */
-  syntaxPerHunk?: boolean;
-  /** R3 — reuse per-hunk rendered rows when the same variant repeats. */
-  cache?: boolean;
   /** Source-delta presentation header style. */
   headerStyle?: DiffHeaderStyle;
   /** Phase 5 — when true AND `noColor=false`, adjacent `-`/`+` pairs
@@ -83,7 +75,6 @@ export interface DiffRenderVariant {
   syntax: boolean;
   colorTier: DiffColorTier;
   isLight: boolean;
-  syntaxPerHunk: boolean;
   inlineWordDiff: boolean;
 }
 
@@ -171,7 +162,6 @@ type HunkRenderCache = Map<string, string[]>;
 
 interface ResolvedDiffRenderOptions {
   variant: DiffRenderVariant;
-  cache: boolean;
   headerStyle: DiffHeaderStyle;
 }
 
@@ -212,14 +202,9 @@ export async function renderEditBlockAsync(result: EditResult, opts: DiffRenderO
   let newHL: HighlightLineMap | null = null;
   let oldHL: HighlightLineMap | null = null;
   try {
-    if (opts.syntaxPerHunk === false) {
-      newHL = linesToMap(await highlightCode(result.newContent, lang));
-      oldHL = linesToMap(await highlightCode(result.originalContent, lang));
-    } else {
-      const maps = await highlightHunks(result.structuredPatch, lang);
-      newHL = maps.newLines;
-      oldHL = maps.oldLines;
-    }
+    const maps = await highlightHunks(result.structuredPatch, lang);
+    newHL = maps.newLines;
+    oldHL = maps.oldLines;
   } catch {
     newHL = null;
     oldHL = null;
@@ -273,7 +258,6 @@ function renderEditBlockCore(
       maxLineWidth: variant.maxLineWidth,
       palette,
       newHL, oldHL,
-      cache: opts.cache,
       cacheKey: buildDiffRenderCacheKey(variant),
       syntax: variant.syntax,
       inlineWordDiff: variant.inlineWordDiff,
@@ -291,14 +275,13 @@ interface HunkCtx {
   palette: DiffPalette;
   newHL: HighlightLineMap | null;
   oldHL: HighlightLineMap | null;
-  cache: boolean;
   cacheKey: string;
   syntax: boolean;
   inlineWordDiff: boolean;
 }
 
 function renderHunkCached(hunk: StructuredPatchHunk, ctx: HunkCtx, out: string[]): void {
-  if (!ctx.cache || (ctx.syntax && !hasHighlightCoverage(hunk, ctx.newHL, ctx.oldHL))) {
+  if (ctx.syntax && !hasHighlightCoverage(hunk, ctx.newHL, ctx.oldHL)) {
     renderHunk(hunk, ctx, out);
     return;
   }
@@ -455,12 +438,6 @@ function paintTailPad(raw: string, padded: string, bg: typeof chalk | null): str
   return bg ? bg(pad) : pad;
 }
 
-function linesToMap(lines: HighlightedLines): HighlightLineMap {
-  const out = new Map<number, SyntaxToken[]>();
-  for (let i = 0; i < lines.length; i++) out.set(i, lines[i]!);
-  return out;
-}
-
 async function highlightHunks(
   hunks: readonly StructuredPatchHunk[],
   lang: string,
@@ -500,8 +477,7 @@ export function resolveDiffRenderVariant(opts: DiffRenderOptions): DiffRenderVar
     maxLineWidth: opts.maxLineWidth ?? CODE_PREVIEW_MAX_LINE_WIDTH,
     syntax: opts.syntax === true,
     colorTier: opts.colorTier ?? 'auto',
-    isLight: opts.isLight ?? (opts.adaptiveBg === false ? false : detectTerminalBgLightness() ?? false),
-    syntaxPerHunk: opts.syntaxPerHunk !== false,
+    isLight: opts.isLight ?? (detectTerminalBgLightness() ?? false),
     inlineWordDiff: opts.inlineWordDiff === true,
   };
 }
@@ -509,7 +485,6 @@ export function resolveDiffRenderVariant(opts: DiffRenderOptions): DiffRenderVar
 function resolveDiffRenderOptions(opts: DiffRenderOptions): ResolvedDiffRenderOptions {
   return {
     variant: resolveDiffRenderVariant(opts),
-    cache: opts.cache !== false,
     headerStyle: opts.headerStyle ?? 'legacy',
   };
 }
@@ -522,7 +497,6 @@ export function buildDiffRenderCacheKey(opts: DiffRenderVariant): string {
     `syn:${opts.syntax ? 1 : 0}`,
     `tier:${opts.colorTier}`,
     `light:${opts.isLight ? 1 : 0}`,
-    `perHunk:${opts.syntaxPerHunk ? 1 : 0}`,
     `wd:${opts.inlineWordDiff ? 1 : 0}`,
   ].join('|');
 }

package/src/code-edit/source-delta-browser.ts

@@ -89,7 +89,6 @@ export function renderSourceDeltaFilePreview(
   const rows = renderEditBlock(sourceDeltaFileToEditResult(file), {
     cols: opts.cols ?? 96,
     syntax: false,
-    cache: true,
     headerStyle: 'edited',
   });
   const maxLines = Math.max(4, opts.maxLines ?? 36);

package/src/codex/models.ts

@@ -58,7 +58,7 @@ export const CODEX_MODELS: CodexModel[] = [
   },
   {
     id: 'gpt-6-sol',
-    label: 'GPT-6 Sol (recommended)',
+    label: 'GPT-6 Sol',   // «recommended» 표시는 목록이 `recommended: true` 로 붙인다 — 라벨에도 쓰면 두 번 뜬다(UX 8)
     tier: 'balanced',
     description: 'elanous 운영 기본(대표 2026-09-23). 복합 코딩·agentic 워크플로. Reasoning «Highest» 인데 가격은 5.6 Terra 와 같은 입력·더 싼 출력. 1.05M ctx, effort none..max(기본 medium).',
     contextWindow: 1_050_000,

package/src/config.ts

@@ -1,9 +1,11 @@
-import { existsSync, readFileSync, realpathSync } from 'fs';
+import { existsSync, realpathSync } from 'fs';
+import { effectiveInstanceRoot, normRoot } from './instance/resolve.js';
 import { homedir } from 'os';
 import { join, resolve } from 'path';
 import { lookupLlmTierSpec } from './model-tier/llm-tier-map.js';
 import { listSshHosts } from './ssh/ssh-hosts.js';
 import { isInstalledPackagePath } from './instance/installed-package.js';
+import { defaultObsidianVault } from './obsidian/default-vault.js';
 
 // ── User config ──
 export const REMOTE_HOME = homedir();
@@ -13,12 +15,12 @@ export const LOCAL_AGENTS_DIR = join(REMOTE_HOME, '.claude/agents');
  * 가변 상태(`plugin-trust.json` · `market-posture.json` · `execution-history.json` · `sync.db` …)의 폴더.
  * 🩸 2026-09-24: 종전엔 늘 «코드 옆» `<코드>/data` 였다. 운영이 설치본(`~/.local/share/elanous/versions/<판>`)으로 옮기자
  *    판마다 빈 `data/` 가 새로 생기고 야간 정리가 옛 판을 지우며 같이 지워졌다(플러그인 신뢰 승인·시장 자세 last-good).
- *    ⇒ 운영 코드(설치본 · 리더 트리)는 상태 폴더 `~/.elanous/data` 를 쓴다. 다른 워크트리는 종전대로 자기 `data/`.
+ *    ⇒ 설치본 또는 운영 우주는 `~/.elanous/data`, 격리 소스 트리는 자기 `data/`를 쓴다.
  *    `ELANOUS_DATA_DIR` 가 있으면 그것이 이긴다.
  */
 export function resolveDataDir(
   codeRoot: string = resolve(import.meta.dir, '..'),
-  deps: { env?: NodeJS.ProcessEnv; home?: string; leaderTree?: () => string | null; hasGit?: (dir: string) => boolean } = {},
+  deps: { env?: NodeJS.ProcessEnv; home?: string; instanceRoot?: () => string; hasGit?: (dir: string) => boolean } = {},
 ): string {
   const env = deps.env ?? process.env;
   const override = env.ELANOUS_DATA_DIR?.trim();
@@ -37,17 +39,11 @@ export function resolveDataDir(
     return false;
   });
   if (isInstalledPackagePath(root) && !hasGit(root)) return stateData;   // 설치본(설치기 · npm)
-  const leaderTree = deps.leaderTree ?? (() => {
-    try {
-      const raw = JSON.parse(readFileSync(join(home, '.elanous', 'leader.json'), 'utf-8')) as { tree?: unknown };
-      return typeof raw.tree === 'string' ? raw.tree : null;
-    } catch { return null; }
-  });
-  const leader = leaderTree();
-  if (leader && real(leader) === root) return stateData;   // 리더(운영) 트리
+  if (normRoot((deps.instanceRoot ?? effectiveInstanceRoot)()) === normRoot(join(home, '.elanous'))) return stateData;
   return join(codeRoot, 'data');
 }
 
+// Module consumers of DATA_DIR/DB_PATH use the same resolved universe as the CLI.
 export const DATA_DIR = resolveDataDir();
 export const DB_PATH = join(DATA_DIR, 'sync.db');
 
@@ -55,8 +51,7 @@ export const DB_PATH = join(DATA_DIR, 'sync.db');
 // Root directory of the user's Obsidian vault. The working-dir V1
 // layout pairs a Working browser and an Obsidian browser side by side
 // so results saved to Obsidian are one pane-focus away.
-export const OBSIDIAN_VAULT =
-  process.env.OBSIDIAN_VAULT || join(REMOTE_HOME, 'Obsidian', 'ElanvitalAI');
+export const OBSIDIAN_VAULT = defaultObsidianVault({ env: process.env, home: REMOTE_HOME });
 
 // ── Servers (SSH host aliases) ──
 // `local` is a first-class target for syncing between local agent runtimes