elanous 0.2.38 → 0.2.40

package/src/ux-sim/fake-land-queue.ts

@@ -0,0 +1,88 @@
+/** In-process LAND-QUEUE simulator. Scheduling and verdict logic use the production train functions;
+ * only git's merge-tree/commit-tree and the remote gate are replaced. */
+import { integrateTrain, runTrain, type TrainCandidate, type TrainGit, type TrainVerdict } from '../self-implement/merge-train.js';
+
+export type FakeLandQueueItem = TrainCandidate & { files: string[] };
+export type FakeLandQueueInput = {
+  readonly queue: readonly FakeLandQueueItem[];
+  readonly load: number;
+  readonly previousSlots?: 2 | 3;
+  readonly cutWindowOpen?: boolean;
+  readonly expedite?: number;
+  readonly eject?: readonly number[];
+  readonly conflicting?: readonly number[];
+  readonly gates?: readonly ('pass' | 'fail' | 'unmeasured')[];
+};
+export type FakeLandQueueResult = {
+  readonly slots: 2 | 3;
+  readonly departed: readonly (readonly number[])[];
+  readonly waiting: readonly number[];
+  readonly ejected: readonly number[];
+  readonly stoppedAtCut: boolean;
+  readonly verdicts: readonly TrainVerdict[];
+};
+
+/** Hysteresis prevents slot oscillation: below 60% expand; at/above 80% contract. */
+export function fakeLandSlots(load: number, previous: 2 | 3 = 2): 2 | 3 {
+  if (!Number.isFinite(load) || load < 0 || load > 100) throw new Error('load must be between 0 and 100');
+  if (load < 60) return 3;
+  if (load >= 80) return 2;
+  return previous;
+}
+
+function syntheticGit(conflicting: ReadonlySet<number>, prByHead: ReadonlyMap<string, number>): TrainGit {
+  let commit = 0;
+  const sha = (n: number) => n.toString(16).padStart(40, '0');
+  return (args) => {
+    const command = args.find((arg) => arg === 'merge-tree' || arg === 'commit-tree');
+    if (command === 'merge-tree') {
+      const pr = prByHead.get(args.at(-1) ?? '');
+      return pr !== undefined && conflicting.has(pr)
+        ? { status: 1, stdout: `${sha(900 + (pr ?? 0))}\0src/conflict.ts\0\0`, stderr: '' }
+        : { status: 0, stdout: `${sha(900 + (pr ?? 0))}\0`, stderr: '' };
+    }
+    if (command === 'commit-tree') return { status: 0, stdout: sha(++commit), stderr: '' };
+    return { status: 2, stdout: '', stderr: `unsupported fake git command: ${args[0]}` };
+  };
+}
+
+/** One dry-run tick. Cut-window closure and ejection never call the train; no ref is updated. */
+export async function simulateFakeLandQueue(input: FakeLandQueueInput): Promise<FakeLandQueueResult> {
+  const ejected = new Set(input.eject ?? []);
+  const queue = input.queue.filter((item) => !ejected.has(item.number)).map((item) => ({ ...item, files: [...item.files] }));
+  if (input.expedite !== undefined) {
+    const at = queue.findIndex((item) => item.number === input.expedite);
+    if (at >= 0) queue.unshift(...queue.splice(at, 1));
+  }
+  const slots = fakeLandSlots(input.load, input.previousSlots);
+  if (input.cutWindowOpen === false) return {
+    slots, departed: [], waiting: queue.map((item) => item.number), ejected: [...ejected], stoppedAtCut: true, verdicts: [],
+  };
+
+  const departed: number[][] = [];
+  const waiting: number[] = [];
+  const verdicts: TrainVerdict[] = [];
+  const gates = [...(input.gates ?? [])];
+  const git = syntheticGit(new Set(input.conflicting ?? []), new Map(queue.map((item) => [item.head, item.number])));
+  while (queue.length) {
+    const batch: FakeLandQueueItem[] = [];
+    const occupied = new Set<string>();
+    for (let i = 0; i < queue.length && batch.length < slots;) {
+      const candidate = queue[i]!;
+      if (candidate.files.some((file) => occupied.has(file))) { waiting.push(candidate.number); queue.splice(i, 1); continue; }
+      batch.push(candidate); queue.splice(i, 1); candidate.files.forEach((file) => occupied.add(file));
+    }
+    if (!batch.length) break;
+    departed.push(batch.map((item) => item.number));
+    const train = await runTrain(batch, {
+      integrate: (candidates) => {
+        const integrated = integrateTrain('/fake-land-queue', '1'.repeat(40), candidates, git);
+        return integrated;
+      },
+      gate: async () => gates.shift() ?? 'pass',
+      observe: () => {},
+    });
+    verdicts.push(...train.verdicts);
+  }
+  return { slots, departed, waiting: [...waiting, ...queue.map((item) => item.number)], ejected: [...ejected], stoppedAtCut: false, verdicts };
+}

package/src/ux-sim/gate-shard-host-reroute.ts

