triflux 10.39.0 → 10.40.0

package/bin/tfx-live.mjs

@@ -734,6 +734,23 @@ function isClaudeTrustPrompt(text) {
   return /Quick safety check|trust this folder/i.test(String(text));
 }
 
+function isClaudeExternalImportsPrompt(text) {
+  return /Allow external CLAUDE\.md file imports|allow external imports/i.test(
+    String(text),
+  );
+}
+
+function isClaudeTourPrompt(text) {
+  // Claude's post-update welcome/tour screen ("Take the tour" / "Skip for now").
+  // Claude has no codex-style "Update available / Skip until next version" menu
+  // (its update is a non-blocking background auto-updater), so the recurring
+  // startup screen that needs a "skip" is this tour prompt. Require both labels
+  // so a stray "Skip for now" elsewhere cannot false-match.
+  return (
+    /Take the tour/i.test(String(text)) && /Skip for now/i.test(String(text))
+  );
+}
+
 function selectedLine(text) {
   // Menu selector glyphs only (exclude ASCII '>' which appears in codex's
   // "> You are in ..." trust-prompt header and would mis-target navigation).
@@ -843,6 +860,51 @@ async function dismissClaudeTrustPrompt(remote, session) {
   return { dismissed: false, raw };
 }
 
+async function dismissClaudeExternalImportsPrompt(remote, session) {
+  let raw = await captureVisible(remote, session);
+  if (!isClaudeExternalImportsPrompt(raw)) {
+    return { dismissed: false, raw };
+  }
+
+  for (let iteration = 0; iteration < 4; iteration += 1) {
+    if (/Yes, allow external imports/.test(selectedLine(raw))) {
+      await runTmux(remote, ["send-keys", "-t", session, "Enter"]);
+      return { dismissed: true, raw };
+    }
+
+    await runTmux(remote, ["send-keys", "-t", session, "Up"]);
+    await sleep(200);
+    raw = await captureVisible(remote, session);
+  }
+
+  await runTmux(remote, ["send-keys", "-t", session, "Enter"]);
+  return { dismissed: true, raw };
+}
+
+async function dismissClaudeTourPrompt(remote, session) {
+  let raw = await captureVisible(remote, session);
+  if (!isClaudeTourPrompt(raw)) {
+    return { dismissed: false, raw };
+  }
+
+  for (let iteration = 0; iteration < 4; iteration += 1) {
+    if (/Skip for now/.test(selectedLine(raw))) {
+      await runTmux(remote, ["send-keys", "-t", session, "Enter"]);
+      return { dismissed: true, raw };
+    }
+
+    await runTmux(remote, ["send-keys", "-t", session, "Down"]);
+    await sleep(200);
+    raw = await captureVisible(remote, session);
+  }
+
+  // Fallback: Escape cancels the welcome/tour dialog (equivalent to "Skip for
+  // now"). Never blind-Enter here — the default selection may be "Take the
+  // tour", and Enter would launch the tour instead of skipping it.
+  await runTmux(remote, ["send-keys", "-t", session, "Escape"]);
+  return { dismissed: true, raw };
+}
+
 const ADAPTERS = {
   codex: {
     cli: "codex",
@@ -917,6 +979,16 @@ const ADAPTERS = {
         isPresent: isClaudeTrustPrompt,
         dismiss: dismissClaudeTrustPrompt,
       },
+      {
+        name: "external-imports",
+        isPresent: isClaudeExternalImportsPrompt,
+        dismiss: dismissClaudeExternalImportsPrompt,
+      },
+      {
+        name: "tour",
+        isPresent: isClaudeTourPrompt,
+        dismiss: dismissClaudeTourPrompt,
+      },
     ],
   },
 };

package/cto/status.mjs

