triflux 10.9.13 → 10.9.15

package/.claude-plugin/marketplace.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "https://anthropic.com/claude-code/marketplace.schema.json",
+  "name": "triflux",
+  "description": "CLI-first multi-model orchestrator — Codex/Gemini/Claude routing with DAG execution, auto-triage, and cost optimization",
+  "owner": {
+    "name": "tellang"
+  },
+  "plugins": [
+    {
+      "name": "triflux",
+      "description": "Tri-CLI orchestrator for Claude Code. Routes tasks across Claude + Codex + Gemini with consensus intelligence, natural language routing, 42 skills, and cross-model review.",
+      "version": "10.9.6",
+      "author": {
+        "name": "tellang"
+      },
+      "source": {
+        "source": "npm",
+        "package": "triflux"
+      },
+      "category": "productivity",
+      "homepage": "https://github.com/tellang/triflux",
+      "tags": [
+        "multi-model",
+        "codex",
+        "gemini",
+        "cli-routing",
+        "orchestration",
+        "cost-optimization",
+        "dag-execution"
+      ]
+    }
+  ],
+  "version": "10.9.14"
+}

package/.claude-plugin/plugin.json

@@ -0,0 +1,22 @@
+{
+  "name": "triflux",
+  "version": "10.3.4",
+  "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
+  "author": {
+    "name": "tellang"
+  },
+  "repository": "https://github.com/tellang/triflux",
+  "homepage": "https://github.com/tellang/triflux",
+  "license": "MIT",
+  "keywords": [
+    "claude-code",
+    "plugin",
+    "codex",
+    "gemini",
+    "cli-routing",
+    "orchestration",
+    "multi-model"
+  ],
+  "skills": "./skills/",
+  "hooks": "./hooks/hooks.json"
+}

package/config/mcp-registry.json

@@ -0,0 +1,29 @@
+{
+  "$schema": "mcp-registry-schema",
+  "version": 1,
+  "description": "MCP 서버 중앙 레지스트리 — 진실의 원천",
+  "defaults": {
+    "transport": "hub-url",
+    "hub_base": "http://127.0.0.1:27888"
+  },
+  "servers": {
+    "tfx-hub": {
+      "transport": "hub-url",
+      "url": "http://127.0.0.1:27888/mcp",
+      "safe": true,
+      "targets": ["claude", "gemini", "codex"],
+      "description": "triflux Hub MCP 서버"
+    }
+  },
+  "policies": {
+    "stdio_action": "replace-with-hub",
+    "unknown_server_action": "warn",
+    "watched_paths": [
+      "~/.gemini/settings.json",
+      "~/.codex/config.toml",
+      "~/.claude/settings.json",
+      "~/.claude/settings.local.json",
+      ".mcp.json"
+    ]
+  }
+}

package/hub/lib/spawn-trace.mjs

