elanous 0.2.4 → 0.2.5

package/src/cli/doctor-cli.ts

@@ -8,7 +8,7 @@ import { fileURLToPath } from 'node:url';
 import type { Command } from 'commander';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
 import { discoverChromeBinary } from '../browser-cdp/client.js';
-import { listProviders } from '../oauth/store.js';
+import { resolveUsableLlm, type UsableLlm } from '../llm/usable-llm.js';
 import { detectLocale } from '../expression/locale.js';
 import { findRetiredConfigKeysInFile, getUserConfig, type RetiredConfigKey, type UserConfig } from '../user-config.js';
 import { codeRevision } from '../version/code-revision.js';
@@ -142,7 +142,8 @@ export interface DoctorOptions {
    */
   readiness?: ReadinessDeps;
   checkReadiness?: (deps: ReadinessDeps) => ReadinessReport;
-  /** Read-only auth-store provider names. Values are never requested. */
+  resolveLlm?: () => UsableLlm;
+  /** Legacy read-only seam; route selection no longer uses provider-name presence. */
   listAuthProviders?: () => readonly string[];
   /** Read-only `codeRevision()`. */
   codeRevision?: () => string | undefined;
@@ -187,15 +188,6 @@ export interface DoctorCliDeps extends DoctorOptions, Pick<DoctorFixDeps, 'home'
 const repositoryRoot = resolve(dirname(fileURLToPath(import.meta.url)), '../..');
 const tavilyNames = new Set(['TAVILY_API_KEY', 'TAVILY_KEY']);
 
-function codexLoginPresent(providers: readonly string[]): boolean {
-  return providers.some((name) => name === 'openai-codex' || name.startsWith('openai-codex:'));
-}
-
-/** Presence only. Token strings from the auth store never leave this function. */
-function defaultListAuthProviders(): readonly string[] {
-  return listProviders();
-}
-
 function defaultCodeRevision(): string | undefined {
   try {
     return codeRevision();
@@ -294,7 +286,6 @@ interface ReadinessLookup {
   platform: NodeJS.Platform;
   commandExists: (name: string) => boolean;
   getConfig: () => UserConfig;
-  listAuthProviders: () => readonly string[];
   codeRevision: () => string | undefined;
   fetchHealth: () => { daemonSha?: string } | null;
   readInstallPrefix: () => string | null | undefined;
@@ -306,8 +297,6 @@ interface ReadinessLookup {
   /** 저장소가 시험한 bun 판(`.bun-version`) · 지금 도는 bun 판(시험 seam). */
   bunPin?: () => string | null;
   bunVersion?: () => string | null;
-  /** LLM 키가 하나라도 풀렸나(자격 보고서에서 · 없으면 못 쟀다). */
-  llmKeyResolved?: boolean;
   /** `/etc/os-release` 본문(시험 seam) — 못 읽으면 null. */
   readOsRelease?: () => string | null;
   /** 빌드 도구 탐침(시험 seam). */
@@ -371,19 +360,6 @@ function resolveReadinessDeps(lookup: ReadinessLookup): ReadinessDeps {
   if (provider !== null && provider !== 'auto' && !/^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/.test(provider)) {
     provider = null;
   }
-  let codexLogin: boolean | null = null;
-  let anyLogin: boolean | null = null;
-  try {
-    const providers = lookup.listAuthProviders();
-    codexLogin = codexLoginPresent(providers);
-    anyLogin = providers.length > 0;
-  } catch {
-    codexLogin = null;
-  }
-  // 로그인이 있거나 LLM 키가 풀렸으면 true · 둘 다 «아니라고 잰» 경우만 false · 하나라도 못 쟀으면 null.
-  const llmCredentialAvailable = anyLogin === true || lookup.llmKeyResolved === true
-    ? true
-    : anyLogin === false && lookup.llmKeyResolved === false ? false : null;
   const pathEntries = (lookup.env.PATH ?? '').split(lookup.pathDelimiter).filter((entry) => entry.length > 0);
   let ghOnPath: boolean | null = null;
   let ghAuthStatus: number | null = null;
@@ -466,8 +442,6 @@ function resolveReadinessDeps(lookup: ReadinessLookup): ReadinessDeps {
   }
   return {
     provider,
-    codexLogin,
-    llmCredentialAvailable,
     ghOnPath,
     ghAuthStatus,
     ghVersion,
@@ -1045,8 +1019,7 @@ export function runDoctor(options: DoctorOptions = {}): DoctorReport {
         pathDelimiter,
         platform,
         commandExists,
-        getConfig,
-        listAuthProviders: options.listAuthProviders ?? defaultListAuthProviders,
+        getConfig: () => resolutionOptions.userConfig,
         codeRevision: options.codeRevision ?? defaultCodeRevision,
         fetchHealth: options.fetchHealth ?? (() => defaultFetchHealth(options.resolveDaemonEndpoint ?? resolveDaemonEndpoint)),
         readInstallPrefix: options.readInstallPrefix ?? (() => defaultReadInstallPrefix(root, exists)),
@@ -1054,12 +1027,17 @@ export function runDoctor(options: DoctorOptions = {}): DoctorReport {
         ghAuthStatus: options.ghAuthStatus ?? (() => defaultGhAuthStatus(commandExists)),
         ghVersion: options.ghVersion ?? (() => defaultGhVersion(commandExists)),
         tmpdirSameFsAsBunCache: options.tmpdirSameFsAsBunCache ?? (() => defaultTmpdirSameFsAsBunCache(env)),
-        llmKeyResolved: llmKeyResolvedFrom(credentials),
         nodePty: nodePtyStatus(externalCommands.commands),
         ...(options.probeBuildToolchain ? { probeBuildToolchain: options.probeBuildToolchain } : {}),
         ...(options.checkPythonEnv ? { checkPythonEnv: options.checkPythonEnv } : {}),
         ...(options.probeHostEnvironment ? { probeHostEnvironment: options.probeHostEnvironment } : {}),
       });
+    // An injected readiness snapshot stays as-is. For a real machine, measure the
+    // same runtime route as `start` rather than inferring usability from key names.
+    if (options.readiness === undefined && readiness.provider !== null) {
+      try { readiness.usableLlm = options.resolveLlm ? options.resolveLlm() : resolveUsableLlm({ config: resolutionOptions.userConfig }); }
+      catch { readiness.usableLlm = null; }
+    }
     return {
       ok: true,
       credentials,
@@ -1083,15 +1061,14 @@ function formatReadiness(readiness: ReadinessReport | undefined): string[] {
   if (readiness === undefined) return [];
   const todo = readiness.items.filter((entry) => entry.status === 'manual' || entry.status === 'fixable');
   return [
-    '준비 상태:',
+    'Readiness:',
     ...readiness.items.map((entry) => {
       const remedy = entry.remedy === undefined ? '' : ` — ${entry.remedy}`;
       return `  ${entry.id}: ${entry.status} — ${entry.evidence}${remedy}`;
     }),
     todo.length === 0
-      ? '할 일 없음.'
-      // 처방은 줄마다 이미 있다 — 「fixable」이 곧 `doctor --fix` 는 아니다(install-path 의 처방은 export 한 줄).
-      : `할 일 ${todo.length}개: ${todo.map((entry) => entry.id).join(', ')} — 처방은 위 각 줄 끝`,
+      ? 'Nothing to do.'
+      : `To do (${todo.length}): ${todo.map((entry) => entry.id).join(', ')} — each line above ends with its fix`,
   ];
 }
 
@@ -1105,14 +1082,21 @@ function humanFreeFallback(value: string): string {
     .replace(/\s{2,}/g, ' ').trim().replace(/[—–·;,\s]+$/, '');
 }
 
+export function humanBreaks(value: string): string | undefined {
+  if (value.trim().toLowerCase() === 'unmeasured'
+    || /\b\d+ test (failures|errors)\b|\bmeasured\b|\bpostmortem\b|\bquota\b/i.test(value)
+    || /[가-힣ㄱ-ㅎㅏ-ㅣ]/.test(value)) return undefined;
+  return humanFreeFallback(value) || undefined;
+}
+
 function formatCapabilitySummary(summary: DoctorCapabilitySummary): string[] {
   const unavailable = summary.unavailable.map((capability) =>
     `  ${capability.name} — unlock with ${capability.credential}${capability.freeFallback !== undefined && humanFreeFallback(capability.freeFallback) ? `; free alternative: ${humanFreeFallback(capability.freeFallback)}` : ''}`,
   );
   return [
-    '할 수 있는 일:',
+    'Available:',
     ...(summary.available.length === 0 ? ['  None.'] : summary.available.map((capability) => `  ${capability.name} — unlocked by ${capability.credential}`)),
-    '못 하는 일:',
+    'Unavailable:',
     ...(unavailable.length === 0 ? ['  None.'] : unavailable),
     'Unknown by credential:',
     ...(summary.unknownCredentials.length === 0 ? ['  Empty.'] : summary.unknownCredentials.map((credential) => `  ${credential}`)),
@@ -1129,8 +1113,8 @@ export function formatDoctorReport(report: DoctorReport, options: { credentials?
   const satisfied = report.credentials.filter((credential) => !credential.resolved && credential.satisfiedBy !== undefined).length;
   return [
     ...formatReadiness(report.readiness),
-    ...(requiredMissing.length ? [`⛔ 필수 명령 없음: ${requiredMissing.join(', ')}`] : []),
-    `자격증명: ${resolved}/${report.credentials.length} resolved${satisfied ? ` · ${satisfied} satisfied by alternative names` : ''} · details: elanous doctor --credentials`,
+    ...(requiredMissing.length ? [`⛔ Required commands missing: ${requiredMissing.join(', ')}`] : []),
+    `Credentials: ${resolved}/${report.credentials.length} resolved${satisfied ? ` · ${satisfied} satisfied by alternative names` : ''} · details: elanous doctor --credentials`,
     ...(options.credentials ? report.credentials.map((credential) => [
       `${credential.name}: ${credential.resolved ? 'resolved' : 'unresolved'} (${credential.source}) — ${credential.note}`,
       ...(credential.satisfiedBy !== undefined ? [`  Satisfied by: ${credential.satisfiedBy.name} (${credential.satisfiedBy.source})`] : []),
@@ -1138,14 +1122,15 @@ export function formatDoctorReport(report: DoctorReport, options: { credentials?
       ...(credential.freeFallback !== undefined ? [`  Free fallback${credential.freeFallbackMode === 'auto' || credential.freeFallbackMode === 'manual' || credential.freeFallbackMode === 'none' ? ` [${credential.freeFallbackMode}]` : ''}: ${humanFreeFallback(credential.freeFallback)}`] : []),
     ].join('\n')) : []),
     ...(report.catalogMetadataUnavailable ? ['Catalog metadata unavailable: could not read catalog/resources.yaml.'] : []),
-    ...(report.retiredConfigKeys ?? []).map(({ path, reason }) => `더는 안 쓰는 설정 키: ${path} — ${reason}`),
+    ...(report.retiredConfigKeys ?? []).map(({ path, reason }) => `Retired config key: ${path} — ${reason}`),
     'External commands:',
     ...report.externalCommands.map((command) => {
       const breaks = command.status === 'broken' ? command.breaks_broken ?? command.breaks : command.breaks;
+      const visibleBreaks = breaks === undefined ? undefined : humanBreaks(breaks);
       const fix = command.status === 'broken' ? command.fix_broken ?? command.fix : command.fix;
       return [
         `${command.name}: ${command.status === 'skipped' ? `skipped (${command.platform}-only)` : `${command.status} (${command.tier})`}${command.detail === undefined ? '' : ` — ${command.detail}`}`,
-        ...((command.status === 'missing' || command.status === 'broken') && breaks !== undefined ? [`  Breaks: ${breaks}`] : []),
+        ...((command.status === 'missing' || command.status === 'broken') && visibleBreaks !== undefined ? [`  Breaks: ${visibleBreaks}`] : []),
         ...((command.status === 'missing' || command.status === 'broken') && fix !== undefined ? [`  Fix: ${fix}`] : []),
       ].join('\n');
     }),
@@ -1260,13 +1245,12 @@ export function registerDoctorCommand(program: Command, deps: DoctorCliDeps = {}
         home: deps.home,
         cacheDir: deps.cacheDir,
         readdir: deps.readdir,
-        readiness: deps.readiness ?? resolveReadinessDeps({
+        readiness: deps.readiness ?? { ...resolveReadinessDeps({
           env: deps.env ?? process.env,
           pathDelimiter: deps.pathDelimiter ?? delimiter,
           platform: deps.platform ?? process.platform,
           commandExists: deps.commandExists ?? ((name) => (deps.env ?? process.env).PATH?.split(deps.pathDelimiter ?? delimiter).some((dir) => existsSync(join(dir, name))) ?? false),
-          getConfig: deps.getUserConfig ?? getUserConfig,
-          listAuthProviders: deps.listAuthProviders ?? defaultListAuthProviders,
+          getConfig: () => deps.userConfig ?? (deps.getUserConfig ?? getUserConfig)(),
           codeRevision: deps.codeRevision ?? defaultCodeRevision,
           fetchHealth: deps.fetchHealth ?? (() => defaultFetchHealth(deps.resolveDaemonEndpoint ?? resolveDaemonEndpoint)),
           readInstallPrefix: deps.readInstallPrefix ?? (() => defaultReadInstallPrefix(deps.repositoryRoot ?? repositoryRoot, deps.exists ?? existsSync)),
@@ -1274,13 +1258,15 @@ export function registerDoctorCommand(program: Command, deps: DoctorCliDeps = {}
           // gh 판은 수리 계획에 쓰인다(낡은 gh → 정적 gh) — 🩸 09-25: 여기서 안 재서 계획은 보고서에만 뜨고 적용이 안 됐다.
           ghVersion: deps.ghVersion ?? (() => defaultGhVersion((name) => (deps.env ?? process.env).PATH?.split(deps.pathDelimiter ?? delimiter).some((dir) => existsSync(join(dir, name))) ?? false)),
           tmpdirSameFsAsBunCache: deps.tmpdirSameFsAsBunCache ?? (() => defaultTmpdirSameFsAsBunCache(deps.env ?? process.env)),
-          // 보고서와 같은 자로 — 로그인도 LLM 키도 없으면 계획에 «사람 한 줄»(로그인)이 실린다(🅢 #20263 ③).
-          ...(source.ok ? { llmKeyResolved: llmKeyResolvedFrom(source.credentials), nodePty: nodePtyStatus(source.externalCommands) } : {}),
+          ...(source.ok ? { nodePty: nodePtyStatus(source.externalCommands) } : {}),
           // L0 칸(substrate·docker·kubernetes·memory)은 «정보성·선택 기능»이라 수리 계획에 싣지 않는다 —
           // `--sudo` 가 `sudo systemctl start docker` 를 «설치 줄»로 치지 않게 하고, docker·kubectl 탐침(최대 수 초)을 두 번 돌리지 않는다.
           // 보고서(`runDoctor`)에는 그대로 나온다.
           probeHostEnvironment: () => null,
-        }),
+        }), usableLlm: (() => {
+          try { return deps.resolveLlm ? deps.resolveLlm() : resolveUsableLlm({ config: deps.userConfig ?? (deps.getUserConfig ?? getUserConfig)() }); }
+          catch { return null; }
+        })() },
         exists: deps.exists,
         readFile: deps.readFile,
         writeFile: deps.writeFile,
@@ -1374,16 +1360,16 @@ export function registerDoctorCommand(program: Command, deps: DoctorCliDeps = {}
       else out.log([
         formatDoctorReport(currentReport, { credentials: opts.credentials }),
         ...(advice ? [formatDoctorAdvice(advice)] : []),
-        '수정 계획:',
+        'Fix plan:',
         ...plan.items.map((item) => `  ${item.id}: ${item.status} — ${item.path} — ${item.action}${item.reason ? ` — ${item.reason}` : ''}`),
         ...plan.manual.map((item) => `  ${item.id}: manual${item.remedy ? ` — ${item.remedy}` : ''}`),
         ...manualCommandFixes(currentReport).map((line) => `  ${line}`),
-        ...(gitInstall ? [`git 설치: ${gitInstall.detail}${gitPlan?.note ? ` — ${gitPlan.note}` : ''}`] : []),
+        ...(gitInstall ? [`Git installation: ${gitInstall.detail}${gitPlan?.note ? ` — ${gitPlan.note}` : ''}`] : []),
         ...(sudoResult ? [sudoResult.sudoAvailable
-          ? `sudo 설치: ${sudoResult.runs.length ? sudoResult.runs.map((entry) => `${entry.result} — ${entry.command}${entry.detail ? ` — ${entry.detail}` : ''}`).join(' · ') : '칠 줄 없음'}`
-          : 'sudo 설치: 건너뜀 — 이 기계는 sudo 에 암호가 필요하다(sudo -n true 실패). 위 «manual» 줄을 직접 치세요.'] : []),
-        ...(results ? ['적용 결과:', ...results.items.map((item) => `  ${item.id}: ${item.result} — ${item.path}${item.reason ? ` — ${item.reason}` : ''}`)] : ['적용하려면 --fix --yes']),
-        ...(restartResult ? [`서비스 재시작: ${restartResult.result} — ${restartResult.reason}`] : []),
+          ? `Sudo installation: ${sudoResult.runs.length ? sudoResult.runs.map((entry) => `${entry.result} — ${entry.command}${entry.detail ? ` — ${entry.detail}` : ''}`).join(' · ') : '칠 줄 없음'}`
+          : 'Sudo installation: 건너뜀 — 이 기계는 sudo 에 암호가 필요하다(sudo -n true 실패). 위 «manual» 줄을 직접 치세요.'] : []),
+        ...(results ? ['Applied:', ...results.items.map((item) => `  ${item.id}: ${item.result} — ${item.path}${item.reason ? ` — ${item.reason}` : ''}`)] : ['적용하려면 --fix --yes']),
+        ...(restartResult ? [`Service restart: ${restartResult.result} — ${restartResult.reason}`] : []),
       ].join('\n'));
       const exitCode = Math.max(results?.exitCode ?? 0, sudoResult?.exitCode ?? 0, restartResult?.result === 'failed' ? 1 : 0, currentReport.requiredMissing?.length ? 1 : 0, gitInstall?.ran && !gitInstall.ok ? 1 : 0);
       if (results || exitCode) setExitCode(exitCode);

package/src/cli/doctor-readiness.ts

@@ -1,4 +1,5 @@
 import { remediesFor, type DistroFamily } from './doctor-distro.js';
+import type { UsableLlm } from '../llm/usable-llm.js';
 import { providerSecretNames } from '../nexus/install/launchd.js';
 import { win32 } from 'node:path';
 /**
@@ -42,13 +43,8 @@ export interface ReadinessDeps {
    * must pass `null` rather than omit it).
    */
   provider?: string | null;
-  /**
-   * Codex subscription login is present. `null` means not measured.
-   * The token itself is never passed in.
-   */
-  codexLogin?: boolean | null;
-  /** LLM 을 부를 자격이 «하나라도» 있나(어떤 로그인이든 · LLM 키가 풀렸든). 없으면(undefined/null) 못 쟀다. */
-  llmCredentialAvailable?: boolean | null;
+  /** Selected runtime route, already resolved with the runtime auto selector. null = unmeasured. */
+  usableLlm?: UsableLlm | null;
   /** `gh` is on PATH. `null` means not measured. */
   ghOnPath?: boolean | null;
   /** `gh --version` 의 판 · null/undefined = 못 쟀다. */
@@ -210,23 +206,19 @@ function providerDecision(deps: ReadinessDeps): ReadinessItem {
     return item('provider-decision', 'unknown', 'llm.provider was not measured');
   }
   const provider = deps.provider.trim() || 'auto';
-  if (provider !== 'auto') {
-    // 아는 provider 이름만 보여 준다 — 설정 칸에 자격 같은 값이 들어와 있어도 보고에 싣지 않는다.
-    const shown = KNOWN_PROVIDERS.has(provider) ? provider : '(set · value not shown)';
-    return item('provider-decision', 'ok', `llm.provider=${shown}`);
-  }
-  if (deps.codexLogin === undefined || deps.codexLogin === null) {
-    return item('provider-decision', 'unknown', 'llm.provider=auto but codex login was not measured');
-  }
-  if (deps.codexLogin === true) {
-    // 2026-09-24 결정(`#20142`) — auto 는 codex 구독을 먼저 쓰고 계정 회전·llm.fallbackChain 이 뒤를 잇는다.
-    return item('provider-decision', 'ok', 'llm.provider=auto uses the codex login first; account rotation and llm.fallbackChain apply');
-  }
-  // 🩸 2026-09-24 빈 VM(🅢 #20263): 로그인도 키도 없는데 여기서 `ok` 가 나왔다(거짓 초록) — auto 가 고를 것이 없다.
-  if (deps.llmCredentialAvailable === false) {
-    return item('provider-decision', 'manual', 'llm.provider=auto but no LLM login or key was found — LLM commands will fail', 'elanous login openai-codex');
-  }
-  return item('provider-decision', 'ok', 'llm.provider=auto and no codex login');
+  const shown = KNOWN_PROVIDERS.has(provider) ? provider : '(set · value not shown)';
+  if (deps.usableLlm == null) return item('provider-decision', 'unknown', `llm.provider=${shown} route was not measured`);
+  const { usable, provider: selected, via, why } = deps.usableLlm;
+  if (!usable) {
+    const reason = why === 'no usable LLM route selected' ? why : 'route unavailable';
+    const remedy = provider === 'auto' || provider === 'openai-codex' ? 'elanous login openai-codex'
+      : provider === 'openai' ? 'Set OPENAI_API_KEY or llm.apiKey for openai'
+      : provider === 'local' ? 'Set llm.baseUrl or LOCAL_LLM_URL for local'
+      : KNOWN_PROVIDERS.has(provider) ? `Configure credentials for llm.provider=${provider}` : undefined;
+    return item('provider-decision', 'manual', `llm.provider=${shown} selected no usable LLM (via none) — ${reason}`, remedy);
+  }
+  const selectedName = selected && KNOWN_PROVIDERS.has(selected) ? selected : 'selected provider';
+  return item('provider-decision', 'ok', `llm.provider=${shown} → ${via} ${selectedName}`);
 }
 
 /** Debian 계열 apt 의 gh 는 GH_MIN_VERSION 미만이다(📏 09-25: Debian 12 = 2.23 · Ubuntu 24.04 = 2.45) — apt 로 깔면 곧바로

package/src/cli/intake-cli.ts

@@ -282,7 +282,7 @@ export function registerIntakeCommands(program: Command): void {
         const { sendTelegramReport } = await import('../telegram-report.js');
         const { getUserConfig } = await import('../user-config.js');
         const text = renderDigestTelegram(d, { ...(opts.vault ? { vaultRoot: opts.vault } : {}), ...(opts.note ? { notePath: opts.note } : {}) });
-        const sent = await sendTelegramReport(getUserConfig(), text, { markdown: true });
+        const sent = await sendTelegramReport(getUserConfig(), text, { markdown: true, kind: 'intake' });
         debug.log('intake.digest', 'telegram', { day, absorbed: d.absorbed.length, goals: d.goals.length, sent });
         console.log(sent ? `텔레그램 보고 채널로 보냈다 (${day} · 흡수 ${d.absorbed.length} · 골 후보 ${d.goals.length})` : '텔레그램 보고 채널 설정이 없다(telegram.reportChannel) — 보내지 않음');
         if (!sent) process.exitCode = 3;

package/src/cli/mcp-call.ts

@@ -1,6 +1,7 @@
 import { resolveDaemonEndpoint, type ResolveDaemonEndpointOpts } from '../nexus/daemon-endpoint.js';
 import { RemotesStore } from './remotes.js';
 import { bookmarkAttachDefaults } from './remote-resolve.js';
+import { getNodeKind } from '../graph-kinds/registry.js';
 
 export type McpCliClassification =
   | 'ok'
@@ -84,7 +85,15 @@ export async function callDaemonMcpTool(opts: {
   arguments: Record<string, unknown>;
   endpoint?: string | ResolvedEndpoint;
   fetchFn?: McpCallOpts['fetchFn'];
+  pluginKind?: string;
 }): Promise<unknown> {
+  if (opts.pluginKind) {
+    const entry = getNodeKind('workflow', opts.pluginKind);
+    if (!entry || entry.core || !entry.plugin || !entry.run || !('mcp' in entry.run)
+      || opts.tool !== `${entry.run.mcp.server}.${entry.run.mcp.tool}`) {
+      throw new McpCliFailure('mcp-usage-error', 'invalid plugin MCP kind');
+    }
+  }
   const endpoint = typeof opts.endpoint === 'string' ? { url: opts.endpoint } : opts.endpoint;
   const resolved = endpoint ? { ok: true as const, value: endpoint } : resolveMcpEndpoint({});
   if (!resolved.ok) throw new McpCliFailure(resolved.classification, resolved.message);

package/src/cli/mcp-gateway-cli.ts

@@ -6,6 +6,7 @@ import { getElanousConfigDir } from '../elanous-config-dir.js';
 import { effectiveInstanceRoot } from '../instance/resolve.js';
 import { issueMcpPat, listMcpPats, revokeMcpPat } from '../mcp-gateway/pat-store.js';
 import { startMcpGateway } from '../mcp-gateway/gateway.js';
+import { resolveDaemonEndpoint } from '../nexus/daemon-endpoint.js';
 
 function privateTokenFile(path: string): string {
   const fd = openSync(path, constants.O_RDONLY | constants.O_NOFOLLOW);
@@ -47,12 +48,15 @@ export function registerMcpGatewayCommands(mcp: Command): void {
     .description('Owner-PAT authenticated public MCP relay to the scoped NEXUS endpoint')
     .option('--host <host>', 'Bind host', '127.0.0.1')
     .option('--port <port>', 'Bind port', '31482')
-    .requiredOption('--nexus-url <url>', 'NEXUS base URL')
+    .option('--nexus-url <url>', 'NEXUS base URL. Default: the current daemon (elanous nexus show).')
     .option('--public-url <url>', 'Public HTTPS origin used in protected resource metadata')
     .option('--nexus-token-file <path>', 'Private file holding the mcp-public NEXUS token; use - for stdin')
-    .action(safeAction(async (opts: { host: string; port: string; nexusUrl: string; publicUrl?: string; nexusTokenFile?: string }) => {
+    .action(safeAction(async (opts: { host: string; port: string; nexusUrl?: string; publicUrl?: string; nexusTokenFile?: string }) => {
       const port = Number(opts.port);
       if (!Number.isSafeInteger(port) || port < 1 || port > 65535) throw new Error('invalid gateway port');
+      // 데몬 주소는 짐작하지 않는다 — 통합관제(daemon-endpoint)에 묻고, 모르면 멈춘다(대표 09-28).
+      const nexusUrl = opts.nexusUrl ?? resolveDaemonEndpoint()?.baseUrl;
+      if (!nexusUrl) throw new Error('daemon address unknown — pass --nexus-url or start the daemon (elanous nexus show)');
       if (!opts.publicUrl) throw new Error('--public-url <url> required for protected-resource metadata');
       if (!opts.nexusTokenFile) throw new Error('--nexus-token-file <path|-> required (no token argv)');
       if (opts.nexusTokenFile === '-' && process.stdin.isTTY) throw new Error('pipe the nexus token on stdin');
@@ -66,7 +70,7 @@ export function registerMcpGatewayCommands(mcp: Command): void {
         if (!stat.isFile() || (stat.mode & 0o077) !== 0) throw new Error('PAT store must be a private regular file (0600)');
       } finally { closeSync(fd); }
       listMcpPats(patRoot);
-      const server = startMcpGateway({ host: opts.host, port, nexusUrl: opts.nexusUrl, nexusToken, patRoot, publicUrl: opts.publicUrl });
+      const server = startMcpGateway({ host: opts.host, port, nexusUrl, nexusToken, patRoot, publicUrl: opts.publicUrl });
       process.stderr.write(`MCP gateway listening on ${server.hostname}:${server.port}\n`);
     }));
 

package/src/cli/plugin-cli.ts

@@ -5,10 +5,12 @@ import { join } from 'node:path';
 import { existsSync, readFileSync } from 'node:fs';
 import { elanousStateRoot } from '../autopilot/state-paths.js';
 import { userConfigPath } from '../user-config.js';
-import { debug } from '../debug/log.js';
+import { debug, redactSecretText } from '../debug/log.js';
+import { addMarket, listMarkets, MarketFetchError, updateMarket } from '../plugins/install/market-fetch.js';
 import { emitDecision } from '../live/detail-switch.js';
 import { OFFICIAL_INDEX_KEYS } from '../market/official-keys.js';
 import { installPlugin, listInstalledPlugins, PluginInstallError, removePlugin, type InstallEvent } from '../plugins/install/plugin-install.js';
+import { credentialStatus, setPluginCredentials } from '../plugins/install/plugin-credentials.js';
 
 function keys(): ReadonlyArray<{ keyId: string; publicKey: string }> {
   const configPath = userConfigPath();
@@ -32,43 +34,99 @@ async function askConsent(capabilities: string[], json: boolean): Promise<boolea
   }
 }
 
-function outputEvent(event: InstallEvent, json: boolean): void {
+function outputEvent(event: InstallEvent, json: boolean, nodeCount: { value: number }): void {
   // Connector field names are useful; values and secret-field metadata are not needed here.
   const safe = event.event === 'credentials'
     ? { event: 'credentials', connectors: event.connectors.map(({ id, fields }) => ({ id, fields: fields.map(({ name }) => name) })) }
     : event;
   debug.log('plugin.cli', event.event, { event: event.event });
+  if (event.event === 'registered') nodeCount.value = event.nodes.length;
   if (json) stdout.write(JSON.stringify(safe) + '\n');
   else if (event.event === 'credentials') {
     if (event.connectors.length) console.log(`Connectors: ${event.connectors.map(connector => connector.id).join(', ')} — configure via elanous connector settings (no secrets requested here)`);
-  } else if (event.event === 'done') console.log(`Installed ${event.plugin}@${event.version}`);
+  } else if (event.event === 'done') console.log(`Installed ${event.plugin}@${event.version} (${nodeCount.value} nodes)`);
   else if (event.event === 'consent' && event.required) console.log(`Permissions: ${event.capabilities.join(', ')}`);
 }
 
+/** Only our own install/market errors carry a cause (fixed wording that may name the user's own spec); URLs and secrets are masked; any other error stays generic. */
+function safeCause(error: unknown): string {
+  if (!(error instanceof PluginInstallError || error instanceof MarketFetchError)) return 'unexpected error';
+  return redactSecretText(error.message.replace(/https?:\/\/[^\s"'<>]+/gi, '[redacted URL]'));
+}
+
 export function registerPluginCommands(program: Command): void {
   const plugin = program.command('plugin').description('Install and manage Elanous plugins');
   plugin.command('add <spec>').description('Install a local path, pinned git plugin or signed market plugin')
     .option('--yes', 'Accept requested capabilities')
     .option('--json', 'NDJSON progress events')
     .option('--allow-unsigned', 'Allow unsigned marketplace indices')
-    .action(async (spec: string, opts: { yes?: boolean; json?: boolean; allowUnsigned?: boolean }) => {
+    .option('--refresh', 'Refresh the signed marketplace index before installing')
+    .action(async (spec: string, opts: { yes?: boolean; json?: boolean; allowUnsigned?: boolean; refresh?: boolean }) => {
       try {
         const root = elanousStateRoot();
+        const nodeCount = { value: 0 };
         await installPlugin(spec, {
           root, marketDir: join(root, 'plugins', 'markets'), trustedKeys: keys(),
-          yes: opts.yes, allowUnsigned: opts.allowUnsigned,
-          onEvent: event => outputEvent(event, !!opts.json),
+          yes: opts.yes, allowUnsigned: opts.allowUnsigned, refresh: opts.refresh,
+          onEvent: event => outputEvent(event, !!opts.json, nodeCount),
           consent: capabilities => askConsent(capabilities, !!opts.json),
         });
         emitDecision({ kind: 'ROUTE', what: 'plugin add', reason: 'plugin installed', purpose: 'make plugin available', target: 'plugin host' });
       } catch (error) {
         const reason = error instanceof PluginInstallError ? error.reason : 'io';
-        // Installer errors may embed an arbitrary source path or git URL; never echo them or config secrets.
         const detail = reason === 'consent-denied' ? 'plugin capabilities require consent' : `plugin installation ${reason} error`;
-        debug.log('plugin.cli', 'failed', { reason }, { level: 'error' });
+        const cause = safeCause(error);
+        debug.log('plugin.cli', 'failed', { reason, cause }, { level: 'error' });
         emitDecision({ kind: 'ESCALATE', what: 'plugin add', reason, purpose: 'report installation failure', target: 'user' });
-        if (opts.json) stdout.write(JSON.stringify({ event: 'failed', reason, detail }) + '\n');
-        else console.error(`plugin add failed: ${detail}`);
+        if (opts.json) stdout.write(JSON.stringify({ event: 'failed', reason, detail, ...(reason === 'consent-denied' ? {} : { cause }) }) + '\n');
+        else console.error(`plugin add failed: ${detail}${reason === 'consent-denied' ? '' : `: ${cause}`}`);
+        process.exitCode = 1;
+      }
+    });
+  const market = plugin.command('market').description('Manage signed plugin marketplaces');
+  market.command('add <name> <url>').description('Register a marketplace URL')
+    .action((name: string, url: string) => {
+      try {
+        const added = addMarket(name, url);
+        debug.log('plugin.cli', 'market.add', { name: added.name });
+        console.log(`Added market ${added.name} (${added.url})`);
+      } catch (error) {
+        console.error(`plugin market add failed: ${safeCause(error)}`);
+        process.exitCode = 1;
+      }
+    });
+  market.command('list').description('List configured marketplaces').option('--json', 'JSON array')
+    .action((opts: { json?: boolean }) => {
+      try {
+        const markets = listMarkets();
+        debug.log('plugin.cli', 'market.list', { count: markets.length });
+        if (opts.json) stdout.write(JSON.stringify(markets) + '\n');
+        else for (const entry of markets) console.log(`${entry.name} (${entry.url})`);
+      } catch (error) {
+        if (opts.json) stdout.write(JSON.stringify({ event: 'failed', cause: safeCause(error) }) + '\n');
+        else console.error(`plugin market list failed: ${safeCause(error)}`);
+        process.exitCode = 1;
+      }
+    });
+  market.command('update [name]').description('Refresh signed marketplace indices')
+    .action(async (name?: string) => {
+      try {
+        const markets = listMarkets();
+        const selected = name ? markets.filter(entry => entry.name === name) : markets;
+        if (!selected.length) throw new Error('market not configured');
+        const root = elanousStateRoot();
+        for (const entry of selected) {
+          try {
+            const result = await updateMarket(entry.name, { root, marketDir: join(root, 'plugins', 'markets') });
+            debug.log('plugin.cli', 'market.update', { name: result.market.name, sequence: result.index.sequence });
+            console.log(`Updated market ${result.market.name} (sequence ${result.index.sequence})`);
+          } catch (error) {
+            console.error(`plugin market update ${entry.name} failed: ${safeCause(error)}`);
+            process.exitCode = 1;
+          }
+        }
+      } catch (error) {
+        console.error(`plugin market update failed: ${safeCause(error)}`);
         process.exitCode = 1;
       }
     });
@@ -83,12 +141,52 @@ export function registerPluginCommands(program: Command): void {
         const installed = listInstalledPlugins(root).filter(item => registered.has(`${item.market}/${item.name}/${item.version}`));
         debug.log('plugin.cli', 'list', { count: installed.length });
         if (opts.json) stdout.write(JSON.stringify(installed) + '\n');
-        else for (const item of installed) console.log(`${item.name}@${item.version} (${item.market})`);
+        else for (const item of installed) console.log(`${item.name}@${item.version} (${item.market})${item.installedAt ? ` — installed ${item.installedAt}` : ''}`);
       } catch {
         console.error('plugin list failed: invalid plugin ledger');
         process.exitCode = 1;
       }
     });
+  plugin.command('credentials <plugin>').description('Show or update installed plugin credential status')
+    .option('--set <NAME=VALUE>', 'Set a declared field', (value: string, values: string[]) => [...values, value], [] as string[])
+    .option('--unset <NAME>', 'Remove a declared field', (value: string, values: string[]) => [...values, value], [] as string[])
+    .option('--stdin <NAME>', 'Read one credential value from standard input')
+    .option('--json', 'JSON status')
+    .action(async (name: string, opts: { set: string[]; unset: string[]; stdin?: string; json?: boolean }) => {
+      try {
+        const root = elanousStateRoot();
+        const fields: Record<string, string | null> = Object.create(null);
+        for (const assignment of opts.set) {
+          const equal = assignment.indexOf('=');
+          if (equal < 1) throw new Error('invalid credential assignment');
+          fields[assignment.slice(0, equal)] = assignment.slice(equal + 1);
+        }
+        for (const field of opts.unset) fields[field] = null;
+        if (opts.stdin !== undefined) {
+          let input = '';
+          for await (const chunk of stdin) {
+            input += chunk.toString();
+            if (input.includes('\n')) break;
+          }
+          if (!input) throw new Error('credential stdin is empty');
+          fields[opts.stdin] = input.split(/\r?\n/, 1)[0]!;
+        }
+        if (Object.keys(fields).length > 0) {
+          setPluginCredentials(name, fields, root);
+          debug.log('plugin.credentials', 'set', { plugin: name, fields: Object.keys(fields), count: Object.keys(fields).length });
+        }
+        const status = credentialStatus(name, root);
+        if (opts.json) stdout.write(JSON.stringify(status) + '\n');
+        else for (const field of status.fields) console.log(`${field.name}\t${field.env}\t${field.set ? 'set' : 'unset'}`);
+        // The web app's PUT reloads MCP clients itself; a CLI write reaches an already-running daemon only after a reload.
+        // stderr in both modes, so `--json` stdout stays one JSON line.
+        if (Object.keys(fields).length > 0) console.error('A running daemon applies this to plugin MCP servers after `elanous mcp reload` (the web app does it for you).');
+      } catch {
+        if (opts.json) stdout.write(JSON.stringify({ error: 'plugin credentials failed' }) + '\n');
+        else console.error('plugin credentials failed');
+        process.exitCode = 1;
+      }
+    });
   plugin.command('remove <name>').description('Remove installed plugin versions')
     .action((name: string) => {
       try {

package/src/cli/pr-lineage.ts

@@ -1,5 +1,6 @@
 const SELF_IMPL_PREFIX = 'self-impl/';
 const LINEAGE_HASH_SUFFIX = /-[0-9a-f]{7,8}$/i;
+const RUN_SUFFIX = /-r[a-z0-9]{6}$/i;
 /**
  * Formal new-generation segment after `self-impl/`: dash-delimited `-goalid-<id>-`.
  * ⛔ A substring like `mygoalid-foo` is not that segment — it has no leading `-`/`^` boundary.
@@ -9,7 +10,7 @@ const GOAL_ID_SEGMENT = /(?:^|-)goalid-([^/-]+)-/;
 /** Lineage slug of a harness branch: `self-impl/<slug>-<7–8 hex>`, or null when the name is not that shape. */
 export function branchLineageSlug(branch: string): string | null {
   if (!branch.startsWith(SELF_IMPL_PREFIX)) return null;
-  const rest = branch.slice(SELF_IMPL_PREFIX.length);
+  const rest = branch.slice(SELF_IMPL_PREFIX.length).replace(RUN_SUFFIX, '');
   const hash = LINEAGE_HASH_SUFFIX.exec(rest);
   return hash ? rest.slice(0, rest.length - hash[0].length) : rest;
 }

package/src/cli/pwa-start.ts

@@ -126,6 +126,8 @@ export interface PwaStartOpts {
    *  MCP-client boot is skipped (PR1 2026-05-13). Default undefined =
    *  leave the decision to the daemon-side `mcp.enabled` config. */
   mcpEnabled?: boolean;
+  /** Forward an explicit --no-auth opt-out to the detached Nexus child. */
+  noAuth?: boolean;
   out?: { log: (s: string) => void; error: (s: string) => void };
   // ─── Test seams ─────────────────────────────────────────────
   bgLaunchFn?: (opts: {
@@ -237,6 +239,7 @@ function collectForwardArgs(opts: PwaStartOpts, httpPort: number): string[] {
   // those gates only matter on the parent (build runs before fork).
   if (opts.watch && (opts.mode ?? 'static') === 'static') args.push('--watch');
   if (opts.mcpEnabled === false) args.push('--no-mcp');
+  if (opts.noAuth === true) args.push('--no-auth');
   return args;
 }