@triflux/remote 10.51.0 → 10.52.0

package/hub/team/agents-row-attach.py

@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+# claude agents 행의 백킹 PTY 안에서 워커 tmux pane 에 붙는다.
+# bg-pty-host 가 출력 이력을 다시 재생하면 바깥 터미널이 tmux 의 오래된 질의에 또 답한다.
+# tmux 는 늦게 온 응답을 키 입력으로 넘기므로 여기서 응답 시퀀스를 걸러 낸다.
+import fcntl
+import os
+import pty
+import re
+import select
+import signal
+import sys
+import termios
+import time
+import tty
+
+# DA1/DA2/DA3, 창 크기 보고(CSI ... t), DECRQM, kitty 키보드 플래그 응답, DCS, OSC
+REPLY = re.compile(
+    rb"\x1b\[[?>=][0-9;]*c"
+    rb"|\x1b\[[0-9]+(?:;[0-9]+)*t"
+    rb"|\x1b\[\?[0-9;]*\$y"
+    rb"|\x1b\[\?[0-9]*u"
+    rb"|\x1bP[^\x1b]*\x1b\\"
+    rb"|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)"
+)
+# 응답이 read 경계에서 잘렸을 때 잠깐 붙잡아 둘 접두
+PARTIAL = re.compile(
+    rb"(?:\x1b\[[?>=]?[0-9;$]*|\x1bP[^\x1b]*\x1b?|\x1b\][^\x07\x1b]*\x1b?)\Z"
+)
+HOLD_SEC = 0.05
+
+
+def strip_replies(buf):
+    """걸러 낸 바이트와, 다음 read 까지 보류할 꼬리를 돌려준다."""
+    cleaned = REPLY.sub(b"", buf)
+    m = PARTIAL.search(cleaned)
+    if m and cleaned[m.start():] != b"\x1b":
+        return cleaned[: m.start()], cleaned[m.start():]
+    return cleaned, b""
+
+
+def copy_winsize(src, dst):
+    try:
+        size = fcntl.ioctl(src, termios.TIOCGWINSZ, b"\0" * 8)
+        fcntl.ioctl(dst, termios.TIOCSWINSZ, size)
+    except OSError:
+        pass
+
+
+def relay(argv, env):
+    pid, fd = pty.fork()
+    if pid == 0:
+        os.execvpe(argv[0], argv, env)
+    stdin = sys.stdin.fileno()
+    stdout = sys.stdout.fileno()
+    copy_winsize(stdin, fd)
+    signal.signal(signal.SIGWINCH, lambda *_: copy_winsize(stdin, fd))
+    saved = termios.tcgetattr(stdin) if os.isatty(stdin) else None
+    if saved:
+        tty.setraw(stdin)
+    pending = b""
+    deadline = 0.0
+    try:
+        while True:
+            # 자식 출력이 계속 바빠도 보류한 바이트가 HOLD_SEC 를 넘겨 묶이지 않게 마감을 둔다.
+            timeout = max(0.0, deadline - time.monotonic()) if pending else None
+            try:
+                ready, _, _ = select.select([stdin, fd], [], [], timeout)
+            except InterruptedError:
+                continue
+            if pending and time.monotonic() >= deadline:
+                os.write(fd, pending)
+                pending = b""
+            if fd in ready:
+                try:
+                    data = os.read(fd, 65536)
+                except OSError:
+                    break
+                if not data:
+                    break
+                os.write(stdout, data)
+            if stdin in ready:
+                # 행 PTY 가 닫히면 slave 읽기는 EIO 를 던진다.
+                try:
+                    data = os.read(stdin, 65536)
+                except OSError:
+                    break
+                if not data:
+                    break
+                out, held = strip_replies(pending + data)
+                if held and not pending:
+                    deadline = time.monotonic() + HOLD_SEC
+                pending = held
+                if out:
+                    os.write(fd, out)
+    finally:
+        if saved:
+            try:
+                termios.tcsetattr(stdin, termios.TCSADRAIN, saved)
+            except termios.error:
+                pass
+    # 행 PTY 가 닫히면 attach client 도 끝낸다. 워커 방은 그대로 남는다.
+    os.close(fd)
+    _, status = os.waitpid(pid, 0)
+    return os.waitstatus_to_exitcode(status)
+
+
+def main():
+    # 사용법: agents-row-attach.py -- <tmux attach 명령>
+    argv = sys.argv[1:]
+    if argv[:1] == ["--"]:
+        argv = argv[1:]
+    if not argv:
+        print("usage: agents-row-attach.py -- <command>", file=sys.stderr)
+        return 2
+    env = {k: v for k, v in os.environ.items() if k not in ("TMUX", "TMUX_PANE")}
+    return relay(argv, env)
+
+
+if __name__ == "__main__":
+    sys.exit(main())

