@triflux/remote 10.25.1 → 10.26.0

package/hub/workers/gemini-worker.mjs

@@ -1,15 +1,12 @@
-// hub/workers/gemini-worker.mjs — Gemini headless subprocess 래퍼
-// ADR-006: --output-format stream-json 기반 단발 실행 워커.
+// hub/workers/gemini-worker.mjs
+// Deprecated compatibility surface. Direct Gemini CLI execution is removed;
+// old imports now route through Antigravity.
 
-import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { extname } from "node:path";
-import readline from "node:readline";
 
-import { extractText, terminateChild, withRetry } from "./worker-utils.mjs";
-
-const DEFAULT_TIMEOUT_MS = 15 * 60 * 1000;
-const DEFAULT_KILL_GRACE_MS = 1000;
+import { AntigravityRouteWorker } from "./antigravity-route-worker.mjs";
+import { withRetry } from "./worker-utils.mjs";
 
 function toStringList(value) {
   if (!Array.isArray(value)) return [];
@@ -18,7 +15,6 @@ function toStringList(value) {
 
 /**
  * Windows에서 cmd.exe에 전달할 인자를 안전하게 quoting한다.
- * 빈 문자열은 ""로, 특수문자 포함 시 큰따옴표로 감싼다.
  */
 function quoteWindowsCmdArg(value) {
   const raw = String(value ?? "").replace(/[\r\n]/g, " ");
@@ -33,10 +29,6 @@ function quoteWindowsCmdArg(value) {
 
 /**
  * Windows npm shim(.cmd) spawn 문제를 해결한다.
- * - command -v가 확장자 없는 경로를 반환하면 .exe → .cmd → .bat 순으로 탐색
- * - .cmd/.bat는 CVE-2024-27980 이후 shell:false에서 실행 불가하므로 cmd.exe /d /s /c 경유
- * - .exe는 직접 실행
- * - non-Windows는 그대로 통과
  */
 function buildSpawnSpec(command, args) {
   if (process.platform !== "win32") {
@@ -65,48 +57,6 @@ function buildSpawnSpec(command, args) {
   return { command: resolved, args, shell: false };
 }
 
-function safeJsonParse(line) {
-  try {
-    return JSON.parse(line);
-  } catch {
-    return null;
-  }
-}
-
-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);
@@ -120,7 +70,7 @@ function normalizeRetryOptions(retryOptions) {
   return Object.freeze({ ...retryOptions });
 }
 
-function isGeminiRetryable(error) {
+function isAntigravityRetryable(error) {
   return (
     error?.code === "WORKER_EXIT" &&
     error?.result?.exitCode !== 0 &&
@@ -128,7 +78,7 @@ function isGeminiRetryable(error) {
   );
 }
 
-function detectGeminiCategory(error) {
+function detectAntigravityCategory(error) {
   const combined =
     `${error?.message || ""}\n${error?.stderr || ""}`.toLowerCase();
 
@@ -141,32 +91,27 @@ function detectGeminiCategory(error) {
   }
   if (
     error?.result?.exitCode === 2 ||
-    /expected stream-json|unknown option|invalid option|config/.test(combined)
+    /unknown option|invalid option|config|route script/.test(combined)
   ) {
     return "config";
   }
-  if (error?.code === "WORKER_EVENT_ERROR") {
-    return "input";
-  }
 
   return "transient";
 }
 
-function buildGeminiErrorInfo(error, attempts) {
-  const category = detectGeminiCategory(error);
-  const retryable = isGeminiRetryable(error);
-  let recovery = "Retry the Gemini worker after correcting the reported issue.";
+function buildAntigravityErrorInfo(error, attempts) {
+  const category = detectAntigravityCategory(error);
+  const retryable = isAntigravityRetryable(error);
+  let recovery = "Retry the Antigravity route worker after correcting the issue.";
 
   if (category === "auth") {
-    recovery = "Refresh the Gemini authentication state and retry.";
+    recovery = "Refresh the Antigravity authentication state and retry.";
   } else if (category === "config") {
-    recovery = "Check the Gemini CLI flags and worker configuration.";
-  } else if (category === "input") {
-    recovery = "Check the Gemini request payload and streamed event format.";
+    recovery = "Check the Antigravity route worker configuration.";
   }
 
   return Object.freeze({
-    code: error?.code || "GEMINI_EXECUTION_ERROR",
+    code: error?.code || "ANTIGRAVITY_EXECUTION_ERROR",
     retryable,
     attempts,
     category,
@@ -174,260 +119,64 @@ function buildGeminiErrorInfo(error, attempts) {
   });
 }
 
-/**
- * Gemini stream-json 래퍼
- */
-export class GeminiWorker {
-  type = "gemini";
+export class GeminiWorker extends AntigravityRouteWorker {
+  type = "antigravity";
 
   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;
+    const { command, commandArgs, args, model, approvalMode, yolo, ...rest } =
+      options;
+    void commandArgs;
+    void args;
+    void model;
+    void approvalMode;
+    void yolo;
+    super(rest);
+    this.command = command || "agy";
     this.retryOptions = normalizeRetryOptions(options.retryOptions);
-    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,
+      type: "antigravity",
+      state: this.children.size > 0 ? "running" : "idle",
+      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;
-    terminateChild(child, this.killGraceMs);
-    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();
-  }
-
   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 {
-      command: spawnCmd,
-      args: spawnArgs,
-      shell,
-    } = buildSpawnSpec(this.command, args);
-    const child = spawn(spawnCmd, spawnArgs, {
-      cwd: options.cwd || this.cwd,
-      env: { ...this.env, ...(options.env || {}) },
-      stdio: ["pipe", "pipe", "pipe"],
-      windowsHide: true,
-      shell,
-    });
-
-    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;
-      terminateChild(child, this.killGraceMs);
-    }, 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",
+    const result = await super.run(prompt, options);
+    const normalized = {
+      type: "antigravity",
       command: this.command,
-      args,
-      response,
-      events,
-      resultEvent,
-      usage: resultEvent?.usage || null,
-      stdout: stdoutLines.join("\n").trim(),
-      stderr: stderrLines.join("\n").trim(),
-      exitCode,
-      exitSignal,
-      timedOut,
+      args: toStringList(options.extraArgs),
+      response: result.response || result.output || "",
+      output: result.output || result.response || "",
+      stderr: result.stderr || "",
+      exitCode: result.exitCode ?? 1,
+      exitSignal: null,
+      timedOut: result.exitCode === 124,
       startedAtMs,
       finishedAtMs: Date.now(),
+      raw: result.raw || result,
     };
+    this.lastRun = normalized;
 
-    this.lastRun = result;
-
-    if (timedOut) {
-      throw createWorkerError(`Gemini worker timed out after ${timeoutMs}ms`, {
-        code: "ETIMEDOUT",
-        result,
-        stderr: result.stderr,
-      });
-    }
-
-    if (exitCode !== 0) {
-      // Build a descriptive message when stderr is empty to aid debugging
-      const errMsg = result.stderr
-        ? `Gemini worker exited with code ${exitCode}`
-        : `Gemini worker exited with code ${exitCode} (stderr empty, signal=${exitSignal ?? "none"}, events=${events.length}, stdout=${result.stdout.length}B)`;
-      throw createWorkerError(errMsg, {
-        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,
-      });
+    if (normalized.exitCode !== 0) {
+      throw createWorkerError(
+        `Antigravity route worker exited with code ${normalized.exitCode}`,
+        {
+          code: "WORKER_EXIT",
+          result: normalized,
+          stderr: normalized.stderr,
+        },
+      );
     }
 
-    return result;
-  }
-
-  isReady() {
-    return this.state !== "stopped";
+    return normalized;
   }
 
   async execute(prompt, options = {}) {
@@ -441,7 +190,7 @@ export class GeminiWorker {
         },
         {
           ...this.retryOptions,
-          shouldRetry: (error) => isGeminiRetryable(error),
+          shouldRetry: (error) => isAntigravityRetryable(error),
         },
       );
 
@@ -453,15 +202,15 @@ export class GeminiWorker {
       };
     } catch (error) {
       return {
-        output: error.stderr || error.message || "Gemini worker failed",
+        output: error.stderr || error.message || "Antigravity worker failed",
         exitCode: error.code === "ETIMEDOUT" ? 124 : 1,
         sessionKey: options.sessionKey || null,
-        error: buildGeminiErrorInfo(error, attempts || 1),
+        error: buildAntigravityErrorInfo(error, attempts || 1),
         raw: error.result || null,
       };
     }
   }
 }
 
-/** @visibleForTesting — 테스트 전용 export. 외부 소비 금지. */
+/** @visibleForTesting - 테스트 전용 export. 외부 소비 금지. */
 export { buildSpawnSpec, quoteWindowsCmdArg };

package/hub/workers/interface.mjs

@@ -61,13 +61,14 @@
  * @property {() => Promise<void>} start
  * @property {() => Promise<void>} stop
  * @property {() => boolean} isReady
- * @property {'codex'|'codex-app-server'|'gemini'|'claude'|'delegator'} type
+ * @property {'codex'|'codex-app-server'|'gemini'|'antigravity'|'claude'|'delegator'} type
  */
 
 export const WORKER_TYPES = Object.freeze([
   "codex",
   "codex-app-server",
   "gemini",
+  "antigravity",
   "claude",
   "delegator",
 ]);

package/hub/workers/worker-utils.mjs

@@ -1,5 +1,5 @@
 // hub/workers/worker-utils.mjs — 워커 공통 유틸리티
-// claude-worker, gemini-worker, pipe 등에서 공유하는 순수 유틸 함수 모음.
+// claude-worker, Antigravity route compatibility worker, pipe 등에서 공유하는 순수 유틸 함수 모음.
 
 export const DEFAULT_TIMEOUT_MS = 15 * 60 * 1000;
 export const DEFAULT_KILL_GRACE_MS = 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triflux/remote",
-  "version": "10.25.1",
+  "version": "10.26.0",
   "description": "triflux remote — team mode, psmux, MCP workers, SQLite store.",
   "type": "module",
   "main": "hub/index.mjs",

package/scripts/lib/cli-codex.mjs

@@ -33,14 +33,14 @@ const AGENT_PROFILES = {
     mcpHint: "implement",
   },
   cleanup: {
-    profile: "mini54_med",
+    profile: "gpt55_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
     mcpHint: "implement",
   },
   deslop: {
-    profile: "mini54_med",
+    profile: "gpt55_med",
     timeoutSec: 540,
     runMode: "fg",
     opusOversight: false,
@@ -157,7 +157,7 @@ const AGENT_PROFILES = {
     subcommand: "review",
   },
   spark: {
-    profile: "spark53_low",
+    profile: "gpt55_low",
     timeoutSec: 180,
     runMode: "fg",
     opusOversight: false,

package/scripts/lib/cli-gemini.mjs

@@ -1,39 +1,11 @@
-// cli-gemini.mjs — Gemini CLI adapter (Phase 0 PoC).
-//
-// 책임: Gemini 프로파일/모델/timeout 매핑. resolve_gemini_profile() 의 결과는 Phase 1 에서
-// 통합한다 (Phase 0 은 라벨만 전달).
-//
-// 출처: scripts/tfx-route.sh route_agent() L1045-L1050.
+// cli-gemini.mjs — legacy Gemini adapter alias.
+// The public "gemini" label remains accepted, but the executable plan is AGY.
 
-export const id = "gemini";
-export const cliType = "gemini";
-export const command = "gemini";
-
-const AGENT_PROFILES = {
-  designer: {
-    profile: "pro31",
-    timeoutSec: 900,
-    runMode: "bg",
-    opusOversight: false,
-    mcpHint: "docs",
-  },
-  gemini: {
-    profile: "pro31",
-    timeoutSec: 900,
-    runMode: "bg",
-    opusOversight: false,
-    mcpHint: "docs",
-  },
-  writer: {
-    profile: "flash3",
-    timeoutSec: 900,
-    runMode: "bg",
-    opusOversight: false,
-    mcpHint: "docs",
-  },
-};
+import * as agyAdapter from "./cli-agy.mjs";
 
-const DEFAULT_PROFILE = AGENT_PROFILES.gemini;
+export const id = "gemini";
+export const cliType = "antigravity";
+export const command = "agy";
 
 export function plan({
   agent,
@@ -45,23 +17,21 @@ export function plan({
   if (!agent) {
     throw new Error("[cli-gemini] agent required");
   }
-  const cfg = AGENT_PROFILES[agent] ?? DEFAULT_PROFILE;
-  const effectiveTimeoutSec =
-    Number.isFinite(timeoutSec) && timeoutSec > 0 ? timeoutSec : cfg.timeoutSec;
-  return {
-    command,
-    profile: cfg.profile,
-    effort: cfg.profile,
-    args: ["-m", cfg.profile, "-y", "--prompt"],
-    timeoutMs: effectiveTimeoutSec * 1000,
-    runMode: cfg.runMode,
-    opusOversight: cfg.opusOversight,
-    mcpProfile: mcpProfile === "auto" ? cfg.mcpHint : mcpProfile,
-    promptLength: prompt.length,
-    contextFile: contextFile || null,
-  };
+  return agyAdapter.plan({
+    agent: agent === "gemini" ? "antigravity" : agent,
+    prompt,
+    mcpProfile,
+    timeoutSec,
+    contextFile,
+  });
 }
 
 export function describe() {
-  return { id, cliType, command, agents: Object.keys(AGENT_PROFILES) };
+  return {
+    id,
+    cliType,
+    command,
+    aliases: ["gemini"],
+    agents: ["gemini", "designer", "writer", "antigravity", "agy"],
+  };
 }

package/scripts/lib/keyword-rules.mjs

@@ -1,6 +1,6 @@
 import { readFileSync } from "node:fs";
 
-const VALID_MCP_ROUTES = new Set(["codex", "gemini", "claude"]);
+const VALID_MCP_ROUTES = new Set(["codex", "antigravity", "gemini", "claude"]);
 
 function logRuleError(message, error) {
   if (error) {