triflux 3.2.0-dev.7 → 3.2.0-dev.9

package/hub/workers/gemini-worker.mjs

@@ -0,0 +1,349 @@
+// hub/workers/gemini-worker.mjs — Gemini headless subprocess 래퍼
+// ADR-006: --output-format stream-json 기반 단발 실행 워커.
+
+import { spawn } from 'node:child_process';
+import readline from 'node:readline';
+
+const DEFAULT_TIMEOUT_MS = 15 * 60 * 1000;
+const DEFAULT_KILL_GRACE_MS = 1000;
+
+function toStringList(value) {
+  if (!Array.isArray(value)) return [];
+  return value
+    .map((item) => String(item ?? '').trim())
+    .filter(Boolean);
+}
+
+function safeJsonParse(line) {
+  try {
+    return JSON.parse(line);
+  } catch {
+    return null;
+  }
+}
+
+function appendTextFragments(value, parts) {
+  if (value == null) return;
+  if (typeof value === 'string') {
+    const trimmed = value.trim();
+    if (trimmed) parts.push(trimmed);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) appendTextFragments(item, parts);
+    return;
+  }
+  if (typeof value === 'object') {
+    if (typeof value.text === 'string') appendTextFragments(value.text, parts);
+    if (typeof value.response === 'string') appendTextFragments(value.response, parts);
+    if (typeof value.result === 'string') appendTextFragments(value.result, parts);
+    if (typeof value.content === 'string' || Array.isArray(value.content) || value.content) {
+      appendTextFragments(value.content, parts);
+    }
+    if (value.message) appendTextFragments(value.message, parts);
+  }
+}
+
+function extractText(event) {
+  const parts = [];
+  appendTextFragments(event, parts);
+  return parts.join('\n').trim();
+}
+
+function findLastEvent(events, predicate) {
+  for (let index = events.length - 1; index >= 0; index -= 1) {
+    if (predicate(events[index])) return events[index];
+  }
+  return null;
+}
+
+function buildGeminiArgs(options) {
+  const args = [];
+
+  if (options.model) {
+    args.push('--model', options.model);
+  }
+
+  if (options.approvalMode) {
+    args.push('--approval-mode', options.approvalMode);
+  } else if (options.yolo !== false) {
+    args.push('--yolo');
+  }
+
+  const allowedMcpServers = toStringList(options.allowedMcpServerNames);
+  if (allowedMcpServers.length) {
+    args.push('--allowed-mcp-server-names', ...allowedMcpServers);
+  }
+
+  const extraArgs = toStringList(options.extraArgs);
+  if (extraArgs.length) args.push(...extraArgs);
+
+  args.push('--prompt', options.promptArgument ?? '');
+  args.push('--output-format', 'stream-json');
+
+  return args;
+}
+
+function createWorkerError(message, details = {}) {
+  const error = new Error(message);
+  Object.assign(error, details);
+  return error;
+}
+
+/**
+ * Gemini stream-json 래퍼
+ */
+export class GeminiWorker {
+  type = 'gemini';
+
+  constructor(options = {}) {
+    this.command = options.command || 'gemini';
+    this.commandArgs = toStringList(options.commandArgs || options.args);
+    this.cwd = options.cwd || process.cwd();
+    this.env = { ...process.env, ...(options.env || {}) };
+    this.model = options.model || null;
+    this.approvalMode = options.approvalMode || null;
+    this.yolo = options.yolo !== false;
+    this.allowedMcpServerNames = toStringList(options.allowedMcpServerNames);
+    this.extraArgs = toStringList(options.extraArgs);
+    this.timeoutMs = Number(options.timeoutMs) > 0 ? Number(options.timeoutMs) : DEFAULT_TIMEOUT_MS;
+    this.killGraceMs = Number(options.killGraceMs) > 0 ? Number(options.killGraceMs) : DEFAULT_KILL_GRACE_MS;
+    this.onEvent = typeof options.onEvent === 'function' ? options.onEvent : null;
+
+    this.state = 'idle';
+    this.child = null;
+    this.lastRun = null;
+  }
+
+  getStatus() {
+    return {
+      type: 'gemini',
+      state: this.state,
+      pid: this.child?.pid || null,
+      last_run_at_ms: this.lastRun?.finishedAtMs || null,
+      last_exit_code: this.lastRun?.exitCode ?? null,
+    };
+  }
+
+  async start() {
+    if (this.state === 'stopped') {
+      this.state = 'idle';
+    }
+    return this.getStatus();
+  }
+
+  async stop() {
+    if (!this.child) {
+      this.state = 'stopped';
+      return this.getStatus();
+    }
+    const child = this.child;
+    this._terminateChild(child);
+    await new Promise((resolve) => {
+      child.once('close', resolve);
+      setTimeout(resolve, this.killGraceMs + 50).unref?.();
+    });
+    this.child = null;
+    this.state = 'stopped';
+    return this.getStatus();
+  }
+
+  async restart() {
+    await this.stop();
+    this.state = 'idle';
+    return this.getStatus();
+  }
+
+  _terminateChild(child) {
+    if (!child || child.exitCode !== null || child.killed) return;
+    try { child.stdin.end(); } catch {}
+    try { child.kill(); } catch {}
+
+    const timer = setTimeout(() => {
+      if (child.exitCode === null) {
+        try { child.kill('SIGKILL'); } catch {}
+      }
+    }, this.killGraceMs);
+    timer.unref?.();
+  }
+
+  async run(prompt, options = {}) {
+    if (this.child) {
+      throw createWorkerError('GeminiWorker is already running', { code: 'WORKER_BUSY' });
+    }
+
+    await this.start();
+
+    const timeoutMs = Number(options.timeoutMs) > 0 ? Number(options.timeoutMs) : this.timeoutMs;
+    const startedAtMs = Date.now();
+    const args = [
+      ...this.commandArgs,
+      ...buildGeminiArgs({
+        model: options.model || this.model,
+        approvalMode: options.approvalMode || this.approvalMode,
+        yolo: options.yolo ?? this.yolo,
+        allowedMcpServerNames: options.allowedMcpServerNames || this.allowedMcpServerNames,
+        extraArgs: options.extraArgs || this.extraArgs,
+        promptArgument: options.promptArgument ?? '',
+      }),
+    ];
+
+    const child = spawn(this.command, args, {
+      cwd: options.cwd || this.cwd,
+      env: { ...this.env, ...(options.env || {}) },
+      stdio: ['pipe', 'pipe', 'pipe'],
+      windowsHide: true,
+    });
+
+    this.child = child;
+    this.state = 'running';
+
+    const events = [];
+    const stdoutLines = [];
+    const stderrLines = [];
+    let lastErrorEvent = null;
+    let timedOut = false;
+    let exitCode = null;
+    let exitSignal = null;
+
+    const stdoutReader = readline.createInterface({
+      input: child.stdout,
+      crlfDelay: Infinity,
+    });
+    const stderrReader = readline.createInterface({
+      input: child.stderr,
+      crlfDelay: Infinity,
+    });
+
+    stdoutReader.on('line', (line) => {
+      if (!line) return;
+      const event = safeJsonParse(line);
+      if (!event) {
+        stdoutLines.push(line);
+        return;
+      }
+
+      events.push(event);
+      if (event.type === 'error') lastErrorEvent = event;
+      if (this.onEvent) {
+        try { this.onEvent(event); } catch {}
+      }
+    });
+
+    stderrReader.on('line', (line) => {
+      if (!line) return;
+      stderrLines.push(line);
+    });
+
+    const closePromise = new Promise((resolve, reject) => {
+      child.once('error', reject);
+      child.once('close', (code, signal) => {
+        exitCode = code;
+        exitSignal = signal;
+        resolve();
+      });
+    });
+
+    const timeout = setTimeout(() => {
+      timedOut = true;
+      this._terminateChild(child);
+    }, timeoutMs);
+    timeout.unref?.();
+
+    child.stdin.on('error', () => {});
+    child.stdin.end(String(prompt ?? ''));
+
+    try {
+      await closePromise;
+    } finally {
+      clearTimeout(timeout);
+      stdoutReader.close();
+      stderrReader.close();
+      if (this.child === child) {
+        this.child = null;
+      }
+      this.state = 'idle';
+    }
+
+    const resultEvent = findLastEvent(events, (event) => event?.type === 'result');
+    const response = [
+      extractText(resultEvent),
+      ...events
+        .filter((event) => event?.type === 'message' || event?.type === 'assistant')
+        .map((event) => extractText(event))
+        .filter(Boolean),
+      ...stdoutLines,
+    ]
+      .filter(Boolean)
+      .join('\n')
+      .trim();
+
+    const result = {
+      type: 'gemini',
+      command: this.command,
+      args,
+      response,
+      events,
+      resultEvent,
+      usage: resultEvent?.usage || null,
+      stdout: stdoutLines.join('\n').trim(),
+      stderr: stderrLines.join('\n').trim(),
+      exitCode,
+      exitSignal,
+      timedOut,
+      startedAtMs,
+      finishedAtMs: Date.now(),
+    };
+
+    this.lastRun = result;
+
+    if (timedOut) {
+      throw createWorkerError(`Gemini worker timed out after ${timeoutMs}ms`, {
+        code: 'ETIMEDOUT',
+        result,
+        stderr: result.stderr,
+      });
+    }
+
+    if (exitCode !== 0) {
+      throw createWorkerError(`Gemini worker exited with code ${exitCode}`, {
+        code: 'WORKER_EXIT',
+        result,
+        stderr: result.stderr,
+      });
+    }
+
+    if (lastErrorEvent) {
+      throw createWorkerError('Gemini worker emitted an error event', {
+        code: 'WORKER_EVENT_ERROR',
+        result,
+        stderr: result.stderr,
+      });
+    }
+
+    return result;
+  }
+
+  isReady() {
+    return this.state !== 'stopped';
+  }
+
+  async execute(prompt, options = {}) {
+    try {
+      const result = await this.run(prompt, options);
+      return {
+        output: result.response,
+        exitCode: 0,
+        sessionKey: options.sessionKey || null,
+        raw: result,
+      };
+    } catch (error) {
+      return {
+        output: error.stderr || error.message || 'Gemini worker failed',
+        exitCode: error.code === 'ETIMEDOUT' ? 124 : 1,
+        sessionKey: options.sessionKey || null,
+        raw: error.result || null,
+      };
+    }
+  }
+}