package/hub/team/agents-row.mjs

@@ -0,0 +1,200 @@
+// hub/team/agents-row.mjs: 워커 tmux pane 을 `claude agents` 행으로 노출한다.
+// 행의 백킹 job 은 공식 `claude --bg --exec` 로 띄운 tmux attach client 다.
+// Enter 를 누르면 그 PTY, 곧 워커가 도는 tmux 방이 열린다(ADR-0026).
+
+import { execFile } from "node:child_process";
+import { accessSync, constants } from "node:fs";
+import { delimiter, dirname, isAbsolute, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { promisify } from "node:util";
+import { getMultiplexerType, psmuxExec } from "./psmux.mjs";
+
+const execFileAsync = promisify(execFile);
+const ATTACH_HELPER = join(
+  dirname(fileURLToPath(import.meta.url)),
+  "agents-row-attach.py",
+);
+const READ_ONLY_SUFFIX = " [read-only]";
+
+function shellQuote(value) {
+  return `'${String(value).replace(/'/g, "'\\''")}'`;
+}
+
+// daemon 이 띄운 셸의 PATH 는 호출자와 다를 수 있어 절대 경로로 넘긴다.
+export function resolveExecutable(name, envPath = process.env.PATH || "") {
+  if (isAbsolute(name)) return name;
+  for (const dir of envPath.split(delimiter)) {
+    if (!dir) continue;
+    const candidate = join(dir, name);
+    try {
+      accessSync(candidate, constants.X_OK);
+      return candidate;
+    } catch {
+      /* 다음 후보 */
+    }
+  }
+  return "";
+}
+
+/** tmux target 을 서버 안에서 유일한 socket/session/pane ID 로 고정한다. */
+export function resolveTmuxPane(target, { tmux = psmuxExec } = {}) {
+  const out = tmux([
+    "display-message",
+    "-p",
+    "-t",
+    String(target),
+    "#{socket_path}\t#{session_id}\t#{pane_id}\t#{session_name}",
+  ]);
+  const [socketPath, sessionId, paneId, sessionName] = String(out)
+    .trim()
+    .split("\t");
+  if (!socketPath || !/^\$\d+$/u.test(sessionId) || !/^%\d+$/u.test(paneId)) {
+    throw new Error(`tmux pane을 확인할 수 없습니다: ${target}`);
+  }
+  return { socketPath, sessionId, paneId, sessionName };
+}
+
+/**
+ * 행의 백킹 명령. pane 이 등록한 세션에 그대로 있는 동안 attach 를 반복하고,
+ * 방이 사라지면 자기 행을 지운다. 대화형은 python3 중계로 터미널 응답 누수를 걸러 내고,
+ * 그 밖에는 읽기 전용 attach 로 입력 자체를 막는다.
+ */
+export function buildAgentsRowCommand({
+  tmuxBin,
+  claudeBin = "claude",
+  pane,
+  interactive = false,
+  python = "",
+}) {
+  const q = shellQuote;
+  const tmux = `${q(tmuxBin)} -S ${q(pane.socketPath)}`;
+  const readOnly = !(interactive && python);
+  const attach = [
+    ...(readOnly ? [] : [q(python), q(ATTACH_HELPER), "--"]),
+    "env -u TMUX -u TMUX_PANE",
+    tmux,
+    `attach-session -t ${q(pane.paneId)}`,
+    // -r 은 read-only,ignore-size 와 같고 tmux 3.2 이전에도 있다.
+    ...(readOnly ? ["-r"] : []),
+  ].join(" ");
+  // 같은 번호의 다른 방에 붙지 않도록 pane 의 세션 ID 를 매번 대조한다.
+  const alive = `[ "$(${tmux} display-message -p -t ${q(pane.paneId)} '#{session_id}' 2>/dev/null)" = ${q(pane.sessionId)} ]`;
+  // CLAUDE_JOB_DIR 의 끝이 이 job 의 short id 다. job 이 끝난 뒤 지우도록 nohup 으로 띄운다.
+  const removeSelf = `nohup sh -c 'sleep 1; exec "$0" rm "\${CLAUDE_JOB_DIR##*/}"' ${q(claudeBin)} >/dev/null 2>&1 &`;
+  // attach 가 바로 끝나기를 5번 연달아 반복하면 고칠 수 없는 실패로 보고 멈춘다.
+  const loop = `n=0; while ${alive}; do t=$(date +%s); ${attach}; if [ $(($(date +%s) - t)) -lt 2 ]; then n=$((n + 1)); else n=0; fi; [ "$n" -ge 5 ] && break; sleep 1; done`;
+  return { readOnly, command: `${loop}; ${removeSelf}` };
+}
+
+// macOS 에는 CLT 설치 안내만 띄우는 /usr/bin/python3 스텁이 있어 실제로 한 번 돌려 본다.
+async function usablePython(resolve, run) {
+  const python = resolve("python3");
+  if (!python) return "";
+  try {
+    await run(python, ["-c", "import pty"], { timeout: 5_000 });
+    return python;
+  } catch {
+    return "";
+  }
+}
+
+export function parseBackgroundShort(stdout) {
+  const match = /backgrounded · ([0-9a-f]{6,}) ·/u.exec(String(stdout));
+  return match ? match[1] : "";
+}
+
+/**
+ * 워커 pane 하나를 `claude agents` 행으로 연다.
+ * @returns {Promise<{short:string, name:string, readOnly:boolean, pane:object}>}
+ */
+export async function openAgentsRow({
+  name,
+  target,
+  cwd = process.cwd(),
+  interactive = false,
+  _deps = {},
+} = {}) {
+  if (!name) throw new Error("name is required");
+  const tmux = _deps.tmux || psmuxExec;
+  const run = _deps.execFile || execFileAsync;
+  const resolve = _deps.resolveExecutable || resolveExecutable;
+  const pane = resolveTmuxPane(target, { tmux });
+  const tmuxBin = resolve(getMultiplexerType()) || getMultiplexerType();
+  const claudeBin = _deps.claudeBin || resolve("claude") || "claude";
+  const python = interactive ? await usablePython(resolve, run) : "";
+  const { command, readOnly } = buildAgentsRowCommand({
+    tmuxBin,
+    claudeBin,
+    pane,
+    interactive,
+    python,
+  });
+  // 대화형인데 읽기 전용으로 떨어졌으면 행 이름에서 바로 보이게 한다.
+  const rowName = interactive && readOnly ? `${name}${READ_ONLY_SUFFIX}` : name;
+  const { stdout = "", stderr = "" } = await run(
+    claudeBin,
+    ["--bg", "--name", rowName, "--exec", command],
+    { cwd, timeout: 20_000, encoding: "utf8" },
+  );
+  const short = parseBackgroundShort(`${stdout}\n${stderr}`);
+  if (!short) {
+    throw new Error(`claude --bg 출력에서 id를 찾지 못했습니다: ${stdout}`);
+  }
+  return { short, name: rowName, readOnly, pane };
+}
+
+/** 행을 지운다. rm 은 실행 중인 job 도 멈춘다. 워커 tmux 방은 건드리지 않는다. */
+export async function closeAgentsRow(short, { _deps = {} } = {}) {
+  if (!short) return;
+  const run = _deps.execFile || execFileAsync;
+  await run(_deps.claudeBin || "claude", ["rm", short], {
+    timeout: 10_000,
+  }).catch(() => {});
+}
+
+/** 실행이 연 행만 정확히 한 번 닫는다. */
+export function createAgentsRowOwnership(close = closeAgentsRow) {
+  const shorts = new Set();
+  return {
+    get size() {
+      return shorts.size;
+    },
+    add(short) {
+      if (short) shorts.add(short);
+    },
+    async release() {
+      const owned = [...shorts];
+      shorts.clear();
+      await Promise.all(owned.map((short) => close(short)));
+    },
+  };
+}
+
+/**
+ * tfx-live start 가 띄운 Claude 외 CLI 세션을 대화형 행으로 노출한다.
+ * Claude 세션은 원래 목록에 뜨므로 건너뛴다. 실패해도 start 는 성공으로 두고 경고만 돌려준다.
+ */
+export async function exposeLiveSession(
+  { cli, session, name, cwd, remote, ready },
+  _deps,
+) {
+  if (process.env.TFX_AGENTS_ROW === "0") return {};
+  if (remote || cli === "claude" || !ready) return {};
+  try {
+    const row = await openAgentsRow({
+      name: name || session,
+      target: session,
+      cwd,
+      interactive: true,
+      _deps,
+    });
+    return {
+      agentsRow: row.short,
+      ...(row.readOnly
+        ? { agentsRowWarning: "python3 not found; row is read-only" }
+        : {}),
+    };
+  } catch (error) {
+    return { agentsRowWarning: error?.message || String(error) };
+  }
+}

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/cli/commands/debug.mjs

@@ -6,7 +6,7 @@ import {
 } from "../../session.mjs";
 import { AMBER, BOLD, DIM, RESET } from "../../shared.mjs";
 import { isTeamAlive } from "../services/runtime-mode.mjs";
-import { loadTeamState, TEAM_PROFILE } from "../services/state-store.mjs";
+import { loadTeamState } from "../services/state-store.mjs";
 
 export async function teamDebug(args = []) {
   const state = loadTeamState();
@@ -33,7 +33,6 @@ export async function teamDebug(args = []) {
 
   console.log(`\n  ${BOLD}state${RESET}`);
   console.log(`    session:   ${state.sessionName}`);
-  console.log(`    profile:   ${state.profile || TEAM_PROFILE}`);
   console.log(`    mode:      ${state.teammateMode || "tmux"}`);
   console.log(`    lead:      ${state.lead}`);
   console.log(`    agents:    ${(state.agents || []).join(", ")}`);

package/hub/team/cli/commands/start/index.mjs

@@ -88,7 +88,8 @@ export async function teamStart(args = []) {
   });
 
   const effectiveMode = normalizeTeammateMode(teammateMode);
-  if (effectiveMode !== "headless") ensureTmuxOrExit();
+  // headless 워커도 tmux 방에서 돈다. 방이 없으면 claude agents 행도 열 수 없다.
+  ensureTmuxOrExit();
   const effectiveNativeBridge =
     effectiveMode === "headless" && !nativeBridgeUiOptOut ? true : nativeBridge;
 

package/hub/team/cli/commands/start/start-mux.mjs

@@ -10,7 +10,7 @@ import {
 import { BOLD, DIM, GREEN, RESET } from "../../../shared.mjs";
 import { ok, warn } from "../../render.mjs";
 import { toAgentId } from "../../services/member-selector.mjs";
-import { PKG_ROOT, TEAM_PROFILE } from "../../services/state-store.mjs";
+import { PKG_ROOT } from "../../services/state-store.mjs";
 import { buildTasks } from "../../services/task-model.mjs";
 
 export async function startMuxTeam({
@@ -106,9 +106,7 @@ export async function startMuxTeam({
       members.filter((member) => member.role === "worker"),
     ),
     postSave() {
-      const profilePrefix =
-        TEAM_PROFILE === "team" ? "" : `TFX_TEAM_PROFILE=${TEAM_PROFILE} `;
-      const taskListCommand = `${profilePrefix}${process.execPath} ${join(PKG_ROOT, "bin", "triflux.mjs")} team tasks`;
+      const taskListCommand = `${process.execPath} ${join(PKG_ROOT, "bin", "triflux.mjs")} team tasks`;
       configureTeammateKeybindings(sessionId, {
         inProcess: false,
         taskListCommand,

package/hub/team/cli/services/state-store.mjs

@@ -14,26 +14,14 @@ import { fileURLToPath } from "node:url";
 export const PKG_ROOT = fileURLToPath(new URL("../../../../", import.meta.url));
 export const HUB_PID_DIR =
   process.env.TFX_HUB_PID_DIR || join(homedir(), ".claude", "cache", "tfx-hub");
-export const TEAM_PROFILE = (() => {
-  const raw = String(process.env.TFX_TEAM_PROFILE || "team")
-    .trim()
-    .toLowerCase();
-  return raw === "codex-team" ? "codex-team" : "team";
-})();
-
 export const SESSION_ID = process.env.CLAUDE_SESSION_ID || `s${Date.now()}`;
 
 function getStatePath(sessionId) {
   if (sessionId) return join(HUB_PID_DIR, `team-state-${sessionId}.json`);
-  return join(
-    HUB_PID_DIR,
-    TEAM_PROFILE === "codex-team"
-      ? "team-state-codex-team.json"
-      : "team-state.json",
-  );
+  return join(HUB_PID_DIR, "team-state.json");
 }
 
-function findLatestMatchingTeamState() {
+function findLatestTeamState() {
   try {
     if (!existsSync(HUB_PID_DIR)) return null;
     const entries = readdirSync(HUB_PID_DIR)
@@ -51,7 +39,7 @@ function findLatestMatchingTeamState() {
     for (const { path } of entries) {
       try {
         const parsed = JSON.parse(readFileSync(path, "utf8"));
-        if ((parsed.profile || "team") === TEAM_PROFILE) return parsed;
+        if (parsed && typeof parsed === "object") return parsed;
       } catch {
         // corrupt entry — skip
       }
@@ -84,7 +72,7 @@ export function loadTeamState(sessionId) {
   // team-state-*.json 을 tfx multi status 가 못 찾던 false-negative 우회.
   // 명시 sessionId lookup 은 의도적 조회이므로 auto-discover 하지 않는다.
   if (!explicit) {
-    const latest = findLatestMatchingTeamState();
+    const latest = findLatestTeamState();
     if (latest) return latest;
   }
   return null;
@@ -93,10 +81,7 @@ export function loadTeamState(sessionId) {
 export function saveTeamState(state, sessionId) {
   const path = getStatePath(sessionId || state.sessionId || SESSION_ID);
   mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(
-    path,
-    JSON.stringify({ ...state, profile: TEAM_PROFILE }, null, 2) + "\n",
-  );
+  writeFileSync(path, JSON.stringify(state, null, 2) + "\n");
 }
 
 export function clearTeamState(sessionId) {