elanous 0.2.31 → 0.2.34

package/src/chat/index.ts

@@ -10,6 +10,7 @@ import type { ChatPickerKind } from './pickers/kinds.js';
 import { createPickerState, type BufferAction, type PickerBufferView } from './pickers/state.js';
 import { createChatPickerModalRuntime } from './pickers/modal-runtime.js';
 import type { ModalSurface } from '../display/modal-stack.js';
+import type { PromptRowOwner } from '../display/prompt-row-owner.js';
 // Type-only import: avoids the runtime circular dep that streamGrok
 // below sidesteps with a dynamic `await import('../llm.js')`. Keeping
 // ChatMessage structurally compatible with LLMMessage lets the
@@ -35,6 +36,7 @@ import {
 } from '../input-core/index.js';
 import { applyInlineEditorKey } from '../input-core/inline-editor-key.js';
 import type { InputSourceRef } from '../input/input-source-kind.js';
+import { routeRawPtyStop } from '../input/external-input-queue.js';
 import {
   multilineEditorBackspace,
   multilineEditorInsertLineBreak,
@@ -70,6 +72,7 @@ export interface ModalSink {
  *  DisplayCoordinator that satisfies both. */
 export interface DisplaySink extends CursorSink, ModalSink {}
 import type { Key } from '../tui.js';
+import { noteInputLagKey, noteInputLagPaint } from '../tui/input-lag-probe.js';
 import {
   createSpinner,
   createToolLoader,
@@ -173,6 +176,8 @@ function writeTerminal(chunk: string): void {
   process.stdout.write(chunk);
   // viaCoordinator=false — this is the bypass path /perf highlights.
   perf.recordStdoutWrite(chunk.length, false);
+  // 입력칸 키 echo 는 render() 가 아니라 이 직접 쓰기로 칠해진다 — 키→칠 관측의 칠 지점.
+  noteInputLagPaint();
 }
 
 /** textInput reports the current prompt's top row so writeTerminal
@@ -324,11 +329,16 @@ export function createTextInputRenderActions(opts: {
    *  coordinator-owned cursor sinks re-show it at the final position. */
   hideCursorBeforePaint?: boolean;
   beforePaint?: () => void;
+  /** The frame renderer owns the prompt band (TUI-PROMPT-SINGLE-OWNER):
+   *  `paint` only publishes, so there are no direct writes to wrap in
+   *  synchronized output. */
+  frameOwned?: boolean;
   modalSink?: ModalSink;
   shouldRequestModalRender?: () => boolean;
 }): TextInputRenderActions {
-  const paintAll = (synchronizedOutput = false) => {
+  const paintAll = (requestSynchronizedOutput = false) => {
     if (opts.shouldPaint?.() === false) return false;
+    const synchronizedOutput = requestSynchronizedOutput && !opts.frameOwned;
     if (synchronizedOutput) writeTerminal(SYNCHRONIZED_OUTPUT_BEGIN);
     try {
       if (opts.beforePaint) {
@@ -837,6 +847,10 @@ export async function textInput(opts: {
      *  input is idle. */
     insertAtCursor?: (text: string) => void;
   };
+  /** TUI-PROMPT-SINGLE-OWNER — when supplied, the frame renderer owns
+   *  the prompt band: drawInput publishes its rows/hint/caret here and
+   *  writes nothing to the prompt rows itself (no direct `\x1b[2K`). */
+  promptRowOwner?: PromptRowOwner;
   /** P2.2.c — sink for cursor placement. When supplied, drawInput
    *  routes its caret-position decision through this instead of
    *  emitting `\\x1b[r;cH` directly. The coordinator owns the
@@ -1194,6 +1208,8 @@ export async function textInput(opts: {
     // from there as lines accumulate. `startOffset` is how many rows
     // up from `row` we start touching — zero when both current and
     // previous drew only one line.
+    const promptRowOwner = opts.promptRowOwner;
+    const ownedRows: string[] = [];
     for (let i = 0; i < rowsToTouch; i++) {
       const r = row - i; // i=0 → bottom row; i=1 → one row up; etc.
       if (r < 1) continue;
@@ -1212,8 +1228,9 @@ export async function textInput(opts: {
           ).display;
 
         const padded = display + ' '.repeat(Math.max(0, rowTextW - visibleWidth(display)));
-        writeTerminal(ansi.moveTo(r, col) + '\x1b[2K' + pfx + padded);
-      } else {
+        if (promptRowOwner) ownedRows.unshift(pfx + padded);
+        else writeTerminal(ansi.moveTo(r, col) + '\x1b[2K' + pfx + padded);
+      } else if (!promptRowOwner) {
         // This row had content on the previous paint but doesn't anymore
         // (user deleted a line / shrank the input). Clear it so stale
         // text doesn't linger on what is now part of the log / divider
@@ -1223,7 +1240,9 @@ export async function textInput(opts: {
     }
     prevDrawnLines = visibleLines;
 
-    if (ctrlCHint) {
+    if (promptRowOwner) {
+      // The frame renders the hint row from the published paint.
+    } else if (ctrlCHint) {
       writeTerminal(ansi.moveTo(row + 2, col) + '\x1b[2K' + C.muted(truncate(ctrlCHint, getWidth())));
       ctrlCHintPainted = true;
     } else if (ctrlCHintPainted) {
@@ -1244,6 +1263,12 @@ export async function textInput(opts: {
     const pfxW = lineIdx === 0 ? visibleWidth(prompt) : contPfxW;
     const { cursorCol } = inputLineWindow(lines[lineIdx]!, colIdx, textWFor(lineIdx));
     const curX = col + pfxW + cursorCol;
+    promptRowOwner?.publish({
+      rows: ownedRows,
+      hint: ctrlCHint ? C.muted(truncate(ctrlCHint, getWidth())) : null,
+      caret: curR >= 1 ? { row: curR, col: curX, visible: true } : null,
+      source: 'text-input',
+    });
     // P2.2.c — coordinator owns the cursor emit when wired; falls
     // back to direct stdout for non-coordinator callers (tests, non-dashboard
     // entry points) so the change is non-breaking.
@@ -1342,19 +1367,28 @@ export async function textInput(opts: {
     const display = prefix + result;
     const padded = display + ' '.repeat(Math.max(0, textW - visibleWidth(display)));
 
-    for (let i = 0; i < rowsToTouch; i++) {
-      const r = row - i;
-      if (r < 1) continue;
-      if (i === 0) {
-        writeTerminal(ansi.moveTo(searchRow, col) + '\x1b[2K' + promptStr + padded);
-      } else {
-        writeTerminal(ansi.moveTo(r, col) + '\x1b[2K');
+    const curR = searchRow;
+    const curX = col + promptW + visibleWidth(prefix);
+    if (opts.promptRowOwner) {
+      opts.promptRowOwner.publish({
+        rows: [promptStr + padded],
+        hint: null,
+        caret: { row: curR, col: curX, visible: true },
+        source: 'reverse-search',
+      });
+    } else {
+      for (let i = 0; i < rowsToTouch; i++) {
+        const r = row - i;
+        if (r < 1) continue;
+        if (i === 0) {
+          writeTerminal(ansi.moveTo(searchRow, col) + '\x1b[2K' + promptStr + padded);
+        } else {
+          writeTerminal(ansi.moveTo(r, col) + '\x1b[2K');
+        }
       }
     }
     prevDrawnLines = visibleLines;
 
-    const curR = searchRow;
-    const curX = col + promptW + visibleWidth(prefix);
     if (opts.cursorSink && (opts.canClaimCursor?.() ?? true)) {
       opts.cursorSink.setCursor({ row: curR, col: curX, visible: true });
     } else if (!opts.cursorSink) {
@@ -1389,11 +1423,16 @@ export async function textInput(opts: {
     syncActivePickerModal();
     drawInput();
   };
+  // A frame-owned prompt band has no direct paint to hide the cursor
+  // for, wrap in synchronized output, or re-assert divider chrome around:
+  // the frame render does all three in its own single write.
+  const frameOwnsPromptBand = opts.promptRowOwner !== undefined;
   const renderActions = createTextInputRenderActions({
     shouldPaint: opts.shouldPaint,
-    paintChrome: opts.onPaintChrome,
+    paintChrome: frameOwnsPromptBand ? undefined : opts.onPaintChrome,
     paint: repaintPure,
-    beforePaint: () => {
+    frameOwned: frameOwnsPromptBand,
+    beforePaint: frameOwnsPromptBand ? () => {} : () => {
       const chunk = hideTextInputCursor(opts.cursorSink);
       if (chunk) writeTerminal(chunk);
       else if (opts.cursorSink) writeTerminal(paintCursorVisibility(false));
@@ -1407,6 +1446,7 @@ export async function textInput(opts: {
   const finalizeInput = (result: InputResult): InputResult => {
     // 외부 주입 라우터가 «composer 가 안 떠 있다»를 알 수 있게 내린다.
     if (hostControl) hostControl.getBufferText = undefined;
+    opts.promptRowOwner?.clear();
     detachInternalTurnYield(result.yieldedToInternalTurn === true);
     clearPicker();
     writeTerminal(endTextInputCursor(opts.cursorSink));
@@ -1723,6 +1763,7 @@ export async function textInput(opts: {
         // input loop exits cleanly and the dashboard's pane dispatcher
         // picks up the keys.
         if (hostControl) hostControl.getBufferText = undefined;
+        opts.promptRowOwner?.clear();
         detachInternalTurnYield();
         return { text: '', submitted: false, gotoPane: true };
       }
@@ -2066,7 +2107,12 @@ export function attachStreamingKeys(
   const listener = (data: string | Buffer) => {
     clearEscapeTimer();
     deliverInjected();
+    // ⏹ TUI-STOP-RAW-PTY — 원시 pty 길로 한 청크에 온 `/stop⏎`·`/esc⏎` 는 typeahead 대기열 대신 지금 턴의 escGate 로.
+    //    파서가 이스케이프·붙여넣기·UTF-8 조각을 쥐고 있으면 그 청크는 앞 입력의 이어짐이라 건드리지 않는다.
+    if (!parser.hasPendingEscape() && !parser.hasPendingPaste() && !parser.hasPendingDecoderBytes()
+      && routeRawPtyStop(typeof data === 'string' ? data : data.toString('utf8'))) return;
     const keys = parser.push(data);
+    if (keys.length > 0) noteInputLagKey(keys.length);
     deliver(keys);
     // ⚠️ `unref()` — 이 타이머가 프로세스를 붙잡아 두면 안 된다(입력 대기는 stdin 의 몫).
     if (parser.hasPendingEscape()) {

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

@@ -146,6 +146,12 @@ export function createChatPickerModalRuntime(deps: ChatPickerModalRuntimeDeps):
     getInputZoneHeight: deps.getInputZoneHeight,
     width: deps.getBounds().width,
     getWidth: () => deps.getBounds().width,
+    // TUI-PICKER-RESIZE-SHRINK — follow the live prompt row, not the
+    // row captured when the family was created (stale after resize).
+    getAnchor: () => {
+      const b = deps.getBounds();
+      return { row: b.row, col: b.col };
+    },
     onKey: makePickerOnKey(kind),
     onRowClick: makePickerOnRowClick(kind),
   });

package/src/chat/pickers/modals.ts

@@ -108,6 +108,10 @@ export interface ChatPickerModalBindings {
   getInputZoneHeight: () => number;
   width: number;
   getWidth?: () => number;
+  /** Live prompt anchor (input bottom row + col). When present it wins
+   *  over the mount-time `bounds` snapshot, so a terminal resize moves
+   *  an already-open picker with the prompt (TUI-PICKER-RESIZE-SHRINK). */
+  getAnchor?: () => { row: number; col: number };
   onKey?: PickerOnKey;
   onRowClick?: PickerOnRowClick;
 }
@@ -124,6 +128,7 @@ type FramedPickerSpec<T> = {
   getInputZoneHeight: () => number;
   width: number;
   getWidth?: () => number;
+  getAnchor?: () => { row: number; col: number };
   onKey?: PickerOnKey;
   onRowClick?: PickerOnRowClick;
 };
@@ -132,7 +137,8 @@ function createFramedPickerModal<T>(spec: FramedPickerSpec<T>): ModalSurface {
   const computeBounds = (): (ModalBounds & { startIdx: number; visibleCount: number }) | null => {
     const rows = spec.getRows();
     const inputZoneHeight = spec.getInputZoneHeight();
-    const bottomRow = spec.bounds.row - inputZoneHeight;
+    const anchor = spec.getAnchor?.() ?? spec.bounds;
+    const bottomRow = anchor.row - inputZoneHeight;
     if (rows.length === 0 || bottomRow < 4) return null;
     const { visibleCount, startIdx } = pickerWindow(
       rows.length,
@@ -142,7 +148,7 @@ function createFramedPickerModal<T>(spec: FramedPickerSpec<T>): ModalSurface {
     if (visibleCount <= 0) return null;
     const height = visibleCount + 3;
     const row = bottomRow - height + 1;
-    return { row, col: spec.bounds.col, width: spec.getWidth?.() ?? spec.width, height, startIdx, visibleCount };
+    return { row, col: anchor.col, width: spec.getWidth?.() ?? spec.width, height, startIdx, visibleCount };
   };
 
   /** Phase 4.5a (substrate Occam · §4-pre.7 · 2026-05-03) — update

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/ask-bare.ts

@@ -37,6 +37,7 @@ export async function askBare({ text, provider, model, deps }: {
     ...(provider === undefined ? { initialProvider: chosenProvider } : { provider: chosenProvider }),
     ...(selected.model === '(none)' ? {} : { model: selected.model }),
     onResolvedProvider: (name, activeModel) => { resolvedProvider = name; resolvedModel = activeModel; },
+    usageSite: 'cli.ask-bare',
   });
   return { provider: resolvedProvider, model: resolvedModel, reply };
 }

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/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/import-cli.ts

@@ -21,8 +21,20 @@ export async function buildImportPlan(home = homedir()): Promise<ImportPlan> {
 }
 
 export function registerImportCommand(program: Command): void {
+  const publicContributionHelp = `
+Public contribution (EC1 · 10-28 update; moved from 0.2.8 in the 10-01 release split):
+  Show HN / community: share a working import example and feedback; posting and replies remain with the human author.
+  CB1 contribution entry: open an issue or pull request at https://github.com/ElanvitalAI/elanous
+  Marketplace plugins: propose a plugin in plugins/ via pull request; inclusion in the signed marketplace is reviewed, not automatic.
+  Remaining drafts (not published): Show HN · 긱뉴스 · 3-minute install-to-first-result video
+    docs/marketing/DRAFT-ec1-show-hn-geeknews-and-3min-video-2026-10-01.md
+  Measure adoption separately: GitHub stars · installs · npm downloads (downloads are not unique users).
+  Historical positioning (§4, 2026-10-01; not current counts): elanous ★0 · OpenClaw ~390k · Hermes ~250k · Codex ~127k.
+  10-03 baseline (not current results): stars 0 · npm 7-day downloads 790 (includes our own installs).
+`;
   program.command('import')
     .description('Show what elanous can bring over from Claude Code, Codex, ~/.agents, OpenClaw and Hermes — a plan first; `--apply` registers skills in place and adds MCP switched off, `--undo` puts everything back')
+    .addHelpText('after', publicContributionHelp)
     .option('--json', 'Print the plan (or the apply result) as JSON')
     .option('--apply', 'Apply the plan: skills in place (ref) or as link/copy · MCP switched off · secrets and hooks only listed')
     .option('--mode <mode>', `How skills come over: ${IMPORT_MODES.join('|')} (default ref — nothing copied)`)

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

@@ -0,0 +1,35 @@
+export type LightCliRoute = 'msg' | 'release' | 'tasks' | 'pty' | 'logs' | 'config';
+
+const VALUE_FLAGS = new Set(['--config-dir', '--test-state-dir']);
+
+/** Select only read-heavy command paths whose CLI module 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);
+  }
+
+  if (command[0] === 'msg' && (command[1] === 'list' || command[1] === 'ack' || command[1] === 'watch')) 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') return 'release';
+  if (command[0] === 'tasks' && command[1] === 'show') return 'tasks';
+  if (command[0] === 'pty' && (command[1] === 'list' || command[1] === 'state')) return 'pty';
+  if (command[0] === 'logs') 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);
   }