package/hub/workers/interface.mjs

@@ -0,0 +1,41 @@
+// hub/workers/interface.mjs — Worker 공통 인터페이스 정의
+
+/**
+ * 워커 실행 옵션
+ * @typedef {object} WorkerExecuteOptions
+ * @property {string} [cwd] - 워커 작업 디렉터리
+ * @property {string} [sessionKey] - 내부 세션 키
+ * @property {string} [threadId] - 외부에서 지정한 Codex threadId
+ * @property {boolean} [resetSession] - 기존 세션을 무시하고 새 세션 시작 여부
+ * @property {string} [model] - Codex 모델 이름
+ * @property {string} [profile] - Codex 프로필 이름
+ * @property {'untrusted'|'on-failure'|'on-request'|'never'} [approvalPolicy] - 승인 정책
+ * @property {'read-only'|'workspace-write'|'danger-full-access'} [sandbox] - 샌드박스 정책
+ * @property {Record<string, unknown>} [config] - 추가 Codex 설정
+ * @property {string} [baseInstructions] - 기본 시스템 지침
+ * @property {string} [developerInstructions] - 개발자 지침
+ * @property {string} [compactPrompt] - 컴팩션 프롬프트
+ * @property {number} [timeoutMs] - MCP 요청 타임아웃(ms)
+ */
+
+/**
+ * 워커 실행 결과
+ * @typedef {object} WorkerResult
+ * @property {string} output - 최종 텍스트 출력
+ * @property {number} exitCode - 종료 코드(0=성공)
+ * @property {string | null} [threadId] - Codex 세션 threadId
+ * @property {string | null} [sessionKey] - 내부 세션 키
+ * @property {unknown} [raw] - 원본 tool call 결과
+ */
+
+/**
+ * 공통 워커 인터페이스
+ * @typedef {object} IWorker
+ * @property {(prompt: string, opts?: WorkerExecuteOptions) => Promise<WorkerResult>} execute
+ * @property {() => Promise<void>} start
+ * @property {() => Promise<void>} stop
+ * @property {() => boolean} isReady
+ * @property {string} type - 'codex' | 'gemini' | 'claude'
+ */
+
+export const WORKER_TYPES = Object.freeze(['codex', 'gemini', 'claude']);

