triflux 10.45.0 → 10.47.0

package/hub/team/uds-orchestrator.mjs

@@ -1,9 +1,9 @@
 import { spawn } from "node:child_process";
 import crypto from "node:crypto";
-import { mkdtemp, rm, stat } from "node:fs/promises";
+import { mkdtemp, realpath, rm, stat } from "node:fs/promises";
 import net from "node:net";
 import { tmpdir } from "node:os";
-import { join as pathJoin } from "node:path";
+import { join as pathJoin, resolve as pathResolve } from "node:path";
 
 import { execute as defaultExecuteCodex } from "../codex-adapter.mjs";
 import {
@@ -23,6 +23,378 @@ const DEFAULT_TIMEOUT_MS = 90_000;
 const DEFAULT_CODEX_APP_SERVER_UDS_TIMEOUT_MS = 120_000;
 const DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS = 12_000;
 
+function codexClient(socketPath, timeoutMs, clientFactory) {
+  return clientFactory({ socketPath, connectTimeoutMs: timeoutMs });
+}
+
+async function initializeCodexClient(client, timeoutMs) {
+  await client.connect();
+  await client.request(
+    "initialize",
+    { clientInfo: { name: "triflux-tfx-live", version: "1.0.0" } },
+    timeoutMs,
+  );
+  client.notify("initialized", {});
+}
+
+async function runCodexAppServerTurn({
+  client,
+  threadId,
+  prompt,
+  timeoutMs,
+  maxTurnMs,
+  expectedTurnId,
+}) {
+  const messages = new Map();
+  const pending = [];
+  let turnId = null;
+  let startedTurnId = null;
+  let retries = 0;
+  let settled = false;
+  let timer = null;
+  let resolveCompletion;
+  const completion = new Promise((resolve) => {
+    resolveCompletion = resolve;
+  });
+  const lifecycle = createActivityLifecycle({
+    enabled: isActivityLifecycleEnabled(),
+    interventionMs: timeoutMs,
+    hardCeilingMs: maxTurnMs,
+  });
+  const finish = (result) => {
+    if (settled) return;
+    settled = true;
+    resolveCompletion(result);
+  };
+  const matching = (params) =>
+    (!params?.threadId || params.threadId === threadId) &&
+    (!params?.turnId || params.turnId === turnId) &&
+    (!params?.turn?.id || params.turn.id === turnId);
+  const receive = (kind, params) => {
+    if (!turnId) {
+      pending.push([kind, params]);
+      return;
+    }
+    if (!matching(params)) return;
+    if (kind === "started" && params?.turn?.id === turnId) {
+      startedTurnId = turnId;
+    } else if (kind === "delta" && typeof params?.delta === "string") {
+      const itemId = params?.itemId || "__unidentified_agent_message__";
+      if (!messages.has(itemId))
+        messages.set(itemId, { text: "", phase: null });
+      messages.get(itemId).text += params.delta;
+      lifecycle.observe();
+    } else if (
+      kind === "itemCompleted" &&
+      params?.item?.type === "agentMessage"
+    ) {
+      const itemId = params.item.id;
+      if (itemId) {
+        if (!messages.has(itemId))
+          messages.set(itemId, { text: "", phase: null });
+        const message = messages.get(itemId);
+        if (typeof params.item.text === "string")
+          message.text = params.item.text;
+        message.phase = params.item.phase || null;
+      }
+    } else if (kind === "completed" && params?.turn?.id === turnId) {
+      finish({
+        status: params?.turn?.status || "unknown",
+        matchedCompletion: true,
+      });
+    } else if (kind === "error") {
+      if (params?.willRetry === true) {
+        retries++;
+        lifecycle.observe();
+        return;
+      }
+      finish({
+        status: "failed",
+        message:
+          params?.error?.message || params?.message || "codex app-server error",
+        matchedCompletion: false,
+      });
+    }
+  };
+  const offDelta = client.onNotification("item/agentMessage/delta", (p) =>
+    receive("delta", p),
+  );
+  const offItemCompleted = client.onNotification("item/completed", (p) =>
+    receive("itemCompleted", p),
+  );
+  const offStarted = client.onNotification("turn/started", (p) =>
+    receive("started", p),
+  );
+  const offDone = client.onNotification("turn/completed", (p) =>
+    receive("completed", p),
+  );
+  const offError = client.onNotification("error", (p) => receive("error", p));
+  const offActivity = client.onNotification("*", (params) => {
+    if (matching(params)) lifecycle.observe();
+  });
+  const armTimer = () => {
+    timer = setTimeout(async () => {
+      if (settled) return;
+      if (!isActivityLifecycleEnabled()) {
+        finish({ status: "timeout", matchedCompletion: false });
+        return;
+      }
+      const reason = await lifecycle.check();
+      if (settled) return;
+      if (reason)
+        finish({ status: "timeout", reason, matchedCompletion: false });
+      else armTimer();
+    }, timeoutMs);
+  };
+  armTimer();
+  try {
+    const input = [{ type: "text", text: prompt }];
+    const started = expectedTurnId
+      ? await client.request(
+          "turn/steer",
+          { threadId, input, expectedTurnId },
+          timeoutMs,
+        )
+      : await client.request("turn/start", { threadId, input }, timeoutMs);
+    turnId = started?.turn?.id || started?.turnId;
+    if (!turnId)
+      throw new Error("codex app-server turn/start returned no turn id");
+    for (const [kind, params] of pending) receive(kind, params);
+    const result = await completion;
+    const entries = [...messages.values()].map((item) => ({
+      ...item,
+      text: item.text.trim(),
+    }));
+    const finals = entries.filter((item) => item.phase === "final_answer");
+    const answer = finals.length ? finals : entries.slice(-1);
+    const commentary = entries.filter(
+      (item) => item.phase === "commentary" && item.text,
+    );
+    return {
+      ...result,
+      turnId,
+      response: answer
+        .map((item) => item.text)
+        .filter(Boolean)
+        .join("\n\n"),
+      commentary: commentary.map((item) => item.text),
+      retries,
+      steered:
+        result.matchedCompletion &&
+        (expectedTurnId === turnId || startedTurnId !== turnId),
+      timedOut: result.status === "timeout",
+    };
+  } finally {
+    clearTimeout(timer);
+    offDelta();
+    offItemCompleted();
+    offStarted();
+    offDone();
+    offError();
+    offActivity();
+  }
+}
+
+async function readCodexThread(client, threadId, timeoutMs) {
+  const result = await client.request("thread/read", { threadId }, timeoutMs);
+  if (!result?.thread)
+    throw new Error(`codex thread/read returned no thread: ${threadId}`);
+  return result.thread;
+}
+
+async function normalizedCwd(cwd) {
+  if (!cwd) return null;
+  try {
+    return await realpath(cwd);
+  } catch (error) {
+    if (error?.code === "ENOENT") return pathResolve(cwd);
+    throw error;
+  }
+}
+
+async function loadedCodexThreads(client, cwd, timeoutMs) {
+  const wantedCwd = await normalizedCwd(cwd);
+  const threads = [];
+  let cursor;
+  do {
+    const result = await client.request(
+      "thread/loaded/list",
+      cursor ? { cursor } : {},
+      timeoutMs,
+    );
+    for (const threadId of result?.data || []) {
+      const thread = await readCodexThread(client, threadId, timeoutMs);
+      if (wantedCwd && (await normalizedCwd(thread.cwd)) !== wantedCwd)
+        continue;
+      threads.push({
+        threadId,
+        cwd: thread.cwd,
+        name: thread.name,
+        status: thread.status,
+        source: thread.source,
+      });
+    }
+    cursor = result?.nextCursor;
+  } while (cursor);
+  return threads;
+}
+
+export async function listCodexAppServerThreads({
+  socketPath,
+  cwd,
+  clientFactory = (opts) => new JsonRpcWsUdsClient(opts),
+} = {}) {
+  const client = codexClient(
+    socketPath,
+    DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+    clientFactory,
+  );
+  try {
+    await initializeCodexClient(
+      client,
+      DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+    );
+    return await loadedCodexThreads(
+      client,
+      cwd,
+      DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+    );
+  } finally {
+    client.close();
+  }
+}
+
+export async function askCodexAppServerThread({
+  socketPath,
+  threadId,
+  cwd,
+  prompt,
+  timeoutMs = DEFAULT_CODEX_APP_SERVER_UDS_TIMEOUT_MS,
+  maxTurnMs = Math.min(resolveHardCeilingMs(), 15 * 60_000),
+  ifBusy = "wait",
+  busyTimeoutMs = timeoutMs,
+  pollIntervalMs = 200,
+  clientFactory = (opts) => new JsonRpcWsUdsClient(opts),
+} = {}) {
+  if (typeof prompt !== "string" || !prompt.trim())
+    throw new Error("codex UDS ask requires a non-empty prompt");
+  if (!threadId) throw new Error("codex UDS ask requires --thread <id|auto>");
+  if (!["wait", "fail", "steer"].includes(ifBusy))
+    throw new Error(`invalid --if-busy: ${ifBusy}`);
+  const client = codexClient(
+    socketPath,
+    DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+    clientFactory,
+  );
+  try {
+    await initializeCodexClient(
+      client,
+      DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+    );
+    let selectedId = threadId;
+    if (threadId === "auto") {
+      const candidates = await loadedCodexThreads(
+        client,
+        cwd,
+        DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+      );
+      if (!candidates.length)
+        throw new Error(
+          "no loaded Codex threads; open the TUI and send its first message before using --thread auto",
+        );
+      if (candidates.length !== 1)
+        throw new Error(
+          `multiple loaded Codex threads; pass --thread ID: ${JSON.stringify(candidates)}`,
+        );
+      selectedId = candidates[0].threadId;
+    }
+    const busyStarted = Date.now();
+    let thread = await readCodexThread(
+      client,
+      selectedId,
+      DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+    );
+    const initiallyBusy = thread.status?.type === "active";
+    if (thread.status?.type === "active" && ifBusy === "fail")
+      throw new Error(`target busy (--if-busy fail): ${selectedId}`);
+    const busyDeadline = busyStarted + busyTimeoutMs;
+    const busyError = () =>
+      new Error(
+        `target busy after ${Math.ceil(busyTimeoutMs / 1000)}s (--if-busy wait)`,
+      );
+    while (thread.status?.type === "active" && ifBusy === "wait") {
+      const waitMs = Math.min(
+        pollIntervalMs,
+        Math.max(0, busyDeadline - Date.now()),
+      );
+      if (waitMs > 0)
+        await new Promise((resolve) => setTimeout(resolve, waitMs));
+      const remainingMs = busyDeadline - Date.now();
+      try {
+        thread = await readCodexThread(
+          client,
+          selectedId,
+          Math.min(
+            DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+            Math.max(1, remainingMs),
+          ),
+        );
+      } catch (error) {
+        if (Date.now() >= busyDeadline) throw busyError();
+        throw error;
+      }
+      if (Date.now() >= busyDeadline && thread.status?.type === "active")
+        throw busyError();
+    }
+    const busyWaitedMs =
+      ifBusy === "wait" && initiallyBusy ? Date.now() - busyStarted : 0;
+    const resumed = await client.request(
+      "thread/resume",
+      { threadId: selectedId, excludeTurns: true },
+      DEFAULT_CODEX_APP_SERVER_UDS_BOOTSTRAP_MS,
+    );
+    let activeTurns = null;
+    if (resumed?.thread?.status?.type === "active")
+      activeTurns = resumed.thread.turns?.length
+        ? resumed.thread.turns
+        : thread.turns;
+    else if (!resumed?.thread && thread.status?.type === "active")
+      activeTurns = thread.turns;
+    const expectedTurnId =
+      ifBusy === "steer"
+        ? activeTurns?.findLast((turn) => turn.status === "inProgress")?.id
+        : undefined;
+    const turn = await runCodexAppServerTurn({
+      client,
+      threadId: selectedId,
+      prompt,
+      timeoutMs,
+      maxTurnMs,
+      expectedTurnId,
+    });
+    if (turn.message) throw new Error(turn.message);
+    return {
+      cli: "codex",
+      transport: "uds",
+      threadId: selectedId,
+      turnId: turn.turnId,
+      response: turn.response,
+      done: turn.status === "completed",
+      matchedCompletion: turn.matchedCompletion,
+      timedOut: turn.timedOut,
+      status: turn.status,
+      commentary: turn.commentary,
+      meta: { retries: turn.retries },
+      ifBusy,
+      busyWaitedMs,
+      steered: turn.steered,
+      socketPath,
+    };
+  } finally {
+    client.close();
+  }
+}
+
 function requireEndpoint(endpoint, name) {
   if (!endpoint || typeof endpoint.ask !== "function") {
     throw new Error(`${name} endpoint with ask(prompt) is required`);
@@ -532,17 +904,8 @@ export function createCodexAppServerUdsEndpoint({
           );
         }
 
-        client = clientFactory({
-          socketPath: resolvedSock,
-          connectTimeoutMs: bootstrapTimeoutMs,
-        });
-        await client.connect();
-        await client.request(
-          "initialize",
-          { clientInfo: { name: "triflux-tfx-live", version: "1.0.0" } },
-          bootstrapTimeoutMs,
-        );
-        client.notify("initialized", {});
+        client = codexClient(resolvedSock, bootstrapTimeoutMs, clientFactory);
+        await initializeCodexClient(client, bootstrapTimeoutMs);
 
         const threadParams = {
           sandbox: "read-only",
@@ -563,85 +926,23 @@ export function createCodexAppServerUdsEndpoint({
           );
         }
 
-        const parts = [];
-        let offDelta = () => {};
-        let offError = () => {};
-        let offDone = () => {};
-        let offActivity = () => {};
-        const cleanup = () => {
-          offDelta();
-          offError();
-          offDone();
-          offActivity();
-        };
-        const completion = new Promise((resolve) => {
-          offDelta = client.onNotification(
-            "item/agentMessage/delta",
-            (params) => {
-              if (typeof params?.delta === "string") parts.push(params.delta);
-            },
-          );
-          offError = client.onNotification("error", (params) => {
-            cleanup();
-            resolve({
-              status: "failed",
-              message: params?.message || "codex app-server error",
-            });
-          });
-          offDone = client.onNotification("turn/completed", (params) => {
-            cleanup();
-            resolve({ status: params?.turn?.status || "unknown" });
-          });
-        });
-
-        await client.request(
-          "turn/start",
-          { threadId, input: [{ type: "text", text: prompt }] },
+        const settled = await runCodexAppServerTurn({
+          client,
+          threadId,
+          prompt,
           timeoutMs,
-        );
-        const activityEnabled = isActivityLifecycleEnabled();
-        const lifecycle = createActivityLifecycle({
-          enabled: activityEnabled,
-          interventionMs: timeoutMs,
-          hardCeilingMs: maxTurnMs,
-        });
-        offActivity = client.onNotification("*", () => lifecycle.observe());
-        let timeoutHandle = null;
-        const timeoutPromise = new Promise((resolve) => {
-          const arm = () => {
-            timeoutHandle = setTimeout(async () => {
-              if (!activityEnabled) {
-                cleanup();
-                resolve({ status: "timeout" });
-                return;
-              }
-              const reason = await lifecycle.check();
-              if (reason) {
-                cleanup();
-                resolve({ status: "timeout", reason });
-                return;
-              }
-              arm();
-            }, timeoutMs);
-          };
-          arm();
+          maxTurnMs,
         });
-        let settled;
-        try {
-          settled = await Promise.race([completion, timeoutPromise]);
-        } finally {
-          // Clear the timer whichever side won, so a completed turn does not
-          // keep the event loop alive until timeoutMs.
-          if (timeoutHandle) clearTimeout(timeoutHandle);
-        }
 
         return {
           endpoint: "codex-app-server-uds",
-          text: parts.join("").trim(),
+          text: settled.response,
           done: settled.status === "completed",
           meta: {
             threadId,
             status: settled.status,
+            retries: settled.retries,
+            commentary: settled.commentary,
             socketPath: resolvedSock,
             spawned: Boolean(child),
             ...(settled.message ? { error: settled.message } : {}),

package/hub/team/worktree-lifecycle.mjs

@@ -273,6 +273,8 @@ export async function ensureWorktree({
  * @param {string} opts.baseBranch
  * @param {string} [opts.rootDir=process.cwd()]
  * @returns {Promise<{ integrationBranch: string, baseCommit: string }>}
+ * @throws {Error} when the integration branch is checked out by another
+ * worktree; this is an intentional NO-GO and leaves that worktree untouched.
  */
 export async function prepareIntegrationBranch({
   runId,
@@ -299,42 +301,17 @@ export async function prepareIntegrationBranch({
  * Rebase a shard branch onto the integration branch.
  * Uses rebase + fast-forward only (no merge commits).
  *
- * Synapse v1: when a `preflight` checker + `sessionContext` are provided,
- * the rebase is pre-flighted against active sessions' dirty files/leases.
- * Blocked rebases return `{ ok: false, preflight: decision }` without touching
- * any branch. If preflight is omitted, behavior is unchanged.
- *
  * @param {object} opts
  * @param {string} opts.shardBranch — the shard's branch name
  * @param {string} opts.integrationBranch — target integration branch
  * @param {string} [opts.rootDir=process.cwd()]
- * @param {{ checkRebase: Function } | null} [opts.preflight=null] — git-preflight instance
- * @param {{ sessionId: string, workerId?: string } | null} [opts.sessionContext=null]
- * @returns {Promise<{ ok: boolean, headCommit?: string, strategy?: string, commits?: number, notes?: string, fallbackReason?: string, error?: string, preflight?: object }>}
+ * @returns {Promise<{ ok: boolean, headCommit?: string, strategy?: string, commits?: number, notes?: string, fallbackReason?: string, error?: string }>}
  */
 export async function rebaseShardOntoIntegration({
   shardBranch,
   integrationBranch,
   rootDir = process.cwd(),
-  preflight = null,
-  sessionContext = null,
 }) {
-  // Synapse v1 pre-flight: bail out before mutating branches when another
-  // session claims overlapping files.
-  if (preflight && sessionContext) {
-    const decision = preflight.checkRebase(
-      { branch: integrationBranch },
-      sessionContext,
-    );
-    if (!decision.allowed) {
-      return {
-        ok: false,
-        error: `git-preflight blocked rebase: ${decision.reason || "overlap"}`,
-        preflight: decision,
-      };
-    }
-  }
-
   // #127 BUG-E accident history: this function used to checkout the
   // integration branch in rootDir, leak rootDir HEAD, and redirect later user
   // edits/commits into swarm/.../merge. Integration now happens exclusively in
@@ -458,6 +435,11 @@ export async function rebaseShardOntoIntegration({
       }
     } else {
       await rm(integrationWorktree, { recursive: true, force: true });
+      try {
+        await git(["worktree", "prune"], rootDir);
+      } catch {
+        /* best-effort metadata cleanup after a partial worktree add */
+      }
     }
   }
 }
@@ -524,40 +506,18 @@ export async function cleanupWorktree({
  * Remove a worktree and its branch.
  * Follows WT race-guard: sleep between operations.
  *
- * Synapse v1: when `preflight` + `sessionContext` are provided, the removal
- * is pre-flighted against active sessions — blocked if another session is
- * still registered to this worktree path.
- *
  * @param {object} opts
  * @param {string} opts.worktreePath
  * @param {string} [opts.branchName] — optional branch to delete
  * @param {string} [opts.rootDir=process.cwd()]
  * @param {boolean} [opts.force=false]
- * @param {{ checkWorktreeRemove: Function } | null} [opts.preflight=null]
- * @param {{ sessionId: string, workerId?: string } | null} [opts.sessionContext=null]
  */
 export async function pruneWorktree({
   worktreePath,
   branchName,
   rootDir = process.cwd(),
   force = false,
-  preflight = null,
-  sessionContext = null,
 }) {
-  if (preflight && sessionContext) {
-    const decision = preflight.checkWorktreeRemove(
-      { worktreePath },
-      sessionContext,
-    );
-    if (!decision.allowed) {
-      return {
-        ok: false,
-        error: `git-preflight blocked worktree-remove: ${decision.reason || "active_worktree"}`,
-        preflight: decision,
-      };
-    }
-  }
-
   const cleanupResult = await cleanupWorktree({
     worktreePath,
     branchName,

package/hub/tray-lifecycle.mjs

@@ -120,7 +120,7 @@ export function spawnTrayForHub({
   cwd = process.cwd(),
   spawnFn = spawn,
 } = {}) {
-  if (env?.TFX_HUB_AUTO_TRAY === "0") return { status: "disabled" };
+  if (env?.TFX_HUB_AUTO_TRAY !== "1") return { status: "disabled" };
   if (isWorktreeOrEphemeralHubContext({ cwd, env })) {
     return { status: "disabled", reason: "ephemeral-or-worktree-context" };
   }

package/hub/workers/codex-mcp.mjs

@@ -120,7 +120,7 @@ function readTomlScalar(raw, key) {
 }
 
 /**
- * Resolve a Codex effort profile name (e.g. "gpt56_terra_high") to its concrete
+ * Resolve a Codex effort profile name (e.g. "gpt6_sol_high") to its concrete
  * `model` + reasoning effort. SSOT = the per-profile file written by
  * `tfx setup` at `~/.codex/<profile>.config.toml`. Falls back to deriving the
  * effort from the `<...>_<effort>` naming convention when the file is absent.