@@ -0,0 +1,82 @@
+/** S1 device for a release gate's shard dispatch. It replaces host execution, not planning or reduction. */
+import { createHash } from 'node:crypto';
+import {
+  planGateShardDispatch,
+  reduceGateShardReceipts,
+  type GateShardAction,
+  type GateShardDispatchInput,
+  type GateShardReceipt,
+  type GateShardReduction,
+} from '../../scripts/release-loop/gate-shard-dispatch.js';
+
+export interface FakeGateShardHostResult {
+  shardId: string;
+  host: string;
+  status: 'complete' | 'unmeasured';
+  failureIds: string[];
+  errorIds: string[];
+  envKey?: string;
+}
+
+export interface GateShardRerouteScenario {
+  input: GateShardDispatchInput;
+  /** A result is supplied only for an expected host call. An omitted result remains unmeasured. */
+  hostResults: readonly FakeGateShardHostResult[];
+}
+
+export interface FakeGateShardHostCall {
+  shardId: string;
+  host: string;
+  files: string[];
+  head40: string;
+  base40: string;
+}
+
+export interface GateShardRerouteObservation {
+  actions: GateShardAction[];
+  hostCalls: FakeGateShardHostCall[];
+  /** One selected receipt per reused or executed shard; no predecessor fills a failed remeasurement. */
+  receipts: GateShardReceipt[];
+  reduction: GateShardReduction;
+}
+
+/** Stage inputs without making dispatch decisions; the production planner receives them unchanged. */
+export function gateShardRerouteScenario(
+  input: GateShardDispatchInput,
+  hostResults: readonly FakeGateShardHostResult[],
+): GateShardRerouteScenario {
+  return { input, hostResults };
+}
+
+/**
+ * Inject deterministic fake host results into the production planner and reducer. This never starts a gate,
+ * Pod, SSH command, or host sweep. The fake evidence digest is a scenario marker, not an artifact verification;
+ * the caller of the production planner still owns verification before reuse.
+ */
+export function simGateShardHostReroute(scenario: GateShardRerouteScenario): GateShardRerouteObservation {
+  const actions = planGateShardDispatch(scenario.input);
+  const hostCalls: FakeGateShardHostCall[] = [];
+  const receipts: GateShardReceipt[] = [];
+  for (const action of actions) {
+    if (action.kind === 'reuse') {
+      receipts.push(action.receipt);
+      continue;
+    }
+    if (action.kind === 'unmeasured') continue;
+    hostCalls.push({ shardId: action.shardId, host: action.host, files: [...action.files],
+      head40: scenario.input.head40, base40: scenario.input.base40 });
+    const result = scenario.hostResults.find((row) => row.shardId === action.shardId && row.host === action.host);
+    if (!result) continue;
+    const evidence = JSON.stringify({ head40: scenario.input.head40, base40: scenario.input.base40,
+      shardId: action.shardId, host: action.host, files: action.files, result });
+    receipts.push({ id: action.shardId, files: [...action.files], head40: scenario.input.head40, base40: scenario.input.base40,
+      host: action.host, envKey: result.envKey ?? `sim:${action.host}`, status: result.status,
+      failureIds: [...result.failureIds], errorIds: [...result.errorIds],
+      evidencePath: `sim/${action.shardId}-${action.host}.json`,
+      evidenceSha256: createHash('sha256').update(evidence).digest('hex'),
+      measuredAt: '2026-10-27T00:00:00.000Z', attempt: (action.replacing?.attempt ?? 0) + 1 });
+  }
+  const reduction = reduceGateShardReceipts({ head40: scenario.input.head40, base40: scenario.input.base40,
+    shards: scenario.input.shards, receipts });
+  return { actions, hostCalls, receipts, reduction };
+}

package/src/ux-sim/goal-interim-trace.ts

@@ -0,0 +1,24 @@
+/** One injected input trace shared by classic and next goal-interim renderer evidence. */
+export const GOAL_INTERIM_USER_INPUT = '영상 만들어줘';
+export const GOAL_INTERIM_NOT_DONE_REPLY = '[fake-llm] {step}단계 렌더를 진행했습니다.\n남은 작업 {step}단계: 완료 영상 경로는 아직 보고할 수 없습니다 — 아직 못 했습니다.';
+export const GOAL_INTERIM_TOOL_CALL = JSON.stringify({ when: GOAL_INTERIM_USER_INPUT, name: 'ScheduleWakeup', args: { delaySeconds: 3600, reason: '렌더 점검' } });
+
+export const GOAL_INTERIM_RENDER_TRACE = {
+  userInput: GOAL_INTERIM_USER_INPUT,
+  interimReplies: [1, 2].map((step) => GOAL_INTERIM_NOT_DONE_REPLY.replaceAll('{step}', String(step))),
+  finalReply: '완료 영상: /tmp/final.mp4',
+  toolCalls: ['ScheduleWakeup', 'ScheduleWakeup progress', 'ScheduleWakeup progress'],
+} as const;
+
+export function goalInterimRenderMessages(ts: string) {
+  const trace = GOAL_INTERIM_RENDER_TRACE;
+  return [
+    { role: 'user' as const, content: trace.userInput, ts },
+    { role: 'tool' as const, content: '', toolName: trace.toolCalls[0], toolResult: '예약됨', ts },
+    { role: 'tool' as const, content: '', toolName: trace.toolCalls[1], toolResult: '진행', ts },
+    { role: 'assistant' as const, goalInterim: true, content: trace.interimReplies[0], ts },
+    { role: 'tool' as const, content: '', toolName: trace.toolCalls[2], toolResult: '진행', ts },
+    { role: 'assistant' as const, goalInterim: true, content: trace.interimReplies[1], ts },
+    { role: 'assistant' as const, content: trace.finalReply, ts },
+  ];
+}

package/src/ux-sim/next-tui-seat-scenarios.ts

