@triflux/remote 10.50.1 → 10.51.0

package/cto/brief.mjs

@@ -27,13 +27,6 @@ function formatGoal(goal) {
   return `- ${id} ${status}: ${title}`;
 }
 
-function formatShard(shard) {
-  const id = oneLine(shard?.id || shard?.name || shard?.sessionId, "shard");
-  const status = oneLine(shard?.status || shard?.state, "unknown");
-  const detail = oneLine(shard?.summary || shard?.objective || shard?.task, "");
-  return detail ? `- ${id} ${status}: ${detail}` : `- ${id} ${status}`;
-}
-
 function formatEvent(event) {
   const ts = oneLine(event?.ts, "unknown_ts");
   const name = oneLine(event?.event, "event");
@@ -61,9 +54,6 @@ export function renderBrief(current) {
   const activeGoals = Array.isArray(summary.active_goals)
     ? summary.active_goals.slice(0, 3)
     : [];
-  const swarmShards = Array.isArray(summary.swarm_shards)
-    ? summary.swarm_shards.slice(0, 2)
-    : [];
   const recentEvents = Array.isArray(current?.ledger_tail)
     ? current.ledger_tail.slice(-2)
     : [];
@@ -75,8 +65,6 @@ export function renderBrief(current) {
     `summary: ${oneLine(summary.repo_state, "no repo summary")}`,
     "active_goals",
     ...(activeGoals.length > 0 ? activeGoals.map(formatGoal) : ["- none"]),
-    "swarm_shards",
-    ...(swarmShards.length > 0 ? swarmShards.map(formatShard) : ["- none"]),
     "hub_status",
     `status: ${oneLine(hub.status, "unknown")} available: ${hub.available === true} detail: ${compactDetail(hub.detail)}`,
     "recent_events",

package/cto/collect.mjs

@@ -1,23 +1,23 @@
 import { execFileSync } from "node:child_process";
 import {
-  appendFileSync,
-  closeSync,
   existsSync,
   mkdirSync,
-  openSync,
   readdirSync,
   readFileSync,
-  renameSync,
   statSync,
-  unlinkSync,
-  writeFileSync,
 } from "node:fs";
 import { homedir } from "node:os";
-import { basename, dirname, join, relative } from "node:path";
+import { join, relative } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { renderBrief } from "./brief.mjs";
-import { resolveLakeRootDir } from "./lake-root.mjs";
+import { appendCtoEvent } from "./events.mjs";
+import {
+  firstExisting,
+  readJsonLines,
+  resolveLakeRootDir,
+  writeAtomic,
+} from "./lake-root.mjs";
 
 const SCHEMA_VERSION = "cto-lake.v1";
 const SOURCE_REGISTRY = [
@@ -33,12 +33,6 @@ const SOURCE_REGISTRY = [
     probe: ".triflux/hub/status.json or host tfx-hub cache",
     enabled: true,
   },
-  {
-    id: "tfx_swarm",
-    kind: "triflux-runtime-artifact",
-    probe: ".triflux/swarm-locks.json or .triflux/swarm/*.json",
-    enabled: true,
-  },
   {
     id: "tfx_team",
     kind: "triflux-runtime-artifact",
@@ -69,24 +63,6 @@ const SOURCE_REGISTRY = [
     probe: ".omx/handoffs/*",
     enabled: true,
   },
-  {
-    id: "session_vault",
-    kind: "optional-durable-ref",
-    probe: ".triflux/session-vault.json, sessions_v2.db, or .session-vault",
-    enabled: true,
-  },
-  {
-    id: "agy",
-    kind: "optional-durable-ref",
-    probe: ".agy/state.json or .agy/refs.json",
-    enabled: true,
-  },
-  {
-    id: "gbrain",
-    kind: "optional-durable-ref",
-    probe: ".gbrain/refs.json or .gbrain/config.json",
-    enabled: true,
-  },
 ];
 const SOURCE_IDS = SOURCE_REGISTRY.map((source) => source.id);
 
@@ -104,10 +80,6 @@ function isoNow(opts) {
   return value.toISOString();
 }
 
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 function sourceState(available, status, detail, collectedAt) {
   return {
     available,
@@ -130,25 +102,6 @@ function readJson(filePath) {
   return JSON.parse(readFileSync(filePath, "utf8"));
 }
 
-function readJsonLines(filePath, limit = 20) {
-  if (!existsSync(filePath)) return [];
-  const lines = readFileSync(filePath, "utf8")
-    .split(/\r?\n/u)
-    .map((line) => line.trim())
-    .filter(Boolean);
-  return lines.slice(-limit).flatMap((line) => {
-    try {
-      return [JSON.parse(line)];
-    } catch {
-      return [];
-    }
-  });
-}
-
-function findFirstExisting(candidates) {
-  return candidates.find((candidate) => existsSync(candidate)) || null;
-}
-
 function listDirFiles(dirPath, rootDir, limit = 10) {
   if (!existsSync(dirPath)) return [];
   try {
@@ -237,7 +190,7 @@ function collectJsonArtifact(
   collectedAt,
   summarize = safeSummary,
 ) {
-  const filePath = findFirstExisting(candidates);
+  const filePath = firstExisting(candidates);
   if (!filePath) {
     return missingSource(
       "no_shell_readable_artifact",
@@ -347,70 +300,6 @@ function collectUltragoal(dirPath, rootDir, collectedAt) {
   }
 }
 
-export function collectSwarm(rootDir, collectedAt) {
-  const locksPath = join(rootDir, ".triflux", "swarm-locks.json");
-  const logsDir = join(rootDir, ".triflux", "swarm-logs");
-  if (!existsSync(locksPath) && !existsSync(logsDir)) {
-    return missingSource(
-      "no_shell_readable_artifact",
-      "no swarm locks or logs found",
-      collectedAt,
-    );
-  }
-  try {
-    const detail = { locks_path: null, locks: null, shards: [], log_runs: [] };
-    if (existsSync(locksPath)) {
-      const locks = readJson(locksPath);
-      detail.locks_path = relPath(rootDir, locksPath);
-      detail.locks = safeSummary(locks);
-      if (Array.isArray(locks?.shards)) detail.shards = locks.shards;
-      else if (Array.isArray(locks)) detail.shards = locks;
-      else if (locks && typeof locks === "object") {
-        // 실제 producer(hub/team/swarm-locks.mjs persist)는
-        // { "<file>": { workerId, leaseType, sessionMeta } } 형태의 lock map 을 쓴다.
-        // workerId 가 곧 shard.name 이다 — swarm-hypervisor 가
-        // acquire(shard.name, shard.files) 로 잠그기 때문(swarm-hypervisor.mjs:753).
-        // workerId 별로 묶어 active shard row 로 환원한다. (expired lock 정밀 필터는
-        // hub snapshot() 의 책임이라, 여기서는 persist 된 보유 lock 전부를 active 로 본다.)
-        const byWorker = new Map();
-        for (const entry of Object.values(locks)) {
-          const workerId =
-            entry && typeof entry.workerId === "string" ? entry.workerId : null;
-          if (!workerId) continue;
-          let row = byWorker.get(workerId);
-          if (!row) {
-            row = { shard_name: workerId, phase: "active", members: [] };
-            byWorker.set(workerId, row);
-          }
-          const host = entry?.sessionMeta?.host;
-          if (typeof host === "string" && host && !row.members.includes(host)) {
-            row.members.push(host);
-          }
-        }
-        detail.shards = [...byWorker.values()];
-      }
-    }
-    if (existsSync(logsDir)) {
-      detail.log_runs = readdirSync(logsDir, { withFileTypes: true })
-        .filter((entry) => entry.isDirectory() && entry.name.startsWith("run-"))
-        .map((entry) => {
-          const path = join(logsDir, entry.name);
-          return { id: entry.name, mtime: statSync(path).mtime.toISOString() };
-        })
-        .sort((a, b) => b.mtime.localeCompare(a.mtime))
-        .slice(0, 5);
-    }
-    return sourceState(true, "ok", detail, collectedAt);
-  } catch (error) {
-    return sourceState(
-      true,
-      "read_error",
-      error?.message || "swarm read failed",
-      collectedAt,
-    );
-  }
-}
-
 function collectHandoffs(rootDir, collectedAt) {
   const dirPath = join(rootDir, ".omx", "handoffs");
   const files = listDirFiles(dirPath, rootDir, 10);
@@ -429,64 +318,10 @@ function collectHandoffs(rootDir, collectedAt) {
   );
 }
 
-function collectDurableRefs(
-  id,
-  candidates,
-  rootDir,
-  collectedAt,
-  unavailableStatus = "no_shell_readable_artifact",
-) {
-  const filePath = findFirstExisting(candidates);
-  if (!filePath) {
-    return missingSource(
-      unavailableStatus,
-      `${id} exposes no shell-readable durable artifact`,
-      collectedAt,
-    );
-  }
-  try {
-    const stat = statSync(filePath);
-    if (stat.isDirectory()) {
-      return sourceState(
-        true,
-        "ok",
-        {
-          path: relPath(rootDir, filePath),
-          files: listDirFiles(filePath, rootDir, 10),
-        },
-        collectedAt,
-      );
-    }
-    const parsed = basename(filePath).endsWith(".json")
-      ? readJson(filePath)
-      : readFileSync(filePath, "utf8");
-    return sourceState(
-      true,
-      "ok",
-      {
-        path: relPath(rootDir, filePath),
-        summary: safeSummary(parsed),
-      },
-      collectedAt,
-    );
-  } catch (error) {
-    return sourceState(
-      true,
-      "read_error",
-      {
-        path: relPath(rootDir, filePath),
-        error: error?.message || `${id} read failed`,
-      },
-      collectedAt,
-    );
-  }
-}
-
 function buildSummary(current) {
   const repo = current.repo;
   const omxGoals = current.sources.ultragoal_omx.detail?.active_goals || [];
   const omcGoals = current.sources.ultragoal_omc.detail?.active_goals || [];
-  const swarmShards = current.sources.tfx_swarm.detail?.shards || [];
   const availableSources = Object.values(current.sources).filter(
     (source) => source.available,
   ).length;
@@ -494,7 +329,6 @@ function buildSummary(current) {
   return {
     repo_state: `branch ${repo.branch || "unknown"} at ${repo.head || "unknown"} is ${repo.dirty ? "dirty" : "clean"}`,
     active_goals: [...omxGoals, ...omcGoals].slice(0, 5),
-    swarm_shards: Array.isArray(swarmShards) ? swarmShards.slice(0, 5) : [],
     hub_status: current.sources.tfx_hub.status,
     available_sources: availableSources,
     missing_sources: SOURCE_IDS.length - availableSources,
@@ -633,48 +467,6 @@ function validateCurrent(current) {
   }
 }
 
-function writeAtomic(filePath, body) {
-  mkdirSync(dirname(filePath), { recursive: true });
-  const tmpPath = join(
-    dirname(filePath),
-    `.${basename(filePath)}.${process.pid}.${Date.now()}.tmp`,
-  );
-  writeFileSync(tmpPath, body, "utf8");
-  renameSync(tmpPath, filePath);
-}
-
-async function appendLedgerEvent(lakeRoot, event, stderr) {
-  mkdirSync(lakeRoot, { recursive: true });
-  const ledgerPath = join(lakeRoot, "ledger.jsonl");
-  const lockPath = join(lakeRoot, "ledger.jsonl.lock");
-  let fd = null;
-  for (let attempt = 0; attempt < 3; attempt += 1) {
-    try {
-      fd = openSync(lockPath, "wx", 0o600);
-      break;
-    } catch (error) {
-      if (error?.code !== "EEXIST") throw error;
-      if (attempt < 2) await sleep(100);
-    }
-  }
-  if (fd === null) {
-    stderr.write(
-      "[tfx cto collect] warning: ledger lock timeout; skipped ledger append\n",
-    );
-    return false;
-  }
-
-  try {
-    appendFileSync(ledgerPath, `${JSON.stringify(event)}\n`, "utf8");
-    return true;
-  } finally {
-    closeSync(fd);
-    try {
-      unlinkSync(lockPath);
-    } catch {}
-  }
-}
-
 function collectSources(rootDir, collectedAt, execFileSyncFn, opts = {}) {
   const home = homedir();
   const hostArtifactCandidates =
@@ -717,7 +509,6 @@ function collectSources(rootDir, collectedAt, execFileSyncFn, opts = {}) {
       rootDir,
       collectedAt,
     ),
-    tfx_swarm: collectSwarm(rootDir, collectedAt),
     tfx_team: collectJsonArtifact(
       "tfx_team",
       [
@@ -748,34 +539,6 @@ function collectSources(rootDir, collectedAt, execFileSyncFn, opts = {}) {
       collectedAt,
     ),
     handoffs: collectHandoffs(rootDir, collectedAt),
-    session_vault: collectDurableRefs(
-      "session_vault",
-      [
-        join(rootDir, ".triflux", "session-vault.json"),
-        join(rootDir, "sessions_v2.db"),
-        join(rootDir, ".session-vault"),
-      ],
-      rootDir,
-      collectedAt,
-      "not_shell_collectable",
-    ),
-    agy: collectDurableRefs(
-      "agy",
-      [join(rootDir, ".agy", "state.json"), join(rootDir, ".agy", "refs.json")],
-      rootDir,
-      collectedAt,
-      "not_shell_collectable",
-    ),
-    gbrain: collectDurableRefs(
-      "gbrain",
-      [
-        join(rootDir, ".gbrain", "refs.json"),
-        join(rootDir, ".gbrain", "config.json"),
-      ],
-      rootDir,
-      collectedAt,
-      "not_shell_collectable",
-    ),
   };
 
   return { repo: git.repo, sources };
@@ -786,6 +549,12 @@ function hasFlag(args, flag) {
 }
 
 export async function runCollect(args = [], opts = {}) {
+  if (hasFlag(args, "--help")) {
+    (opts.stdout || process.stdout).write(
+      "Usage: tfx cto collect [--json]\nRefresh the CTO lake from durable authority sources.\n",
+    );
+    return;
+  }
   const rootDir = opts.rootDir || resolveLakeRootDir(process.cwd());
   const lakeRoot = opts.lakeRoot || join(rootDir, ".triflux", "lake");
   const stdout = opts.stdout || process.stdout;
@@ -822,7 +591,7 @@ export async function runCollect(args = [], opts = {}) {
       sources_json: "sources.json",
     },
   };
-  const appended = await appendLedgerEvent(lakeRoot, event, stderr);
+  const { appended } = await appendCtoEvent(lakeRoot, event, { stderr });
   if (appended) current.ledger_tail = readLedgerTail(lakeRoot);
 
   validateCurrent(current);

package/cto/current.schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://triflux.local/schemas/cto/current.schema.json",
   "title": "Triflux CTO Lake Current Authority State",
-  "description": "Contract for .triflux/lake/current.json. .triflux/lake is a triflux-owned, namespace-neutral cross-agent rollup for durable artifacts across Claude, Codex/OMX, OMC, AGY, gstack, gbrain, and Triflux state. It reads and aggregates .omx/ultragoal and .omc/ultragoal execution ledgers without replacing or duplicating their authority. ledger.jsonl and sources.json companion contracts are documented in $defs.",
+  "description": "Contract for .triflux/lake/current.json. .triflux/lake is a triflux-owned, namespace-neutral cross-agent rollup for durable artifacts across Claude, Codex/OMX, OMC, and Triflux state. It reads and aggregates .omx/ultragoal and .omc/ultragoal execution ledgers without replacing or duplicating their authority. ledger.jsonl and sources.json companion contracts are documented in $defs.",
   "type": "object",
   "additionalProperties": false,
   "required": [
@@ -44,20 +44,16 @@
     },
     "sources": {
       "type": "object",
-      "description": "Durable artifact source states only. Live Claude /goal state and AGY internal state are not shell-collectable; a source reports available:false when no shell-readable durable artifact exists.",
+      "description": "Durable artifact source states only. A source reports available:false when no shell-readable durable artifact exists.",
       "additionalProperties": false,
       "required": [
         "git",
         "tfx_hub",
-        "tfx_swarm",
         "tfx_team",
         "tfx_synapse",
         "ultragoal_omx",
         "ultragoal_omc",
-        "handoffs",
-        "session_vault",
-        "agy",
-        "gbrain"
+        "handoffs"
       ],
       "properties": {
         "git": {
@@ -66,9 +62,6 @@
         "tfx_hub": {
           "$ref": "#/$defs/sourceState"
         },
-        "tfx_swarm": {
-          "$ref": "#/$defs/sourceState"
-        },
         "tfx_team": {
           "$ref": "#/$defs/sourceState"
         },
@@ -83,21 +76,12 @@
         },
         "handoffs": {
           "$ref": "#/$defs/sourceState"
-        },
-        "session_vault": {
-          "$ref": "#/$defs/sourceState"
-        },
-        "agy": {
-          "$ref": "#/$defs/sourceState"
-        },
-        "gbrain": {
-          "$ref": "#/$defs/sourceState"
         }
       }
     },
     "summary": {
       "type": "object",
-      "description": "Human- and dashboard-oriented synthesized authority summary derived from durable artifacts and live Triflux synapse session status. Phase 1 may add source-derived fields here without changing the top-level contract.",
+      "description": "Human-oriented synthesized authority summary derived from durable artifacts and live Triflux synapse session status. Phase 1 may add source-derived fields here without changing the top-level contract.",
       "additionalProperties": true
     },
     "ledger_tail": {