triflux 10.9.22 → 10.9.24

package/.claude-plugin/marketplace.json

@@ -30,5 +30,5 @@
       ]
     }
   ],
-  "version": "10.9.21"
+  "version": "10.9.24"
 }

package/hooks/keyword-rules.json

@@ -557,6 +557,7 @@
     },
     {
       "id": "gstack-ship",
+      "disabled": true,
       "patterns": [
         {
           "source": "(?:배포해|PR\\s*만들|릴리스\\s*해|머지하고\\s*배포)",

package/hub/workers/delegator-mcp.mjs

@@ -14,6 +14,7 @@ import * as z from "zod";
 import { resolveBashExecutable } from "../lib/bash-path.mjs";
 import { CodexMcpWorker } from "./codex-mcp.mjs";
 import { GeminiWorker } from "./gemini-worker.mjs";
+import { runHeadlessWithCleanup } from "../team/headless.mjs";
 
 const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
 
@@ -321,6 +322,18 @@ const DelegateInputSchema = z.object({
   teamAgentName: z.string().optional().describe("TFX_TEAM_AGENT_NAME"),
   teamLeadName: z.string().optional().describe("TFX_TEAM_LEAD_NAME"),
   hubUrl: z.string().optional().describe("TFX_HUB_URL"),
+  workers: z
+    .array(
+      z.object({
+        provider: z.enum(["codex", "gemini"]).describe("워커 provider"),
+        agentType: z.string().default("executor").describe("역할명"),
+        prompt: z.string().describe("워커별 프롬프트"),
+        mcpProfile: z.string().default("auto").describe("MCP 프로필"),
+        model: z.string().optional().describe("모델 오버라이드"),
+      }),
+    )
+    .optional()
+    .describe("병렬 멀티워커 목록. 지정 시 psmux 기반 병렬 실행"),
 });
 
 const DelegateStatusInputSchema = z.object({
@@ -341,7 +354,7 @@ const DelegateOutputSchema = z.object({
   jobId: z.string().optional(),
   job_id: z.string().optional(),
   mode: z.enum(["sync", "async"]).optional(),
-  status: z.enum(["running", "completed", "failed"]).optional(),
+  status: z.enum(["running", "completed", "failed", "partial"]).optional(),
   error: z.string().optional(),
   providerRequested: z.string().optional(),
   providerResolved: z.string().nullable().optional(),
@@ -357,6 +370,20 @@ const DelegateOutputSchema = z.object({
   threadId: z.string().nullable().optional(),
   sessionKey: z.string().nullable().optional(),
   conversationOpen: z.boolean().optional(),
+  workerResults: z
+    .array(
+      z.object({
+        cli: z.string(),
+        role: z.string().optional(),
+        paneName: z.string(),
+        matched: z.boolean(),
+        exitCode: z.number().nullable(),
+        output: z.string(),
+      }),
+    )
+    .optional()
+    .describe("멀티워커 개별 결과"),
+  sessionName: z.string().optional().describe("psmux 세션명"),
 });
 
 function isTeamRouteRequested(args) {
@@ -791,6 +818,23 @@ export class DelegatorMcpWorker {
       "위임 실행을 시작합니다.",
     );
 
+    // 멀티워커 분기: workers 배열이 있으면 headless psmux 병렬 실행
+    if (Array.isArray(args.workers) && args.workers.length > 0) {
+      try {
+        const result = await this._executeMultiWorker(args, extra);
+        await emitProgress(extra, DIRECT_PROGRESS_DONE, 100, "위임이 완료되었습니다.");
+        return result;
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        return createErrorPayload(message, {
+          mode: "sync",
+          providerRequested: "multi",
+          agentType: args.agentType,
+          transport: "headless-psmux",
+        });
+      }
+    }
+
     const runViaRoute = this._shouldUseRoute(args);
 
     try {
@@ -816,6 +860,90 @@ export class DelegatorMcpWorker {
     }
   }
 
+  async _executeMultiWorker(args, extra) {
+    await emitProgress(
+      extra,
+      DIRECT_PROGRESS_START,
+      100,
+      "멀티워커 psmux 병렬 실행을 시작합니다.",
+    );
+
+    // workers 배열을 headless assignments 형식으로 변환
+    const assignments = args.workers.map((w) => {
+      // provider를 CLI 이름으로 매핑 (codex/gemini 그대로)
+      const cli = w.provider;
+      const role = w.agentType || "executor";
+      // buildDirectPrompt와 동일한 context 처리
+      const prompt = withContext(String(w.prompt || ""), args.contextFile);
+      return { cli, prompt, role };
+    });
+
+    // 타임아웃: 워커 중 가장 긴 타임아웃 사용
+    const maxTimeoutSec = Math.max(
+      ...args.workers.map((w) =>
+        Math.ceil(resolveTimeoutMs(w.agentType || "executor", args.timeoutMs) / 1000),
+      ),
+      300,
+    );
+
+    try {
+      const { results, sessionName } = await runHeadlessWithCleanup(assignments, {
+        sessionPrefix: "dlg",
+        timeoutSec: maxTimeoutSec,
+        layout: assignments.length <= 2 ? "even-horizontal" : "2x2",
+        progressive: true,
+        dashboard: true,
+        dashboardLayout: "single",
+      });
+
+      await emitProgress(
+        extra,
+        DIRECT_PROGRESS_DONE,
+        100,
+        `멀티워커 실행 완료: ${results.length}개 워커`,
+      );
+
+      // 전체 성공 판단: 모든 워커가 matched && exitCode === 0
+      const allOk = results.every((r) => r.matched && r.exitCode === 0);
+      // 개별 출력을 합산
+      const combinedOutput = results
+        .map(
+          (r, i) =>
+            `=== Worker ${i + 1} (${r.cli}/${assignments[i].role}) ===\n${r.output || "(no output)"}`,
+        )
+        .join("\n\n");
+
+      return {
+        ok: allOk,
+        mode: "sync",
+        status: allOk ? "completed" : "partial",
+        providerRequested: "multi",
+        providerResolved: "multi",
+        agentType: args.agentType || "executor",
+        transport: "headless-psmux",
+        exitCode: allOk ? 0 : 1,
+        output: combinedOutput,
+        workerResults: results.map((r) => ({
+          cli: r.cli,
+          role: r.role || "",
+          paneName: r.paneName,
+          matched: r.matched,
+          exitCode: r.exitCode,
+          output: r.output || "",
+        })),
+        sessionName,
+      };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return createErrorPayload(message, {
+        mode: "sync",
+        providerRequested: "multi",
+        agentType: args.agentType || "executor",
+        transport: "headless-psmux",
+      });
+    }
+  }
+
   async _executeWorker(args, extra) {
     await emitProgress(
       extra,

package/hub/workers/gemini-worker.mjs

@@ -2,7 +2,8 @@
 // ADR-006: --output-format stream-json 기반 단발 실행 워커.
 
 import { spawn } from "node:child_process";
-import { isAbsolute } from "node:path";
+import { existsSync } from "node:fs";
+import { extname } from "node:path";
 import readline from "node:readline";
 
 import { extractText, terminateChild, withRetry } from "./worker-utils.mjs";
@@ -15,6 +16,51 @@ function toStringList(value) {
   return value.map((item) => String(item ?? "").trim()).filter(Boolean);
 }
 
+/**
+ * Windows에서 cmd.exe에 전달할 인자를 안전하게 quoting한다.
+ * 빈 문자열은 ""로, 특수문자 포함 시 큰따옴표로 감싼다.
+ */
+function quoteWindowsCmdArg(value) {
+  const raw = String(value ?? "");
+  if (raw.length === 0) return '""';
+  if (!/[\s"()^&|<>%!]/.test(raw)) return raw;
+  const escaped = raw
+    .replace(/%/g, "%%")
+    .replace(/(\\*)"/g, '$1$1\\"')
+    .replace(/(\\+)$/g, "$1$1");
+  return `"${escaped}"`;
+}
+
+/**
+ * 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") {
+    return { command, args, shell: false };
+  }
+
+  let resolved = command;
+  if (!extname(resolved)) {
+    for (const ext of [".exe", ".cmd", ".bat"]) {
+      if (existsSync(resolved + ext)) {
+        resolved = resolved + ext;
+        break;
+      }
+    }
+  }
+
+  if (/\.(cmd|bat)$/i.test(resolved)) {
+    const line = [resolved, ...args].map(quoteWindowsCmdArg).join(" ");
+    return { command: "cmd.exe", args: ["/d", "/s", "/c", line], shell: false };
+  }
+
+  return { command: resolved, args, shell: false };
+}
+
 function safeJsonParse(line) {
   try {
     return JSON.parse(line);
@@ -223,12 +269,17 @@ export class GeminiWorker {
       }),
     ];
 
-    const child = spawn(this.command, args, {
+    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: process.platform === "win32" && !isAbsolute(this.command),
+      shell,
     });
 
     this.child = child;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "10.9.22",
+  "version": "10.9.24",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "type": "module",
   "bin": {

package/scripts/lib/mcp-filter.mjs

@@ -36,28 +36,12 @@ const PROFILE_DEFINITIONS = Object.freeze({
     }),
   }),
   executor: Object.freeze({
-    description: "구현 워커용. 문서/검색/브라우징 보조 MCP 허용",
-    allowedServers: Object.freeze([
-      "context7",
-      "playwright",
-      "brave-search",
-      "tavily",
-      "exa",
-    ]),
+    description: "구현 워커용. 문서 조회 전용 MCP만 허용 (검색/브라우징은 Codex stall 유발)",
+    allowedServers: Object.freeze(["context7"]),
     alwaysOnServers: Object.freeze(["context7"]),
-    maxSearchServers: 2,
+    maxSearchServers: 0,
     allowedToolsByServer: Object.freeze({
       context7: Object.freeze(["resolve-library-id", "query-docs"]),
-      "brave-search": Object.freeze(["brave_web_search", "brave_news_search"]),
-      exa: Object.freeze(["web_search_exa", "get_code_context_exa"]),
-      tavily: Object.freeze(["tavily_search", "tavily_extract"]),
-      playwright: Object.freeze([
-        "browser_navigate",
-        "browser_navigate_back",
-        "browser_snapshot",
-        "browser_take_screenshot",
-        "browser_wait_for",
-      ]),
     }),
   }),
   designer: Object.freeze({

package/scripts/tfx-route-worker.mjs

@@ -7,6 +7,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 
 const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
 const FACTORY_CANDIDATES = [
+  resolve(process.cwd(), "hub/workers/factory.mjs"),
   resolve(SCRIPT_DIR, "../hub/workers/factory.mjs"),
   resolve(SCRIPT_DIR, "./hub/workers/factory.mjs"),
 ];