@@ -9,7 +9,7 @@ const DEDUPE_WINDOW_MS = 5_000;
 const RATE_WINDOW_MS = 1_000;
 export const MAX_SPAWN_PER_SEC = resolvePositiveInteger(
   process.env.TRIFLUX_MAX_SPAWN_RATE,
-  10,
+  30,
 );
 export const MAX_TOTAL_DESCENDANTS = resolvePositiveInteger(
   process.env.TRIFLUX_MAX_DESCENDANTS,

package/hub/server.mjs

@@ -2,6 +2,7 @@
 
 import { execSync as execSyncHub } from "node:child_process";
 import { createHash, randomUUID, timingSafeEqual } from "node:crypto";
+import { EventEmitter } from "node:events";
 import {
   existsSync,
   mkdirSync,
@@ -40,7 +41,10 @@ import {
   writeState,
 } from "./state.mjs";
 import { createStoreAdapter } from "./store-adapter.mjs";
+import { createGitPreflight } from "./team/git-preflight.mjs";
 import { nativeProxy } from "./team/nativeProxy.mjs";
+import { createSwarmLocks } from "./team/swarm-locks.mjs";
+import { createSynapseRegistry } from "./team/synapse-registry.mjs";
 import { registerTeamBridge } from "./team-bridge.mjs";
 import { createTools } from "./tools.mjs";
 import { createDelegatorMcpWorker } from "./workers/delegator-mcp.mjs";
@@ -573,6 +577,36 @@ export async function startHub({
   }
   const delegatorService = new DelegatorService({ worker: delegatorWorker });
 
+  // Synapse Layer 4: session registry + git preflight + swarm locks
+  const synapseEmitter = new EventEmitter();
+  synapseEmitter.setMaxListeners(50);
+  const synapseRegistry = createSynapseRegistry({
+    persistPath: join(CACHE_DIR, "tfx-hub", "synapse-sessions.json"),
+    emitter: synapseEmitter,
+  });
+  const swarmLocks = createSwarmLocks({
+    repoRoot: PROJECT_ROOT,
+    persistPath: join(CACHE_DIR, "tfx-hub", "swarm-locks.json"),
+  });
+  const gitPreflight = createGitPreflight({
+    registry: synapseRegistry,
+    locks: swarmLocks,
+  });
+
+  // Synapse Layer 5: emitter subscribers — bridge events to hub logging
+  synapseEmitter.on("synapse.session.started", ({ sessionId }) => {
+    hubLog.info({ sessionId }, "synapse.session.started");
+  });
+  synapseEmitter.on("synapse.session.heartbeat", ({ sessionId }) => {
+    hubLog.debug({ sessionId }, "synapse.session.heartbeat");
+  });
+  synapseEmitter.on("synapse.session.stale", ({ sessionId }) => {
+    hubLog.warn({ sessionId }, "synapse.session.stale");
+  });
+  synapseEmitter.on("synapse.session.removed", ({ sessionId }) => {
+    hubLog.info({ sessionId }, "synapse.session.removed");
+  });
+
   const hitl = createHitlManager(store, router);
   const pipe = createPipeServer({
     router,
@@ -740,6 +774,33 @@ export async function startHub({
         return writeJson(res, 200, { ok: true, accounts });
       }
 
+      // ── Synapse Layer 5: session registry + locks + preflight routes ──
+      if (path === "/synapse/sessions" && req.method === "GET") {
+        return writeJson(res, 200, { ok: true, ...synapseRegistry.snapshot(), ts: Date.now() });
+      }
+
+      if (path === "/synapse/locks" && req.method === "GET") {
+        return writeJson(res, 200, { ok: true, locks: swarmLocks.snapshot(), ts: Date.now() });
+      }
+
+      if (path === "/synapse/preflight" && req.method === "POST") {
+        const VALID_OPS = new Set(["checkout", "rebase", "cherry-pick", "reset", "stash-pop", "worktree-remove"]);
+        try {
+          const body = await parseBody(req);
+          const { op, args = {}, sessionContext = {} } = body;
+          if (!op || typeof op !== "string") {
+            return writeJson(res, 400, { ok: false, error: "op 필수" });
+          }
+          if (!VALID_OPS.has(op)) {
+            return writeJson(res, 400, { ok: false, error: `invalid op: ${op}` });
+          }
+          const result = gitPreflight.check(op, args, sessionContext);
+          return writeJson(res, 200, { ok: true, ...result });
+        } catch (err) {
+          return writeJson(res, 400, { ok: false, error: String(err?.message || err) });
+        }
+      }
+
       if (path.startsWith("/bridge")) {
         const isBridgeStatusGet =
           path === "/bridge/status" && req.method === "GET";
@@ -1521,6 +1582,7 @@ export async function startHub({
             await pipe.stop();
             await assignCallbacks.stop();
             await delegatorWorker.stop().catch(() => {});
+            try { synapseRegistry.destroy(); } catch {}
             store.close();
             try {
               unlinkSync(PID_FILE);

package/hub/team/conductor.mjs

@@ -66,6 +66,40 @@ const TERMINAL_STATES = new Set([STATES.DEAD, STATES.COMPLETED]);
 const DEFAULT_MAX_RESTARTS = 3;
 const DEFAULT_GRACE_MS = 10_000;
 
+/**
+ * Auth 파일을 lease 소스에서 CLI 대상 경로로 복사.
+ * @param {object} lease — broker lease 객체 (mode, authFile 필수)
+ * @param {'codex'|'gemini'} agent
+ * @param {string} sessionId — 로깅용
+ * @param {object} eventLog — createEventLog 인스턴스
+ */
+function swapAuthFile(lease, agent, sessionId, eventLog) {
+  if (lease?.mode !== "auth" || !lease.authFile) return true;
+  const dests =
+    agent === "codex"
+      ? [join(homedir(), ".codex", "auth.json")]
+      : [
+          join(homedir(), ".gemini", "oauth_creds.json"),
+          join(homedir(), ".gemini", "gemini-credentials.json"),
+        ];
+  let allOk = true;
+  for (const dest of dests) {
+    try {
+      mkdirSync(dirname(dest), { recursive: true });
+      copyFileSync(lease.authFile, dest);
+      eventLog.append("auth_copy", { session: sessionId, agent, dest });
+    } catch (err) {
+      allOk = false;
+      eventLog.append("auth_copy_error", {
+        session: sessionId,
+        dest,
+        error: err.message,
+      });
+    }
+  }
+  return allOk;
+}
+
 /**
  * Conductor 팩토리.
  * @param {object} opts
@@ -73,6 +107,7 @@ const DEFAULT_GRACE_MS = 10_000;
  * @param {number} [opts.maxRestarts=3]
  * @param {number} [opts.graceMs=10000] — shutdown grace period
  * @param {object} [opts.probeOpts] — health-probe 옵션 오버라이드
+ * @param {object} [opts.broker] — AccountBroker 인스턴스 (tierFallback 구독용)
  * @returns {Conductor}
  */
 export function createConductor(opts = {}) {
@@ -81,6 +116,7 @@ export function createConductor(opts = {}) {
     maxRestarts = DEFAULT_MAX_RESTARTS,
     graceMs = DEFAULT_GRACE_MS,
     probeOpts = {},
+    broker: optsBroker,
   } = opts;
 
   if (!logsDir) throw new Error("logsDir is required");
@@ -739,32 +775,7 @@ export function createConductor(opts = {}) {
       : config;
 
     // auth file copy — broker resolved absolute path, conductor does the actual copy
-    if (lease?.mode === "auth" && lease.authFile) {
-      const dests =
-        config.agent === "codex"
-          ? [join(homedir(), ".codex", "auth.json")]
-          : [
-              join(homedir(), ".gemini", "oauth_creds.json"),
-              join(homedir(), ".gemini", "gemini-credentials.json"),
-            ];
-      for (const dest of dests) {
-        try {
-          mkdirSync(dirname(dest), { recursive: true });
-          copyFileSync(lease.authFile, dest);
-          eventLog.append("auth_copy", {
-            session: config.id,
-            agent: config.agent,
-            dest,
-          });
-        } catch (err) {
-          eventLog.append("auth_copy_error", {
-            session: config.id,
-            dest,
-            error: err.message,
-          });
-        }
-      }
-    }
+    swapAuthFile(lease, config.agent, config.id, eventLog);
 
     // 원격 세션은 launcher 불필요 (이미 원격에서 실행 중)
     const launcher = resolvedConfig.remote
@@ -892,12 +903,44 @@ export function createConductor(opts = {}) {
       });
 
     await Promise.allSettled(cleanups);
+    process.removeListener("SIGINT", onSignal);
+    process.removeListener("SIGTERM", onSignal);
+    if (brokerInstance && onTierFallback) {
+      brokerInstance.removeListener("tierFallback", onTierFallback);
+    }
     if (conductor._meshBridge) conductor._meshBridge.detach();
     await eventLog.flush();
     await eventLog.close();
     emitter.emit("shutdown");
   }
 
+  // ── broker tierFallback 구독 ──────────────────────────────────
+  // 토큰 만료 등으로 상위 tier 계정이 불가능해지면, 활성 세션의 auth를 새 lease로 교체.
+  const brokerInstance = optsBroker ?? null;
+  const onTierFallback = brokerInstance
+    ? ({ provider }) => {
+        for (const session of sessions.values()) {
+          if (TERMINAL_STATES.has(session.state)) continue;
+          if (session.config.agent !== provider) continue;
+          if (session.config.remote) continue;
+
+          const newLease = brokerInstance.lease({ provider });
+          if (!newLease) continue;
+
+          swapAuthFile(newLease, provider, session.id, eventLog);
+          eventLog.append("tier_fallback_swap", {
+            session: session.id,
+            agent: provider,
+            newAccount: newLease.id,
+          });
+        }
+      }
+    : null;
+
+  if (brokerInstance && onTierFallback) {
+    brokerInstance.on("tierFallback", onTierFallback);
+  }
+
   // Shutdown traps
   const onSignal = () => {
     void shutdown("signal");

package/hub/team/synapse-registry.mjs

@@ -42,6 +42,7 @@ function sanitizeSession(raw, fallbackSessionId = "") {
 export function createSynapseRegistry(opts = {}) {
   const {
     persistPath,
+    emitter = null,
     localHeartbeatIntervalMs = DEFAULT_LOCAL_HEARTBEAT_INTERVAL_MS,
     localTimeoutMs = DEFAULT_LOCAL_TIMEOUT_MS,
     remoteHeartbeatIntervalMs = DEFAULT_REMOTE_HEARTBEAT_INTERVAL_MS,
@@ -67,6 +68,9 @@ export function createSynapseRegistry(opts = {}) {
     return session.isRemote ? remoteTimeoutMs : localTimeoutMs;
   }
 
+  let persistTimer = null;
+  let destroyed = false;
+
   function persist() {
     if (!persistPath) return;
     try {
@@ -80,6 +84,15 @@ export function createSynapseRegistry(opts = {}) {
     }
   }
 
+  function schedulePersist() {
+    if (destroyed || persistTimer) return;
+    persistTimer = setTimeout(() => {
+      persistTimer = null;
+      if (!destroyed) persist();
+    }, 200);
+    if (typeof persistTimer.unref === "function") persistTimer.unref();
+  }
+
   function restore() {
     if (!persistPath || !existsSync(persistPath)) return;
     try {
@@ -101,10 +114,11 @@ export function createSynapseRegistry(opts = {}) {
   }
 
   function notifyStale(session) {
-    // TODO: emit synapse.session.stale via Hub deliveryEmitter
+    const clone = cloneSession(session);
+    emitter?.emit("synapse.session.stale", { sessionId: session.sessionId, session: clone });
     for (const callback of staleCallbacks) {
       try {
-        callback(cloneSession(session));
+        callback(clone);
       } catch {
         /* no-op */
       }
@@ -112,10 +126,11 @@ export function createSynapseRegistry(opts = {}) {
   }
 
   function notifyRemoved(session) {
-    // TODO: emit synapse.session.removed via Hub deliveryEmitter
+    const clone = cloneSession(session);
+    emitter?.emit("synapse.session.removed", { sessionId: session.sessionId, session: clone });
     for (const callback of removedCallbacks) {
       try {
-        callback(cloneSession(session));
+        callback(clone);
       } catch {
         /* no-op */
       }
@@ -134,8 +149,10 @@ export function createSynapseRegistry(opts = {}) {
 
       const elapsedMs = now() - current.lastHeartbeat;
       if (elapsedMs > timeoutFor(current) && current.status !== "stale") {
-        current.status = "stale";
-        notifyStale(current);
+        const staled = { ...current, status: "stale" };
+        sessions.set(sessionId, staled);
+        schedulePersist();
+        setImmediate(() => notifyStale(staled));
       }
     }, intervalFor(session));
 
@@ -150,8 +167,13 @@ export function createSynapseRegistry(opts = {}) {
 
   function register(meta) {
     const sessionId = normalizeSessionId(meta?.sessionId);
-    if (!sessionId || sessions.has(sessionId)) {
-      return { ok: false, sessionId };
+    if (!sessionId) {
+      return { ok: false, sessionId, reason: "invalid_id" };
+    }
+
+    if (sessions.has(sessionId)) {
+      console.warn("[synapse-registry] duplicate registration rejected:", sessionId);
+      return { ok: false, sessionId, reason: "duplicate" };
     }
 
     const session = sanitizeSession(
@@ -168,7 +190,7 @@ export function createSynapseRegistry(opts = {}) {
     startMonitor(sessionId);
     persist();
 
-    // TODO: emit synapse.session.started via Hub deliveryEmitter
+    emitter?.emit("synapse.session.started", { sessionId, session: cloneSession(session) });
     return { ok: true, sessionId };
   }
 
@@ -190,33 +212,35 @@ export function createSynapseRegistry(opts = {}) {
     if (!session) return false;
 
     const wasRemote = session.isRemote;
-
-    session.lastHeartbeat = now();
-    session.status = "active";
+    const updated = { ...session, lastHeartbeat: now(), status: "active" };
 
     if (partialMeta && typeof partialMeta === "object") {
-      if (typeof partialMeta.host === "string") session.host = partialMeta.host;
+      if (typeof partialMeta.host === "string") updated.host = partialMeta.host;
       if (typeof partialMeta.worktreePath === "string") {
-        session.worktreePath = partialMeta.worktreePath;
+        updated.worktreePath = partialMeta.worktreePath;
       }
-      if (typeof partialMeta.branch === "string") session.branch = partialMeta.branch;
+      if (typeof partialMeta.branch === "string") updated.branch = partialMeta.branch;
       if (Array.isArray(partialMeta.dirtyFiles)) {
-        session.dirtyFiles = [...partialMeta.dirtyFiles];
+        updated.dirtyFiles = partialMeta.dirtyFiles.filter(
+          (f) => typeof f === "string" && f.length > 0,
+        );
       }
       if (typeof partialMeta.taskSummary === "string") {
-        session.taskSummary = partialMeta.taskSummary;
+        updated.taskSummary = partialMeta.taskSummary;
       }
       if (typeof partialMeta.isRemote === "boolean") {
-        session.isRemote = partialMeta.isRemote;
+        updated.isRemote = partialMeta.isRemote;
       }
     }
 
-    if (session.isRemote !== wasRemote) {
+    sessions.set(normalized, updated);
+
+    if (updated.isRemote !== wasRemote) {
       startMonitor(normalized);
     }
 
-    persist();
-    // TODO: emit synapse.session.heartbeat via Hub deliveryEmitter
+    schedulePersist();
+    emitter?.emit("synapse.session.heartbeat", { sessionId: normalized, session: cloneSession(updated), partial: partialMeta });
     return true;
   }
 
@@ -254,9 +278,14 @@ export function createSynapseRegistry(opts = {}) {
   }
 
   function destroy() {
+    destroyed = true;
     for (const sessionId of monitors.keys()) {
       stopMonitor(sessionId);
     }
+    if (persistTimer) {
+      clearTimeout(persistTimer);
+      persistTimer = null;
+    }
     persist();
   }
 
@@ -272,4 +301,4 @@ export function createSynapseRegistry(opts = {}) {
     snapshot,
     destroy,
   });
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "triflux",
-  "version": "10.9.13",
+  "version": "10.9.15",
   "description": "CLI-first multi-model orchestrator for Claude Code — route tasks to Codex, Gemini, and Claude",
   "type": "module",
   "bin": {
@@ -13,26 +13,69 @@
     "tfx-doctor-tui": "bin/tfx-doctor-tui.mjs",
     "tfx-setup-tui": "bin/tfx-setup-tui.mjs"
   },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "dependencies": {
-    "@triflux/core": "10.0.1",
-    "@triflux/remote": "^10.0.0-alpha.1"
-  },
   "files": [
     "bin",
+    "tui",
+    "hub",
+    "config",
     "skills",
+    "!skills/tfx-workspace",
+    "!**/failure-reports",
+    "scripts",
     "hooks",
     "hud",
-    "scripts",
-    "hub",
     "mesh",
-    "references",
-    "CLAUDE.md",
+    ".claude-plugin",
     "README.md",
+    "README.ko.md",
     "LICENSE"
   ],
+  "workspaces": [
+    "packages/core",
+    "packages/remote",
+    "packages/triflux"
+  ],
+  "scripts": {
+    "pack": "node scripts/pack.mjs all",
+    "pack:core": "node scripts/pack.mjs core",
+    "pack:remote": "node scripts/pack.mjs remote",
+    "setup": "node scripts/setup.mjs",
+    "preinstall": "node scripts/preinstall.mjs",
+    "postinstall": "node scripts/setup.mjs",
+    "lint": "biome check .",
+    "lint:fix": "biome check --fix .",
+    "health": "npm test && npm run lint",
+    "test": "node scripts/test-lock.mjs --test --test-force-exit --test-concurrency=8 \"tests/**/*.test.mjs\" \"scripts/__tests__/**/*.test.mjs\"",
+    "test:unit": "node scripts/test-lock.mjs --test --test-force-exit --test-concurrency=8 tests/unit/**/*.test.mjs",
+    "test:integration": "node scripts/test-lock.mjs --test --test-force-exit --test-concurrency=8 tests/integration/**/*.test.mjs",
+    "test:route-smoke": "node scripts/test-lock.mjs --test scripts/test-tfx-route-no-claude-native.mjs",
+    "test:contract": "node scripts/test-lock.mjs --test --test-force-exit --test-concurrency=8 tests/contract/**/*.test.mjs",
+    "test:coverage": "node --experimental-test-coverage --test-coverage-lines=60 --test-coverage-functions=60 --test --test-force-exit --test-concurrency=8 \"tests/**/*.test.mjs\"",
+    "gen:skill-docs": "node scripts/gen-skill-docs.mjs",
+    "gen:skill-manifest": "node scripts/gen-skill-manifest.mjs"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tellang/triflux.git"
+  },
+  "homepage": "https://github.com/tellang/triflux#readme",
+  "author": "tellang",
+  "license": "MIT",
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.27.1",
+    "better-sqlite3": "^12.6.2",
+    "pino": "^10.3.1",
+    "pino-pretty": "^13.1.3",
+    "systray2": "^2.1.4",
+    "zod": "^4.0.0"
+  },
+  "devDependencies": {
+    "@biomejs/biome": "^2.0.0",
+    "knip": "^6.3.0"
+  },
   "keywords": [
     "claude-code",
     "plugin",
@@ -43,13 +86,5 @@
     "multi-model",
     "triflux",
     "tfx"
-  ],
-  "author": "tellang",
-  "license": "MIT",
-  "homepage": "https://github.com/tellang/triflux#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tellang/triflux.git",
-    "directory": "packages/triflux"
-  }
+  ]
 }

package/scripts/tfx-route.sh

@@ -105,17 +105,14 @@ if [[ -f "$_CODEX_CONFIG" ]] && awk '
 fi
 
 build_codex_base() {
-  # Escape hatch: TFX_FORCE_CODEX_BYPASS=1이면 감지 결과와 무관하게 항상 bypass.
-  # CI/디버깅/긴급 상황에서 config.toml 상태에 상관없이 non-TTY codex exec를 보장.
-  if [[ "${TFX_FORCE_CODEX_BYPASS:-0}" == "1" ]]; then
-    echo "--dangerously-bypass-approvals-and-sandbox --skip-git-repo-check"
-    return
-  fi
-  if [[ -n "$_CODEX_HAS_SANDBOX" ]]; then
-    echo "--skip-git-repo-check"
-  else
-    echo "--dangerously-bypass-approvals-and-sandbox --skip-git-repo-check"
-  fi
+  # codex exec는 항상 non-TTY subprocess에서 실행되므로 --dangerously-bypass 필수.
+  # --dangerously-bypass는 config.toml의 approval_mode/sandbox와 충돌하지 않음
+  # (--full-auto와 달리 bypass는 config 값을 override할 뿐 에러를 던지지 않음).
+  # 검증: approval_mode="auto" config에서 --dangerously-bypass 동시 사용 → exit 0 확인.
+  #
+  # Note: 위의 _CODEX_HAS_SANDBOX awk 감지는 현재 미사용이지만, 향후 codex가
+  # bypass와 config.toml 충돌을 감지하면 분기 로직을 재활성화할 수 있으므로 유지.
+  echo "--dangerously-bypass-approvals-and-sandbox --skip-git-repo-check"
 }
 
 # ── Async Job 디렉토리 ──