triflux 10.3.4 → 10.7.0

package/hub/team/staleState.mjs

@@ -1,13 +1,19 @@
 // hub/team/staleState.mjs
 // .omc/state 아래에 남은 stale team 상태를 탐지/정리한다.
 
-import { existsSync, readFileSync, readdirSync, rmSync, statSync, unlinkSync } from "node:fs";
 import { execFileSync } from "node:child_process";
-import { dirname, join, resolve } from "node:path";
+import {
+  existsSync,
+  readdirSync,
+  readFileSync,
+  rmSync,
+  statSync,
+  unlinkSync,
+} from "node:fs";
 import { homedir } from "node:os";
-
-import { forceCleanupTeam } from "./nativeProxy.mjs";
+import { dirname, join, resolve } from "node:path";
 import { isPidAlive } from "../lib/process-utils.mjs";
+import { forceCleanupTeam } from "./nativeProxy.mjs";
 
 export const TEAM_STATE_FILE_NAME = "team-state.json";
 export const STALE_TEAM_MAX_AGE_MS = 60 * 60 * 1000;
@@ -99,7 +105,9 @@ function normalizeProcessEntries(processEntries = []) {
 
   return processEntries.map((entry) => ({
     pid: Number(entry?.pid ?? entry?.ProcessId ?? 0),
-    command: String(entry?.command ?? entry?.CommandLine ?? entry?.Name ?? "").toLowerCase(),
+    command: String(
+      entry?.command ?? entry?.CommandLine ?? entry?.Name ?? "",
+    ).toLowerCase(),
   }));
 }
 