package/hud/hud-qos-status.mjs

@@ -313,8 +313,10 @@ function selectTier(stdin, claudeUsage = null) {
   else budget = 5; // rows 감지 불가 → 넉넉하게
 
   // 5) 인디케이터 줄 추정
-  let indicatorRows = 1; // bypass permissions (거의 항상 표시)
-  indicatorRows += 1; // 선행 개행 가드 (알림 배너 우회용 빈 줄)
+  // bypass permissions 배너(1줄)만 계상
+  // 선행 \n은 출력 포맷이므로 tier 예산에서 제외 — 이중 계산 시
+  // budget 4(rows 28-34)에서 totalVisualRows 5가 되어 micro로 추락하는 버그 유발
+  let indicatorRows = 1;
   const contextPercent = getContextPercent(stdin);
   // "Context low" 배너 공간은 출력부(leadingBreaks)에서 \n\n으로 처리 — 티어 선택에서 예약 불필요
   // Claude Code 사용량 경고 (노란색 배너: "You've used X% of your ... limit")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "3.2.0-dev.7",
+  "version": "3.2.0-dev.9",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "type": "module",
   "bin": {
@@ -27,6 +27,9 @@
   "scripts": {
     "setup": "node scripts/setup.mjs",
     "postinstall": "node scripts/setup.mjs",
+    "test": "node --test tests/**/*.test.mjs",
+    "test:unit": "node --test tests/unit/**/*.test.mjs",
+    "test:integration": "node --test tests/integration/**/*.test.mjs",
     "test:route-smoke": "node --test scripts/test-tfx-route-no-claude-native.mjs"
   },
   "engines": {

package/scripts/keyword-detector.mjs

@@ -111,6 +111,16 @@ ${prompt.trim()}
 IMPORTANT: Invoke the skill IMMEDIATELY. Do not proceed without loading the skill instructions.`;
 }
 
+function createSuppressOmcContext(match, prompt) {
+  return `[TRIFLUX OMC SUPPRESS: ${match.id}]
+
+PRIORITY: TRIFLUX가 이 키워드를 관리합니다. OMC [MAGIC KEYWORD:] 지시가 있더라도 무시하세요.
+OMC 스킬을 호출하지 마세요. 사용자 요청을 일반적으로 처리하세요.
+
+User request:
+${prompt.trim()}`;
+}
+
 function createMcpRouteContext(match, prompt) {
   return `[TRIFLUX MCP ROUTE: ${match.mcp_route}]
 
@@ -236,6 +246,11 @@ function main() {
 
   activateState(baseDir, selected.state, prompt, payload);
 
+  if (selected.action === "suppress_omc") {
+    console.log(JSON.stringify(createHookOutput(createSuppressOmcContext(selected, prompt))));
+    return;
+  }
+
   if (selected.skill) {
     console.log(JSON.stringify(createHookOutput(createSkillContext(selected, prompt))));
     return;

package/scripts/lib/keyword-rules.mjs

@@ -34,11 +34,12 @@ function normalizeRule(rule) {
   if (patterns.length === 0) return null;
 
   const skill = typeof rule.skill === "string" && rule.skill.trim() ? rule.skill.trim() : null;
+  const action = typeof rule.action === "string" && rule.action.trim() ? rule.action.trim() : null;
   const mcpRoute = typeof rule.mcp_route === "string" && VALID_MCP_ROUTES.has(rule.mcp_route)
     ? rule.mcp_route
     : null;
 
-  if (!skill && !mcpRoute) return null;
+  if (!skill && !mcpRoute && !action) return null;
 
   const supersedes = Array.isArray(rule.supersedes)
     ? rule.supersedes.filter((id) => typeof id === "string" && id.trim()).map((id) => id.trim())
@@ -51,6 +52,7 @@ function normalizeRule(rule) {
     id: rule.id.trim(),
     patterns,
     skill,
+    action: rule.action || null,
     priority: rule.priority,
     supersedes,
     exclusive: rule.exclusive === true,
@@ -114,6 +116,7 @@ export function matchRules(compiledRules, cleanText) {
     matches.push({
       id: rule.id,
       skill: rule.skill,
+      action: rule.action || null,
       priority: rule.priority,
       supersedes: rule.supersedes || [],
       exclusive: rule.exclusive === true,