elanous 0.2.32 → 0.2.35

package/src/budget/run-usage-rollup.ts

@@ -5,6 +5,7 @@ export interface RunUsageInput {
   hostId?: string | null;
   site?: string | null;
   role?: string | null;
+  phase?: string | null;
   model?: string | null;
   billingProvider?: string | null;
   billing?: BillingRoute | null;

package/src/chat/index.ts

@@ -1022,7 +1022,6 @@ export async function textInput(opts: {
     modalSink: opts.modalSink,
     picker,
     getBufferView: bufView,
-    writeTerminal,
     getBounds: () => ({ row: getRow(), col, width: getWidth(), height: 1 }),
     getInputZoneHeight: () => Math.min(lines.length, maxLines),
     onDispatchResult: async (dispatched) => processPickerDispatch(dispatched),
@@ -1336,7 +1335,6 @@ export async function textInput(opts: {
     }
     pickerModalRuntime.syncFamily({
       activeKind: activePickerKind(),
-      clearRows: MAX_PICKER + 3,
       debugLayout: { row: getRow(), col, width: getWidth() },
       family: pickerModalFamily,
     });

package/src/chat/pickers/modal-runtime.ts

@@ -1,5 +1,5 @@
 import { debug } from '../../debug/log.js';
-import { ansi, type Key } from '../../tui.js';
+import type { Key } from '../../tui.js';
 import { createChatPickerModalFamily, type ChatPickerFamilySources, type ChatPickerModalBindings, type ChatPickerModalFamily, type PickerOnKey, type PickerOnRowClick } from './modals.js';
 import { CHAT_PICKER_KINDS, type ChatPickerKind } from './kinds.js';
 import type { ModalSink } from '../index.js';
@@ -10,7 +10,6 @@ export interface ChatPickerModalRuntimeDeps {
   modalSink?: ModalSink;
   picker: PickerState;
   getBufferView: () => PickerBufferView;
-  writeTerminal: (s: string) => void;
   getBounds: () => { row: number; col: number; width: number; height: number };
   getInputZoneHeight: () => number;
   onDispatchResult: (
@@ -26,30 +25,15 @@ interface PickerHandle {
 interface SyncPickerModalSpec {
   kind: ChatPickerKind;
   active: boolean;
-  clearRows: number;
   createSurface: () => ModalSurface;
 }
 
 interface SyncPickerFamilySpec {
   activeKind: ChatPickerKind | null;
-  clearRows: number;
   debugLayout?: { row: number; col: number; width: number };
   family: ChatPickerModalFamily;
 }
 
-export function paintChatPickerClear(spec: {
-  bounds: { row: number; col: number };
-  rows: number;
-  inputZoneHeight: number;
-}): string {
-  const out: string[] = [];
-  for (let i = 0; i < spec.rows; i++) {
-    const r = spec.bounds.row - spec.inputZoneHeight - 1 - i;
-    if (r >= 1) out.push(ansi.moveTo(r, spec.bounds.col) + '\x1b[2K');
-  }
-  return out.join('');
-}
-
 export function createChatPickerModalRuntime(deps: ChatPickerModalRuntimeDeps): {
   dispatchKey: (input: { key: Key; source: 'onKey' | 'input-loop'; label: string }) => Promise<boolean>;
   makePickerOnKey: (label: string) => PickerOnKey;
@@ -112,15 +96,15 @@ export function createChatPickerModalRuntime(deps: ChatPickerModalRuntimeDeps):
     });
   };
 
-  const clearHandle = (kind: ChatPickerKind, clearRows: number): void => {
+  // TUI-DIRECT-WRITE-ROWS — no direct terminal clear here. The sink is the
+  // display coordinator, whose popModal marks every row dirty and forces the
+  // next frame (Q7 / F9), so the picker rows repaint through the frame cache.
+  // The old CUP+EL clear bypassed that cache and was off by one row: it
+  // erased the row above the picker band (ChatLog header) and left it blank
+  // until the forced repaint arrived.
+  const clearHandle = (kind: ChatPickerKind): void => {
     const handle = handles.get(kind);
     if (!handle) return;
-    const bounds = deps.getBounds();
-    deps.writeTerminal(paintChatPickerClear({
-      bounds,
-      rows: clearRows,
-      inputZoneHeight: deps.getInputZoneHeight(),
-    }));
     handle.dispose();
     handles.delete(kind);
   };
@@ -133,7 +117,7 @@ export function createChatPickerModalRuntime(deps: ChatPickerModalRuntimeDeps):
       return;
     }
     if (!spec.active && handle) {
-      clearHandle(spec.kind, spec.clearRows);
+      clearHandle(spec.kind);
     }
   };
 
@@ -188,7 +172,6 @@ export function createChatPickerModalRuntime(deps: ChatPickerModalRuntimeDeps):
       syncModal({
         kind,
         active: kind === input.activeKind && itemCount > 0,
-        clearRows: input.clearRows,
         createSurface: () => input.family.createSurface(kind),
       });
     }
@@ -196,7 +179,7 @@ export function createChatPickerModalRuntime(deps: ChatPickerModalRuntimeDeps):
 
   const clearAll = (): void => {
     for (const kind of [...handles.keys()]) {
-      clearHandle(kind, 9);
+      clearHandle(kind);
     }
   };
 

package/src/chat/tool-render/dispatch.ts

@@ -18,7 +18,12 @@ import type {
 import { renderToolBlock } from './block.js';
 import { renderToolInline } from './inline.js';
 
-const SUPPORTED_TOOLS = new Set<ToolRenderName>([
+/** 접힌 결과 요약 첫 조각은 `MsgPost` 하나뿐이라 이름 확장을 `dispatch.ts` 안에 둔다.
+ *  `types.ts:ToolRenderName` 은 나머지 도구의 공용 계약 그대로 두고, 이 파일의 내부
+ *  시그니처만 넓힌다(블록·인라인 렌더는 `ToolRenderModel.kind` 문자열만 본다). */
+type ToolRenderKind = ToolRenderName | 'MsgPost';
+
+const SUPPORTED_TOOLS = new Set<ToolRenderKind>([
   'Bash',
   'Read',
   'Grep',
@@ -35,9 +40,10 @@ const SUPPORTED_TOOLS = new Set<ToolRenderName>([
   'WebSearch',
   'WebFetch',
   'GetDashboardState',
+  'MsgPost',
 ]);
 
-export function isToolRenderSupported(name: string): name is ToolRenderName | 'update_plan' | 'update_goal' {
+export function isToolRenderSupported(name: string): name is ToolRenderKind | 'update_plan' | 'update_goal' {
   return normalizeToolRenderName(name) !== null;
 }
 
@@ -48,6 +54,9 @@ export function renderToolCallEvent(
   if (config.displayMode !== 'inline-to-block') return null;
   const kind = normalizeToolRenderName(call.name);
   if (!kind) return null;
+  // Keep the generic running block: a MsgPost error must still fall back to
+  // the same generic result block that was used before this summary slice.
+  if (kind === 'MsgPost') return null;
   const model: ToolRenderModel = {
     kind,
     status: 'running',
@@ -75,9 +84,18 @@ export function renderToolResultVariants(
   if (config.displayMode !== 'inline-to-block') return null;
   const kind = normalizeToolRenderName(call.name);
   if (!kind) return null;
+  // Only successful MsgPost results enter the compact renderer. Returning
+  // null for errors lets the dashboard formatter use its existing generic
+  // result path, including its expanded argument/result view.
+  if (kind === 'MsgPost' && extractErrorText(call.result)) return null;
   const model = buildToolRenderModel(kind, call, config);
   const collapsed = renderToolBlock(model, config.blockMaxLines, config.foldMode, config.expandHint);
-  const expanded = renderToolBlock(model, Number.POSITIVE_INFINITY);
+  // ⭐ MsgPost 는 접힌 행에서 본문을 빼고 펼친 행에서만 싣는다 ⇒ 같은 model 로는 두 변형을
+  //   만들 수 없어, 펼친 쪽만 본문 포함 model 을 따로 세운다(다른 도구는 종전과 동일 model).
+  const expandedModel = kind === 'MsgPost'
+    ? buildToolRenderModel(kind, call, config, { includeMsgPostBody: true })
+    : model;
+  const expanded = renderToolBlock(expandedModel, Number.POSITIVE_INFINITY);
   const variants: ToolRenderResultVariants = {
     collapsed,
     expanded: arraysEqual(collapsed, expanded) ? null : expanded,
@@ -88,22 +106,28 @@ export function renderToolResultVariants(
   return variants;
 }
 
-function normalizeToolRenderName(name: string): ToolRenderName | null {
+interface ToolRenderModelOptions {
+  /** 펼친 변형만 `message.body` 를 싣는다 — 접힌 행에는 본문·전체 JSON 이 남지 않는다. */
+  includeMsgPostBody?: boolean;
+}
+
+function normalizeToolRenderName(name: string): ToolRenderKind | null {
   if (name === 'update_plan' || name === 'UpdatePlan') return 'UpdatePlan';
   if (name === 'update_goal' || name === 'UpdateGoal') return 'UpdateGoal';
-  return SUPPORTED_TOOLS.has(name as ToolRenderName) ? (name as ToolRenderName) : null;
+  return SUPPORTED_TOOLS.has(name as ToolRenderKind) ? (name as ToolRenderKind) : null;
 }
 
 function buildToolRenderModel(
-  kind: ToolRenderName,
+  kind: ToolRenderKind,
   call: ToolRenderResult,
   config?: ToolRenderConfig,
+  options?: ToolRenderModelOptions,
 ): ToolRenderModel {
   const resultRecord = asRecord(call.result);
   const errorText = extractErrorText(call.result);
   const bodyLines = errorText
     ? errorText.split('\n')
-    : buildToolBodyLines(kind, call.args, call.result, resultRecord);
+    : buildToolBodyLines(kind, call.args, call.result, resultRecord, options);
   const status = errorText ? 'error' : 'success';
   const model: ToolRenderModel = {
     kind,
@@ -119,7 +143,7 @@ function buildToolRenderModel(
 }
 
 function summarizeCollapsedToolResult(
-  kind: ToolRenderName,
+  kind: ToolRenderKind,
   status: 'success' | 'error',
   resultRecord: Record<string, unknown> | null,
   bodyLines: string[],
@@ -206,10 +230,12 @@ function summarizeCollapsedToolResult(
 }
 
 function summarizeToolCallForRender(
-  kind: ToolRenderName,
+  kind: ToolRenderKind,
   args: Record<string, unknown>,
   result?: unknown,
 ): string {
+  // ⭐ MsgPost — 행위(`post`)·수신자·(결과가 있으면) id 셋만. 본문은 부르지도 읽지도 않는다.
+  if (kind === 'MsgPost') return summarizeMsgPostCall(args, result);
   if (kind === 'UpdatePlan') {
     const plan = Array.isArray(args.plan) ? args.plan : [];
     const current = plan.find((step) => asRecord(step)?.status === 'in_progress');
@@ -230,6 +256,29 @@ function summarizeToolCallForRender(
   return summarizeToolCall(kind, args);
 }
 
+/** MsgPost 머리글 — 행위(`post`)·수신자·id. 펼치기 전에도 세 가지가 한 줄에 다 있다. */
+function summarizeMsgPostCall(args: Record<string, unknown>, result?: unknown): string {
+  const to = typeof args.to === 'string' ? args.to.trim() : '';
+  const id = msgPostMessage(asRecord(result))?.id;
+  const route = to ? `post → ${to}` : 'post';
+  return typeof id === 'string' || typeof id === 'number' ? `${route} #${id}` : route;
+}
+
+/** 결과 페이로드의 `message` 레코드. 모양을 못 읽으면 `null` — 없는 필드를 지어내지 않는다. */
+function msgPostMessage(resultRecord: Record<string, unknown> | null): Record<string, unknown> | null {
+  return asRecord(resultRecord?.message);
+}
+
+/** MsgPost 결과 본문. 접힌 행은 비우고 펼친 변형에는 원래 결과 전체를 한 번만 싣는다. */
+function buildMsgPostBodyLines(
+  resultRecord: Record<string, unknown> | null,
+  includeMsgPostBody: boolean,
+): string[] {
+  if (!includeMsgPostBody) return [];
+  if (!resultRecord) return [];
+  return JSON.stringify(resultRecord, null, 2).split('\n');
+}
+
 function summarizeSpecialToolCall(kind: ToolRenderName, args: Record<string, unknown>): string | null {
   if (kind === 'AstGrep') {
     const pattern = typeof args.pattern === 'string' ? args.pattern : '';
@@ -292,14 +341,17 @@ function summarizeStructuralSearchRender(kind: ToolRenderName, bodyText: string
 }
 
 function buildToolBodyLines(
-  kind: ToolRenderName,
+  kind: ToolRenderKind,
   args: Record<string, unknown>,
   result: unknown,
   resultRecord: Record<string, unknown> | null,
+  options?: ToolRenderModelOptions,
 ): string[] {
   const syntheticGuard = extractSyntheticGuardSummary(result);
   if (syntheticGuard) return [syntheticGuard];
 
+  if (kind === 'MsgPost') return buildMsgPostBodyLines(resultRecord, options?.includeMsgPostBody === true);
+
   if (kind === 'Edit' || kind === 'Write') {
     const edit = resultRecord?.edit && isEditResult(resultRecord.edit) ? resultRecord.edit : null;
     const output = typeof resultRecord?.output === 'string' ? resultRecord.output : null;

package/src/cli/agent-cli.ts

@@ -57,6 +57,13 @@ export function emitHarnessFeedbackProgress(
 type CliAgentDispatch = typeof import('../skills/tools/agent.js').dispatchAgent;
 let cliAgentDispatchForTesting: CliAgentDispatch | undefined;
 
+let cliRunTurnForTesting: typeof runTurn | undefined;
+
+/** Test seam for exercising the real Commander and pipeline path without an LLM call. */
+export function setCliRunTurnForTesting(runTurnForTesting: typeof runTurn | undefined): void {
+  cliRunTurnForTesting = runTurnForTesting;
+}
+
 export function setCliAgentDispatchForTesting(dispatch: CliAgentDispatch | undefined): void {
   cliAgentDispatchForTesting = dispatch;
 }
@@ -524,7 +531,11 @@ export async function runChatTurnCli(opts: {
       ...(modelFamily !== undefined ? { modelFamily } : {}),
       ...(enabledToolNames !== undefined ? { enabledTools: enabledToolNames } : {}),
     });
-    const joined = universal
+    const discipline = opts.goalLoop
+      ? (require('../impl-discipline/index.js') as typeof import('../impl-discipline/index.js'))
+        .buildImplDisciplineSystemMessages({ text: opts.userText })
+      : [];
+    const joined = [...universal, ...discipline]
       .map(m => (typeof m.content === 'string' ? m.content : ''))
       .filter(s => s.length > 0)
       .join('\n\n');
@@ -559,7 +570,7 @@ export async function runChatTurnCli(opts: {
   }
   let result: Awaited<ReturnType<typeof runTurn>>;
   try {
-    result = await (opts.runTurn ?? runTurn)({
+    result = await (opts.runTurn ?? cliRunTurnForTesting ?? runTurn)({
       userConfig: opts.cfg,
       sessionId: session.id,
       userText: opts.userText,

package/src/cli/control-cli.ts

@@ -13,7 +13,8 @@ import { RESOURCE_KINDS, type ResourceKind } from '../control-plane/ledger.js';
 import { runControlJoin, type ControlJoinOptions } from './control-join-cli.js';
 import type { ResourceView } from '../control-plane/ledger.js';
 import { issueMemberToken, revokeMemberToken, listMemberTokens } from '../control-plane/member-tokens.js';
-import { collectControlStatus } from '../control/control-status.js';
+import { collectControlStatus, readControlHqLease } from '../control/control-status.js';
+import { getUserConfig } from '../user-config.js';
 
 function controlPort(flag?: string): number {
   const raw = flag ?? (process.env.ELANOUS_CONTROL_PORT?.trim() || undefined);
@@ -97,8 +98,9 @@ export async function runResourcesQuery(options: { where?: string; kind?: string
   }
 }
 
-export async function runControlServe(options: { port?: string; host?: string; followLease?: boolean; bucket?: string;
+export async function runControlServe(options: { port?: string; host?: string; followLease?: boolean; followHqLease?: boolean; bucket?: string;
   read?: (bucket: string) => RoleLeaseRead | Promise<RoleLeaseRead>; machine?: string;
+  readHq?: typeof readControlHqLease; hqHostName?: string;
   /** 시험 seam — 이 신호로 멈춘다. ⛔ 시험이 `process.emit('SIGTERM')` 로 멈추면 같은 프로세스의 다른 SIGTERM 처리기
    *  (로그 저장소가 «남은 처리기가 없으면 자기에게 진짜 SIGTERM 을 다시 보낸다»)가 깨어 **시험 러너가 죽었다**
    *  (📏 09-27 0.2.3 게이트: 전체 한 프로세스면 이 시험 자리에서 rc 143 · 조각으로 나누면 완주). */
@@ -108,12 +110,26 @@ export async function runControlServe(options: { port?: string; host?: string; f
   let bucket: string | undefined;
   try {
     port = controlPort(options.port);
+    if (options.followLease && options.followHqLease) throw new Error('GCS 임대와 HQ 임대는 동시에 따를 수 없음');
     if (options.followLease) bucket = resolveRoleBucket(options.bucket);
   } catch (error) { console.error(reasonFor(error)); process.exitCode = 2; return; }
-  const machine = resolveMachineName({ option: options.machine }).machine;
-  const leaseView = bucket === undefined ? undefined : createLeaseHolderView({
+  const machine = options.followHqLease ? '' : resolveMachineName({ option: options.machine }).machine;
+  // HQ's holder identity is hq.hostName. A caller-controlled role machine alias cannot grant primary writes.
+  let hqHostName: string | undefined;
+  if (options.followHqLease) {
+    try { hqHostName = options.hqHostName ?? getUserConfig().hq?.hostName; }
+    catch { /* Unknown local identity must remain fail closed at the write boundary. */ }
+  }
+  const leaseView = bucket !== undefined ? createLeaseHolderView({
     machine, read: () => (options.read ?? readRoleLeaseAsync)(bucket),
-  });
+  }) : options.followHqLease ? createLeaseHolderView({
+    machine: hqHostName ?? '', read: () => {
+      const { record, expired } = (options.readHq ?? readControlHqLease)();
+      return hqHostName && record && expired === false
+        ? { kind: 'present' as const, doc: { holder: record.holder, generation: record.generation, state: 'held' as const, renewedAt: record.renewedAt } }
+        : { kind: 'unmeasured' as const, why: 'HQ lease missing or expired' };
+    },
+  }) : undefined;
   let server: ReturnType<typeof startControlServer>;
   try { server = startControlServer({ port, hostname: options.host, ...(leaseView ? { leaseView, requireKnownLeaseForWrites: true } : {}) }); }
   catch (error) { console.error(`관제부 시작 실패: ${reasonFor(error)}`); process.exitCode = 2; return; }
@@ -130,7 +146,7 @@ export async function runControlServe(options: { port?: string; host?: string; f
       if (options.signal.aborted) { stop(); return; }
       options.signal.addEventListener('abort', stop, { once: true });
     }
-    console.log(`관제부 ${new URL(server.url).host} · 토큰 ${join(effectiveInstanceRoot(), 'control', 'tokens.json')}${bucket === undefined ? '' : ` · 임대 따름 · ${bucket} · 나=${machine}`}`);
+    console.log(`관제부 ${new URL(server.url).host} · 토큰 ${join(effectiveInstanceRoot(), 'control', 'tokens.json')}${bucket !== undefined ? ` · 임대 따름 · ${bucket} · 나=${machine}` : options.followHqLease ? ` · HQ 임대 따름 · 나=${hqHostName ?? '미확인'}` : ''}`);
   });
 }
 
@@ -199,8 +215,9 @@ export function registerControlCommands(program: Command): void {
     .option('--port <n>', '리스닝 포트(0=임시 포트)')
     .option('--host <addr>', '루프백 또는 tailnet 바인드 주소')
     .option('--follow-lease', '임대 보유자일 때만 쓰기')
+    .option('--follow-hq-lease', 'HQ 임대 보유자일 때만 쓰기')
     .option('--bucket <bucket>', 'GCS 임대 버킷')
-    .action((options: { port?: string; host?: string; followLease?: boolean; bucket?: string }) => runControlServe(options));
+    .action((options: { port?: string; host?: string; followLease?: boolean; followHqLease?: boolean; bucket?: string }) => runControlServe(options));
   control.command('member').description('합류 기계의 자원을 포그라운드에서 등록·심박')
     .option('--resource <kind:name=url>', '등록할 자원', (value: string, previous: string[]) => [...previous, value], [] as string[])
     .option('--interval <seconds>', '심박 간격(초)')

package/src/cli/doctor-cli.ts

@@ -222,6 +222,8 @@ export interface DoctorCliDeps extends DoctorOptions, Pick<DoctorFixDeps, 'home'
   hostDoctorMachineResources?: () => Promise<ResourceView[]>;
   /** `doctor visit`/`doctor status` 원장 디렉터리(시험 seam) — 기본 = `runLedgerDir()`. */
   doctorVisitLedgerDir?: string;
+  /** `doctor visit` 사고 선례 연결 루트(시험 seam) — 기본 = `doctorVisitIncidentRoot()` · `null` 이면 건너뛴다. */
+  doctorVisitIncidentRoot?: string | null;
 }
 
 const repositoryRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
@@ -1378,8 +1380,9 @@ export function registerDoctorCommand(program: Command, deps: DoctorCliDeps = {}
           symptom: opts.symptom,
           ...(opts.evidence !== undefined ? { evidence: opts.evidence } : {}),
           ...(deps.doctorVisitLedgerDir !== undefined ? { dir: deps.doctorVisitLedgerDir } : {}),
+          ...(deps.doctorVisitIncidentRoot !== undefined ? { incidentRoot: deps.doctorVisitIncidentRoot } : {}),
         });
-        out.log(json ? JSON.stringify(visit) : `doctor visit recorded: runId=${runId} from=${opts.from} symptom=${opts.symptom}${visit.evidence !== undefined ? ` evidence=${visit.evidence}` : ''}`);
+        out.log(json ? JSON.stringify(visit) : `doctor visit recorded: runId=${runId} from=${opts.from} symptom=${opts.symptom}${visit.evidence !== undefined ? ` evidence=${visit.evidence}` : ''}${visit.incidentPrecedents !== undefined ? ` incident-precedents=${visit.incidentPrecedents.length}` : ''}`);
       } catch (error) {
         const reason = error instanceof Error ? error.message : String(error);
         if (json) out.log(JSON.stringify({ status: 'rejected', reason }));

package/src/cli/guardian-cli.ts

@@ -19,6 +19,16 @@ async function guardianPlan(): Promise<{ db: Database; plan: GuardianPlan }> {
 
 export function registerGuardianCommands(program: Command): void {
   const guardian = program.command('guardian').description('크론 수호자 그림자 관측(기존 크론·알림 무변경)');
+  guardian.command('grok-expiry').description('현재 호스트 Grok 구독 만료 시각과 4시간 경보 상태 출력')
+    .action(async () => {
+      const { readGrokSubscriptionExpiry } = await import('../grok/credential.js');
+      const { grokExpiryAlertLine, grokExpiryStatusLine } = await import('../domains/guardian-tick.js');
+      const now = new Date();
+      const expiresAt = readGrokSubscriptionExpiry();
+      console.log(grokExpiryStatusLine({ now, expiresAt }));
+      const alert = grokExpiryAlertLine({ now, expiresAt });
+      if (alert) console.log(alert);
+    });
   guardian.command('tick').description('현재 시각에 발화했을 잡을 관측(잡은 실행하지 않음)')
     .action(async () => {
       const { guardianTick } = await import('../domains/guardian-tick.js');

package/src/cli/light-entry-route.ts

@@ -0,0 +1,75 @@
+export type LightCliRoute = 'msg' | 'release' | 'tasks' | 'pty' | 'logs' | 'config';
+
+const VALUE_FLAGS = new Set(['--config-dir', '--test-state-dir']);
+const HOT_ROOTS = new Set(['msg', 'pty', 'logs', 'tasks']);
+const ROOT_GLOBAL_FLAGS = new Set(['--test', '--config-dir', '--test-state-dir', '--state-dir', '--remote', '-r', '--name', '--help-all', '--version', '-V']);
+const LOG_SUBCOMMANDS = new Set([
+  'instances', 'level', 'timeline', 'durations', 'model-input', 'degenerate', 'fields', 'unclosed', 'abandoned-draft-prs',
+]);
+const LOG_VALUE_FLAGS = new Set([
+  '--level', '--surface', '--space', '--category', '--exact-category', '--axis', '--event', '--grep',
+  '--rework-recurrence-disagreement', '--since', '--until', '--before', '--session', '--limit', '--threshold', '--instance',
+]);
+const LOG_BOOLEAN_FLAGS = new Set([
+  '-h', '--help', '-f', '--follow', '--list-categories', '--list-events', '--explain', '--top-failures', '--json', '--json-data', '--test', '--all', '--include-test',
+]);
+
+function isRootGlobalFlag(arg: string): boolean {
+  return [...ROOT_GLOBAL_FLAGS].some(flag => arg === flag || arg.startsWith(`${flag}=`))
+    || (arg.startsWith('-') && !arg.startsWith('--') && (arg.startsWith('-r') && arg.length > 2 || arg.slice(1).includes('V')));
+}
+
+function isSupportedLogsShape(args: readonly string[]): boolean {
+  for (let index = 1; index < args.length; index += 1) {
+    const token = args[index]!;
+    if (token.startsWith('-')) {
+      const equals = token.indexOf('=');
+      const flag = equals < 0 ? token : token.slice(0, equals);
+      if (LOG_BOOLEAN_FLAGS.has(flag)) continue;
+      if (!LOG_VALUE_FLAGS.has(flag)) return false;
+      if (equals < 0) index += 1;
+      continue;
+    }
+    return LOG_SUBCOMMANDS.has(token);
+  }
+  return true;
+}
+
+/** Select lightweight operational paths whose CLI modules can stand alone. */
+export function selectLightCliRoute(args: readonly string[]): LightCliRoute | undefined {
+  const command: string[] = [];
+  let index = 0;
+  while (index < args.length && args[index]!.startsWith('-')) {
+    const flag = args[index]!;
+    index += 1;
+    if ([...VALUE_FLAGS].some(value => flag.startsWith(`${value}=`))) continue;
+    if (VALUE_FLAGS.has(flag)) {
+      if (index >= args.length || args[index]!.startsWith('-')) return undefined;
+      index += 1;
+      continue;
+    }
+    // Only flags removed by the pre-import isolation helpers can safely
+    // precede a light route. Other root flags keep their original parser.
+    if (flag !== '--test' && !flag.startsWith('--test=')) return undefined;
+  }
+  for (const token of args.slice(index)) {
+    if (token.startsWith('-')) break;
+    command.push(token);
+  }
+
+  // These four operational roots are the hot router. Keep all root flags and
+  // every leading-option form on the full entry so its isolation/bootstrap
+  // parser remains the sole owner of those semantics.
+  if (HOT_ROOTS.has(command[0] ?? '') && (args[0] !== command[0] || args.some(isRootGlobalFlag))) return undefined;
+
+  if (command[0] === 'msg' && ['list', 'post', 'ack', 'watch'].includes(command[1] ?? '')) return 'msg';
+  // --reveal has an audit-log contract owned by the full CLI.
+  if (command[0] === 'config' && command[1] === 'get' && !args.some(arg => arg === '--reveal' || arg.startsWith('--reveal='))) return 'config';
+  if (command[0] === 'release' && command[1] === 'checklist'
+    && (command[2] === 'status' || command[2] === 'list')) return 'release';
+  if (command[0] === 'tasks' && (command[1] === 'list' || command[1] === 'show'
+    || (command[1] === 'hand' && args.includes('--help')))) return 'tasks';
+  if (command[0] === 'pty' && ['list', 'snapshot', 'text', 'state'].includes(command[1] ?? '')) return 'pty';
+  if (command[0] === 'logs' && isSupportedLogsShape(args)) return 'logs';
+  return undefined;
+}

package/src/cli/llm-detect-cli.ts

@@ -2,6 +2,7 @@ import type { Command } from 'commander';
 import type { LLMProvider } from '../llm.js';
 import { detectProviders, type DetectedProvider } from '../llm/provider-detect.js';
 import { probeProvider, type ProviderProbeResult } from '../llm/provider-probe.js';
+import { openrouterSource } from '../registry/discovery/sources/openrouter.js';
 import {
   getUserConfig, reloadUserConfig, saveUserConfig, userConfigPath,
   type UserConfig,
@@ -20,6 +21,7 @@ export interface LlmDetectDeps {
   config?: () => UserConfig;
   save?: (config: UserConfig) => void;
   output?: (line: string) => void;
+  discoverUpstageModels?: () => Promise<string[] | null>;
 }
 
 export interface LlmDetectResult {
@@ -29,6 +31,15 @@ export interface LlmDetectResult {
   /** Why a selected provider was not written (an explicit llm.provider is never overwritten). */
   notApplied?: string;
   error?: string;
+  /** OpenRouter /models candidates; null means discovery was unavailable, not an empty catalogue. */
+  upstageCandidates?: string[] | null;
+}
+
+async function discoverUpstageModels(): Promise<string[] | null> {
+  const result = await openrouterSource.run({ timeoutMs: 3_000 });
+  if (!result.ok) return null;
+  return result.models.map(({ id }) => id).filter((id) => /^upstage\/[^/]+$/.test(id))
+    .map((id) => `openrouter/${id}`).sort();
 }
 
 /** Discovery alone cannot validate credentials. Only a successful probe can select a provider. */
@@ -76,6 +87,13 @@ export async function runLlmDetect(
     }
   }
 
+  let upstageCandidates: string[] | null | undefined;
+  if (!options.apply && (!options.probe || selected === 'openrouter')
+    && rows.some((row) => row.provider === 'openrouter' && row.available && row.auth === 'apikey')) {
+    try { upstageCandidates = await (deps.discoverUpstageModels ?? discoverUpstageModels)(); }
+    catch { upstageCandidates = null; }
+  }
+
   let applied = false;
   let notApplied: string | undefined;
   const previous = config.llm?.provider ?? 'auto';
@@ -91,7 +109,8 @@ export async function runLlmDetect(
     }
     applied = true;
   }
-  const result: LlmDetectResult = { candidates: rows, selected, applied, ...(notApplied ? { notApplied } : {}) };
+  const result: LlmDetectResult = { candidates: rows, selected, applied,
+    ...(upstageCandidates !== undefined ? { upstageCandidates } : {}), ...(notApplied ? { notApplied } : {}) };
   if (options.json) output(JSON.stringify(result));
   else {
     if (rows.length === 0) output('No LLM providers detected.');
@@ -111,6 +130,9 @@ export async function runLlmDetect(
       }
     }
     if (options.probe && !selected) output('No provider passed the probe; configuration unchanged.');
+    if (upstageCandidates !== undefined) output(upstageCandidates === null
+      ? 'Upstage candidates: catalogue unavailable'
+      : `Upstage candidates: ${upstageCandidates.join(', ') || '(none in OpenRouter /models)'}`);
     if (applied) output(`Applied llm.provider=${selected} — revert: elanous config set llm.provider auto`);
     if (notApplied) output(notApplied);
   }