elanous 0.2.9 → 0.2.11

package/src/user-config.ts

@@ -50,7 +50,7 @@ import type { SkillTier } from './skills/runner.js';
 import { sharedAgentSkillRoots } from './skills/shared-agent-skill-roots.js';
 import {
   isModelTier,
-  isModelTierPersona,
+  isModelTierProfile,
   type BudgetUserConfig,
   type ModelTier,
   type ModelTierUserConfig,
@@ -450,6 +450,8 @@ export interface SkillSource {
 export interface SkillsConfig {
   activeSet: SkillSetName;
   dirs: string[];
+  /** Gift redemption API origin; defaults to https://elanous.ai. */
+  giftEndpoint?: string;
   /** Include the existing shared ~/.agents/skills directory. Default true; false opts out. */
   includeSharedAgentSkills?: boolean;
   /**
@@ -766,6 +768,7 @@ function skillsDefaults(): SkillsConfig {
   return {
     activeSet: 'claudecode',
     dirs: d ? [d] : [],
+    giftEndpoint: 'https://elanous.ai',
     includeSharedAgentSkills: true,
     allow: [],
     deny: [],
@@ -912,11 +915,13 @@ export interface TelegramConfig {
   /** 누가 Q&A 폴링을 하나 — 기본(없음·`'nexus'`)은 넥서스 데몬, `'standalone'` 이면
    *  넥서스는 폴링하지 않고 `elanous telegram run` 이 맡는다. */
   poller?: 'nexus' | 'standalone';
-  /** 발송 목적(kind) → 채널 역할. 명시 `channels` 가 있을 때만 쓴다 — 표에 없는 kind 는 옛 `reportChannel` 로 간다.
-   *  기본표는 `DEFAULT_KIND_ROLES`(telegram-report.ts) · 여기 값이 덮어쓴다. */
+  /** 레거시 kind→역할 설정(읽기 호환). 선택한 채널의 봇이 kind 정책의
+   *  운영/매매 경계를 지킬 때만 발송 라우팅에 적용한다. */
   kindRoles?: Record<string, string>;
   /** `#현장` 캡션에 행사 슬러그가 없을 때 쓸 기본 행사(예: `marketers-night-2026-10`). 없으면 `field-<로컬 날짜>`. */
   fieldDefaultEvent?: string;
+  /** `#현장` 영상의 기본 렌더 모드. 미지정 시 standard, 캡션의 `즉석`/`instant` 가 우선. */
+  fieldReelMode?: 'standard' | 'instant';
 }
 
 const TELEGRAM_DEFAULTS: TelegramConfig = { enabled: false, allowedUsers: [] };
@@ -982,6 +987,7 @@ const DISCORD_DEFAULTS: DiscordConfig = { enabled: false, allowedUsers: [] };
 
 export interface OnboardingConfig {
   webFirst?: boolean;
+  ready?: boolean;
   completed: boolean;
   completedAt?: string;
   version: number;
@@ -1474,6 +1480,7 @@ export function parseErrorReportsConfig(raw: unknown): ErrorReportsConfig | unde
 }
 
 export interface ChatConfig {
+  factQuestion: { maxToolTurns: number };
   /** Short questions may receive a tool-free first reply. Default true. */
   fastPath: boolean;
   conciseness: ChatConcisenessConfig;
@@ -1502,6 +1509,7 @@ const CHAT_CONCISENESS_DEFAULTS: ChatConcisenessConfig = {
 };
 
 export const CHAT_DEFAULTS: ChatConfig = {
+  factQuestion: { maxToolTurns: 6 },
   fastPath: true,
   conciseness: { ...CHAT_CONCISENESS_DEFAULTS },
   toolOutput: {
@@ -1682,6 +1690,8 @@ export interface AcpHopCapConfig {
 
 export interface AcpConfig {
   hopCap: AcpHopCapConfig;
+  /** ACP client permission response deadline (positive integer milliseconds). */
+  toolApproval: { timeoutMs: number };
   /** ACP PR reviewer and final judge backend. Absent defers to DEFAULT_REVIEW_BACKEND. */
   reviewBackend?: string;
   /** Rework agent backend. Absent defers to the driver default (codex). */
@@ -1707,7 +1717,17 @@ export interface AcpConfig {
   scrubBillingEnv: boolean;
 }
 
-const ACP_DEFAULTS: AcpConfig = { hopCap: {}, scrubBillingEnv: true };
+const ACP_DEFAULTS: AcpConfig = { hopCap: {}, toolApproval: { timeoutMs: 60_000 }, scrubBillingEnv: true };
+
+function acpApprovalTimeoutMs(value: unknown): number | undefined {
+  return typeof value === 'number' && Number.isSafeInteger(value) && value > 0 && value <= 2_147_483_647
+    ? value : undefined;
+}
+
+function acpApprovalTimeoutEnv(): number | undefined {
+  const raw = process.env.ELANOUS_ACP_TOOL_APPROVAL_TIMEOUT_MS;
+  return raw !== undefined && /^\d+$/.test(raw) ? acpApprovalTimeoutMs(Number(raw)) : undefined;
+}
 
 // ── Plan mode config (Coding Pipeline P4 followup) ───────────────────
 //
@@ -1912,6 +1932,17 @@ function parseOpenDesignConfig(raw: unknown): OpenDesignConfig | undefined {
   return Object.keys(out).length > 0 ? out : undefined;
 }
 
+export function parseDiagnosticsConfig(raw: unknown): UserConfig['diagnostics'] {
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return undefined;
+  const value = (raw as Record<string, unknown>).uploadUrl;
+  if (typeof value !== 'string' || !value.trim()) return undefined;
+  try {
+    const url = new URL(value.trim());
+    if (url.protocol !== 'https:' || !url.hostname || url.username || url.password) return undefined;
+    return { uploadUrl: url.href };
+  } catch { return undefined; }
+}
+
 function parseDesignConfig(raw: unknown): DesignConfig | undefined {
   if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return undefined;
   const r = raw as Record<string, unknown>;
@@ -1995,7 +2026,12 @@ function parseModelTierFieldOrUndefined(v: unknown): ModelTier | undefined {
 function parseModelTierConfig(raw: unknown): ModelTierUserConfig | undefined {
   if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return undefined;
   const r = raw as Record<string, unknown>;
-  const persona = isModelTierPersona(r.persona) ? r.persona : undefined;
+  // Compatibility is read-only: the normalized config and subsequent writes use profile.
+  let profile = isModelTierProfile(r.profile) ? r.profile : undefined;
+  if (r.profile === undefined && r.persona !== undefined) {
+    debug.log('config', 'deprecated-key', { from: 'modelTier.persona', to: 'modelTier.profile' });
+    if (isModelTierProfile(r.persona)) profile = r.persona;
+  }
   const preset = typeof r.preset === 'string' && r.preset.trim().length > 0
     ? r.preset.trim()
     : undefined;
@@ -2029,7 +2065,7 @@ function parseModelTierConfig(raw: unknown): ModelTierUserConfig | undefined {
   const embedding = parseModelTierFieldOrUndefined(r.embedding);
   const vision = parseModelTierFieldOrUndefined(r.vision);
   const out: ModelTierUserConfig = {
-    ...spreadIfDefined('persona', persona),
+    ...spreadIfDefined('profile', profile),
     ...spreadIfDefined('preset', preset),
     ...spreadIfDefined('voice', voice),
     ...spreadIfDefined('llm', llm),
@@ -3401,7 +3437,9 @@ export interface RoleLlmResolveOptions {
  *  ⛔ 아무 override 도 없으면 ③~⑥ 만 타므로 산출이 종전과 «같다»(§4f 불변식 · NL 진입 무변경). */
 export function resolveRoleLlm(role: ModelRole, opts: RoleLlmResolveOptions = {}): RoleLlmResolution {
   const config = opts.config ?? getUserConfig();
-  const globalProvider = resolveActiveProvider(config);
+  // 전역 provider 는 필요할 때만 푼다 — 역할이 provider 를 명시했으면 전역 provider 가 없어도 해석된다.
+  let activeProvider: LLMProviderName | undefined;
+  const globalProvider = (): LLMProviderName => (activeProvider ??= resolveActiveProvider(config));
   // 명시 인자가 있으면 그것이 진실 — 없을 때만 발사 시점에 정해진 값을 읽는다(둘 다 source='flag').
   const flagSpec = (opts.overrides ?? launchRoleLlmOverrides)?.[role];
   const layers: ReadonlyArray<readonly [RoleLlmSpec | undefined, RoleLlmSource]> = [
@@ -3410,7 +3448,7 @@ export function resolveRoleLlm(role: ModelRole, opts: RoleLlmResolveOptions = {}
   ];
   for (const [spec, source] of layers) {
     if (!spec) continue;
-    const provider = spec.provider ?? globalProvider;
+    const provider = spec.provider ?? globalProvider();
     const pinned = spec.model?.trim();
     let resolution: RoleLlmResolution | undefined;
     if (pinned) resolution = { model: pinned, provider, ...(spec.tier ? { tier: spec.tier } : {}), source };
@@ -3419,7 +3457,7 @@ export function resolveRoleLlm(role: ModelRole, opts: RoleLlmResolveOptions = {}
     if (resolution) { observeRoleLlm(role, resolution, spec); return resolution; }
     // 세 칸이 «다 비었으면» 아래 층으로 흘린다 — 빈 칸은 선언이 아니다.
   }
-  const baseline = resolveRoleLlmBaseline(role, config, globalProvider);
+  const baseline = resolveRoleLlmBaseline(role, config, globalProvider());
   if (opts.overrides || launchRoleLlmOverrides || config.roleLlm?.[role]) observeRoleLlm(role, baseline, flagSpec);
   return baseline;
 }
@@ -3435,21 +3473,66 @@ export function resolveRoleModel(role: ModelRole, config: UserConfig = getUserCo
 }
 
 
+export type StewardLoopMode = 'off' | 'shadow' | 'live';
+
 export type SeatLoopMode = 'off' | 'shadow' | 'on';
 
+export interface PersonaLoopConfig { enabled: boolean }
+
 export interface SeatLoopConfig {
   /** No seat actions by default; shadow observes without execution, on permits the seat loop to act. */
   mode: SeatLoopMode;
+  /** Seat-to-seat and human questions default to shadow even when the checklist loop is on. */
+  questions?: 'shadow' | 'on';
+  seats?: string[];
+  podPool?: string;
+  reportPr?: number;
+  /** Parent routing and age limits for checklist stalls; omitted values use findStalls defaults. */
+  stall?: { parents?: Record<string, string>; redMinutes?: number; blockedMinutes?: number };
+}
+
+export type EventSeat = 'OP' | 'TC' | 'MK' | 'UX';
+export interface EventRoute { source: 'linear' | 'asana' | 'github'; kind: string; seat: EventSeat; loop: 'seat' }
+export interface EventsConfig { mode: 'shadow' | 'on'; routes: EventRoute[]; linearAssignees: Record<string, EventSeat> }
+
+export function parseEventsConfig(input: unknown): EventsConfig {
+  const events = input && typeof input === 'object' && !Array.isArray(input) ? input as Record<string, unknown> : {};
+  const routes: EventRoute[] = [];
+  const linearAssignees: Record<string, EventSeat> = Object.create(null);
+  if (events.linearAssignees && typeof events.linearAssignees === 'object' && !Array.isArray(events.linearAssignees)) {
+    for (const [id, seat] of Object.entries(events.linearAssignees)) {
+      if (id.trim() && (seat === 'OP' || seat === 'TC' || seat === 'MK' || seat === 'UX')) linearAssignees[id] = seat;
+    }
+  }
+  if (Array.isArray(events.routes)) for (const value of events.routes) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) continue;
+    const route = value as Record<string, unknown>;
+    if ((route.source === 'linear' || route.source === 'asana' || route.source === 'github') && typeof route.kind === 'string' && route.kind.trim()
+      && (route.seat === 'OP' || route.seat === 'TC' || route.seat === 'MK' || route.seat === 'UX') && route.loop === 'seat')
+      routes.push({ source: route.source, kind: route.kind, seat: route.seat, loop: route.loop });
+  }
+  return { mode: events.mode === 'on' ? 'on' : 'shadow', routes, linearAssignees };
 }
 
 export interface UserConfig {
+  events?: EventsConfig;
+  /** Explicit HTTPS destination for doctor diagnostics; absent means no upload. */
+  diagnostics?: { uploadUrl?: string };
+  /** Root CLI help audience; absent or invalid means owner. */
+  cli?: { helpRole?: 'owner' | 'contributor' | 'general' };
+  /** Execution-phase HITL answer deadline; absent means 30 minutes. */
+  hitl?: { executionDeadlineMinutes?: number };
+  coo?: { linearProject?: string };
+  decisions?: { linearProjection: { enabled: boolean } };
+  /** Per-seat goal and Pod limits; missing or invalid limits use seat-budget defaults. */
+  org?: { budget?: Record<string, { dailyGoals?: number; concurrentPods?: number }> };
   /** Steward and seat loops are parsed independently. An absent seat remains off. */
-  loops?: { steward?: { mode?: 'observe' | 'act'; linearTeam?: string; roles?: Record<string, { maxConcurrent?: number }>; budget?: number; tracks?: Record<string, string>; alertAfterFailures?: number }; seat?: SeatLoopConfig };
+  loops?: { steward?: { mode?: StewardLoopMode; linearTeam?: string; roles?: Record<string, { maxConcurrent?: number }>; budget?: number; tracks?: Record<string, string>; alertAfterFailures?: number; launch?: 'off' | 'shadow' | 'live'; maxParallel?: number; podPool?: string }; seat?: SeatLoopConfig; persona?: PersonaLoopConfig };
   /** 🔐 Pod 의 Grok API 키 과금은 명시 opt-in 만. 생략·잘못된 값은 false.
    *  budgetGate 와 같은 `harness` 객체다 — 중복 선언이면 뒤 타입이 앞을 지운다. */
-  harness?: { pod?: { grokApiKeyOptIn: boolean }; budgetGate?: HarnessBudgetGateConfig; defaultRepo?: string; substrate?: 'local' | 'pod'; podPool?: string };
-  /** ☸️ Pod 실행 칸 — `pool` = 기존 기본 풀(`컨텍스트[@ssh호스트][:상한]` 쉼표 · 앞이 우선). harness 실행은 인자·ELANOUS_POD_POOL·harness.podPool 다음으로 읽는다. */
-  pod?: { pool?: string; /** 호스트 Git 미러 디렉터리 — Pod Job 에 읽기 전용으로 마운트한다. */ hostMirror?: string; /** 원격 그라운딩 엔드포인트(호스트 nexus · tailnet 주소) — Pod 가 토큰으로 «질의→인용»만 묻는다(P13). */ groundingUrl?: string };
+  harness?: { pod?: { grokApiKeyOptIn: boolean }; budgetGate?: HarnessBudgetGateConfig; defaultRepo?: string; substrate?: 'local' | 'pod'; podPool?: string; worktreeAddTimeoutSec?: number };
+  /** ☸️ Pod 실행 칸 — `pool` = 기존 기본 풀(`컨텍스트[@ssh호스트][:상한][#k3d-레지스트리:포트]` 쉼표 · 앞이 우선). harness 실행은 인자·ELANOUS_POD_POOL·harness.podPool 다음으로 읽는다. */
+  pod?: { pool?: string; /** 호스트 Git 미러 디렉터리 — Pod Job 에 읽기 전용으로 마운트한다. */ hostMirror?: string; /** 원격 그라운딩 엔드포인트(호스트 nexus · tailnet 주소) — Pod 가 토큰으로 «질의→인용»만 묻는다(P13). */ groundingUrl?: string; /** 읽기 전용 Pod lease 권장에 쓰는 계정별 동시 수. */ lease?: { perAccount?: number } };
   skillRouter: SkillRouterConfig;
   llm: LLMConfig;
   skills: SkillsConfig;
@@ -3773,7 +3856,10 @@ function parseRoleLlmConfig(raw: unknown): RoleLlmConfig | undefined {
 
 function defaultConfig(): UserConfig {
   return {
-    loops: { seat: { mode: 'off' } },
+    cli: { helpRole: 'owner' },
+    coo: { linearProject: '외부 행정·큰 일 (COO)' },
+    decisions: { linearProjection: { enabled: false } },
+    loops: { steward: { mode: 'shadow' }, seat: { mode: 'off', questions: 'shadow', seats: ['MK'], podPool: 'pool-node-b@node-b:8' }, persona: { enabled: false } },
     skillRouter: { ...SR_DEFAULTS },
     llm: { ...LLM_DEFAULTS },
     skills: skillsDefaults(),
@@ -3786,6 +3872,7 @@ function defaultConfig(): UserConfig {
     logs: { retention: { ...LOGS_DEFAULTS.retention } },
     shell: { ...SHELL_DEFAULTS },
     chat: {
+      factQuestion: { ...CHAT_DEFAULTS.factQuestion },
       fastPath: CHAT_DEFAULTS.fastPath,
       conciseness: { ...CHAT_CONCISENESS_DEFAULTS },
       toolOutput: { ...CHAT_DEFAULTS.toolOutput },
@@ -3823,7 +3910,7 @@ function defaultConfig(): UserConfig {
       iulForegroundOnStartup: false,
       order: [...VW_ORDER_DEFAULT],
     },
-    acp: { hopCap: { ...ACP_DEFAULTS.hopCap }, scrubBillingEnv: ACP_DEFAULTS.scrubBillingEnv },
+    acp: { hopCap: { ...ACP_DEFAULTS.hopCap }, toolApproval: { timeoutMs: acpApprovalTimeoutEnv() ?? ACP_DEFAULTS.toolApproval.timeoutMs }, scrubBillingEnv: ACP_DEFAULTS.scrubBillingEnv },
     lsp: cloneLspDefaults(),
     plan: { ...PLAN_DEFAULTS },
     goals: { ...GOALS_DEFAULTS },
@@ -4253,18 +4340,43 @@ function parseStewardTracks(input: unknown): Record<string, string> | undefined
 }
 
 function parseSeatLoopsConfig(input: unknown): SeatLoopConfig {
-  if (!input || typeof input !== 'object' || Array.isArray(input)) return { mode: 'off' };
+  const defaults: SeatLoopConfig = { mode: 'off', questions: 'shadow', seats: ['MK'], podPool: 'pool-node-b@node-b:8' };
+  if (!input || typeof input !== 'object' || Array.isArray(input)) return defaults;
   const seat = (input as Record<string, unknown>).seat;
-  if (!seat || typeof seat !== 'object' || Array.isArray(seat)) return { mode: 'off' };
-  const mode = (seat as Record<string, unknown>).mode;
-  return { mode: mode === 'on' || mode === 'shadow' ? mode : 'off' };
+  if (!seat || typeof seat !== 'object' || Array.isArray(seat)) return defaults;
+  const values = seat as Record<string, unknown>;
+  const mode = values.mode;
+  return {
+    mode: mode === 'on' || mode === 'shadow' ? mode : 'off',
+    questions: values.questions === 'on' ? 'on' : 'shadow',
+    seats: Array.isArray(values.seats) && values.seats.length > 0
+      && values.seats.every((value) => typeof value === 'string' && /^(?:MK|OP|TC|UX)$/.test(value))
+      ? [...new Set(values.seats as string[])] : ['MK'],
+    podPool: typeof values.podPool === 'string' && values.podPool.trim() ? values.podPool.trim() : defaults.podPool,
+    ...(typeof values.reportPr === 'number' && Number.isSafeInteger(values.reportPr) && values.reportPr > 0
+      ? { reportPr: values.reportPr } : {}),
+    ...(() => {
+      const stall = values.stall;
+      if (!stall || typeof stall !== 'object' || Array.isArray(stall)) return {};
+      const raw = stall as Record<string, unknown>;
+      const parents = raw.parents && typeof raw.parents === 'object' && !Array.isArray(raw.parents)
+        ? Object.fromEntries(Object.entries(raw.parents).filter(([from, to]) =>
+          /^(?:MK|OP|TC|UX)$/.test(from) && typeof to === 'string' && /^(?:MK|OP|TC|UX)$/.test(to) && from !== to))
+        : undefined;
+      const minutes = (value: unknown): value is number => typeof value === 'number' && Number.isFinite(value) && value >= 0;
+      return { stall: {
+        ...(parents ? { parents } : {}),
+        ...(minutes(raw.redMinutes) ? { redMinutes: raw.redMinutes } : {}),
+        ...(minutes(raw.blockedMinutes) ? { blockedMinutes: raw.blockedMinutes } : {}),
+      } };
+    })(),
+  };
 }
 
 function parseStewardLoopsConfig(input: unknown): UserConfig['loops'] {
-  if (!input || typeof input !== 'object' || Array.isArray(input)) return undefined;
-  const value = (input as Record<string, unknown>).steward;
-  if (!value || typeof value !== 'object' || Array.isArray(value)) return undefined;
-  const s = value as Record<string, unknown>;
+  const loops = input && typeof input === 'object' && !Array.isArray(input) ? input as Record<string, unknown> : {};
+  const value = loops.steward;
+  const s = value && typeof value === 'object' && !Array.isArray(value) ? value as Record<string, unknown> : {};
   const roles: NonNullable<NonNullable<UserConfig['loops']>['steward']>['roles'] = {};
   if (s.roles && typeof s.roles === 'object' && !Array.isArray(s.roles)) {
     for (const [role, entry] of Object.entries(s.roles)) {
@@ -4274,7 +4386,12 @@ function parseStewardLoopsConfig(input: unknown): UserConfig['loops'] {
     }
   }
   return { steward: {
-    mode: s.mode === 'act' ? 'act' : 'observe',
+    mode: s.mode === 'off' || s.mode === 'shadow' || s.mode === 'live' ? s.mode :
+      s.launch === 'off' || s.launch === 'shadow' || s.launch === 'live' ? s.launch : 'shadow',
+    // A valid legacy launch setting remains effective when mode is absent; explicit mode always wins.
+    ...(s.launch === 'off' || s.launch === 'shadow' || s.launch === 'live' ? { launch: s.launch } : {}),
+    ...(typeof s.maxParallel === 'number' && Number.isSafeInteger(s.maxParallel) && s.maxParallel > 0 ? { maxParallel: s.maxParallel } : {}),
+    ...(typeof s.podPool === 'string' && s.podPool.trim() ? { podPool: s.podPool.trim() } : {}),
     ...(typeof s.linearTeam === 'string' && s.linearTeam.trim() ? { linearTeam: s.linearTeam.trim() } : {}),
     ...(Object.keys(roles).length ? { roles } : {}),
     ...(typeof s.budget === 'number' && Number.isFinite(s.budget) && s.budget >= 0 ? { budget: s.budget } : {}),
@@ -4283,6 +4400,11 @@ function parseStewardLoopsConfig(input: unknown): UserConfig['loops'] {
   } };
 }
 
+export function parseCliHelpRole(raw: unknown): NonNullable<UserConfig['cli']>['helpRole'] {
+  const cli = raw && typeof raw === 'object' && !Array.isArray(raw) ? raw as Record<string, unknown> : {};
+  return cli.helpRole === 'general' || cli.helpRole === 'contributor' ? cli.helpRole : 'owner';
+}
+
 export function buildUserConfig(path: string = defaultPath()): UserConfig {
   if (!existsSync(path)) return defaultConfigWithRuntimeProvider();
   let raw: unknown;
@@ -4338,6 +4460,8 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
   const logsRaw = (rawObj.logs ?? {}) as Record<string, unknown>;
   const sh = (rawObj.shell ?? {}) as Record<string, unknown>;
   const chat = (rawObj.chat ?? {}) as Record<string, unknown>;
+  const chatFactQuestion = (chat.factQuestion && typeof chat.factQuestion === 'object' && !Array.isArray(chat.factQuestion))
+    ? chat.factQuestion as Record<string, unknown> : {};
   const chatConciseness = (chat.conciseness ?? {}) as Record<string, unknown>;
   const chatToolOutput = (chat.toolOutput ?? {}) as Record<string, unknown>;
   const chatAutoCompact = (chat.autoCompact ?? {}) as Record<string, unknown>;
@@ -4370,6 +4494,7 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
   const vw = (rawObj.vw ?? {}) as Record<string, unknown>;
   const acp = (rawObj.acp ?? {}) as Record<string, unknown>;
   const acpHopCap = (acp.hopCap ?? {}) as Record<string, unknown>;
+  const acpToolApproval = (acp.toolApproval ?? {}) as Record<string, unknown>;
   const lspRaw = (rawObj.lsp ?? {}) as Record<string, unknown>;
 
   // RFC #2161 (PLAN-config-unification-elanous-root) — `elanous nexus config
@@ -4385,17 +4510,40 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
   const rawNotifications = rawGlobalObj?.notifications ?? rawObj.notifications;
   const autopilotConfig = parseAutopilotConfig(rawObj.autopilot);
   const stewardLoops = parseStewardLoopsConfig(rawObj.loops);
+  const orgRaw = rawObj.org && typeof rawObj.org === 'object' && !Array.isArray(rawObj.org) ? rawObj.org as Record<string, unknown> : {};
+  const budgetRaw = orgRaw.budget && typeof orgRaw.budget === 'object' && !Array.isArray(orgRaw.budget) ? orgRaw.budget as Record<string, unknown> : {};
+  const seatBudgets: NonNullable<NonNullable<UserConfig['org']>['budget']> = Object.create(null);
+  for (const [seat, value] of Object.entries(budgetRaw)) {
+    if (!seat || !value || typeof value !== 'object' || Array.isArray(value)) continue;
+    const row = value as Record<string, unknown>;
+    const dailyGoals = row.dailyGoals;
+    const concurrentPods = row.concurrentPods;
+    seatBudgets[seat] = {
+      ...(typeof dailyGoals === 'number' && Number.isSafeInteger(dailyGoals) && dailyGoals >= 0 ? { dailyGoals } : {}),
+      ...(typeof concurrentPods === 'number' && Number.isSafeInteger(concurrentPods) && concurrentPods >= 0 ? { concurrentPods } : {}),
+    };
+  }
 
   return {
+    ...(Object.keys(seatBudgets).length ? { org: { budget: seatBudgets } } : {}),
     pod: {
       ...(typeof legacyPod.pool === 'string' && legacyPod.pool.trim() ? { pool: legacyPod.pool.trim() } : {}),
       ...(typeof legacyPod.hostMirror === 'string' && legacyPod.hostMirror.trim() ? { hostMirror: legacyPod.hostMirror.trim() } : {}),
       ...(typeof legacyPod.groundingUrl === 'string' ? { groundingUrl: legacyPod.groundingUrl } : {}),
+      lease: { perAccount: (() => {
+        const lease = legacyPod.lease && typeof legacyPod.lease === 'object' && !Array.isArray(legacyPod.lease)
+          ? (legacyPod.lease as Record<string, unknown>) : {};
+        return typeof lease.perAccount === 'number' && Number.isSafeInteger(lease.perAccount) && lease.perAccount > 0
+          ? lease.perAccount : 4;
+      })() },
     },
     harness: {
       pod: { grokApiKeyOptIn: harnessPod.grokApiKeyOptIn === true },
       ...(harness.substrate === 'local' || harness.substrate === 'pod' ? { substrate: harness.substrate } : {}),
       ...(typeof harness.podPool === 'string' && harness.podPool.trim() ? { podPool: harness.podPool.trim() } : {}),
+      ...(typeof harness.worktreeAddTimeoutSec === 'number' && Number.isSafeInteger(harness.worktreeAddTimeoutSec)
+        && harness.worktreeAddTimeoutSec > 0 && harness.worktreeAddTimeoutSec <= 2_147_483
+        ? { worktreeAddTimeoutSec: harness.worktreeAddTimeoutSec } : {}),
       ...(typeof harness.defaultRepo === 'string' && isAbsolute(harness.defaultRepo)
         ? { defaultRepo: harness.defaultRepo } : {}),
       budgetGate: parseHarnessBudgetGate(
@@ -4509,6 +4657,7 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
     skills: {
       activeSet: normalizeSkillSet(sk.activeSet),
       dirs: strArray(sk.dirs, skillsDefaults().dirs),
+      giftEndpoint: str(sk.giftEndpoint) ?? 'https://elanous.ai',
       includeSharedAgentSkills: sk.includeSharedAgentSkills !== false,
       ...(() => { const sources = parsePersistedSkillSources(sk.sources, sk.connected); return sources ? { sources } : {}; })(),
       allow: strArray(sk.allow, []),
@@ -4533,6 +4682,7 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
       ...(tg.poller === 'standalone' || tg.poller === 'nexus' ? { poller: tg.poller } : {}),
       ...(normalizeKindRoles(tg.kindRoles) ? { kindRoles: normalizeKindRoles(tg.kindRoles)! } : {}),
       ...(str(tg.fieldDefaultEvent) ? { fieldDefaultEvent: str(tg.fieldDefaultEvent)! } : {}),
+      ...(tg.fieldReelMode === 'instant' || tg.fieldReelMode === 'standard' ? { fieldReelMode: tg.fieldReelMode } : {}),
     },
     discord: {
       enabled: dc.enabled === true,
@@ -4593,6 +4743,7 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
     },
     onboarding: {
       ...(typeof ob2.webFirst === 'boolean' ? { webFirst: ob2.webFirst } : {}),
+      ...(typeof ob2.ready === 'boolean' ? { ready: ob2.ready } : {}),
       completed: ob2.completed === true,
       completedAt: str(ob2.completedAt),
       version: typeof ob2.version === 'number' ? ob2.version : 0,
@@ -4640,6 +4791,11 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
     },
     ...((): { errorReports?: ErrorReportsConfig } => { const er = parseErrorReportsConfig(rawObj.errorReports); return er ? { errorReports: er } : {}; })(),
     chat: {
+      factQuestion: {
+        maxToolTurns: typeof chatFactQuestion.maxToolTurns === 'number'
+          && Number.isSafeInteger(chatFactQuestion.maxToolTurns) && chatFactQuestion.maxToolTurns > 0
+          ? chatFactQuestion.maxToolTurns : CHAT_DEFAULTS.factQuestion.maxToolTurns,
+      },
       fastPath: chat.fastPath === false || chat.fastPath === 'false' ? false : CHAT_DEFAULTS.fastPath,
       conciseness: {
         enabled: chatConciseness.enabled === false ? false : CHAT_CONCISENESS_DEFAULTS.enabled,
@@ -4999,6 +5155,10 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
     })(),
     acp: {
       hopCap: parseHopCap(acpHopCap),
+      toolApproval: {
+        timeoutMs: acpApprovalTimeoutMs(acpToolApproval.timeoutMs)
+          ?? acpApprovalTimeoutEnv() ?? ACP_DEFAULTS.toolApproval.timeoutMs,
+      },
       ...(typeof acp.reviewBackend === 'string' && acp.reviewBackend.trim()
         ? { reviewBackend: acp.reviewBackend.trim() }
         : {}),
@@ -5019,7 +5179,17 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
     goals: parseGoalsConfig(rawObj.goals),
     registry: parseRegistryConfig(rawObj.registry),
     tools: parseToolsConfig(rawObj.tools),
-    loops: { ...(stewardLoops ?? {}), seat: parseSeatLoopsConfig(rawObj.loops) },
+    ...(rawObj.hitl && typeof rawObj.hitl === 'object' && !Array.isArray(rawObj.hitl)
+      && typeof (rawObj.hitl as Record<string, unknown>).executionDeadlineMinutes === 'number'
+      ? { hitl: { executionDeadlineMinutes: (rawObj.hitl as { executionDeadlineMinutes: number }).executionDeadlineMinutes } }
+      : {}),
+    cli: { helpRole: parseCliHelpRole(rawObj.cli) },
+    coo: { linearProject: typeof (rawObj.coo as { linearProject?: unknown } | undefined)?.linearProject === 'string' && (rawObj.coo as { linearProject: string }).linearProject.trim()
+      ? (rawObj.coo as { linearProject: string }).linearProject.trim() : '외부 행정·큰 일 (COO)' },
+    decisions: { linearProjection: { enabled: ((rawObj.decisions as { linearProjection?: { enabled?: unknown } } | undefined)?.linearProjection?.enabled === true) } },
+    loops: { ...(stewardLoops ?? {}), seat: parseSeatLoopsConfig(rawObj.loops),
+      persona: { enabled: (rawObj.loops as { persona?: { enabled?: unknown } } | undefined)?.persona?.enabled === true } },
+    events: parseEventsConfig(rawObj.events),
     // M1-1: sparse — undefined when the user hasn't set anything, so
     // resolvers fall through to zero-config defaults.
     ...spreadIfDefined('modelTier', parseModelTierConfig(rawObj.modelTier)),
@@ -5028,6 +5198,7 @@ export function buildUserConfig(path: string = defaultPath()): UserConfig {
     ...spreadIfDefined('taste', parseTasteConfig(rawObj.taste)),
     ...spreadIfDefined('webSearch', parseWebSearchConfig(rawObj.webSearch)),
     ...spreadIfDefined('design', parseDesignConfig(rawObj.design)),
+    diagnostics: parseDiagnosticsConfig(rawObj.diagnostics),
     ...spreadIfDefined('budget', parseBudgetConfig(rawObj.budget)),
     ...spreadIfDefined('smartDefaults', parseSmartDefaultsConfig(rawObj.smartDefaults)),
     ...spreadIfDefined('roleModels', parseRoleModelConfig(rawObj.roleModels)),
@@ -5590,6 +5761,7 @@ export function saveUserConfig(
   delete rawRest.budget;
   delete rawRest.smartDefaults;
   delete rawRest.grounding;
+  delete rawRest.diagnostics;
   const rawHarness = rawRest.harness && typeof rawRest.harness === 'object' && !Array.isArray(rawRest.harness)
     ? rawRest.harness as Record<string, unknown> : {};
   delete rawRest.harness;
@@ -5597,6 +5769,8 @@ export function saveUserConfig(
     ? rawRest.autopilot as Record<string, unknown> : {};
   const rawLoops = rawRest.loops && typeof rawRest.loops === 'object' && !Array.isArray(rawRest.loops)
     ? rawRest.loops as Record<string, unknown> : {};
+  const rawSteward = rawLoops.steward && typeof rawLoops.steward === 'object' && !Array.isArray(rawLoops.steward)
+    ? rawLoops.steward as Record<string, unknown> : {};
   if (cfg.loops) delete rawRest.loops;
   if (cfg.pod?.hostMirror) {
     const rawPod = rawRest.pod && typeof rawRest.pod === 'object' && !Array.isArray(rawRest.pod)
@@ -5616,7 +5790,14 @@ export function saveUserConfig(
     ...rawRest,
     ...(cfg.loops ? { loops: {
       ...rawLoops,
-      ...(cfg.loops.seat ? { seat: { mode: cfg.loops.seat.mode } } : {}),
+      ...(cfg.loops.steward ? { steward: { ...rawSteward, mode: cfg.loops.steward.mode ?? cfg.loops.steward.launch ?? 'shadow' } } : {}),
+      ...(cfg.loops.seat ? { seat: {
+        mode: cfg.loops.seat.mode,
+        questions: cfg.loops.seat.questions ?? 'shadow',
+        seats: cfg.loops.seat.seats ?? ['MK'],
+        podPool: cfg.loops.seat.podPool ?? 'pool-node-b@node-b:8',
+        ...(cfg.loops.seat.reportPr === undefined ? {} : { reportPr: cfg.loops.seat.reportPr }),
+      } } : {}),
     } } : {}),
     ...(cfg.autopilot ? { autopilot: {
       ...rawAutopilot,
@@ -5683,6 +5864,7 @@ export function saveUserConfig(
     skills: stripUndef({
       activeSet: cfg.skills.activeSet,
       dirs: [...cfg.skills.dirs],
+      giftEndpoint: cfg.skills.giftEndpoint === 'https://elanous.ai' ? undefined : cfg.skills.giftEndpoint,
       // EN5 — only connected roots are persisted (preset/shared/package are derived). The dev-only `connected` key is not written back.
       sources: cfg.skills.sources && cfg.skills.sources.some((source) => source.kind === 'connected')
         ? cfg.skills.sources.filter((source) => source.kind === 'connected').map(({ id, path, enabled }) => ({ id, path, enabled }))
@@ -5739,6 +5921,7 @@ export function saveUserConfig(
       //   「직렬화 드롭」으로 조용히 사라졌다 — 운영 전환 스위치를 켤 방법이 없었다(07-22 botUsername 과 같은 모양).
       poller: cfg.telegram.poller,
       fieldDefaultEvent: cfg.telegram.fieldDefaultEvent,
+      fieldReelMode: cfg.telegram.fieldReelMode,
     }),
     discord: stripUndef({
       enabled: cfg.discord.enabled,
@@ -5773,6 +5956,7 @@ export function saveUserConfig(
     }),
     onboarding: stripUndef({
       webFirst: cfg.onboarding.webFirst,
+      ready: cfg.onboarding.ready,
       completed: cfg.onboarding.completed,
       completedAt: cfg.onboarding.completedAt,
       version: cfg.onboarding.version,
@@ -5855,6 +6039,10 @@ export function saveUserConfig(
         : undefined,
       slashMaxTurns: cfg.acp.slashMaxTurns,
       editApproval: cfg.acp.editApproval ? true : undefined,
+      toolApproval: acpApprovalTimeoutMs(
+        (cfg.raw?.acp as { toolApproval?: { timeoutMs?: unknown } } | undefined)?.toolApproval?.timeoutMs,
+      ) !== undefined || cfg.acp.toolApproval.timeoutMs !== (acpApprovalTimeoutEnv() ?? ACP_DEFAULTS.toolApproval.timeoutMs)
+        ? { timeoutMs: cfg.acp.toolApproval.timeoutMs } : undefined,
       scrubBillingEnv: cfg.acp.scrubBillingEnv === false ? false : undefined,
     }),
     lsp: stripUndef({
@@ -5933,12 +6121,13 @@ export function saveUserConfig(
     ...(cfg.tabs && Object.keys(cfg.tabs).length > 0 ? { tabs: cfg.tabs } : {}),
     // M1-2b: sparse — emit only when explicitly set. Keeps Path-A-only
     // users' file clean (no empty modelTier:{} blobs).
-    ...(cfg.modelTier ? { modelTier: cfg.modelTier } : {}),
+    ...(cfg.modelTier ? { modelTier: parseModelTierConfig(cfg.modelTier) } : {}),
     ...(cfg.sessionFabric ? { sessionFabric: cfg.sessionFabric } : {}),
     ...(cfg.nextFluent ? { nextFluent: cfg.nextFluent } : {}),
     ...(cfg.taste ? { taste: cfg.taste } : {}),
     ...(cfg.webSearch ? { webSearch: cfg.webSearch } : {}),
     ...(cfg.design ? { design: cfg.design } : {}),
+    ...(cfg.diagnostics?.uploadUrl ? { diagnostics: parseDiagnosticsConfig(cfg.diagnostics) } : {}),
     ...(cfg.budget ? { budget: cfg.budget } : {}),
     ...(cfg.smartDefaults ? { smartDefaults: cfg.smartDefaults } : {}),
     ...(cfg.grounding && cfg.grounding.sources.length > 0

package/src/version/packed-revision.json

@@ -1 +1 @@
-{"commit":"8f3512a904cff53bb1595fffc091f7443a29c2c2"}
+{"commit":"e61a9846510a7f6ac0a0f223d8e4c8b384685df8"}

package/src/web-push/notify-exec-request.ts

@@ -0,0 +1,32 @@
+import { debug } from '../debug/log.js';
+import type { ExecRequest } from '../exec-requests/store.js';
+import { sendPushToAll } from './sender.js';
+import { listSubscriptions } from './subscriptions.js';
+
+export async function notifyExecRequestTransition(opts: {
+  id: string;
+  text: string;
+  from: ExecRequest['status'];
+  to: ExecRequest['status'];
+  summary?: string;
+  pendingApprovals: number;
+}): Promise<void> {
+  const { id, text, from, to, summary, pendingApprovals } = opts;
+  const kind = from !== to && (to === 'done' || to === 'failed')
+    ? to : pendingApprovals > 0 && from === to ? 'approval' : null;
+  if (!kind) return;
+  const subscribers = listSubscriptions().length;
+  const details = { id, kind, subscribers, textLength: text.length };
+  if (!subscribers) {
+    debug.log('webpush.exec', 'skipped', details);
+    return;
+  }
+  const title = `${kind === 'done' ? '맡긴 일 완료' : kind === 'failed' ? '맡긴 일 실패' : '게시 승인 대기'} · ${text.slice(0, 40)}`;
+  const body = kind === 'approval' ? '승인하거나 보류해 주세요' : (summary ?? '').split(/\r?\n/, 1)[0]!.slice(0, 80);
+  try {
+    await sendPushToAll({ title, body, url: `/exec?id=${encodeURIComponent(id)}`, tag: `exec-${id}` });
+    debug.log('webpush.exec', 'sent', details);
+  } catch {
+    debug.log('webpush.exec', 'skipped', details);
+  }
+}

package/src/web-search/grok.ts

@@ -19,6 +19,7 @@
 
 import { getGrokApiKey } from '../config.js';
 import { grokAgentSearch, GROK_SEARCH_MODEL } from '../grok/agent-search.js';
+import { wantsXSearch } from './x-intent.js';
 import type { WebSearchHit, WebSearchProvider, WebSearchResult } from './provider.js';
 
 const DEFAULT_LIMIT = 5;
@@ -52,10 +53,15 @@ export function buildGrokWebSearchProvider(): WebSearchProvider {
 
       if (!r.ok) throw new Error(r.error ?? 'grok search failed');
 
-      const hits: WebSearchHit[] = r.citations.slice(0, limit).map(c => ({
+      const xSourceUrls = new Set(r.xSearchSources ?? []);
+      const citations = wantsXSearch(q.query)
+        ? [...r.citations.filter(c => xSourceUrls.has(c.url)), ...r.citations.filter(c => !xSourceUrls.has(c.url))]
+        : r.citations;
+      const hits: WebSearchHit[] = citations.slice(0, limit).map(c => ({
         url: c.url,
         title: c.title ?? c.url,
         snippet: '',
+        ...(xSourceUrls.has(c.url) ? { xSearchSource: true } : {}),
       }));
 
       const note = r.text.length > 0 ? r.text.slice(0, 1500) : undefined;