@@ -55,6 +55,17 @@ export function deriveRepoRootFromCwd(cwd) {
   if (cwd.includes("\\") || /^[A-Za-z]:/u.test(cwd)) return cwd;
 
   const normalized = cwd.replace(/\/+$/u, "");
+  const gitWorktreeMarker = "/.worktrees/";
+  const gitWorktreeIndex = normalized.indexOf(gitWorktreeMarker);
+  if (gitWorktreeIndex > 0) {
+    const suffix = normalized.slice(
+      gitWorktreeIndex + gitWorktreeMarker.length,
+    );
+    if (/^[^/]+(?:\/|$)/u.test(suffix)) {
+      return normalized.slice(0, gitWorktreeIndex);
+    }
+  }
+
   const claudeMarker = "/.claude/worktrees/";
   const claudeIndex = normalized.indexOf(claudeMarker);
   if (claudeIndex > 0) {

package/hub/bridge.mjs

@@ -119,6 +119,11 @@ const HUB_OPERATIONS = Object.freeze({
     action: "publish",
     httpPath: "/bridge/publish",
   },
+  takeoverRole: {
+    transport: "command",
+    action: "takeover_role",
+    httpPath: "/bridge/takeover-role",
+  },
   sendInput: {
     transport: "command",
     action: "send_input",
@@ -365,6 +370,7 @@ export function parseArgs(argv) {
     args: argv,
     options: {
       agent: { type: "string" },
+      "agent-id": { type: "string" },
       cli: { type: "string" },
       timeout: { type: "string" },
       topics: { type: "string" },
@@ -387,6 +393,7 @@ export function parseArgs(argv) {
       claim: { type: "boolean" },
       actor: { type: "string" },
       command: { type: "string" },
+      role: { type: "string" },
       "session-id": { type: "string" },
       reason: { type: "string" },
       type: { type: "string" },
@@ -703,6 +710,19 @@ async function cmdPublish(args) {
   return emitJson(result || unavailableResult());
 }
 
+async function cmdTakeoverRole(args) {
+  const role = args.role || args[1] || "cto";
+  const agentId = args.agent || args["agent-id"] || args[2];
+  const outcome = await requestHub(HUB_OPERATIONS.takeoverRole, {
+    role,
+    agent_id: agentId,
+    reason: args.reason || "manual",
+    requested_by: args["requested-by"] || "bridge",
+  });
+  const result = outcome?.result;
+  return emitJson(result || unavailableResult());
+}
+
 async function cmdSendInput(args) {
   const outcome = await requestHub(HUB_OPERATIONS.sendInput, {
     session_id: args["session-id"],
@@ -1554,6 +1574,8 @@ export async function main(argv = process.argv.slice(2)) {
       return await cmdHandoff(args);
     case "publish":
       return await cmdPublish(args);
+    case "takeover-role":
+      return await cmdTakeoverRole(args);
     case "send-input":
       return await cmdSendInput(args);
     case "context":
@@ -1610,7 +1632,7 @@ export async function main(argv = process.argv.slice(2)) {
       return await cmdRetryStatus(args);
     default:
       console.error(
-        "사용법: bridge.mjs <register|result|control|handoff|publish|send-input|context|deregister|assign-async|assign-result|assign-status|assign-retry|team-info|team-task-list|team-task-update|team-send-message|pipeline-state|pipeline-advance|pipeline-init|pipeline-list|ping|delegator-delegate|delegator-reply|delegator-status|hitl-request|hitl-submit|hitl-pending|daemon-probe|daemon-attach|daemon-interrupt|retry-run|retry-status> [--옵션]",
+        "사용법: bridge.mjs <register|result|control|handoff|publish|takeover-role|send-input|context|deregister|assign-async|assign-result|assign-status|assign-retry|team-info|team-task-list|team-task-update|team-send-message|pipeline-state|pipeline-advance|pipeline-init|pipeline-list|ping|delegator-delegate|delegator-reply|delegator-status|hitl-request|hitl-submit|hitl-pending|daemon-probe|daemon-attach|daemon-interrupt|retry-run|retry-status> [--옵션]",
       );
       process.exit(1);
   }

package/hub/cli-adapter-base.mjs

@@ -4,6 +4,7 @@
 import { execSync, spawn } from "node:child_process";
 import { existsSync, readFileSync, statSync } from "node:fs";
 
+import { codexProfileConfigOverrides } from "../scripts/lib/codex-profile-config.mjs";
 import { writePromptToTmpFile } from "./lib/prompt-tmp.mjs";
 import { IS_WINDOWS, killProcess } from "./platform.mjs";
 
@@ -172,7 +173,12 @@ export function buildExecCommand(prompt, resultFile = null, opts = {}) {
   } = opts;
 
   const parts = ["codex"];
-  if (profile) parts.push("--profile", profile);
+  // Select the effort profile via `-c` config overrides instead of
+  // `--profile <name>`. codex 0.134+ rejects `--profile X` whenever config.toml
+  // 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) : [];
 
   if (FEATURES.execSubcommand) {
     parts.push("exec");
@@ -182,6 +188,8 @@ export function buildExecCommand(prompt, resultFile = null, opts = {}) {
       parts.push("--output-last-message", resultFile);
     }
     if (FEATURES.colorNever) parts.push("--color", "never");
+    for (const override of profileOverrides)
+      parts.push("-c", shellQuote(override));
     // NOTE: `codex exec`는 --cwd 플래그를 지원하지 않는다. Node spawn의 cwd
     // 옵션으로 child process의 working directory를 제어한다 (conductor.mjs 참조).
     // opts.cwd는 기록용으로만 받아두고 CLI command에는 반영하지 않는다.
@@ -194,6 +202,8 @@ export function buildExecCommand(prompt, resultFile = null, opts = {}) {
   } else {
     parts.push("--dangerously-bypass-approvals-and-sandbox");
     if (skipGitRepoCheck) parts.push("--skip-git-repo-check");
+    for (const override of profileOverrides)
+      parts.push("-c", shellQuote(override));
   }
 
   const useStdin = resolveStdinPromptMode(stdinPrompt);

package/hub/codex-adapter.mjs

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { basename, join } from "node:path";
+import { codexProfileConfigOverrides } from "../scripts/lib/codex-profile-config.mjs";
 import {
   buildExecCommand,
   createResult,
@@ -72,14 +73,21 @@ function buildAttempts(opts, preflight) {
 // ── Launch script ───────────────────────────────────────────────
 
 function createLaunchScriptText(opts) {
-  const parts = ["codex"];
-  if (opts.profile) parts.push("--profile", shellQuote(opts.profile));
-  parts.push(
+  const parts = [
+    "codex",
     "exec",
     "--dangerously-bypass-approvals-and-sandbox",
     "--skip-git-repo-check",
-    '$(cat "$PROMPT_FILE")',
-  );
+  ];
+  // Select the effort profile via `-c` config overrides instead of
+  // `--profile <name>` (see buildExecCommand): codex 0.134+ rejects `--profile
+  // X` whenever config.toml still contains an inline [profiles.X] table.
+  if (opts.profile) {
+    for (const override of codexProfileConfigOverrides(opts.profile)) {
+      parts.push("-c", shellQuote(override));
+    }
+  }
+  parts.push('$(cat "$PROMPT_FILE")');
   return [
     "#!/usr/bin/env bash",
     "set -euo pipefail",

package/hub/pipe.mjs

@@ -29,6 +29,17 @@ function normalizeTopics(topics) {
   return topics.map((topic) => String(topic || "").trim()).filter(Boolean);
 }
 
+function normalizeReplayTopics(topics) {
+  if (Array.isArray(topics)) return normalizeTopics(topics);
+  if (typeof topics === "string") {
+    return topics
+      .split(/[,\s]+/u)
+      .map((topic) => topic.trim())
+      .filter(Boolean);
+  }
+  return [];
+}
+
 function getTeamBridgeMethod(methodName) {
   const method = getTeamBridge()?.[methodName];
   return typeof method === "function" ? method : null;
@@ -266,6 +277,12 @@ export function createPipeServer({
         return result;
       }
 
+      case "takeover_role": {
+        const result = router.takeoverRole(payload);
+        if (client) touchClient(client);
+        return result;
+      }
+
       case "handoff": {
         const result = router.handleHandoff(payload);
         if (client) touchClient(client);
@@ -454,13 +471,34 @@ export function createPipeServer({
       return pending.slice(0, maxMessages);
     }
 
+    const requestedTopics = normalizeReplayTopics(payload.topics);
+    const auditTopics = new Set(requestedTopics);
+    if (auditTopics.size === 0) {
+      const persistedTopics = store?.getAgent?.(agentId)?.topics || [];
+      for (const topic of persistedTopics) auditTopics.add(topic);
+      if (
+        typeof router.canReplayMessageForAgent === "function" &&
+        router.canReplayMessageForAgent(agentId, {
+          to_agent: "topic:cto",
+          topic: "cto",
+        })
+      ) {
+        auditTopics.add("cto");
+      }
+    }
+
     const audit = store.getAuditMessagesForAgent(agentId, {
       max_messages: maxMessages,
-      include_topics: payload.topics,
+      include_topics: Array.from(auditTopics),
     });
     const byId = new Map();
     for (const message of [...pending, ...audit]) {
       if (!message?.id || byId.has(message.id)) continue;
+      if (
+        typeof router.canReplayMessageForAgent === "function" &&
+        !router.canReplayMessageForAgent(agentId, message)
+      )
+        continue;
       byId.set(message.id, message);
     }
     return Array.from(byId.values())