elanous 0.2.37 → 0.2.38

package/src/grok/credential.ts

@@ -26,7 +26,7 @@
 //   「Using auth.json for API Access」 절이 유일한 문서다. ⇒ 조용히 깨질 수 있으니
 //   호출자는 실패를 fail-soft 로 접고 API 키 경로로 떨어질 수 있어야 한다.
 
-import { chmodSync, existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 
@@ -98,6 +98,7 @@ export interface GrokCredential {
 interface GrokAuthScope {
   key?: unknown;
   expires_at?: unknown;
+  refresh_token?: unknown;
   user_id?: unknown;
 }
 
@@ -112,7 +113,7 @@ export function grokAuthFilePath(home: string = homedir()): string {
  *     키가 다르다(실측: 이 기계는 `https://auth.x.ai::<uuid>`). 그래서 «훑는다». */
 function readSubscriptionToken(
   path: string,
-): { token: string; expiresAt: string | null; userId: string | null } | null {
+): { token: string; expiresAt: string | null; userId: string | null; scopeName: string } | null {
   if (!existsSync(path)) return null;
   let parsed: unknown;
   try {
@@ -120,9 +121,15 @@ function readSubscriptionToken(
   } catch {
     return null;
   }
+  return selectSubscriptionToken(parsed);
+}
+
+function selectSubscriptionToken(
+  parsed: unknown,
+): { token: string; expiresAt: string | null; userId: string | null; scopeName: string } | null {
   if (!parsed || typeof parsed !== 'object') return null;
 
-  type SubscriptionToken = { token: string; expiresAt: string | null; userId: string | null; ms: number };
+  type SubscriptionToken = { token: string; expiresAt: string | null; userId: string | null; scopeName: string; ms: number };
   let best: SubscriptionToken | null = null;
   let hqMirror: SubscriptionToken | null = null;
   for (const [scopeName, scope] of Object.entries(parsed as Record<string, unknown>)) {
@@ -135,13 +142,14 @@ function readSubscriptionToken(
       token: s.key,
       expiresAt,
       userId: typeof s.user_id === 'string' ? s.user_id : null,
+      scopeName,
       ms: Number.isNaN(ms) ? Number.NEGATIVE_INFINITY : ms,
     };
     if (scopeName === 'https://auth.x.ai::hq-mirror') hqMirror = cand;
     if (best === null || cand.ms > best.ms) best = cand;
   }
-  const selected = hqMirror ?? best;
-  return selected ? { token: selected.token, expiresAt: selected.expiresAt, userId: selected.userId } : null;
+  const selected = hqMirror && (best === null || hqMirror.ms >= best.ms) ? hqMirror : best;
+  return selected ? { token: selected.token, expiresAt: selected.expiresAt, userId: selected.userId, scopeName: selected.scopeName } : null;
 }
 
 /** 호스트 발급 문이 응답에 실을 access. user id 는 반환하지 않는다. */
@@ -158,6 +166,14 @@ export function readGrokSubscriptionExpiry(home?: string): string | null {
   return readSubscriptionToken(grokAuthFilePath(home))?.expiresAt ?? null;
 }
 
+/** Read the current selected scope for a host-side launch snapshot. */
+export function readSelectedGrokScope(home?: string): { scopeName: string; key: string; expiresAt: string | null; userId: string | null; hasRefreshToken: boolean } | null {
+  const selected = readSelectedScope(grokAuthFilePath(home));
+  if (!selected) return null;
+  return { scopeName: selected.scopeName, key: selected.token, expiresAt: selected.expiresAt,
+    userId: selected.userId, hasRefreshToken: Boolean(selected.refreshToken) };
+}
+
 /** 프록시 필수 헤더. ⛔ `x-grok-client-version` 을 빼면 426 이다(실측). */
 export function grokSubscriptionHeaders(opts: {
   model?: string;
@@ -366,23 +382,58 @@ export function resolveGrokCredential(opts: ResolveGrokCredentialOpts = {}): Gro
 
 /** 갱신 유도 결과. ⛔ 「갱신됐다」와 «안 됐다»와 «못 했다»를 다른 값으로. */
 export type GrokRefreshOutcome = 'refreshed' | 'unchanged' | 'failed' | 'no-credential';
+const grokSubscriptionRefreshesInProgress = new Set<string>();
 
 /** 토큰의 만료 시각만 뽑는다(비교용). ⛔ 토큰 값은 안 낸다. */
-function readExpiresAt(path: string): string | null {
-  if (!existsSync(path)) return null;
+function readSelectedScope(path: string): { token: string; expiresAt: string | null; refreshToken: string | null; scopeName: string; userId: string | null } | null {
   try {
-    const parsed = JSON.parse(readFileSync(path, 'utf-8')) as unknown;
-    if (!parsed || typeof parsed !== 'object') return null;
-    let latest: string | null = null;
-    for (const scope of Object.values(parsed as Record<string, unknown>)) {
-      if (!scope || typeof scope !== 'object') continue;
-      const raw = (scope as GrokAuthScope).expires_at;
-      if (typeof raw === 'string' && (latest === null || raw > latest)) latest = raw;
+    const parsed = JSON.parse(readFileSync(path, 'utf-8')) as Record<string, unknown>;
+    const selected = selectSubscriptionToken(parsed);
+    if (!selected) return null;
+    const scope = parsed[selected.scopeName];
+    if (!scope || typeof scope !== 'object' || Array.isArray(scope)) return null;
+    const value = scope as GrokAuthScope;
+    if (value.key !== selected.token) return null;
+    return {
+      token: selected.token,
+      expiresAt: selected.expiresAt,
+      refreshToken: typeof value.refresh_token === 'string' && value.refresh_token.trim() ? value.refresh_token : null,
+      scopeName: selected.scopeName,
+      userId: selected.userId,
+    };
+  } catch { return null; }
+}
+
+function acquireGrokRefreshFileLock(path: string, timeoutMs: number): (() => void) | null {
+  const lock = `${path}.refresh-lock`;
+  const deadline = Date.now() + timeoutMs;
+  mkdirSync(join(path, '..'), { recursive: true });
+  while (Date.now() <= deadline) {
+    try {
+      mkdirSync(lock, { mode: 0o700 });
+      writeFileSync(join(lock, 'owner'), `${process.pid} ${Date.now()}`, { mode: 0o600, flag: 'wx' });
+      return () => { try { rmSync(lock, { recursive: true, force: true }); } catch { /* best effort */ } };
+    } catch {
+      try {
+        const owner = readFileSync(join(lock, 'owner'), 'utf8').trim().split(/\s+/);
+        const pid = Number(owner[0]);
+        const started = Number(owner[1]);
+        let alive = false;
+        if (Number.isSafeInteger(pid) && pid > 0) {
+          try { process.kill(pid, 0); alive = true; } catch (error) { alive = (error as NodeJS.ErrnoException).code === 'EPERM'; }
+        }
+        // The holder may outlive this waiter's timeout; only a dead PID is stale.
+        if (!alive && Number.isFinite(started) && Date.now() - started > 30_000) rmSync(lock, { recursive: true, force: true });
+      } catch {
+        // A crash between mkdir and writing owner leaves no PID to inspect.
+        // Give a live creator time to finish, then recover the orphan directory.
+        try { if (Date.now() - statSync(lock).mtimeMs > 30_000) rmSync(lock, { recursive: true, force: true }); }
+        catch { /* another process may be creating or removing the lock */ }
+      }
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 25);
     }
-    return latest;
-  } catch {
-    return null;
   }
+  return null;
 }
 
 /**
@@ -412,30 +463,51 @@ export function refreshGrokSubscriptionToken(
     timeoutMs?: number;
     /** ⛔ 테스트 심 — 실 바이너리 없이 계약을 문다. */
     execImpl?: (cmd: string, args: string[], timeoutMs: number) => void;
+    /** Require a non-empty refresh token on the selected access scope before launching the CLI. */
+    requireRefreshToken?: boolean;
+    requiredValidityMs?: number;
+    nowMs?: number;
   } = {},
 ): GrokRefreshOutcome {
   const path = grokAuthFilePath(opts.home);
-  const before = readExpiresAt(path);
-  if (before === null && !existsSync(path)) return 'no-credential';
-
+  const selected = readSelectedScope(path);
+  if (!selected) return 'no-credential';
+  if (opts.requireRefreshToken && !selected.refreshToken) return 'no-credential';
+  // A nested refresh for the same auth file observes the outer call's result later.
+  if (grokSubscriptionRefreshesInProgress.has(path)) return 'unchanged';
+  grokSubscriptionRefreshesInProgress.add(path);
+  const releaseLock = acquireGrokRefreshFileLock(path, opts.timeoutMs ?? 20_000);
+  if (!releaseLock) { grokSubscriptionRefreshesInProgress.delete(path); return 'failed'; }
   try {
+    const current = readSelectedScope(path);
+    if (!current || current.scopeName !== selected.scopeName) return 'no-credential';
+    if (opts.requireRefreshToken && !current.refreshToken) return 'no-credential';
+    // Only the Pod preflight supplies a validity target. An explicit refresh call still invokes the CLI.
+    const expiresMs = current.expiresAt ? Date.parse(current.expiresAt) : NaN;
+    if (opts.requiredValidityMs !== undefined && Number.isFinite(expiresMs)
+      && expiresMs - (opts.nowMs ?? Date.now()) >= opts.requiredValidityMs) return 'unchanged';
     const timeoutMs = opts.timeoutMs ?? 20_000;
-    if (opts.execImpl) {
-      opts.execImpl(opts.grokPath ?? 'grok', ['models'], timeoutMs);
-    } else {
-      const { execFileSync } = require('node:child_process') as typeof import('node:child_process');
-      execFileSync(opts.grokPath ?? 'grok', ['models'], {
-        timeout: timeoutMs,
-        stdio: ['ignore', 'ignore', 'ignore'],
-      });
-    }
-  } catch {
-    return 'failed';
+    try {
+      if (opts.execImpl) {
+        opts.execImpl(opts.grokPath ?? 'grok', ['models'], timeoutMs);
+      } else {
+        const { execFileSync } = require('node:child_process') as typeof import('node:child_process');
+        execFileSync(opts.grokPath ?? 'grok', ['models'], {
+          timeout: timeoutMs,
+          stdio: ['ignore', 'ignore', 'ignore'],
+        });
+      }
+    } catch { return 'failed'; }
+    const after = readSelectedScope(path);
+    if (!after) return 'no-credential';
+    const afterMs = after?.expiresAt ? Date.parse(after.expiresAt) : NaN;
+    return after?.scopeName === current.scopeName && Number.isFinite(afterMs)
+      && (!Number.isFinite(expiresMs) || afterMs > expiresMs)
+      ? 'refreshed' : 'unchanged';
+  } finally {
+    releaseLock();
+    grokSubscriptionRefreshesInProgress.delete(path);
   }
-
-  const after = readExpiresAt(path);
-  // ⛔ 「돌았다」가 아니라 「만료가 «앞으로» 갔다」를 본다.
-  return after !== null && after !== before ? 'refreshed' : 'unchanged';
 }
 
 // ── ⭐ 「접힌」 자격 해석 — 호출자가 «기억할 것»을 0 으로 ────────────────────────
@@ -492,7 +564,6 @@ export function isGrokSubscriptionExpiring(
 
 /** 구독 만료 상태 — 칸 CRED-EXPIRY-REFRESH 기준 창. 이 안에 만료가 오면 갱신 후보다. */
 export const GROK_EXPIRY_SOON_WINDOW_MS = 2 * 60 * 60 * 1000;
-
 /** 만료 상태 셋 — ⛔ boolean 으로 접으면 「모름」과 «여유»가 «같은 값»이 된다. */
 export type GrokSubscriptionExpiryState = 'healthy' | 'expiring' | 'unknown';
 

package/src/hq/fence-wrapper.ts

@@ -17,7 +17,7 @@ export function renderHqFenceWrapper({ entry, configDir, bun, logFile }: { entry
   if (!isAbsolute(bun)) throw new Error(`hq-fence: bun must be an absolute path: ${bun}`);
   const log = logFile ?? join(configDir, 'logs', 'hq-fence.log');
   return `#!/bin/sh
-# Arbiter (cloud-vm) outage: retain the lease, do not promote; hq fence owns that decision.
+# Arbiter outage: retain the lease, do not promote; hq fence owns that decision.
 ENTRY=${quote(entry)}
 CONFIG_DIR=${quote(configDir)}
 # cron has no PATH for bun — the absolute path was resolved when this wrapper was installed.

package/src/hq/transfer.ts

@@ -17,7 +17,7 @@ export interface TransferDeps {
   journalDir: string;
 }
 
-const aliases: Record<string, string[]> = { mbp: ['mbp', 'MacBookProM5'], node-b: ['node-b', 'MacStudioB1'] };
+const aliases: Record<string, string[]> = { mbp: ['mbp', 'MacBookProM5'], 'node-b': ['node-b', 'MacStudioB1'] };
 const valid = (alias: string, holder: string) => aliases[alias]?.includes(holder) ?? false;
 const leaseCommand = (action: 'release' | 'acquire', expected?: { holder: string; generation: number }) =>
   `elanous hq lease ${action}${expected ? ` --expected-holder '${expected.holder}' --expected-generation ${expected.generation}` : ''} --json`;

package/src/index.ts

@@ -4736,6 +4736,7 @@ selfCmd
   .option('--base <ref>', '커밋됐지만 PR 없는 변경의 비교 기준(ref...HEAD)')
   .option('--pr <number>', '열린 PR 번호에서 gh pr view files로 변경 파일을 읽는다')
   .option('--shards [number]', '메모리 예산에 맞춰 시험을 별도 프로세스로 분할한다 (기본 2)')
+  .option('--shard-concurrency <number>', '동시에 실행할 조각 묶음 수 (1–4, 기본 3)')
   .option('--fixed-shard-distribution', '--shards N 과 함께만: RSS 사전 측정 없이 정렬된 파일을 N 조각에 라운드로빈 고정 배정한다(opt-in · 메모리 보증 아님 · 조각 타임아웃/OOM = unmeasured)')
   .option('--include-importers', '변경 모듈을 가져오는 importer 시험도 실행한다 (기본 caller 한도 밖까지)')
   .option('--remote [host]', 'GATE-REMOTE — 같은 커밋을 원격 호스트(기본 config gateRemote.host=node-b)에서 돌리고 결과만 가져온다(깨끗한 트리 · --pr 은 로컬)')
@@ -4745,9 +4746,10 @@ selfCmd
   .option('--shard-id <id>', 'GATE-REMOTE-SHARD-PLAN — 조각 id(예: <orchestration-id>/shard-2). 원격 명령줄에 그대로 실린다')
   .option('--shard-position <n>', 'GATE-REMOTE-SHARD-PLAN — 조각 위치(1부터 정수). 원격 명령줄에 그대로 실린다')
   .option('--shard-plan <path>', 'GATE-REMOTE-SHARD-PLAN — 조각 계획 파일 경로. 주면 원격 명령줄에 --shard-plan 으로 실린다')
-  .action(async (opts: { changed?: boolean; base?: string; pr?: string; shards?: string | boolean; fixedShardDistribution?: boolean; includeImporters?: boolean; remote?: string | boolean; local?: boolean; artifactDir?: string; orchestrationId?: string; shardId?: string; shardPosition?: string; shardPlan?: string }) => {
+  .action(async (opts: { changed?: boolean; base?: string; pr?: string; shards?: string | boolean; shardConcurrency?: string; fixedShardDistribution?: boolean; includeImporters?: boolean; remote?: string | boolean; local?: boolean; artifactDir?: string; orchestrationId?: string; shardId?: string; shardPosition?: string; shardPlan?: string }) => {
     if (!opts.changed && opts.shards === undefined) { ui.error('self gate requires --changed or --shards'); process.exitCode = 2; return; }
     if (opts.fixedShardDistribution && opts.shards === undefined) { ui.error('self gate: --fixed-shard-distribution requires --shards <n>'); process.exitCode = 2; return; }
+    if (opts.shardConcurrency !== undefined && (!/^[1-4]$/.test(opts.shardConcurrency))) { ui.error('self gate: --shard-concurrency must be 1–4'); process.exitCode = 2; return; }
     if (opts.artifactDir !== undefined && !opts.artifactDir.trim()) { ui.error('self gate: --artifact-dir needs a non-empty directory'); process.exitCode = 2; return; }
     const shardIdentityFlags = [opts.orchestrationId, opts.shardId, opts.shardPosition].filter((value) => value !== undefined).length;
     if (shardIdentityFlags !== 0 && shardIdentityFlags !== 3) { ui.error('self gate: --orchestration-id, --shard-id and --shard-position are used as a set'); process.exitCode = 2; return; }
@@ -4763,11 +4765,11 @@ selfCmd
     const shards = opts.shards === undefined ? undefined : opts.shards === true ? 2 : Number(opts.shards);
     let ranLocal = false;
     let remoteArtifacts: { dir: string; fetch?: { ok: true; summaryPath: string; junitFiles: string[]; remoteDirKept: boolean } | { ok: false; reason: string } } | { unsupported: true } | undefined;
-    const runLocal = () => {
+    const runLocal = async () => {
       ranLocal = true;
       try {
-        const { runSelfGateCli } = require('./self-implement/gate-cli.js') as typeof import('./self-implement/gate-cli.js');
-        const result = runSelfGateCli(process.cwd(), { base: opts.base, pr: opts.pr, shards, ...(opts.fixedShardDistribution ? { fixedShardDistribution: true } : {}), includeImporterTests: !!opts.includeImporters, ...(opts.artifactDir !== undefined ? { artifactDir: opts.artifactDir } : {}) });
+        const { runSelfGateCliAsync } = require('./self-implement/gate-cli.js') as typeof import('./self-implement/gate-cli.js');
+        const result = await runSelfGateCliAsync(process.cwd(), { base: opts.base, pr: opts.pr, shards, ...(opts.shardConcurrency !== undefined ? { shardConcurrency: Number(opts.shardConcurrency) } : {}), ...(opts.fixedShardDistribution ? { fixedShardDistribution: true } : {}), includeImporterTests: !!opts.includeImporters, ...(opts.artifactDir !== undefined ? { artifactDir: opts.artifactDir } : {}) });
         console.log(result.lines.join('\n'));
         return result.exitCode;
       } catch (error) {
@@ -4798,7 +4800,7 @@ selfCmd
       // origin/main is pinned to this machine's origin/main on the host; any other base is passed as its resolved sha.
       const remoteArgv = (sha: (ref: string) => string) => {
         const argv = remoteSelfGateArgv({
-          changed: opts.changed, base: opts.base, shards, fixedShardDistribution: opts.fixedShardDistribution,
+          changed: opts.changed, base: opts.base, shards, shardConcurrency: opts.shardConcurrency === undefined ? undefined : Number(opts.shardConcurrency), fixedShardDistribution: opts.fixedShardDistribution,
           includeImporters: opts.includeImporters,
           // A measured commit without this option rejects it (exit ≠ 0) — read as not passed, never as a silent measured run.
           artifactDir: remoteArtifacts && 'dir' in remoteArtifacts ? remoteArtifacts.dir : undefined,
@@ -4837,7 +4839,7 @@ selfCmd
       const reason = error instanceof Error ? error.message : String(error);
       if (opts.local) {
         ui.error(`self gate dispatch failed: ${reason}`);
-        process.exitCode = runLocal();
+        process.exitCode = await runLocal();
       } else {
         ui.error(opts.remote !== undefined
           ? `self gate remote unmeasured — ${reason.replace(/\s+/g, ' ').trim()}`
@@ -12230,11 +12232,20 @@ const realContinueSessionLookup: ContinueSessionLookup = {
   activeSessionId: () => getActiveSessionId(),
 };
 
+const realNextTuiContinueSessionLookup: ContinueSessionLookup = {
+  projectIdForCwd: (cwd) => suggestProjectForFolder(cwd)?.id ?? null,
+  latestForProject: (projectId) => listSessions({ limit: 1, projectId, source: 'tui' })[0]?.id ?? null,
+  latestGlobal: () => listSessions({ limit: 1, source: 'tui' })[0]?.id ?? null,
+  activeSessionId: () => {
+    const id = getActiveSessionId();
+    return id && (loadSession(id) as unknown as { source?: string } | null)?.source === 'tui' ? id : null;
+  },
+};
+
 /**
  * TUI-CONTINUE-SESSION (0.2.35) — `--continue`(id 없는 `--resume`)의 «최근 세션» 을 cwd 기준으로
  * 먼저 좁힌다: cwd 가 속한 프로젝트(`primaryFolder` 또는 그 하위 디렉토리)의 최신 세션 id.
- * 매칭 프로젝트가 없거나 그 프로젝트에 세션이 하나도 없으면 전역 최신으로 폴백한다 —
- * 프로젝트와 무관한 디렉토리·화면의 이어가기 동작은 종전 그대로다.
+ * 프로젝트가 없거나 그 프로젝트에 세션이 없으면 전역 최신으로 폴백한다.
  */
 export function latestSessionIdForContinue(
   cwd: string = process.cwd(),
@@ -12245,6 +12256,26 @@ export function latestSessionIdForContinue(
   return localId ?? lookup.latestGlobal();
 }
 
+/** Next TUI only: resume a project TUI session, never an automation or cross-project session. */
+export function latestNextTuiSessionIdForContinue(
+  cwd: string = process.cwd(),
+  lookup: ContinueSessionLookup = realNextTuiContinueSessionLookup,
+): string | null {
+  const projectId = lookup.projectIdForCwd(cwd);
+  return projectId ? lookup.latestForProject(projectId) : lookup.latestGlobal();
+}
+
+/** Keep the source-filtered session selection scoped to the Next TUI entry. */
+export function latestRootSessionIdForContinue(
+  tuiEntry: 'classic' | 'next',
+  cwd: string = process.cwd(),
+  lookup?: ContinueSessionLookup,
+): string | null {
+  return tuiEntry === 'next'
+    ? latestNextTuiSessionIdForContinue(cwd, lookup ?? realNextTuiContinueSessionLookup)
+    : latestSessionIdForContinue(cwd, lookup ?? realContinueSessionLookup);
+}
+
 /**
  * cwd 가 프로젝트 안이면 활성 표지보다 cwd 프로젝트의 최신 세션 선택을 우선한다.
  * 프로젝트 밖에서는 종전처럼 활성 표지가 전역 최신보다 우선한다.
@@ -12501,17 +12532,16 @@ async function main(): Promise<void> {
   // 우선순위: `--resume <id>` > `--continue`·id 없는 `--resume`(최신) > (폐기 예정) ELANOUS_RESUME_SESSION.
   //   ⛔ 명시 인자가 있으면 환경변수가 이기지 않는다(TUI-H8 r1 must-fix).
   const { resolveLatestSessionId, resolveRootResumeSessionId } = await import('./session/session-start.js');
+  const continueLookup = tuiEntry === 'next' ? realNextTuiContinueSessionLookup : realContinueSessionLookup;
   const rootResume = resolveRootResumeSessionId({
     ...(resumeFromFlag !== undefined ? { flagId: resumeFromFlag } : {}),
     continueLatest,
     // 명시 인자가 있으면 env 를 «읽지도» 않는다(폐기 경고가 명시 이어하기에 섞이지 않게).
     readEnvId: () => readDeprecatedEnvForResume('ELANOUS_RESUME_SESSION').value ?? null,
     latest: () => resolveLatestSessionId({
-      // TUI-CONTINUE-SESSION (0.2.35) — 활성 표지가 «다른 프로젝트» 세션이면 버리고 cwd 기준으로 고른다.
-      activeSessionId: () => activeSessionIdForContinue(),
-      // TUI-CONTINUE-SESSION (0.2.35) — «지금 이 디렉토리» 의 프로젝트 최근 세션을 먼저 본다.
-      //   그 프로젝트에 세션이 없으면 종전대로 전역 최신으로 폴백(다른 화면 동작 보존).
-      latestSessionId: () => latestSessionIdForContinue(),
+      // Next TUI는 사람 TUI 세션만 이어가고, classic dashboard의 기존 선택은 보존한다.
+      activeSessionId: () => activeSessionIdForContinue(process.cwd(), continueLookup),
+      latestSessionId: () => latestRootSessionIdForContinue(tuiEntry),
       // TUI-H8-FOLLOW ① — 활성 표지가 사라진 세션이면 최신 세션으로(#28509 리뷰 should-fix).
       sessionExists: (id) => loadSession(id) !== null,
     }),
@@ -12714,7 +12744,7 @@ async function main(): Promise<void> {
       return;
     }
     const { showNextTui } = await import('./tui/entry.js');
-    await showNextTui({ resumeSessionId });
+    await showNextTui({ resumeSessionId, sidetabMode: getUserConfig().tui?.sidetab ?? 'collapsed' });
     bootTimer.phase('show-next');
     bootTimer.done();
   } else {

package/src/intake-plane/collect-telegram-saved.ts

@@ -37,7 +37,50 @@ function writeSavedCursor(root: string, lastId: number): void {
   writeFileSync(cursorFile(root), JSON.stringify({ lastId, at: new Date().toISOString() }) + '\n');
 }
 
-export interface CollectSavedResult { cursorBefore: number; cursorAfter: number; messages: number; raws: number; dryRun: boolean; ingest?: IngestResult }
+export interface CollectSavedResult {
+  cursorBefore: number;
+  cursorAfter: number;
+  /** fetch 가 돌려준 «저장된 메시지» 수 — 커서 이후 읽은 것. */
+  messages: number;
+  /** 그중 savedMessageToRaws 가 0줄로 버린 메시지 수(빈 몸통) — «필터» 축. */
+  droppedByFilter: number;
+  /** 원장에 넣으려고 만든 입력 줄 수 — «원장 입력» 축. messages 와 다른 값이다. */
+  raws: number;
+  dryRun: boolean;
+  ingest?: IngestResult;
+}
+
+/** «메시지 0»·«원장 입력 0» 의 까닭 — 필터로 비었는지 다른 주체가 이미 가져갔는지 갈라 읽는다. */
+export type SavedCollectDiagnosis = 'new-items' | 'no-new-messages' | 'filtered-out' | 'already-consumed';
+
+export function diagnoseSavedCollect(res: CollectSavedResult): SavedCollectDiagnosis {
+  // 원장 입력이 있고 새로/합쳐 들어간 것이 있으면 정상 흡수다(dry-run 은 넣을 예정).
+  if (res.raws > 0 && (!res.ingest || res.ingest.added + res.ingest.merged > 0)) return 'new-items';
+  if (res.messages === 0) return 'no-new-messages';
+  if (res.droppedByFilter === res.messages) return 'filtered-out';
+  return 'already-consumed';
+}
+
+/** 사람이 읽는 한 덩이 — «메시지 0» 과 «원장 입력 0» 을 다른 줄로 갈라 보여준다. */
+export function renderCollectTelegramSavedResult(res: CollectSavedResult): string {
+  const lines = [
+    `텔레그램 저장된 메시지: 읽음 ${res.messages} · 필터로 버림 ${res.droppedByFilter} · 원장 입력 ${res.raws} · 커서 ${res.cursorBefore} → ${res.cursorAfter}${res.dryRun ? ' (dry-run · 안 씀)' : ''}`,
+  ];
+  if (res.ingest) lines.push(`원장: 새 ${res.ingest.added} · 합침 ${res.ingest.merged} · 이미 끝난 것 ${res.ingest.seen} · 버림 ${res.ingest.skipped}`);
+  const diagnosis = diagnoseSavedCollect(res);
+  if (diagnosis === 'no-new-messages') {
+    lines.push(`메시지 0 — 커서 ${res.cursorBefore} 이후 새 저장 메시지가 없다${res.cursorBefore > 0 ? ' (커서는 이미 다른 주체가 넘겼을 수 있다)' : ''}`);
+  } else if (diagnosis === 'filtered-out') {
+    lines.push(`원장 입력 0 은 필터 때문이다 — 링크·메모 문장이 없는 빈 메시지 ${res.droppedByFilter}건`);
+  } else if (diagnosis === 'already-consumed') {
+    lines.push(`원장 입력 ${res.raws} · 새 0 — 같은 항목을 다른 주체(queue)가 이미 가져갔다 (이미 끝난 것 ${res.ingest?.seen ?? 0})`);
+  } else if (res.dryRun) {
+    lines.push(`원장에 들어갈 것 ${res.raws}건 (dry-run — 쓰지 않았다)`);
+  } else {
+    lines.push(`원장에 새 것 ${res.ingest?.added ?? 0}건이 들어갔다`);
+  }
+  return lines.join('\n');
+}
 
 /**
  * 커서 이후 메시지를 한 번에 최대 max 개 읽어 원장에 넣고 커서를 옮긴다.
@@ -47,15 +90,21 @@ export interface CollectSavedResult { cursorBefore: number; cursorAfter: number;
 export async function collectTelegramSaved(root: string, fetch: FetchSavedMessages, opts: { max: number; dryRun?: boolean }): Promise<CollectSavedResult> {
   const cursorBefore = readSavedCursor(root);
   const messages = await fetch(cursorBefore, opts.max);
-  const raws = messages.flatMap(savedMessageToRaws);
+  const rowsPerMessage = messages.map(savedMessageToRaws);
+  const raws = rowsPerMessage.flat();
+  const droppedByFilter = rowsPerMessage.filter((rows) => rows.length === 0).length;
   const cursorAfter = messages.reduce((mx, m) => Math.max(mx, m.id), cursorBefore);
-  const result: CollectSavedResult = { cursorBefore, cursorAfter, messages: messages.length, raws: raws.length, dryRun: !!opts.dryRun };
+  const result: CollectSavedResult = { cursorBefore, cursorAfter, messages: messages.length, droppedByFilter, raws: raws.length, dryRun: !!opts.dryRun };
   if (!opts.dryRun) {
     result.ingest = ingestIntakeItems(root, 'telegram-saved', raws);
     if (cursorAfter > cursorBefore) writeSavedCursor(root, cursorAfter);
   }
-  // ⛔ 본문·링크는 싣지 않는다 — 커서와 건수만.
-  debug.log('intake.collect', 'telegram-saved', { cursorBefore, cursorAfter, messages: messages.length, raws: raws.length, dryRun: !!opts.dryRun });
+  // ⛔ 본문·링크는 싣지 않는다 — 커서와 건수만. 두 축(메시지·원장 입력)을 따로 남겨 사흘 0 을 갈라 읽게.
+  debug.log('intake.collect', 'telegram-saved', {
+    cursorBefore, cursorAfter, messages: messages.length, droppedByFilter, raws: raws.length,
+    ...(result.ingest ? { added: result.ingest.added, merged: result.ingest.merged, seen: result.ingest.seen, skipped: result.ingest.skipped } : {}),
+    diagnosis: diagnoseSavedCollect(result), dryRun: !!opts.dryRun,
+  });
   return result;
 }
 

package/src/interactive-terminal-modal.ts

@@ -55,6 +55,8 @@ export interface InteractiveTerminalModalSpec {
    *  of a plain local shell. Empty default keeps the legacy behaviour. */
   shellArgs?: readonly string[];
   env?: Record<string, string>;
+  /** Remove captured login-shell environment keys after composition. */
+  unsetEnv?: readonly string[];
   /** Ghostty-compatible terminfo name. Defaults via PreviewTerminal
    *  to xterm-256color. */
   termName?: string;
@@ -212,6 +214,7 @@ export function createInteractiveTerminalModal(
     shell: spec.shell,
     shellArgs: spec.shellArgs,
     env: spec.env,
+    unsetEnv: spec.unsetEnv,
     termName: spec.termName,
     useRegistry: spec.useRegistry,
     registryKind: spec.registryKind,

package/src/keybindings.ts

@@ -54,32 +54,27 @@ export const KEYBINDINGS: KeyBinding[] = [
   { keys: ['Ctrl+K', 'Ctrl+ㅏ'],   action: 'Open SSH remote picker',         context: 'global', note: 'FU-1 — registerKeyBinding({handler})' },
   { keys: ['Ctrl+P', 'Ctrl+ㅔ'],   action: 'Open finder (file picker)',      context: 'global', note: 'FU-1 — registerKeyBinding({handler})' },
   { keys: ['Ctrl+M', 'Ctrl+ㅡ'],   action: 'Arm pane-modal chord (1 s window; next letter opens deferred pane)', context: 'global', note: 'FU-1 — coordinator chord, SHORTCUT_TABLE' },
-  { keys: ['Ctrl+B', 'Ctrl+ㅠ'],   action: 'Arm virtual-window chord (1 s window; see §14)', context: 'global', note: 'FU-2 — coordinator chord' },
-  { keys: ['Ctrl+B w'],            action: 'Focus working-dir browser',      context: 'global', note: 'tmux-style prefix chord' },
-  { keys: ['Ctrl+B o'],            action: 'Focus Obsidian browser',         context: 'global' },
-  { keys: ['Ctrl+B s'],            action: 'Reopen scratchpad (pane-browse) · Enter sync mode (chat input) — A3',  context: 'global', note: 'input-focus route added P5 / unified in C1' },
-  { keys: ['Ctrl+B g'],            action: 'Exit sync/control mode → general (chat input)',                       context: 'global', note: 'P5 input-focus only' },
-  { keys: ['Ctrl+B S'],            action: 'Focus sessions sidebar',         context: 'global', note: 'ST4 — jumps focus to the leadColumn session list' },
-  { keys: ['Ctrl+B n'],            action: 'Next VW / advance to next session + focus sidebar', context: 'global', note: 'ST4 + VW chord — context gated' },
-  { keys: ['Ctrl+B p'],            action: 'Prev VW / retreat to previous session + focus sidebar', context: 'global', note: 'ST4 + VW chord — context gated' },
-  { keys: ['Ctrl+B 0'],            action: 'Open window picker (VW chord)',  context: 'global', note: 'FU-2' },
-  { keys: ['Ctrl+B 1'],            action: 'Switch to VW 1 (Ctrl+1 also works)', context: 'global', note: 'FU-2 — also 2..9' },
-  { keys: ['Ctrl+B c'],            action: 'New virtual window — terminal (pane-browse) · Enter control mode (chat input)', context: 'global', note: 'FU-2 + P5 input-focus chord overlay' },
-  { keys: ['Ctrl+B t'],            action: 'Toggle modal ↔ virtual-window session', context: 'global', note: 'FU-2' },
-  { keys: ['Ctrl+B x'],            action: 'Close focused pane (VW chord)',  context: 'global', note: 'FU-2' },
-  { keys: ['Ctrl+B Shift+X'],      action: 'Close whole window (VW chord)',  context: 'global', note: 'FU-2 — Shift+X dispatch fixed' },
-  { keys: ['Ctrl+B %', 'Ctrl+B s'], action: 'Horizontal split',              context: 'global', note: 'FU-2' },
-  { keys: ['Ctrl+B "', 'Ctrl+B v'], action: 'Vertical split',                context: 'global', note: 'FU-2' },
-  { keys: ['Ctrl+B ?'],            action: 'Open VW chord help popup (transient modal, 8 s)', context: 'global', note: 'FU-2 — upgraded from chatLines' },
-  { keys: ['Ctrl+B z'],            action: 'Toggle zoom on focused pane (fullscreen within VW)', context: 'global', note: 'VW-U5' },
-  { keys: ['Ctrl+B Tab'],          action: 'Focus last pane (alt-tab within VW)',             context: 'global', note: 'VW-U5' },
-  { keys: ['Ctrl+B R'],            action: 'Rename foreground window (input modal)',          context: 'global', note: 'VW-B1 — tmux `,` 는 prev 이라 R 사용' },
-  { keys: ['Ctrl+B A'],            action: 'Rename focused pane (VW-local override, empty clears)', context: 'global', note: 'VW-B2' },
+  { keys: ['Ctrl+B'],             action: 'Background running child tasks (while streaming; turn continues)', context: 'global' },
+  { keys: ['Ctrl+X', 'Ctrl+ㅌ'],   action: 'Arm dashboard pane chord (1 s window)', context: 'pane' },
+  { keys: ['Ctrl+X Ctrl+W'],       action: 'Focus working-dir browser',      context: 'global', note: 'pane-browse chord' },
+  { keys: ['Ctrl+X Ctrl+O'],       action: 'Focus Obsidian browser',         context: 'global', note: 'pane-browse chord' },
+  { keys: ['Ctrl+X Ctrl+S'],       action: 'Reopen scratchpad (pane-browse)', context: 'global' },
+  { keys: ['Ctrl+X s'],            action: 'Enter sync mode (chat input)',   context: 'input' },
+  { keys: ['Ctrl+X g'],            action: 'Exit sync/control mode → general (chat input)', context: 'input' },
+  { keys: ['Ctrl+X S'],            action: 'Focus sessions sidebar',        context: 'pane' },
+  { keys: ['Ctrl+X n'],            action: 'Advance to next session + focus sidebar', context: 'pane' },
+  { keys: ['Ctrl+X p'],            action: 'Retreat to previous session + focus sidebar', context: 'pane' },
+  { keys: ['Ctrl+X c'],            action: 'Enter control mode (chat input)', context: 'input' },
+  { keys: ['Ctrl+X x'],            action: 'Close focused pane',             context: 'pane' },
+  { keys: ['Ctrl+X z'],            action: 'Toggle log zoom',               context: 'pane' },
+  { keys: ['Ctrl+X t'],            action: 'Open preview terminal',          context: 'pane' },
+  { keys: ['Ctrl+X e'],            action: 'Toggle preview terminal expansion', context: 'pane' },
+  { keys: ['Ctrl+X f'],            action: 'Toggle all log folds',          context: 'pane' },
   { keys: ['Alt+N', 'Alt+ㅜ'],     action: 'Next virtual window (fast-switch, no chord)',       context: 'global', note: 'VW-U2 — guarded by list().length>1' },
   { keys: ['Alt+P', 'Alt+ㅔ'],     action: 'Prev virtual window (fast-switch, no chord)',       context: 'global', note: 'VW-U2' },
   { keys: ['Alt+1..9'],            action: 'Switch directly to Nth virtual window',             context: 'global', note: 'VW-U2 — guarded by list().length>1' },
   { keys: ['Alt+0'],               action: 'Open window picker (fast, no chord)',               context: 'global', note: 'VW-U2' },
-  { keys: ['Ctrl+B b'],            action: 'Toggle notification bell modal',  context: 'global', note: 'NT5 — open/close bell modal with unread + error filter' },
+  { keys: ['Ctrl+X b'],            action: 'Toggle notification bell modal',  context: 'pane', note: 'NT5 — open/close bell modal with unread + error filter' },
   { keys: ['Ctrl+Shift+V', 'Ctrl+Shift+ㅍ'], action: 'Enter Voice mode (Space hold push-to-talk · Esc to exit)', context: 'global', note: 'PR-S1V.4 — voice-input-host · kitty >3u on entry · brand prefix routing' },
   { keys: ['Alt+S', 'Alt+ㄴ'], action: 'Toggle continuous voice-chat mode (real-time STT + auto-TTS · ESC or chord again to exit)', context: 'global', note: '2026-05-03 — moved from Alt+R to free R for reasoning cycle (V/D/R mnemonic)' },
   { keys: ['Alt+R', 'Alt+ㄱ'], action: 'Cycle reasoning level (off → low → medium → high → xhigh). Codex / Claude reasoning models only — no-op on grok/gemini', context: 'global', note: '2026-05-03 — provider-agnostic ReasoningLevel cycle, same effect as `/reasoning` slash. V/D/R mnemonic: V=voice control (Ctrl+Shift+V), D=batch dictation (Space-longpress), R=reasoning' },

package/src/llm/provider-credentials.ts

@@ -209,7 +209,7 @@ export function resolveProviderCredential(input: ResolveCredentialInput): Resolv
   // 목표 provider 의 엔드포인트 — 키와 **같은 규율**로 rotation 에서만 가져온다(10R).
   //   전환이면 옛 baseUrl 은 틀린 주소이므로, rotation 에 명시가 없으면 undefined(provider 기본).
   // ⛔⭐ local 은 «런 단위 env»(`LOCAL_LLM_URL`)가 config rotation 을 이긴다 — `ELANOUS_LLM_PROVIDER` 가 config 를 이기는 것과 같은 규칙(BACKLOG B13).
-  //   🩸 2026-09-25: 부모에 `LOCAL_LLM_URL=<node-b 경유>` 를 줬는데 rotation 의 `local → localhost:1234` 가 이겨 자식이 «호스트»
+  //   🩸 2026-09-25: 부모에 `LOCAL_LLM_URL=<원격 프록시>` 를 줬는데 rotation 의 `local → localhost:1234` 가 이겨 자식이 «호스트»
   //     LM Studio 로 갔다. Pod(config 없음)에선 안 드러났다.
   const envEndpoint = provider === 'local' ? env.LOCAL_LLM_URL?.trim() : undefined;
   const endpoint = envEndpoint || rotation?.find((r) => r.provider === provider && typeof r.baseUrl === 'string' && r.baseUrl.trim().length > 0)?.baseUrl?.trim();

package/src/llm-tool-schema.ts

@@ -27,6 +27,26 @@ export function sanitizeToolSchemaForGrok(schema: unknown): unknown {
   return output;
 }
 
+/** Anthropic-backed Claude APIs reject top-level JSON Schema composition on tool inputs.
+ * Check every tool before serialization so a newly introduced tool cannot turn a whole
+ * Claude request into a 400 and trigger an unnoticed provider fallback. Nested schemas
+ * remain valid and are deliberately not inspected here. */
+export function assertNoTopLevelToolSchemaCombinators(
+  tools: readonly { name: string; parameters: unknown }[] | undefined,
+): void {
+  if (!tools?.length) return;
+  const combinators = ['anyOf', 'oneOf', 'allOf'] as const;
+  const invalid = tools.flatMap((tool) => {
+    if (!tool.parameters || typeof tool.parameters !== 'object' || Array.isArray(tool.parameters)) return [];
+    const schema = tool.parameters as Record<string, unknown>;
+    const found = combinators.filter((key) => Object.prototype.hasOwnProperty.call(schema, key));
+    return found.length ? [`${tool.name} (${found.join(', ')})`] : [];
+  });
+  if (invalid.length) {
+    throw new Error(`Claude tool schema has unsupported top-level composition: ${invalid.join('; ')}`);
+  }
+}
+
 /** OpenRouter model ids may include the provider prefix; callers can pass
  * either the catalog id or the already-normalized wire id. */
 export function isOpenRouterGrokModel(model: string): boolean {