@triflux/core 10.51.0 → 10.53.0

package/hub/cli-adapter-base.mjs

@@ -15,61 +15,6 @@ import {
 import { IS_WINDOWS, killProcess } from "./platform.mjs";
 import { createInterventionLadder } from "./team/intervention.mjs";
 
-// ── Quota retry-after 파싱 ──────────────────────────────────────
-
-const FALLBACK_COOLDOWN_MS = { codex: 5 * 3600_000, gemini: 86400_000 };
-
-/**
- * 에러 텍스트에서 retry-after 시간을 동적 파싱.
- * "try again at 2026-04-11T10:00:00Z", "retry after 3600 seconds",
- * "resets in 7 days", "wait 5 hours" 등을 감지.
- */
-export function parseRetryAfterMs(text, provider) {
-  // 1. ISO timestamp: "try again at 2026-04-11T10:00:00"
-  const isoMatch = text.match(
-    /(?:try again|retry|available|resets?)\s+(?:at|after)\s+(\d{4}-\d{2}-\d{2}T[\d:.]+Z?)/i,
-  );
-  if (isoMatch) {
-    const target = new Date(isoMatch[1]).getTime();
-    if (target > Date.now()) return target - Date.now();
-  }
-
-  // 2. Duration: "N seconds/minutes/hours/days"
-  const durMatch = text.match(
-    /(?:retry|wait|resets?|again)\s+(?:in\s+|after\s+)?(\d+)\s*(second|minute|hour|day|week)/i,
-  );
-  if (durMatch) {
-    const n = Number(durMatch[1]);
-    const unit = durMatch[2].toLowerCase();
-    const multipliers = {
-      second: 1000,
-      minute: 60_000,
-      hour: 3600_000,
-      day: 86400_000,
-      week: 604800_000,
-    };
-    return n * (multipliers[unit] || 3600_000);
-  }
-
-  // 3. "7 days" / "24 hours" 단독 (context 없이)
-  const standaloneMatch = text.match(/(\d+)\s*(day|hour|week|minute)/i);
-  if (standaloneMatch) {
-    const n = Number(standaloneMatch[1]);
-    const unit = standaloneMatch[2].toLowerCase();
-    const multipliers = {
-      minute: 60_000,
-      hour: 3600_000,
-      day: 86400_000,
-      week: 604800_000,
-    };
-    const parsed = n * (multipliers[unit] || 3600_000);
-    if (parsed >= 3600_000) return parsed; // 1시간 이상만 신뢰
-  }
-
-  // 4. fallback: provider 기본값
-  return FALLBACK_COOLDOWN_MS[provider] || 5 * 3600_000;
-}
-
 // ── Shell utilities ─────────────────────────────────────────────
 
 export function normalizePathForShell(value) {
@@ -195,47 +140,28 @@ export function appendWarnings(stderr, warnings = []) {
   return [stderr, text].filter(Boolean).join("\n");
 }
 
-// ── Broker-integrated execution ─────────────────────────────────
+// ── Attempt execution ───────────────────────────────────────────
 
 /**
- * Shared execute() logic that uses account-broker for per-account circuit
- * breaking instead of a global breaker.
+ * preflight 뒤 buildAttemptsFn 이 만든 시도를 순서대로 실행한다.
  *
  * @param {object} params
- * @param {string} params.provider — 'codex' | 'gemini'
  * @param {(prompt: string, workdir: string, preflight: object, attempt: object) => Promise<object>} params.runFn
  * @param {(opts: object) => Promise<object>} params.preflightFn
  * @param {(opts: object, preflight: object) => object[]} params.buildAttemptsFn
  * @param {object} params.opts — caller-supplied execute options
  * @returns {Promise<object>} createResult-shaped result
  */
-export async function executeWithCircuitBroker({
-  provider,
+export async function executeWithAttempts({
   runFn,
   preflightFn,
   buildAttemptsFn,
   opts = {},
 }) {
-  // late-import to avoid circular dependency at module load time
-  const brokerMod = await import("./account-broker.mjs");
   const { withRetry } = await import("./workers/worker-utils.mjs");
 
-  // access broker as live binding property (not destructured) so reloadBroker() propagates
-  const hasBroker = brokerMod.broker != null;
-  // Empty broker (TFX_DISABLE_ACCOUNT_BROKER=1 or zero accounts) must not
-  // gate execution. lease() is null because there are no accounts to lease,
-  // not because all accounts are busy/cooldown/circuit. Treat it like
-  // hasBroker=false and fall through to the default auth path.
-  const brokerDisabled = hasBroker && brokerMod.broker.isDisabled === true;
-  const effectiveBroker = hasBroker && !brokerDisabled;
-  const lease = effectiveBroker ? brokerMod.broker.lease({ provider }) : null;
-  if (effectiveBroker && !lease) {
-    return createResult(false, { fellBack: true, failureMode: "circuit_open" });
-  }
-
   const preflight = await preflightFn(opts);
   if (!preflight.ok) {
-    if (lease) brokerMod.broker.release(lease.id, { ok: false });
     return createResult(false, {
       stderr: appendWarnings("", preflight.warnings),
       fellBack: opts.fallbackToClaude !== false,
@@ -250,15 +176,11 @@ export async function executeWithCircuitBroker({
   try {
     lastResult = await withRetry(
       async () => {
-        // PRD A1: lease 메타데이터를 runFn 에 전달해서 adapter 가 실제 spawn 시
-        // 해당 account 의 authFile/env/profile 을 적용할 수 있게 한다. lease=null
-        // 이면 adapter 는 default 경로 (단일 ~/.codex/auth.json) 로 동작한다.
         const result = await runFn(
           opts.prompt || "",
           opts.workdir || process.cwd(),
           preflight,
           attempts[attemptIndex],
-          lease,
         );
         const current = {
           ...result,
@@ -286,26 +208,7 @@ export async function executeWithCircuitBroker({
       createResult(false, { stderr: String(error?.message || error) });
   }
 
-  if (lastResult.ok) {
-    if (lease) brokerMod.broker.release(lease.id, { ok: true });
-    return lastResult;
-  }
-
-  if (lease) {
-    if (lastResult.failureMode === "rate_limited") {
-      const text = `${lastResult.output || ""}\n${lastResult.stderr || ""}`;
-      const coolMs = parseRetryAfterMs(text, provider);
-      brokerMod.broker.markRateLimited(lease.id, coolMs);
-      brokerMod.broker.emit("cooldown", {
-        id: lease.id,
-        provider,
-        coolMs,
-        reason: "quota_exhausted",
-      });
-    } else {
-      brokerMod.broker.release(lease.id, { ok: false });
-    }
-  }
+  if (lastResult.ok) return lastResult;
   return {
     ...lastResult,
     retried: attempts.length > 1,
@@ -374,13 +277,10 @@ export async function runProcess(command, workdir, timeout, opts = {}) {
   let child;
 
   try {
-    // PRD A1: opts.spawnEnv 가 있으면 그 env 로 spawn (lease 의 authFile/env 적용).
-    // undefined 면 spawn 의 default 동작 (부모 process env inherit) 유지.
     child = spawnProcess(command, {
       cwd: workdir,
       shell: true,
       windowsHide: true,
-      env: opts.spawnEnv,
     });
   } catch (error) {
     return createResult(false, {

package/hub/codex-adapter.mjs

@@ -1,11 +1,10 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { mkdirSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { basename, join } from "node:path";
+import { join } from "node:path";
 import { codexProfileConfigOverrides } from "../scripts/lib/codex-profile-config.mjs";
 import {
   buildExecCommand,
-  createResult,
-  executeWithCircuitBroker,
+  executeWithAttempts,
   normalizePathForShell,
   runProcess,
   shellQuote,
@@ -113,7 +112,7 @@ export function buildLaunchScript(opts = {}) {
 
 // CTO boundary: this adapter assembles Codex prompts outside
 // scripts/tfx-route.sh. Keep north-star injection in tfx-route.sh until
-// launcher/circuit-broker workdir contracts have focused coverage.
+// launcher workdir contracts have focused coverage.
 export function buildExecArgs(opts = {}) {
   const prompt = typeof opts.prompt === "string" ? opts.prompt : "";
   const command = buildExecCommand(prompt, opts.resultFile || null, {
@@ -153,7 +152,7 @@ export function buildExecArgs(opts = {}) {
 
 // ── Codex execution ─────────────────────────────────────────────
 
-async function runCodex(prompt, workdir, preflight, attempt, lease) {
+async function runCodex(prompt, workdir, preflight, attempt) {
   const dir = join(tmpdir(), "triflux-codex-exec");
   mkdirSync(dir, { recursive: true });
   const resultFile = join(
@@ -162,7 +161,7 @@ async function runCodex(prompt, workdir, preflight, attempt, lease) {
   );
   const command = commandWithOverrides(
     buildExecCommand(prompt, resultFile, {
-      profile: lease?.profile ?? attempt.profile,
+      profile: attempt.profile,
       skipGitRepoCheck: true,
       sandboxBypass: attempt.forceBypass,
     }),
@@ -170,125 +169,17 @@ async function runCodex(prompt, workdir, preflight, attempt, lease) {
     preflight.codexPath,
     buildOverrides(attempt.requested, attempt.excluded),
   );
-  // PRD A1 — lease 메타데이터를 spawn env 에 적용한다. lease.authFile 이 있으면
-  // 해당 파일이 위치한 디렉토리를 CODEX_HOME 으로 export 해서 codex CLI 가 그
-  // account 의 auth.json 을 사용하게 한다. lease 가 null 이면 default ~/.codex
-  // 동작 유지 (회귀 없음). lease.env 는 추가 환경변수 (provider 고정 등) 주입용.
-  const spawnEnv = lease ? buildLeaseSpawnEnv(lease) : undefined;
-  const authCheck = validateLeaseAuth(lease, spawnEnv);
-  if (!authCheck.ok) {
-    return createResult(false, {
-      stderr: authCheck.error,
-      failureMode: "auth_sync",
-      skipCircuit: true,
-    });
-  }
   return runProcess(command, workdir, attempt.timeout, {
     resultFile,
     inferStallMode,
-    spawnEnv,
     cli: "codex",
-    codexHome: spawnEnv?.CODEX_HOME,
   });
 }
 
-function buildLeaseSpawnEnv(lease) {
-  const extra = {};
-  if (lease.authFile) {
-    // lease.authFile 은 보통 ~/.claude/cache/tfx-hub/codex-auth-<account>.json 형식.
-    // codex CLI 는 CODEX_HOME 을 통해 auth.json 위치를 결정하므로, 이 cache 파일을
-    // 직접 CODEX_HOME 후보 디렉토리로 사용한다. cache 파일 자체가 auth.json 이름이
-    // 아니라면 후속 PR 에서 isolated dir + symlink/복사 처리한다 (PRD Open Question).
-    // 현재는 lease.authFile 의 dirname 을 export 하되, 그 dirname 안에 auth.json 이
-    // 실제로 있을 때만 적용한다 (false-positive 회피).
-    try {
-      const dir = dirnameOf(lease.authFile);
-      if (dir) extra.CODEX_HOME = dir;
-    } catch {}
-  }
-  if (lease.env && typeof lease.env === "object") {
-    Object.assign(extra, lease.env);
-  }
-  return Object.keys(extra).length ? { ...process.env, ...extra } : undefined;
-}
-
-function validateLeaseAuth(lease, spawnEnv) {
-  if (!lease?.authFile) return { ok: true };
-  if (basename(lease.authFile) !== "auth.json") {
-    return {
-      ok: false,
-      error: `lease authFile must resolve to auth.json for account ${lease.id}`,
-    };
-  }
-  if (!existsSync(lease.authFile)) {
-    return {
-      ok: false,
-      error: `lease authFile missing for account ${lease.id}: ${lease.authFile}`,
-    };
-  }
-  if (dirnameOf(lease.authFile) !== spawnEnv?.CODEX_HOME) {
-    return {
-      ok: false,
-      // This is currently expected to match because buildLeaseSpawnEnv derives
-      // CODEX_HOME from authFile. Keep the guard so future lease.env overrides
-      // cannot silently point Codex at a different account home.
-      error: `CODEX_HOME mismatch for account ${lease.id}`,
-    };
-  }
-  try {
-    const parsed = JSON.parse(readFileSync(lease.authFile, "utf8"));
-    const accountId =
-      parsed?.tokens?.account_id ??
-      parsed?.account_id ??
-      parsed?.accountId ??
-      null;
-    if (!accountId) {
-      return {
-        ok: false,
-        error: `lease authFile has no account_id for account ${lease.id}`,
-      };
-    }
-    if (accountId !== lease.id) {
-      return {
-        ok: false,
-        error: `lease authFile account mismatch: expected ${lease.id}, got ${accountId}`,
-      };
-    }
-  } catch (error) {
-    return {
-      ok: false,
-      error: `lease authFile unreadable for account ${lease.id}: ${error?.message || error}`,
-    };
-  }
-  return { ok: true };
-}
-
-function dirnameOf(filePath) {
-  if (typeof filePath !== "string" || !filePath) return null;
-  const lastSep = Math.max(
-    filePath.lastIndexOf("/"),
-    filePath.lastIndexOf("\\"),
-  );
-  if (lastSep < 0) return null;
-  return filePath.slice(0, lastSep);
-}
-
 // ── Public API ──────────────────────────────────────────────────
 
-export async function getCircuitState() {
-  const brokerMod = await import("./account-broker.mjs");
-  if (!brokerMod.broker) return { state: "closed", failures: [] };
-  const snap = brokerMod.broker
-    .snapshot()
-    .filter((a) => a.provider === "codex");
-  return snap.length
-    ? { state: snap[0].circuitState, accounts: snap }
-    : { state: "closed", failures: [] };
-}
-
 export function execute(opts = {}) {
-  return executeWithCircuitBroker({
-    provider: "codex",
+  return executeWithAttempts({
     runFn: runCodex,
     preflightFn: (o) =>
       runPreflight({

package/hub/index.mjs

@@ -1,28 +1,11 @@
 // @triflux/core — barrel export (auto-generated by pack.mjs)
 // Adapters
 export { buildExecCommand, sleep, CODEX_MCP_TRANSPORT_EXIT_CODE, normalizePathForShell, shellQuote } from './cli-adapter-base.mjs';
-export { execute as executeCodex, buildExecArgs as buildCodexArgs, buildLaunchScript, getCircuitState as getCodexCircuit } from './codex-adapter.mjs';
+export { execute as executeCodex, buildExecArgs as buildCodexArgs, buildLaunchScript } from './codex-adapter.mjs';
 export { getCodexVersion, runPreflight } from './codex-preflight.mjs';
 
-// Routing
-export { createRouter } from './router.mjs';
-
-// State & Paths & Platform
-export * from './paths.mjs';
+// Platform
 export { IS_WINDOWS, IS_MAC, IS_LINUX, TEMP_DIR, normalizePath, whichCommand, killProcess, pipePath } from './platform.mjs';
 
 // Core services
-export { createHitlManager } from './hitl.mjs';
-export { createAssignCallbackServer } from './assign-callbacks.mjs';
-export { getHubUrl, getHubPipePath, requestJson, post, connectPipe, parseArgs, parseJsonSafe } from './bridge.mjs';
-
-// Reflexion (adaptive error learning)
-export { normalizeError, adaptiveRuleFromError } from './reflexion.mjs';
-
-// Neural Memory (Lake 1.5)
-export { createAdaptiveEngine } from './adaptive.mjs';
-export { createAdaptiveMemory } from './adaptive-memory.mjs';
-export { createDiagnosticPipeline } from './adaptive-diagnostic.mjs';
-export { createAdaptiveInjector } from './adaptive-inject.mjs';
-export { buildAdaptiveFingerprint, createAdaptiveFingerprintService } from './session-fingerprint.mjs';
-export { broker as accountBroker } from './account-broker.mjs';
+export { parseArgs, parseJsonSafe } from './bridge.mjs';

package/hub/lib/process-utils.mjs

@@ -9,7 +9,7 @@ import {
   unlinkSync,
   writeFileSync,
 } from "node:fs";
-import { homedir, tmpdir } from "node:os";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { IS_WINDOWS, killProcess } from "../platform.mjs";
 
@@ -387,23 +387,6 @@ function getProcessSnapshot({
   }
 }
 
-function addHubPid(protectedPids) {
-  try {
-    const hubPidPath = join(
-      homedir(),
-      ".claude",
-      "cache",
-      "tfx-hub",
-      "hub.pid",
-    );
-    if (existsSync(hubPidPath)) {
-      const hubInfo = JSON.parse(readFileSync(hubPidPath, "utf8"));
-      const hubPid = normalizePid(hubInfo?.pid);
-      if (hubPid) protectedPids.add(hubPid);
-    }
-  } catch {}
-}
-
 function getProtectedPids({
   protectedPids,
   isWindows = IS_WINDOWS,
@@ -415,7 +398,6 @@ function getProtectedPids({
   if (Number.isInteger(process.ppid) && process.ppid > 0) {
     result.add(process.ppid);
   }
-  addHubPid(result);
   if (!includeAncestorScan) return result;
 
   const snapshot = getProcessSnapshot({ isWindows, spawnSyncFn });
@@ -845,22 +827,8 @@ export function cleanupStaleFsmonitorDaemons({
 function cleanupOrphansUnix() {
   const myPid = process.pid;
 
-  // Hub PID 보호
   const protectedPids = new Set();
   protectedPids.add(myPid);
-  try {
-    const hubPidPath = join(
-      homedir(),
-      ".claude",
-      "cache",
-      "tfx-hub",
-      "hub.pid",
-    );
-    if (existsSync(hubPidPath)) {
-      const hubPid = Number(JSON.parse(readFileSync(hubPidPath, "utf8"))?.pid);
-      if (Number.isFinite(hubPid) && hubPid > 0) protectedPids.add(hubPid);
-    }
-  } catch {}
 
   // 현재 프로세스의 조상 트리 보호
   try {

package/hub/team/claude-daemon-control.mjs

@@ -1775,8 +1775,7 @@ export async function dispatchClaudeDaemonJob({
 /**
  * dispatchClaudeDaemonJob 의 대칭 정리 경로.
  * removeProjection + killDaemonJob (+ optional removeClaudeJobState) 를
- * 모두 시도하며, 각 스텝 오류는 기존 close()/cleanupDaemonDispatches 와
- * 동일하게 .catch 로 삼킨다.
+ * 모두 시도하며, 각 스텝 오류는 .catch 로 삼킨다.
  */
 export async function teardownClaudeDaemonJob({
   controlSock,

package/hub/team/claude-session-projection.mjs

@@ -1,12 +1,11 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 
-export function normalizeClaudeBridgeSessionId(bridgeSessionId, short) {
+// 실제 bridge ID 가 없으면 만들어 내지 않는다. 추정 ID 는 붙을 수 있는 세션처럼 보이게 한다.
+export function normalizeClaudeBridgeSessionId(bridgeSessionId) {
   const value = String(bridgeSessionId || "").trim();
-  if (value.startsWith("session_")) return value;
   if (value.startsWith("cse_")) return `session_${value.slice(4)}`;
-  if (value) return value;
-  return `session_${short}`;
+  return value;
 }
 
 export function buildClaudeSessionProjection({
@@ -30,6 +29,7 @@ export function buildClaudeSessionProjection({
   if (!cwd) throw new Error("cwd is required");
   if (!name) throw new Error("name is required");
   if (!agent) throw new Error("agent is required");
+  const bridge = normalizeClaudeBridgeSessionId(bridgeSessionId);
   return {
     pid,
     sessionId,
@@ -45,7 +45,7 @@ export function buildClaudeSessionProjection({
     jobId: short,
     status,
     updatedAt,
-    bridgeSessionId: normalizeClaudeBridgeSessionId(bridgeSessionId, short),
+    ...(bridge ? { bridgeSessionId: bridge } : {}),
   };
 }
 
@@ -58,74 +58,6 @@ export async function writeClaudeSessionProjection(sessionsDir, projection) {
   return sessionPath;
 }
 
-export async function updateClaudeSessionProjection(sessionPath, patch) {
-  const parsed = JSON.parse(await fs.readFile(sessionPath, "utf8"));
-  const next = {
-    ...parsed,
-    ...patch,
-    updatedAt: patch.updatedAt || Date.now(),
-  };
-  await fs.writeFile(sessionPath, `${JSON.stringify(next)}\n`, "utf8");
-  return next;
-}
-
-function projectionSessionId(projection) {
-  return String(
-    projection?.sessionId ?? projection?.session_id ?? projection?.id ?? "",
-  ).trim();
-}
-
-export async function findClaudeSessionProjectionBySessionId(
-  sessionsDir,
-  sessionId,
-) {
-  const expected = String(sessionId || "").trim();
-  if (!sessionsDir || !expected) return null;
-  let entries;
-  try {
-    entries = await fs.readdir(sessionsDir, { withFileTypes: true });
-  } catch (error) {
-    if (error?.code === "ENOENT") return null;
-    throw error;
-  }
-
-  for (const entry of entries) {
-    if (!entry.isFile() || !entry.name.endsWith(".json")) continue;
-    const filePath = path.join(sessionsDir, entry.name);
-    try {
-      const projection = JSON.parse(await fs.readFile(filePath, "utf8"));
-      if (projectionSessionId(projection) === expected) {
-        return { path: filePath, projection };
-      }
-    } catch (error) {
-      if (error instanceof SyntaxError) continue;
-      if (error?.code === "ENOENT") continue;
-      throw error;
-    }
-  }
-  return null;
-}
-
-export async function refreshClaudeSessionProjectionCwd({
-  sessionsDir,
-  sessionId,
-  cwd,
-  updatedAt = Date.now(),
-} = {}) {
-  const nextCwd = String(cwd || "").trim();
-  if (!nextCwd) return { updated: false, reason: "missing_cwd" };
-  const found = await findClaudeSessionProjectionBySessionId(
-    sessionsDir,
-    sessionId,
-  );
-  if (!found) return { updated: false, reason: "projection_not_found" };
-  const projection = await updateClaudeSessionProjection(found.path, {
-    cwd: nextCwd,
-    updatedAt,
-  });
-  return { updated: true, path: found.path, projection };
-}
-
 export async function removeClaudeSessionProjection(sessionPath) {
   await fs.rm(sessionPath, { force: true });
 }

package/hub/team/claude-transcript.mjs

@@ -157,6 +157,25 @@ function acceptLine(state, line, marker) {
   }
 }
 
+// daemon 과 tmux wait 가 같은 기준으로 끝을 판정한다. 아직이면 null.
+export function claudeWaitVerdict(transcript, idle) {
+  if (transcript?.error)
+    return { ok: false, status: "failed", error: transcript.error };
+  if (
+    !transcript?.userSeen ||
+    !transcript.turnEnded ||
+    !(idle || transcript.sectionClosed)
+  )
+    return null;
+  if (!transcript.response.trim())
+    return {
+      ok: false,
+      status: "failed",
+      error: "turn ended without assistant text",
+    };
+  return { status: "completed", done: true };
+}
+
 export async function readClaudeTranscript(transcriptPath, { requestId } = {}) {
   if (!transcriptPath) return null;
   const marker = requestId ? `[tfx-live req=${requestId}]` : null;