@triflux/core 10.43.0 → 10.45.0

package/hub/bridge.mjs

@@ -400,6 +400,16 @@ export function parseArgs(argv) {
       command: { type: "string" },
       role: { type: "string" },
       "session-id": { type: "string" },
+      cwd: { type: "string" },
+      "worktree-path": { type: "string" },
+      branch: { type: "string" },
+      host: { type: "string" },
+      "session-kind": { type: "string" },
+      "is-remote": { type: "string" },
+      "tmux-session": { type: "string" },
+      "tmux-pane": { type: "string" },
+      "omx-session-id": { type: "string" },
+      "codex-session-id": { type: "string" },
       reason: { type: "string" },
       type: { type: "string" },
       from: { type: "string" },
@@ -606,6 +616,71 @@ function unavailableResult() {
   return { ok: false, reason: "hub_unavailable" };
 }
 
+function nonEmptyString(value, fallback = "") {
+  const normalized = String(value ?? "").trim();
+  return normalized || fallback;
+}
+
+function readBoolean(value) {
+  return ["1", "true", "yes"].includes(nonEmptyString(value).toLowerCase());
+}
+
+function sessionAgentId(sessionId) {
+  return `codex-session-${sessionId.replace(/[^A-Za-z0-9._-]/g, "_")}`;
+}
+
+export function buildInteractiveSessionRegistrationPayload(args = {}) {
+  const sessionId = nonEmptyString(args["session-id"]);
+  if (!sessionId) return null;
+
+  const cwd = nonEmptyString(args.cwd, process.cwd());
+  const worktreePath = nonEmptyString(args["worktree-path"], cwd);
+  const host = nonEmptyString(args.host, "local");
+  const sessionKind = nonEmptyString(args["session-kind"], "interactive");
+  const agentId = nonEmptyString(args.agent, sessionAgentId(sessionId));
+  const metadata = {
+    pid: process.ppid,
+    registered_at: Date.now(),
+    cwd,
+    worktree_path: worktreePath,
+    branch: nonEmptyString(args.branch),
+    host,
+    session_kind: sessionKind,
+    is_remote: readBoolean(args["is-remote"]),
+    ...(nonEmptyString(args["tmux-session"])
+      ? { tmux_session: nonEmptyString(args["tmux-session"]) }
+      : {}),
+    ...(nonEmptyString(args["tmux-pane"])
+      ? { tmux_pane: nonEmptyString(args["tmux-pane"]) }
+      : {}),
+    ...(nonEmptyString(args["omx-session-id"])
+      ? { omx_session_id: nonEmptyString(args["omx-session-id"]) }
+      : {}),
+    ...(nonEmptyString(args["codex-session-id"])
+      ? { codex_session_id: nonEmptyString(args["codex-session-id"]) }
+      : {}),
+  };
+
+  return {
+    sessionId,
+    cwd,
+    worktreePath,
+    branch: nonEmptyString(args.branch),
+    host,
+    sessionKind,
+    isRemote: readBoolean(args["is-remote"]),
+    agent_id: agentId,
+    cli: nonEmptyString(args.cli, "codex"),
+    capabilities: args.capabilities
+      ? String(args.capabilities).split(",")
+      : ["code"],
+    topics: args.topics ? String(args.topics).split(",") : [],
+    heartbeat_ttl_ms: 300000,
+    session_id: sessionId,
+    metadata,
+  };
+}
+
 function emitJson(payload) {
   if (payload !== undefined) {
     console.log(JSON.stringify(payload));
@@ -613,17 +688,33 @@ function emitJson(payload) {
   return payload?.ok !== false;
 }
 
+const HUB_STORE_CLI_VALUES = new Set(["codex", "gemini", "claude", "other"]);
+function normalizeCliForStore(cli) {
+  return HUB_STORE_CLI_VALUES.has(cli) ? cli : "other";
+}
+
 async function cmdRegister(args) {
+  const interactiveSession = buildInteractiveSessionRegistrationPayload(args);
+  if (interactiveSession) {
+    const result = await requestJson("/synapse/register", {
+      body: interactiveSession,
+      timeoutMs: 3000,
+    });
+    return emitJson(result || unavailableResult());
+  }
+
   const agentId = args.agent;
   const timeoutSec = parseInt(args.timeout || "600", 10);
+  const rawCli = args.cli || "other";
   const outcome = await requestHub(HUB_OPERATIONS.register, {
     agent_id: agentId,
-    cli: args.cli || "other",
+    cli: normalizeCliForStore(rawCli),
     timeout_sec: timeoutSec,
     heartbeat_ttl_ms: (timeoutSec + 120) * 1000,
     topics: args.topics ? args.topics.split(",") : [],
     capabilities: args.capabilities ? args.capabilities.split(",") : ["code"],
     metadata: {
+      cli: rawCli,
       pid: process.ppid,
       registered_at: Date.now(),
     },
@@ -634,8 +725,12 @@ async function cmdRegister(args) {
     return emitJson({
       ok: true,
       agent_id: agentId,
+      lease_id: result.data?.lease_id,
+      presence_generation: result.data?.presence_generation,
       lease_expires_ms: result.data?.lease_expires_ms,
       pipe_path: result.data?.pipe_path || getHubPipePath(),
+      hub_instance_id: result.data?.hub_instance_id,
+      store_fingerprint: result.data?.store_fingerprint,
     });
   }
 
@@ -646,6 +741,10 @@ async function cmdHeartbeat(args) {
   const outcome = await requestHub(HUB_OPERATIONS.heartbeat, {
     agent_id: args.agent,
     ttl_ms: args["ttl-ms"] != null ? Number(args["ttl-ms"]) : undefined,
+    presence_generation:
+      args.generation != null ? Number(args.generation) : undefined,
+    hub_instance_id: args["hub-instance-id"],
+    store_fingerprint: args["store-fingerprint"],
   });
   return emitJson(outcome?.result || unavailableResult());
 }
@@ -731,6 +830,8 @@ async function cmdTakeoverRole(args) {
     agent_id: agentId,
     reason: args.reason || "manual",
     requested_by: args["requested-by"] || "bridge",
+    hub_instance_id: args["hub-instance-id"],
+    store_fingerprint: args["store-fingerprint"],
   });
   const result = outcome?.result;
   return emitJson(result || unavailableResult());
@@ -748,6 +849,8 @@ async function cmdSendInput(args) {
 async function cmdContext(args) {
   const outcome = await requestHub(HUB_OPERATIONS.context, {
     agent_id: args.agent,
+    presence_generation:
+      args.generation != null ? Number(args.generation) : undefined,
     topics: args.topics ? args.topics.split(",") : undefined,
     max_messages: parseInt(args.max || "10", 10),
     auto_ack: true,
@@ -793,13 +896,13 @@ async function cmdContext(args) {
 async function cmdDeregister(args) {
   const outcome = await requestHub(HUB_OPERATIONS.deregister, {
     agent_id: args.agent,
+    presence_generation:
+      args.generation != null ? Number(args.generation) : undefined,
+    hub_instance_id: args["hub-instance-id"],
+    store_fingerprint: args["store-fingerprint"],
   });
   const result = outcome?.result;
 
-  if (result?.ok) {
-    return emitJson({ ok: true, agent_id: args.agent, status: "offline" });
-  }
-
   return emitJson(result || unavailableResult());
 }
 
@@ -1291,6 +1394,7 @@ async function cmdDaemonProbe(args) {
       short: payload.short,
       sessionId: payload.sessionId,
       timeoutMs: numericOption(payload.timeoutMs, 6000),
+      tmpRoot: payload.tmpRoot,
     });
     return emitJson(probe);
   } catch (error) {
@@ -1314,6 +1418,7 @@ async function cmdDaemonAttach(args) {
       short: payload.short,
       sessionId: payload.sessionId,
       timeoutMs: numericOption(payload.timeoutMs, 6000),
+      tmpRoot: payload.tmpRoot,
     });
     if (!probe.ok) return emitJson(daemonAttachProbeFailureResult(probe));
     const short = payload.short ?? probe.target?.short;
@@ -1382,6 +1487,7 @@ async function cmdDaemonInterrupt(args) {
       short: payload.short,
       sessionId: payload.sessionId,
       timeoutMs: numericOption(payload.timeoutMs, 6000),
+      tmpRoot: payload.tmpRoot,
     });
     if (!probe.ok) return emitJson(daemonInterruptProbeFailureResult(probe));
     const short = payload.short ?? probe.target?.short;

package/hub/cli-adapter-base.mjs

@@ -167,7 +167,7 @@ export const CODEX_MCP_EXECUTION_EXIT_CODE = 1;
  *
  * @param {string} prompt
  * @param {string|null} resultFile — null이면 --output-last-message 생략
- * @param {{ profile?: string, skipGitRepoCheck?: boolean, sandboxBypass?: boolean, cwd?: string, mcpServers?: string[], stdinPrompt?: boolean }} [opts]
+ * @param {{ profile?: string, codexHome?: string, disallowUltra?: boolean, enforceCanonicalProfile?: boolean, skipGitRepoCheck?: boolean, sandboxBypass?: boolean, cwd?: string, mcpServers?: string[], stdinPrompt?: boolean }} [opts]
  * @returns {string} 실행할 셸 커맨드
  */
 export function buildExecCommand(prompt, resultFile = null, opts = {}) {
@@ -177,6 +177,9 @@ export function buildExecCommand(prompt, resultFile = null, opts = {}) {
     sandboxBypass = true,
     mcpServers,
     stdinPrompt,
+    codexHome,
+    disallowUltra,
+    enforceCanonicalProfile,
   } = opts;
 
   const parts = ["codex"];
@@ -185,7 +188,13 @@ export function buildExecCommand(prompt, resultFile = null, opts = {}) {
   // still contains an inline [profiles.X] table (and codex re-injects such
   // tables when it rewrites config.toml), so the `-c model=.. -c
   // model_reasoning_effort=..` form is immune and mutates no config.
-  const profileOverrides = profile ? codexProfileConfigOverrides(profile) : [];
+  const profileOverrides = profile
+    ? codexProfileConfigOverrides(profile, {
+        codexHome,
+        disallowUltra,
+        enforceCanonicalProfile,
+      })
+    : [];
 
   if (FEATURES.execSubcommand) {
     parts.push("exec");

package/hub/codex-adapter.mjs

@@ -118,6 +118,9 @@ export function buildExecArgs(opts = {}) {
   const prompt = typeof opts.prompt === "string" ? opts.prompt : "";
   const command = buildExecCommand(prompt, opts.resultFile || null, {
     profile: opts.profile,
+    codexHome: opts.codexHome,
+    disallowUltra: opts.disallowUltra,
+    enforceCanonicalProfile: opts.enforceCanonicalProfile,
     skipGitRepoCheck: true,
     sandboxBypass: true,
     cwd: opts.cwd,

package/hub/gemini-adapter.mjs

@@ -4,6 +4,10 @@
 import { mkdirSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import {
+  resolveGeminiModel,
+  resolveGeminiProfileForPurpose,
+} from "../scripts/lib/gemini-profiles.mjs";
 import {
   executeWithCircuitBroker,
   normalizePathForShell,
@@ -61,15 +65,13 @@ async function runPreflight(opts = {}) {
 // ── Command building ────────────────────────────────────────────
 
 function buildGeminiCommand(prompt, resultFile, opts = {}) {
-  const parts = [
-    "printf",
-    "%s",
-    shellSingleQuote(prompt),
-    "|",
-    "agy",
-    "--print",
-    "--dangerously-skip-permissions",
-  ];
+  // agy 의 --print 는 값(프롬프트)을 받는 플래그다. 1.1.27 부터 stdin 프롬프트는
+  // "empty prompt" 로 거부되므로 프롬프트를 --print 의 값으로, 맨 끝에 넘긴다.
+  const parts = ["agy", "--dangerously-skip-permissions"];
+  if (typeof opts.model === "string" && opts.model.trim()) {
+    parts.push("--model", shellSingleQuote(opts.model.trim()));
+  }
+  parts.push("--print", shellSingleQuote(prompt));
 
   if (resultFile) {
     return `${parts.join(" ")} > ${shellSingleQuote(normalizePathForShell(resultFile))} 2>${shellSingleQuote(normalizePathForShell(resultFile + ".err"))}`;
@@ -78,11 +80,27 @@ function buildGeminiCommand(prompt, resultFile, opts = {}) {
   return parts.join(" ");
 }
 
+function resolveAntigravityModel(opts = {}) {
+  // effort 는 역할별 SSOT(scripts/lib/gemini-profiles.mjs). 명시 model 이 우선한다.
+  const explicit = typeof opts.model === "string" ? opts.model.trim() : "";
+  if (explicit)
+    return resolveGeminiModel(explicit, {
+      profilesPath: opts.geminiProfilesPath,
+    });
+  if (!opts.role && !opts.agent) return "";
+  return resolveGeminiModel(
+    resolveGeminiProfileForPurpose(opts.role || opts.agent),
+    {
+      profilesPath: opts.geminiProfilesPath,
+    },
+  );
+}
+
 function buildAttempts(opts, preflight) {
   const timeout = Number.isFinite(opts.timeout) ? opts.timeout : 900_000;
   const base = {
     timeout,
-    model: opts.model,
+    model: resolveAntigravityModel(opts),
     allowedMcpServers: Array.isArray(opts.mcpServers)
       ? [...opts.mcpServers]
       : [],
@@ -98,7 +116,7 @@ function buildAttempts(opts, preflight) {
 export function buildExecArgs(opts = {}) {
   const prompt = typeof opts.prompt === "string" ? opts.prompt : "";
   return buildGeminiCommand(prompt, opts.resultFile || null, {
-    model: opts.model,
+    model: resolveAntigravityModel(opts),
     allowedMcpServers: opts.mcpServers,
   });
 }

package/hub/intent.mjs

@@ -3,6 +3,7 @@
 
 import { execFileSync } from "node:child_process";
 import crypto from "node:crypto";
+import { resolveCodexAgentPolicy } from "../scripts/lib/agent-route-policy.mjs";
 import { whichCommand } from "./platform.mjs";
 
 /** 캐시 엔트리: { category, confidence, ts } */
@@ -61,31 +62,27 @@ function _tryCodexClassify(prompt) {
  * triflux 특화 의도 카테고리 (10개)
  */
 export const INTENT_CATEGORIES = {
-  // 모델 정책 (2026-04-25):
-  // - GPT-5.6 family = 기존 semantic tier를 Sol/Terra/Luna lane으로 매핑
-  // - gpt-5.4-mini = 자잘/부가/가성비 (fast tier 가능)
-  // - gpt-5.3-codex = escalation 가성비 중간 (fast 미지원)
-  // - 기존 effort는 유지하고 모델만 GPT-5.6 family로 교체
-  implement: {
-    agent: "executor",
-    mcp: "implement",
-    effort: "gpt56_terra_high",
-  },
-  debug: { agent: "debugger", mcp: "implement", effort: "gpt56_sol_xhigh" },
-  analyze: { agent: "analyst", mcp: "analyze", effort: "gpt56_sol_xhigh" },
-  design: { agent: "architect", mcp: "analyze", effort: "gpt56_sol_xhigh" },
-  review: { agent: "code-reviewer", mcp: "review", effort: "gpt56_terra_high" },
-  document: { agent: "writer", mcp: "docs", effort: "pro" },
-  research: { agent: "scientist", mcp: "analyze", effort: "gpt56_terra_high" },
-  "quick-fix": {
-    agent: "build-fixer",
-    mcp: "implement",
-    effort: "gpt56_luna_low",
-  },
-  explain: { agent: "writer", mcp: "docs", effort: "flash" },
-  test: { agent: "test-engineer", mcp: null, effort: null },
+  implement: { agent: "executor", mcp: "implement" },
+  debug: { agent: "debugger", mcp: "implement" },
+  analyze: { agent: "analyst", mcp: "analyze" },
+  design: { agent: "architect", mcp: "analyze" },
+  review: { agent: "code-reviewer", mcp: "review" },
+  document: { agent: "writer", mcp: "docs" },
+  research: { agent: "scientist", mcp: "analyze" },
+  "quick-fix": { agent: "build-fixer", mcp: "implement" },
+  explain: { agent: "writer", mcp: "docs" },
+  test: { agent: "test-engineer", mcp: null },
 };
 
+function routingFor(category) {
+  const route = INTENT_CATEGORIES[category] || INTENT_CATEGORIES.implement;
+  return {
+    agent: route.agent,
+    mcp: route.mcp,
+    effort: resolveCodexAgentPolicy(route.agent).profile,
+  };
+}
+
 /** @internal 키워드 → 카테고리 매핑 패턴 */
 const KEYWORD_PATTERNS = [
   {
@@ -267,17 +264,12 @@ export function classifyIntent(prompt) {
   // 캐시 확인
   const cached = _getCached(hash);
   if (cached) {
-    const routing =
-      INTENT_CATEGORIES[cached.category] || INTENT_CATEGORIES.implement;
+    const routing = routingFor(cached.category);
     return {
       category: cached.category,
       confidence: cached.confidence,
       reasoning: `cache-hit: ${cached.category} (${cached.confidence.toFixed(2)})`,
-      routing: {
-        agent: routing.agent,
-        mcp: routing.mcp,
-        effort: routing.effort,
-      },
+      routing,
     };
   }
 
@@ -308,12 +300,12 @@ export function classifyIntent(prompt) {
   // 캐시 저장
   _intentCache.set(hash, { category, confidence, ts: Date.now() });
 
-  const routing = INTENT_CATEGORIES[category] || INTENT_CATEGORIES.implement;
+  const routing = routingFor(category);
   return {
     category,
     confidence,
     reasoning,
-    routing: { agent: routing.agent, mcp: routing.mcp, effort: routing.effort },
+    routing,
   };
 }
 

package/hub/lib/memory-store.mjs

@@ -142,6 +142,7 @@ export function createMemoryStore() {
   const store = {
     type: "memory",
     db: null,
+    fingerprint: "memory:ephemeral",
     uuidv7,
 
     close() {},
@@ -166,6 +167,7 @@ export function createMemoryStore() {
         topics: clone(topics),
         last_seen_ms: now,
         lease_expires_ms: now + heartbeat_ttl_ms,
+        presence_generation: Number(current.presence_generation || 0) + 1,
         status: "online",
         metadata: clone(metadata),
       };
@@ -173,6 +175,7 @@ export function createMemoryStore() {
       return {
         agent_id,
         lease_id: uuidv7(),
+        presence_generation: next.presence_generation,
         lease_expires_ms: next.lease_expires_ms,
         server_time_ms: now,
         effective: {
@@ -183,6 +186,7 @@ export function createMemoryStore() {
           lease_expires_ms: next.lease_expires_ms,
           store_type: "memory",
           db_path: null,
+          store_fingerprint: "memory:ephemeral",
         },
       };
     },
@@ -191,14 +195,23 @@ export function createMemoryStore() {
       return clone(agents.get(id) || null);
     },
 
-    refreshLease(agentId, ttlMs = 30000) {
+    refreshLease(agentId, ttlMs = 30000, presenceGeneration) {
       const current = agents.get(agentId);
-      if (!current)
+      if (
+        !current ||
+        (presenceGeneration != null &&
+          current.presence_generation !== presenceGeneration)
+      )
         return {
           agent_id: agentId,
           lease_expires_ms: Date.now() + ttlMs,
           server_time_ms: Date.now(),
-          effective: { updated: false, store_type: "memory", db_path: null },
+          effective: {
+            updated: false,
+            store_type: "memory",
+            db_path: null,
+            store_fingerprint: "memory:ephemeral",
+          },
         };
       const now = Date.now();
       current.last_seen_ms = now;
@@ -208,7 +221,12 @@ export function createMemoryStore() {
         agent_id: agentId,
         lease_expires_ms: current.lease_expires_ms,
         server_time_ms: now,
-        effective: { updated: true, store_type: "memory", db_path: null },
+        effective: {
+          updated: true,
+          store_type: "memory",
+          db_path: null,
+          store_fingerprint: "memory:ephemeral",
+        },
       };
     },
 
@@ -243,9 +261,19 @@ export function createMemoryStore() {
 
     sweepStaleAgents() {
       const now = Date.now();
+      const candidates = Array.from(agents.values(), (agent) => ({
+        agent_id: agent.agent_id,
+        presence_generation: agent.presence_generation,
+      }));
       let stale = 0;
       let offline = 0;
-      for (const agent of agents.values()) {
+      for (const candidate of candidates) {
+        const agent = agents.get(candidate.agent_id);
+        if (
+          !agent ||
+          agent.presence_generation !== candidate.presence_generation
+        )
+          continue;
         if (agent.status === "online" && agent.lease_expires_ms < now) {
           agent.status = "stale";
           stale += 1;
@@ -260,9 +288,14 @@ export function createMemoryStore() {
       return { stale, offline };
     },
 
-    updateAgentStatus(agentId, status) {
+    updateAgentStatus(agentId, status, presenceGeneration) {
       const current = agents.get(agentId);
-      if (!current) return false;
+      if (
+        !current ||
+        (presenceGeneration != null &&
+          current.presence_generation !== presenceGeneration)
+      )
+        return false;
       current.status = status;
       return true;
     },
@@ -421,21 +454,11 @@ export function createMemoryStore() {
         .map((request) => clone(request));
     },
 
-    expireHumanRequests() {
-      let changed = 0;
-      const now = Date.now();
-      for (const request of humanRequests.values()) {
-        if (request.state === "pending" && request.deadline_ms < now) {
-          request.state = "timed_out";
-          changed += 1;
-        }
-      }
-      return changed;
-    },
-
     moveToDeadLetter(messageId, reason, lastError = null) {
       const current = messages.get(messageId);
-      if (current) current.status = "dead_letter";
+      if (!current || current.status === "dead_letter") return false;
+      current.status = "dead_letter";
+      if (deadLetters.has(messageId)) return true;
       deadLetters.set(messageId, {
         message_id: messageId,
         reason,
@@ -685,25 +708,38 @@ export function createMemoryStore() {
       });
     },
 
-    sweepExpired() {
-      const now = Date.now();
-      let expiredMessages = 0;
+    sweepExpired({ now_ms = Date.now() } = {}) {
+      const transitions = [];
       for (const message of messages.values()) {
-        if (message.status === "queued" && message.expires_at_ms < now) {
-          message.status = "dead_letter";
+        if (
+          !["queued", "delivered"].includes(message.status) ||
+          message.expires_at_ms > now_ms
+        )
+          continue;
+        const snapshot = clone(message);
+        const previousStatus = message.status;
+        message.status = "dead_letter";
+        const dlqInserted = !deadLetters.has(message.id);
+        if (dlqInserted) {
           deadLetters.set(message.id, {
             message_id: message.id,
             reason: "ttl_expired",
-            failed_at_ms: now,
+            failed_at_ms: now_ms,
             last_error: null,
           });
-          expiredMessages += 1;
         }
+        transitions.push({
+          message: snapshot,
+          previous_status: previousStatus,
+          reason: "ttl_expired",
+          failed_at_ms: now_ms,
+          dlq_inserted: dlqInserted,
+        });
       }
-      const humanRequestsExpired = store.expireHumanRequests();
       return {
-        messages: expiredMessages,
-        human_requests: humanRequestsExpired,
+        now_ms,
+        messages: transitions.length,
+        transitions,
       };
     },