@@ -7,6 +7,8 @@ import { chmodSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from '
 import { join, resolve } from 'node:path';
 import { appendMessage, createSession, getActiveSessionId, loadSession, setActiveSessionId } from '../session/index.js';
 import { mockSeatPtySequence, type SeatPtySequenceEvidence, type SeatPtyStep } from './mock-seat-pty-sequence.js';
+import { GOAL_INTERIM_NOT_DONE_REPLY, GOAL_INTERIM_TOOL_CALL } from './goal-interim-trace.js';
+export { GOAL_INTERIM_NOT_DONE_REPLY, GOAL_INTERIM_TOOL_CALL } from './goal-interim-trace.js';
 import { pasteFoldToken } from '../chat/paste-fold.js';
 import { DEFAULT_GOAL_CONTINUE_CAP } from '../dashboard/input/goal-continue.js';
 import {
@@ -471,29 +473,24 @@ async function runNextProactiveContinueScenario(spec: NextTuiScenarioSpec, root:
 /** TUI-NEXT-QUEUE-AND-WAKE ② — a turn calls ScheduleWakeup(60s); a slow human turn covers the due time
  *  (NotIdle → deferred a minute), then the wakeup opens one internal turn on its own. */
 async function runNextWakeupScenario(spec: NextTuiScenarioSpec, root: string, base: ScenarioBase, reply: string, done: Done): Promise<NextTuiScenarioResult> {
-  let scheduledAt = 0;
   const banner = '↻ 자동 재개(scheduled): 점검';
   const steps: SeatPtyStep[] = [
     {
       label: 'scheduled',
       text: '60초 뒤 예약해줘',
-      until: (s) => {
-        const ok = done(1)(s) && s.includes('⏰ 예약 깨움');
-        if (ok && scheduledAt === 0) scheduledAt = Date.now();
-        return ok;
-      },
+      until: (s) => done(1)(s) && s.includes('⏰ 예약 깨움'),
     },
-    { label: 'before due', until: () => scheduledAt > 0 && Date.now() >= scheduledAt + 45_000, timeoutMs: 60_000 },
-    { label: 'busy over the due time', text: '긴 작업 하나', until: (s) => s.includes('응답 중') },
-    { label: 'long turn done', until: done(2, '긴 작업 하나'), timeoutMs: 60_000 },
-    { label: 'woke', until: (s) => s.includes(banner) && done(3)(s), timeoutMs: 150_000 },
+    { label: 'busy over the due time', text: '긴 작업 하나', until: (s) => s.includes('응답 중'), timeoutMs: 30_000 },
+    { label: 'long turn done', until: done(2, '긴 작업 하나'), timeoutMs: 30_000 },
+    { label: 'woke after one deferral', until: (s) => s.includes(banner) && done(3)(s), timeoutMs: 30_000 },
   ];
   const run = await mockSeatPtySequence({
     ...base,
     env: {
       ...base.env,
+      ELANOUS_TEST_FAST_WAKEUP_CLOCK: '1',
       [TEST_FAKE_LLM_TOOL_CALL_ENV]: JSON.stringify({ when: '예약해줘', name: 'ScheduleWakeup', args: { delaySeconds: 60, reason: '점검' } }),
-      [TEST_FAKE_LLM_DELAY_MS_ENV]: '25000',
+      [TEST_FAKE_LLM_DELAY_MS_ENV]: '5000',
       [TEST_FAKE_LLM_DELAY_WHEN_ENV]: '긴 작업',
     },
     steps,
@@ -737,13 +734,11 @@ async function runNextGoalContinueScenario(spec: NextTuiScenarioSpec, root: stri
 
 /** TUI-GOAL-INTERIM-QUIET — every step ends with «아직 못 했다» (a different reply per turn via `{step}`, so the
  *  same-reply stop does not end it early). The fake reply's honesty sentence, counted on screen. */
-export const GOAL_INTERIM_NOT_DONE_REPLY = '[fake-llm] {step}단계 렌더를 진행했습니다.\n남은 작업 {step}단계: 완료 영상 경로는 아직 보고할 수 없습니다 — 아직 못 했습니다.';
 const GOAL_INTERIM_STEP_MARK = '단계 렌더를 진행했습니다';
 const GOAL_INTERIM_NOT_DONE_MARK = '아직 못 했습니다';
 /** An internal turn drawn as if a person typed it (classic «❯ …» · next «나: …»). */
 /** The first (human) turn also calls one tool, so a folded reply must leave that turn's tool lines on screen.
  *  ScheduleWakeup an hour out: a real registered tool with no approval prompt that never fires inside the run. */
-export const GOAL_INTERIM_TOOL_CALL = JSON.stringify({ when: '영상 만들어줘', name: 'ScheduleWakeup', args: { delaySeconds: 3600, reason: '렌더 점검' } });
 export const INTERNAL_TURN_USER_HEADER = /(?:나:|❯)\s*\[(?:골 이어가기|자동 재개)\]/u;
 
 export interface GoalInterimScreenCounts { steps: number; notDone: number; folded: number; userHeader: boolean }

package/src/ux-sim/task-orchestrator-surfaces-self-implement-pod-device.ts

@@ -31,6 +31,8 @@ export interface PodDeviceEvent {
   jobConditionReason?: string;
   jobConditionMessage?: string;
   activeDeadlineSeconds?: number;
+  jobCreatedAt?: string;
+  jobCompletedAt?: string;
   podPhase?: string;
   podCreatedAt?: string;
   containerReason?: string | null;
@@ -86,6 +88,7 @@ export const POD_DEVICE_EVENTS: readonly PodDeviceEvent[] = [
     jobConditionReason: 'DeadlineExceeded',
     jobConditionMessage: 'Job was active longer than specified deadline',
     activeDeadlineSeconds: 3600,
+    jobCreatedAt: '2026-10-22T12:55:10Z',
     podPhase: 'Failed',
     containerReason: 'Error',
     containerExitCode: 143,
@@ -114,7 +117,7 @@ const ok = (stdout: string) => ({ status: 0, stdout, stderr: '' });
 
 function answerJob(event: PodDeviceEvent, jsonpath: string): { status: number; stdout: string; stderr: string } {
   if (jsonpath === POD_TERMINATION_JOB_JSONPATH) {
-    return ok(`${event.jobConditionReason ?? ''}\t${event.activeDeadlineSeconds ?? ''}\t${event.jobUid ?? ''}`);
+    return ok(`${event.jobConditionReason ?? ''}\t${event.activeDeadlineSeconds ?? ''}\t${event.jobUid ?? ''}\t${event.jobCreatedAt ?? ''}\t${event.jobCompletedAt ?? ''}`);
   }
   if (jsonpath.includes('.spec.activeDeadlineSeconds')) return ok(event.activeDeadlineSeconds != null ? String(event.activeDeadlineSeconds) : '');
   if (jsonpath.includes('conditions[?(@.type=="Failed")].reason')) return ok(event.jobConditionReason ?? '');

package/src/version/packed-revision.json

@@ -1 +1 @@
-{"commit":"a78f3f66a3db5de0bce1342c99d3c4abc0a96f45"}
+{"commit":"0a06cc36728ac7d147fe4988e2fd43d5f5eb8ec8"}

package/src/video-pipeline/recipes/explainer.ts

@@ -1,13 +1,16 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, lstatSync, mkdirSync, readFileSync, realpathSync } from 'node:fs';
 import { dirname, isAbsolute, relative, resolve, sep } from 'node:path';
+import { parse as parseYaml } from 'yaml';
 import type { RunResult } from './ffmpeg.js';
 import { UNOBSERVED, type Recipe, type RecipeCtx, type RecipeResult } from './types.js';
+import { parseGraphTemplateYaml, type GraphParseIssue, type GraphTemplateSpec } from '../../self-implement/graph-yaml.js';
 
 type CommandRunner = (bin: string, args: readonly string[], timeoutMs: number, cwd?: string) => RunResult;
-interface ExplainerDeps { readonly run?: CommandRunner; readonly engineDir?: string }
+interface ExplainerDeps { readonly run?: CommandRunner; readonly engineDir?: string; readonly declarationPath?: string }
 
 const ENGINE = resolve(import.meta.dir, '../../../skills/explainer-video/engine');
+const LINE_DECLARATION = resolve(import.meta.dir, '../../../graphs/video/explainer-line.yaml');
 const ENGINE_MS = 600_000;
 const QC_MS = 180_000;
 
@@ -199,7 +202,19 @@ export function explainerQc(deps: ExplainerDeps = {}): Recipe {
       const peak = Number(j.input_tp);
       if (j.input_i == null || j.input_tp == null || !Number.isFinite(loudness) || !Number.isFinite(peak)) throw new Error('통합 음량/트루 피크가 비수다');
       const produced = { loudness_lufs: loudness, true_peak_db: peak };
-      const outcome = loudness >= -16 && loudness <= -12 && peak <= -1 ? 'pass' : 'loudness';
+      let outcome = loudness >= -16 && loudness <= -12 && peak <= -1 ? 'pass' : 'loudness';
+      // ⭐ «3분 영상» — qc 생산 경로에서 loadExplainerLine 으로 선언의 target_seconds(180)를 소비한다.
+      // 내레이션이 목표 총 길이를 넘으면 too-long → build(재구성). narration_seconds 를 못 쟀으면 건너뛴다(기존 동작 보존).
+      const narrationSeconds = ctx.state.narration_seconds;
+      if (outcome === 'pass' && typeof narrationSeconds === 'number' && Number.isFinite(narrationSeconds)) {
+        const plan = loadExplainerLine(deps.declarationPath);
+        if (plan.targetSeconds !== null && narrationSeconds > plan.targetSeconds) {
+          return finish(ctx, 'qc', {
+            outcome: 'too-long', produced,
+            note: `${Math.round(narrationSeconds)}초 내레이션이 선언 목표 ${plan.targetSeconds}초를 넘는다 — build 로 재구성한다`,
+          });
+        }
+      }
       return finish(ctx, 'qc', { outcome, produced, note: `${loudness} LUFS · ${peak} dBTP` });
     } catch (e) { return finish(ctx, 'qc', { outcome: UNOBSERVED, note: `loudnorm 결과를 못 읽었다: ${String(e)}` }); }
   };
@@ -211,3 +226,40 @@ export const EXPLAINER: Readonly<Record<string, Recipe>> = {
   'explainer-build': explainerBuild(),
   'explainer-qc': explainerQc(),
 };
+
+/** ⭐ «3분 영상» — explainer-line 선언이 이 라인의 영상 계획에 건 목표 총 길이(초). */
+export interface ExplainerLinePlan {
+  /** 지속 필드 `target_seconds`(초). 선언에 없으면 이 라인은 목표 총 길이를 정하지 않았다(null). */
+  readonly targetSeconds: number | null;
+  /** 생산 컴파일러(parseGraphTemplateYaml)가 낸 정규형 — 나머지 선언(노드·계약·엣지)은 이것으로 관측한다. */
+  readonly template: GraphTemplateSpec | null;
+  readonly errors: readonly GraphParseIssue[];
+}
+
+/** ⭐ 생산 로드 — 라인 저작본(graphs/video/explainer-line.yaml)을 읽어 영상 계획을 낸다.
+ *  컴파일러는 top-level 계획 상수를 정규형에 싣지 않는다 — 지속 필드 `target_seconds` 는 로드에서 직접 읽는다.
+ *  ⛔ 던지지 않는다(graph-yaml 계약) · 뿌리는 인자로 덮는다(ENGINE 과 같은 관습). */
+export function loadExplainerLine(declarationPath = LINE_DECLARATION): ExplainerLinePlan {
+  let source: string;
+  try {
+    source = readFileSync(declarationPath, 'utf8');
+  } catch (error) {
+    return {
+      targetSeconds: null,
+      template: null,
+      errors: [{ path: declarationPath, message: `선언 읽기 실패: ${error instanceof Error ? error.message : String(error)}` }],
+    };
+  }
+  const compiled = parseGraphTemplateYaml(source, 'explainer-line.yaml');
+  let targetSeconds: number | null = null;
+  try {
+    const raw: unknown = parseYaml(source);
+    const declared = raw !== null && typeof raw === 'object' && !Array.isArray(raw)
+      ? (raw as Record<string, unknown>).target_seconds
+      : undefined;
+    if (typeof declared === 'number' && Number.isFinite(declared) && declared > 0) targetSeconds = declared;
+  } catch {
+    // YAML 파싱 실패는 컴파일 결과(errors)가 이미 싣는다 — 로드는 던지지 않는다.
+  }
+  return { targetSeconds, template: compiled.template ?? null, errors: compiled.errors };
+}

package/src/web-search/grok.ts

@@ -18,18 +18,43 @@
 //     custom MCP provider without touching skill bodies.
 
 import { getGrokApiKey } from '../config.js';
-import { grokAgentSearch, GROK_SEARCH_MODEL } from '../grok/agent-search.js';
+import { grokAgentSearch, GROK_SEARCH_MODEL, type GrokAgentSearchOpts } from '../grok/agent-search.js';
+import { peekGrokCredential, resolveFreshGrokCredential } from '../grok/credential.js';
 import { wantsXSearch } from './x-intent.js';
 import type { WebSearchHit, WebSearchProvider, WebSearchResult } from './provider.js';
 
 const DEFAULT_LIMIT = 5;
 const GROK_TIMEOUT_MS = 45_000;
+// The subscription proxy's known working model differs from the metered API default.
+const GROK_SUBSCRIPTION_SEARCH_MODEL = 'grok-4.6';
 
-export function buildGrokWebSearchProvider(): WebSearchProvider {
+/** Explicitly metered API provider. The registry only adds it with webSearch.grokApi.enabled. */
+export function buildGrokWebSearchProvider(opts: { id?: string } = {}): WebSearchProvider {
+  return makeGrokProvider(opts.id ?? 'grok', 'Grok (xAI agent-tools search)',
+    () => !!getGrokApiKey(), () => ({}));
+}
+
+/** Subscription search uses the proven cli-chat-proxy /responses route. No API-key fallback. */
+export function buildGrokSubscriptionWebSearchProvider(): WebSearchProvider {
+  return makeGrokProvider('grok', 'Grok (subscription search)',
+    () => peekGrokCredential({ model: GROK_SUBSCRIPTION_SEARCH_MODEL })?.kind === 'subscription',
+    () => {
+      const credential = resolveFreshGrokCredential({ model: GROK_SUBSCRIPTION_SEARCH_MODEL });
+      if (credential?.kind !== 'subscription') throw new Error('Grok subscription search unavailable');
+      return { apiKey: credential.token, baseUrl: credential.baseUrl, headers: credential.headers, model: GROK_SUBSCRIPTION_SEARCH_MODEL };
+    });
+}
+
+function makeGrokProvider(
+  id: string,
+  displayName: string,
+  available: () => boolean,
+  searchOptions: () => GrokAgentSearchOpts,
+): WebSearchProvider {
   return {
-    id: 'grok',
-    displayName: 'Grok (xAI agent-tools search)',
-    available: () => !!getGrokApiKey(),
+    id,
+    displayName,
+    available,
     search: async (q, signal) => {
       const startedAt = Date.now();
       const limit = Math.max(1, Math.min(20, q.limit ?? DEFAULT_LIMIT));
@@ -45,6 +70,7 @@ export function buildGrokWebSearchProvider(): WebSearchProvider {
 
       const r = await grokAgentSearch(query, {
         model: GROK_SEARCH_MODEL,
+        ...searchOptions(),
         tools: ['web_search', 'x_search'],
         systemPrompt: 'You are a concise web-search assistant. Answer in one or two sentences and let the cited sources carry the detail.',
         timeoutMs: GROK_TIMEOUT_MS,
@@ -67,7 +93,7 @@ export function buildGrokWebSearchProvider(): WebSearchProvider {
       const note = r.text.length > 0 ? r.text.slice(0, 1500) : undefined;
       return {
         hits,
-        providerName: 'grok',
+        providerName: id,
         durationMs: Date.now() - startedAt,
         ...(note ? { note } : {}),
       } satisfies WebSearchResult;

package/src/web-search/index.ts

@@ -5,11 +5,11 @@
 // order) and routes the query. Callers that want a specific
 // provider pass `providerId` to force the choice.
 
-import { buildGrokWebSearchProvider } from './grok.js';
+import { buildGrokSubscriptionWebSearchProvider, buildGrokWebSearchProvider } from './grok.js';
 import { buildFirecrawlWebSearchProvider } from './firecrawl.js';
 import { buildTavilyWebSearchProvider } from './tavily.js';
 import { buildFreeWebSearchProvider } from './free.js';
-import { isTavilySearchEnabled } from '../user-config.js';
+import { isPaidWebSearchEnabled, isTavilySearchEnabled } from '../user-config.js';
 import { debug } from '../debug/log.js';
 import { wantsXSearch } from './x-intent.js';
 import {
@@ -35,8 +35,9 @@ function registerBuiltins(): void {
   //   ⇒ 켜면 종전과 «똑같이» 1순위로 복귀한다: `elanous config set webSearch.tavily.enabled true`.
   //   ⚠️ 등록 시점이라 config 변경은 **다음 기동부터** 먹는다(이미 뜬 프로세스엔 안 먹는다).
   if (isTavilySearchEnabled()) providers.push(buildTavilyWebSearchProvider());
-  providers.push(buildGrokWebSearchProvider());
-  providers.push(buildFirecrawlWebSearchProvider());
+  providers.push(buildGrokSubscriptionWebSearchProvider());
+  if (isPaidWebSearchEnabled('grokApi')) providers.push(buildGrokWebSearchProvider({ id: 'grok-api' }));
+  if (isPaidWebSearchEnabled('firecrawl')) providers.push(buildFirecrawlWebSearchProvider());
   providers.push(buildFreeWebSearchProvider());
 }
 registerBuiltins();
@@ -70,10 +71,10 @@ export async function searchWeb(
 ): Promise<WebSearchResult> {
   const xIntent = !opts.providerId && wantsXSearch(q.query);
   const candidates = opts.providerId
-    ? providers.filter(p => p.id === opts.providerId)
+    ? providers.filter(p => p.id === opts.providerId || (opts.providerId === 'grok' && p.id === 'grok-api'))
     : providers.filter(p => p.available());
   if (xIntent) {
-    const grokIndex = candidates.findIndex(p => p.id === 'grok');
+    const grokIndex = candidates.findIndex(p => p.id === 'grok' || p.id === 'grok-api');
     if (grokIndex > 0) candidates.unshift(...candidates.splice(grokIndex, 1));
   }
   if (candidates.length === 0) {
@@ -91,7 +92,7 @@ export async function searchWeb(
     try {
       const result = await provider.search(q, opts.signal);
       if (!xIntent) return result;
-      if (provider.id === 'grok') {
+      if (provider.id === 'grok' || provider.id === 'grok-api') {
         const isXUrl = (raw: string): boolean => {
           try {
             const url = new URL(raw);

package/src/workflow-runtime/node-catalog.ts

@@ -1,6 +1,10 @@
 // M4-5 (2026-05-12 · Phase 4 N5-5) — workflow node catalog.
 //
-// Single source of truth for the 20 workflow-runtime node kinds.
+// GRAPH-UNIFY-KINDS (0.2.40 · 2026-10-27) — this catalog is a view over the
+// node-kind vocabulary registry `src/graph-kinds/registry.ts` (WORKFLOW_CORE_
+// KINDS · 24 workflow kinds). The registry owns the vocabulary; this file owns
+// the per-kind YAML specs, and NODE_CATALOG below is derived so the catalog can
+// never drift from the registry again.
 // CLI (`elanous wf node search/spec/list`) + PWA NodeCreator + external
 // LLM (R3 NL synth · M4-1 node suggestion) all read this catalog.
 //
@@ -15,11 +19,13 @@ export type NodeCategory =
   | 'core'         // prompt · bash · skill · cft
   | 'hitl'         // approval
   | 'branch'       // if · switch
-  | 'iteration'    // iteration
+  | 'iteration'    // iteration · showroom
   | 'transform'    // classify · extract · set · filter · template
-  | 'integration'  // http · task
+  | 'integration'  // http · task · subworkflow
   | 'trigger';     // scheduleTrigger · webhookTrigger · discordTrigger · telegramTrigger · manualTrigger · chatTrigger
 
+import { WORKFLOW_CORE_KINDS } from '../graph-kinds/registry.js';
+
 export interface NodeSpec {
   /** Stable identifier (snake-case in the YAML key when relevant). */
   kind: string;
@@ -42,7 +48,7 @@ export interface NodeSpec {
   related?: string[];
 }
 
-export const NODE_CATALOG: readonly NodeSpec[] = [
+const NODE_SPECS: readonly NodeSpec[] = [
   // ── core ────────────────────────────────────────────────────────
   {
     kind: 'prompt',
@@ -150,6 +156,26 @@ export const NODE_CATALOG: readonly NodeSpec[] = [
       echo "item $index = $item"`,
     related: ['filter'],
   },
+  {
+    kind: 'showroom',
+    category: 'iteration',
+    summary: 'Run a showroom · parallel lane prompts aggregated into a digest pane (strict by default)',
+    yamlKey: 'showroom',
+    required: ['lanes'],
+    optional: ['aggregator', 'mode'],
+    example: `- id: digest
+  depends_on: [fetch]
+  showroom:
+    mode: parallel
+    lanes:
+      - prompt: |
+          $ARGUMENTS 어제 이야기를 레인 요약으로 정리.
+      - prompt: |
+          오늘 일정을 레인 요약으로 정리.
+    aggregator: |
+      레인들을 아침 브리핑으로 합친다.`,
+    related: ['iteration', 'subworkflow'],
+  },
 
   // ── transform ───────────────────────────────────────────────────
   {
@@ -267,6 +293,21 @@ export const NODE_CATALOG: readonly NodeSpec[] = [
       url: $hook.output.body.data.url`,
     related: ['http'],
   },
+  {
+    kind: 'subworkflow',
+    category: 'integration',
+    summary: 'Call another workflow · child output feeds the parent node result',
+    yamlKey: 'subworkflow',
+    required: ['workflow'],
+    optional: ['inputs'],
+    example: `- id: call
+  depends_on: [build]
+  subworkflow:
+    workflow: child-graph
+    inputs:
+      value: $build.output.value`,
+    related: ['task', 'http'],
+  },
 
   // ── trigger ─────────────────────────────────────────────────────
   {
@@ -355,6 +396,14 @@ export const NODE_CATALOG: readonly NodeSpec[] = [
   },
 ] as const;
 
+/** The workflow-node catalog is a view over the registry's WORKFLOW_CORE_KINDS
+ *  vocabulary (24 kinds · showroom · subworkflow included): a spec whose kind
+ *  is not a registry workflow kind is dropped, and `src/graph-kinds/registry.test.ts`
+ *  asserts the catalog and the registry cover the same 24-kind set. */
+export const NODE_CATALOG: readonly NodeSpec[] = NODE_SPECS.filter(
+  (spec): boolean => (WORKFLOW_CORE_KINDS as readonly string[]).includes(spec.kind),
+);
+
 /** Look up a node spec by kind. Case-insensitive. */
 export function getNodeSpec(kind: string): NodeSpec | undefined {
   const lower = kind.trim().toLowerCase();

package/apps/pwa/out/_next/static/chunks/1118.a8a74ea29aac3e46.js

@@ -1,27 +0,0 @@
-"use strict";(self.webpackChunk_N_E=self.webpackChunk_N_E||[]).push([[1118],{39173:(e,t,i)=>{function r(e,t){e.accDescr&&t.setAccDescription?.(e.accDescr),e.accTitle&&t.setAccTitle?.(e.accTitle),e.title&&t.setDiagramTitle?.(e.title)}i.d(t,{S:()=>r}),(0,i(9820).K)(r,"populateCommonDb")},44845:(e,t,i)=>{i.d(t,{m:()=>n});var r=i(9820),n=class{constructor(e){this.init=e,this.records=this.init()}static{(0,r.K)(this,"ImperativeState")}reset(){this.records=this.init()}}},71118:(e,t,i)=>{i.d(t,{diagram:()=>j});var r=i(44845),n=i(39173),o=i(23208),s=i(36693),a=i(51636),l=i(47356),d=i(54730),c=i(9820),h=i(15568),p=/[─━│┃└┗├┣]/,f=/[└┗├┣]/,g=/[─━]/,u=/^[\s│┃]+$/,w=/^\s*(title[\t ]|accTitle[\t ]*:|accDescr[\t ]*[:{])/,x=/^\s*%%/;function m(e){return e.some(e=>p.test(e))}function b(e){for(let t of e){let e=f.exec(t);if(e?.index&&e.index>0)return e.index}return 4}function y(e,t){return e.replace(/\bline\s+(\d+)\b/gi,(e,i)=>{let r=parseInt(i,10),n=t.get(r);return n?`line ${n}`:e})}function $(e){let t=e.split("\n"),i=new Map,r=-1;for(let[e,i]of t.entries())if("treeView-beta"===i.trim()){r=e;break}if(-1===r)return{text:e,lineMap:i};let n=[];for(let e=r+1;e<t.length;e++){let i=t[e];!(""===i.trim()||x.test(i)||w.test(i))&&(u.test(i)||n.push(i.replace(/\t/g,"    ")))}if(!m(n))return{text:e,lineMap:i};let o=b(n),s=[],a=0;for(let e=0;e<=r;e++)s.push(t[e]),a++,i.set(a,e+1);for(let e=r+1;e<t.length;e++){let r=t[e],n=r.trim(),l=e+1;if(""===n||x.test(r)||w.test(r)){s.push(r),a++,i.set(a,l);continue}if(u.test(r))continue;let d=r.replace(/\t/g,"    "),c=f.exec(d);if(c?.index!==void 0){let e=c.index,t=Math.round(e/o)+1,r=e+1;for(;r<d.length&&g.test(d[r]);)r++;for(;r<d.length&&" "===d[r];)r++;let n=d.slice(r).trimEnd();if(!n)throw Error(`Line ${l}: Empty node \u2014 expected a filename or directory name after the box-drawing prefix`);let h="    ".repeat(t);s.push(h+n),a++,i.set(a,l)}else if(/^[\s─━│┃└┗├┣]+$/.test(d))continue;else if(p.test(d))s.push(r),a++,i.set(a,l);else if(/^\s+/.test(d))throw Error(`Line ${l}: Unexpected indentation without box-drawing characters. In box-drawing format, use \u251C\u2500\u2500 or \u2514\u2500\u2500 prefixes for indented nodes.`);else s.push(r),a++,i.set(a,l)}return{text:s.join("\n"),lineMap:i}}(0,c.K)(m,"isBoxDrawingFormat"),(0,c.K)(b,"inferSegmentWidth"),(0,c.K)(y,"remapErrorLines"),(0,c.K)($,"preprocessBoxDrawing");var k=new r.m(()=>({cnt:1,stack:[{id:0,level:-1,name:"/",nodeType:"directory",children:[]}]})),K=(0,c.K)(()=>{k.reset(),(0,l.IU)()},"clear"),v=(0,c.K)(()=>k.records.stack[0],"getRoot"),V=(0,c.K)(()=>k.records.cnt,"getCount"),B=l.UI.treeView,C=(0,c.K)(()=>(0,a.$t)(B,(0,l.zj)().treeView),"getConfig"),I={clear:K,addNode:(0,c.K)((e,t,i,r,n,o)=>{for(;e<=k.records.stack[k.records.stack.length-1].level;)k.records.stack.pop();let s={id:k.records.cnt++,level:e,name:t,nodeType:i,icon:n,cssClass:r,description:o,children:[]};k.records.stack[k.records.stack.length-1].children.push(s),k.records.stack.push(s)},"addNode"),getRoot:v,getCount:V,getConfig:C,getAccTitle:l.iN,getAccDescription:l.m7,getDiagramTitle:l.ab,setAccDescription:l.EI,setAccTitle:l.SV,setDiagramTitle:l.ke},T=(0,c.K)(e=>{for(let t of((0,n.S)(e,I),e.nodes)){let e="number"==typeof t.indent?t.indent:0,i=t.name,r=i.endsWith("/");r&&(i=i.slice(0,-1));let n=r?"directory":"file",o=t.classAnnotation||void 0,s=t.iconAnnotation,a=void 0!==s?s||"none":void 0,d=t.descAnnotation||void 0,c=d?(0,l.jZ)(d,(0,l.zj)()):void 0;I.addNode(e,i,n,o,a,c)}},"populate"),D={parse:(0,c.K)(async e=>{let{text:t,lineMap:i}=$(e);try{let e=await (0,h.qg)("treeView",t);d.R.debug(e),T(e)}catch(e){throw i.size>0&&e instanceof Error&&(e.message=y(e.message,i)),e}},"parse")},E={prefix:"mermaid-treeview",height:24,width:24,icons:{folder:{body:'<path fill="currentColor" d="M10.59 4.59A2 2 0 0 0 9.17 4H4a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.17z"/>'},file:{body:'<path fill="currentColor" fill-rule="evenodd" d="M6 2a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8.83a2 2 0 0 0-.59-1.42l-4.82-4.82A2 2 0 0 0 13.17 2H6Zm7.5 1.9l4.6 4.6h-3.6a1 1 0 0 1-1-1V3.9Z" clip-rule="evenodd"/>'}}};function A(e,t){let i=t?.filenameIcons?.[e];if(i)return i;let r=e.lastIndexOf(".");if(r>0){let i=e.substring(r).toLowerCase(),n=t?.extensionIcons;return n?.[i]??n?.[i.slice(1)]}}function M(e,t){return e.includes(":")?e:e in E.icons||!t?`${E.prefix}:${e}`:`${t}:${e}`}function N(e,t){if("none"!==e.icon){if(e.icon)return M(e.icon,t.defaultIconPack);if(t.showIcons){if("file"===e.nodeType){let i=A(e.name,t);if("none"===i)return;if(i)return M(i,t.defaultIconPack)}return`${E.prefix}:${"directory"===e.nodeType?"folder":"file"}`}}}(0,c.K)(A,"detectIcon"),(0,c.K)(M,"qualifyIcon"),(0,c.K)(N,"getNodeIcon"),(0,s.pC)([{name:E.prefix,icons:E}]);var z=(0,c.K)(async(e,t)=>{let i=[],r=(0,c.K)(e=>{let n=N(e,t);n&&i.push({icon:n,node:e}),e.children.forEach(r)},"collect");return r(e),new Map((await Promise.all(i.map(async({icon:e,node:t})=>({id:t.id,svg:await (0,s.WY)(e,{height:14,width:14})})))).map(({id:e,svg:t})=>[e,t]))},"resolveNodeIcons"),S=(0,c.K)((e,t,i,r,n,o)=>{let s=r.append("g"),a="treeView-node-label";"directory"===i.nodeType&&(a+=" treeView-node-dir"),i.cssClass&&(a+=` ${i.cssClass}`);let l=N(i,n),d=void 0!==l;l&&s.append("g").attr("class","treeView-node-icon").attr("transform",`translate(${e+n.paddingX}, ${t+n.paddingY})`).html(o.get(i.id)??"");let c=s.append("text").text(i.name).attr("dominant-baseline","middle").attr("class",a),{height:h,width:p}=c.node().getBBox(),f=h+2*n.paddingY,g=e+n.paddingX+18*!!d;c.attr("x",g),c.attr("y",t+f/2);let u=g+p;return i.BBox={x:e,y:t,width:p+2*n.paddingX+18*!!d,height:f},i.cssClass?.split(/\s+/).includes("highlight")&&s.insert("rect",":first-child").attr("x",e).attr("y",t+1).attr("width",0).attr("height",f-2).attr("rx",3).attr("class","treeView-highlight-bg"),{node:i,nodeGroup:s,labelRightEdge:u,centerY:t+f/2}},"positionLabel"),X=(0,c.K)((e,t,i,r,n,o)=>e.append("line").attr("x1",t).attr("y1",i).attr("x2",r).attr("y2",n).attr("stroke-width",o).attr("class","treeView-node-line"),"positionLine"),L=(0,c.K)((e,t,i,r)=>{let n=0,o=0,s=[],a=(0,c.K)((e,t,i,a)=>{let l=a*(i.rowIndent+i.paddingX),d=S(l,n,t,e,i,r);s.push(d);let{height:c,width:h}=t.BBox;X(e,l-i.rowIndent,n+c/2,l,n+c/2,i.lineThickness),o=Math.max(o,l+h),n+=c},"drawNode"),l=(0,c.K)((t,r=0)=>{a(e,t,i,r),t.children.forEach(e=>{l(e,r+1)});let{x:n,y:o,height:s}=t.BBox;if(t.children.length){let{y:r,height:a}=t.children[t.children.length-1].BBox;X(e,n+i.paddingX,o+s,n+i.paddingX,r+a/2+i.lineThickness/2,i.lineThickness)}},"processNode");l(t);let d=s.filter(e=>e.node.description);if(d.length>0){let e=Math.max(...s.map(e=>e.labelRightEdge))+16;for(let t of d){let r=t.nodeGroup.append("text").text(t.node.description).attr("dominant-baseline","middle").attr("class","treeView-node-description").attr("x",e).attr("y",t.centerY).node().getBBox();o=Math.max(o,e+r.width+i.paddingX)}}for(let e of s)if(e.node.cssClass?.split(/\s+/).includes("highlight")){let t=e.nodeGroup.select(".treeView-highlight-bg");if(!t.empty()){let i=o-e.node.BBox.x+8;t.attr("width",i),o=Math.max(o,e.node.BBox.x+i+2)}}return{totalHeight:n,totalWidth:o}},"drawTree"),R=(0,c.K)(async(e,t,i,r)=>{d.R.debug("Rendering treeView diagram\n"+e);let n=r.db,s=n.getRoot(),a=n.getConfig(),c=(0,o.D)(t),h=c.append("g");h.attr("class","tree-view");let p=await z(s,a),{totalHeight:f,totalWidth:g}=L(h,s,a,p);c.attr("viewBox",`-${a.lineThickness/2} 0 ${g} ${f}`),(0,l.a$)(c,f,g,a.useMaxWidth)},"draw"),Y={labelFontSize:"16px",labelColor:"black",lineColor:"black",iconColor:"#546e7a",descriptionColor:"#6a9955",highlightBg:"rgba(255, 193, 7, 0.15)",highlightStroke:"#ffc107"},j={db:I,renderer:{draw:R},parser:D,styles:(0,c.K)(({treeView:e})=>{let{labelFontSize:t,labelColor:i,lineColor:r,iconColor:n,descriptionColor:o,highlightBg:s,highlightStroke:l}=(0,a.$t)(Y,e);return`
-    .treeView-node-label {
-        font-size: ${t};
-        fill: ${i};
-        white-space: pre;
-    }
-    .treeView-node-dir {
-        font-weight: bold;
-    }
-    .treeView-node-line {
-        stroke: ${r};
-    }
-    .treeView-node-icon {
-        color: ${n};
-    }
-    .treeView-node-description {
-        font-size: ${t};
-        fill: ${o};
-        font-style: italic;
-        white-space: pre;
-    }
-    .treeView-highlight-bg {
-        fill: ${s};
-        stroke: ${l};
-        stroke-width: 1;
-    }
-    `},"styles")}}}]);