@@ -166,9 +174,11 @@ function resolveLiveness(state, sessionId, liveSessionNames, processEntries) {
 
   const processTokens = findProcessTokens(state, sessionId);
   if (processTokens.length > 0) {
-    const matched = processEntries.find((entry) => (
-      entry.pid > 0 && processTokens.some((token) => entry.command.includes(token))
-    ));
+    const matched = processEntries.find(
+      (entry) =>
+        entry.pid > 0 &&
+        processTokens.some((token) => entry.command.includes(token)),
+    );
     if (matched) {
       return { active: true, reason: `command:${matched.pid}` };
     }
@@ -258,14 +268,23 @@ export function findNearestOmcStateDir(startDir = process.cwd()) {
 }
 
 export function inspectStaleOmcTeams(options = {}) {
-  const stateRoot = options.stateRoot !== undefined ? options.stateRoot : findNearestOmcStateDir(options.startDir || process.cwd());
+  const stateRoot =
+    options.stateRoot !== undefined
+      ? options.stateRoot
+      : findNearestOmcStateDir(options.startDir || process.cwd());
   const requestedTeamsRoot = options.teamsRoot || CLAUDE_TEAMS_ROOT;
-  const teamsRoot = safeStat(requestedTeamsRoot)?.isDirectory() ? requestedTeamsRoot : null;
+  const teamsRoot = safeStat(requestedTeamsRoot)?.isDirectory()
+    ? requestedTeamsRoot
+    : null;
 
   const liveSessionNames = new Set(options.liveSessionNames || []);
-  const processEntries = normalizeProcessEntries(options.processEntries || readProcessEntries());
+  const processEntries = normalizeProcessEntries(
+    options.processEntries || readProcessEntries(),
+  );
   const nowMs = Number.isFinite(options.nowMs) ? options.nowMs : Date.now();
-  const maxAgeMs = Number.isFinite(options.maxAgeMs) ? options.maxAgeMs : STALE_TEAM_MAX_AGE_MS;
+  const maxAgeMs = Number.isFinite(options.maxAgeMs)
+    ? options.maxAgeMs
+    : STALE_TEAM_MAX_AGE_MS;
   const targets = [
     ...(stateRoot ? collectTeamStateTargets(stateRoot) : []),
     ...collectClaudeTeamTargets(teamsRoot),
@@ -291,25 +310,48 @@ export function inspectStaleOmcTeams(options = {}) {
 
     const fileStat = safeStat(target.stateFile);
     const teamDirStat = target.teamDir ? safeStat(target.teamDir) : null;
-    const createdAtMs = Number.isFinite(state?.createdAt) ? state.createdAt : null;
-    const startedAtMs = parseStartedAtMs(state?.started_at)
-      ?? parseStartedAtMs(state?.startedAt)
-      ?? createdAtMs
-      ?? fileStat?.mtimeMs
-      ?? teamDirStat?.mtimeMs
-      ?? null;
+    const createdAtMs = Number.isFinite(state?.createdAt)
+      ? state.createdAt
+      : null;
+    const startedAtMs =
+      parseStartedAtMs(state?.started_at) ??
+      parseStartedAtMs(state?.startedAt) ??
+      createdAtMs ??
+      fileStat?.mtimeMs ??
+      teamDirStat?.mtimeMs ??
+      null;
     const ageMs = startedAtMs == null ? null : Math.max(0, nowMs - startedAtMs);
-    const teamName = state?.teamName || state?.team_name || state?.native?.teamName || state?.name || target.teamName || null;
-    const livenessState = target.scope === "claude_team"
-      ? {
-          ...(state || {}),
-          name: teamName,
-          teamName,
-          sessionName: state?.leadSessionId || state?.lead_session_id || state?.sessionName || target.sessionId,
-          sessionId: state?.leadSessionId || state?.lead_session_id || state?.sessionId || target.sessionId,
-        }
-      : state;
-    const liveness = resolveLiveness(livenessState, target.sessionId, liveSessionNames, processEntries);
+    const teamName =
+      state?.teamName ||
+      state?.team_name ||
+      state?.native?.teamName ||
+      state?.name ||
+      target.teamName ||
+      null;
+    const livenessState =
+      target.scope === "claude_team"
+        ? {
+            ...(state || {}),
+            name: teamName,
+            teamName,
+            sessionName:
+              state?.leadSessionId ||
+              state?.lead_session_id ||
+              state?.sessionName ||
+              target.sessionId,
+            sessionId:
+              state?.leadSessionId ||
+              state?.lead_session_id ||
+              state?.sessionId ||
+              target.sessionId,
+          }
+        : state;
+    const liveness = resolveLiveness(
+      livenessState,
+      target.sessionId,
+      liveSessionNames,
+      processEntries,
+    );
     const stale = ageMs != null && ageMs >= maxAgeMs && !liveness.active;
 
     entries.push({

package/hub/team/swarm-locks.mjs

@@ -3,8 +3,8 @@
 // Lock state is kept in-memory (single-process hypervisor) with optional
 // JSON persistence to .triflux/swarm-locks.json for crash recovery.
 
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from 'node:fs';
-import { dirname, resolve, relative } from 'node:path';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, relative, resolve } from "node:path";
 
 const LOCK_TTL_MS = 10 * 60_000; // 10 minutes default TTL
 
@@ -17,11 +17,7 @@ const LOCK_TTL_MS = 10 * 60_000; // 10 minutes default TTL
  * @returns {SwarmLockManager}
  */
 export function createSwarmLocks(opts = {}) {
-  const {
-    repoRoot = process.cwd(),
-    persistPath,
-    ttlMs = LOCK_TTL_MS,
-  } = opts;
+  const { repoRoot = process.cwd(), persistPath, ttlMs = LOCK_TTL_MS } = opts;
 
   /** @type {Map<string, LockEntry>} normalized relative path → lock */
   const locks = new Map();
@@ -30,7 +26,7 @@ export function createSwarmLocks(opts = {}) {
 
   function normalizePath(filePath) {
     const abs = resolve(repoRoot, filePath);
-    return relative(repoRoot, abs).replace(/\\/g, '/');
+    return relative(repoRoot, abs).replace(/\\/g, "/");
   }
 
   function now() {
@@ -56,21 +52,25 @@ export function createSwarmLocks(opts = {}) {
       const data = Object.fromEntries(
         [...locks].map(([k, v]) => [k, { ...v }]),
       );
-      writeFileSync(persistPath, JSON.stringify(data, null, 2), 'utf8');
-    } catch { /* best-effort */ }
+      writeFileSync(persistPath, JSON.stringify(data, null, 2), "utf8");
+    } catch {
+      /* best-effort */
+    }
   }
 
   function restore() {
     if (!persistPath || !existsSync(persistPath)) return;
     try {
-      const data = JSON.parse(readFileSync(persistPath, 'utf8'));
+      const data = JSON.parse(readFileSync(persistPath, "utf8"));
       const ts = now();
       for (const [path, entry] of Object.entries(data)) {
         if (ts - entry.acquiredAt <= ttlMs) {
           locks.set(path, entry);
         }
       }
-    } catch { /* corrupted file — start fresh */ }
+    } catch {
+      /* corrupted file — start fresh */
+    }
   }
 
   // restore on creation
@@ -199,6 +199,8 @@ export function createSwarmLocks(opts = {}) {
     validateChanges,
     snapshot,
     releaseAll,
-    get size() { return locks.size; },
+    get size() {
+      return locks.size;
+    },
   });
 }

package/hub/team/swarm-planner.mjs

@@ -14,17 +14,17 @@
 //   - prompt: |
 //       multi-line prompt text
 
-import { readFileSync } from 'node:fs';
+import { readFileSync } from "node:fs";
 
 /** Shard schema defaults */
 const SHARD_DEFAULTS = Object.freeze({
-  agent: 'codex',
+  agent: "codex",
   files: [],
   mcp: [],
   depends: [],
   critical: false,
-  prompt: '',
-  host: '',
+  prompt: "",
+  host: "",
 });
 
 /**
@@ -41,7 +41,7 @@ export function parseShards(content) {
 
   function flushPrompt() {
     if (current && promptLines.length > 0) {
-      current.prompt = promptLines.join('\n').trim();
+      current.prompt = promptLines.join("\n").trim();
       promptLines = [];
     }
     inPrompt = false;
@@ -91,26 +91,35 @@ export function parseShards(content) {
     const value = rawValue.trim();
 
     switch (key.toLowerCase()) {
-      case 'agent':
+      case "agent":
         current.agent = value.toLowerCase();
         break;
-      case 'files':
-        current.files = value.split(/,\s*/).map((f) => f.trim()).filter(Boolean);
+      case "files":
+        current.files = value
+          .split(/,\s*/)
+          .map((f) => f.trim())
+          .filter(Boolean);
         break;
-      case 'mcp':
-        current.mcp = value.split(/,\s*/).map((s) => s.trim()).filter(Boolean);
+      case "mcp":
+        current.mcp = value
+          .split(/,\s*/)
+          .map((s) => s.trim())
+          .filter(Boolean);
         break;
-      case 'depends':
-        current.depends = value.split(/,\s*/).map((d) => d.trim()).filter(Boolean);
+      case "depends":
+        current.depends = value
+          .split(/,\s*/)
+          .map((d) => d.trim())
+          .filter(Boolean);
         break;
-      case 'critical':
+      case "critical":
         current.critical = /^(true|yes|1)$/i.test(value);
         break;
-      case 'host':
+      case "host":
         current.host = value;
         break;
-      case 'prompt':
-        if (value && !value.startsWith('|')) {
+      case "prompt":
+        if (value && !value.startsWith("|")) {
           current.prompt = value;
         } else {
           inPrompt = true;
@@ -178,8 +187,8 @@ export function buildMcpManifest(shards) {
  */
 export function computeMergeOrder(shards) {
   const nameSet = new Set(shards.map((s) => s.name));
-  const adj = new Map();    // name → [dependents]
-  const inDeg = new Map();  // name → number
+  const adj = new Map(); // name → [dependents]
+  const inDeg = new Map(); // name → number
 
   for (const shard of shards) {
     adj.set(shard.name, []);
@@ -234,11 +243,13 @@ export function computeMergeOrder(shards) {
  * @returns {SwarmPlan}
  */
 export function planSwarm(prdPath, opts = {}) {
-  const content = opts.content || readFileSync(prdPath, 'utf8');
+  const content = opts.content || readFileSync(prdPath, "utf8");
   const shards = parseShards(content);
 
   if (shards.length === 0) {
-    throw new Error('No shards found in PRD. Expected "## Shard: <name>" sections.');
+    throw new Error(
+      'No shards found in PRD. Expected "## Shard: <name>" sections.',
+    );
   }
 
   const { leaseMap, conflicts } = buildFileLeaseMap(shards);
@@ -246,7 +257,7 @@ export function planSwarm(prdPath, opts = {}) {
   const { order: mergeOrder, cycles } = computeMergeOrder(shards);
 
   if (cycles.length > 0) {
-    throw new Error(`Dependency cycle detected: ${cycles[0].join(' → ')}`);
+    throw new Error(`Dependency cycle detected: ${cycles[0].join(" → ")}`);
   }
 
   return Object.freeze({

package/hub/team/swarm-reconciler.mjs

@@ -2,7 +2,7 @@
 // For critical shards: launches primary + verifier sessions, compares results,
 // applies conservative adoption (fewer changes wins) or HITL fallback.
 
-import { execFile } from 'node:child_process';
+import { execFile } from "node:child_process";
 
 /**
  * Compare two shard results and decide which to accept.
@@ -21,14 +21,23 @@ export async function reconcile(primaryResult, verifierResult, opts = {}) {
   const { rootDir = process.cwd(), maxDivergenceFiles = 5 } = opts;
 
   // If either failed, pick the one that succeeded
-  if (primaryResult.status !== 'completed' && verifierResult.status === 'completed') {
-    return decision('verifier', 'primary_failed', verifierResult);
+  if (
+    primaryResult.status !== "completed" &&
+    verifierResult.status === "completed"
+  ) {
+    return decision("verifier", "primary_failed", verifierResult);
   }
-  if (verifierResult.status !== 'completed' && primaryResult.status === 'completed') {
-    return decision('primary', 'verifier_failed', primaryResult);
+  if (
+    verifierResult.status !== "completed" &&
+    primaryResult.status === "completed"
+  ) {
+    return decision("primary", "verifier_failed", primaryResult);
   }
-  if (primaryResult.status !== 'completed' && verifierResult.status !== 'completed') {
-    return decision('none', 'both_failed', null);
+  if (
+    primaryResult.status !== "completed" &&
+    verifierResult.status !== "completed"
+  ) {
+    return decision("none", "both_failed", null);
   }
 
   // Both completed — compare diffs
@@ -37,29 +46,37 @@ export async function reconcile(primaryResult, verifierResult, opts = {}) {
 
   // Identical diffs → accept primary (no divergence)
   if (primaryDiff.hash === verifierDiff.hash) {
-    return decision('primary', 'identical', primaryResult);
+    return decision("primary", "identical", primaryResult);
   }
 
   // Compute divergence
-  const divergence = Math.abs(primaryDiff.filesChanged - verifierDiff.filesChanged);
+  const divergence = Math.abs(
+    primaryDiff.filesChanged - verifierDiff.filesChanged,
+  );
 
   // High divergence → HITL
   if (divergence > maxDivergenceFiles) {
     return {
-      selected: 'hitl',
+      selected: "hitl",
       reason: `divergence_too_high (${divergence} files differ)`,
       result: null,
       requiresManualReview: true,
-      primary: { filesChanged: primaryDiff.filesChanged, linesChanged: primaryDiff.linesChanged },
-      verifier: { filesChanged: verifierDiff.filesChanged, linesChanged: verifierDiff.linesChanged },
+      primary: {
+        filesChanged: primaryDiff.filesChanged,
+        linesChanged: primaryDiff.linesChanged,
+      },
+      verifier: {
+        filesChanged: verifierDiff.filesChanged,
+        linesChanged: verifierDiff.linesChanged,
+      },
     };
   }
 
   // Conservative adoption: fewer changes wins
   if (primaryDiff.linesChanged <= verifierDiff.linesChanged) {
-    return decision('primary', 'conservative_adoption', primaryResult);
+    return decision("primary", "conservative_adoption", primaryResult);
   }
-  return decision('verifier', 'conservative_adoption', verifierResult);
+  return decision("verifier", "conservative_adoption", verifierResult);
 }
 
 function decision(selected, reason, result) {
@@ -67,7 +84,7 @@ function decision(selected, reason, result) {
     selected,
     reason,
     result,
-    requiresManualReview: selected === 'hitl' || selected === 'none',
+    requiresManualReview: selected === "hitl" || selected === "none",
     primary: null,
     verifier: null,
   };
@@ -82,8 +99,11 @@ function decision(selected, reason, result) {
  */
 async function getDiffStat(branch, cwd) {
   try {
-    const stat = await gitExec(['diff', '--stat', '--numstat', `${branch}~1..${branch}`], cwd);
-    const lines = stat.split('\n').filter(Boolean);
+    const stat = await gitExec(
+      ["diff", "--stat", "--numstat", `${branch}~1..${branch}`],
+      cwd,
+    );
+    const lines = stat.split("\n").filter(Boolean);
     let filesChanged = 0;
     let linesChanged = 0;
 
@@ -96,20 +116,25 @@ async function getDiffStat(branch, cwd) {
     }
 
     // Get tree hash for identity comparison
-    const hash = await gitExec(['rev-parse', `${branch}^{tree}`], cwd);
+    const hash = await gitExec(["rev-parse", `${branch}^{tree}`], cwd);
 
     return { filesChanged, linesChanged, hash: hash.trim() };
   } catch {
-    return { filesChanged: 0, linesChanged: 0, hash: '' };
+    return { filesChanged: 0, linesChanged: 0, hash: "" };
   }
 }
 
 function gitExec(args, cwd) {
   return new Promise((res, rej) => {
-    execFile('git', args, { cwd, windowsHide: true, timeout: 15_000 }, (err, stdout) => {
-      if (err) rej(err);
-      else res(stdout);
-    });
+    execFile(
+      "git",
+      args,
+      { cwd, windowsHide: true, timeout: 15_000 },
+      (err, stdout) => {
+        if (err) rej(err);
+        else res(stdout);
+      },
+    );
   });
 }