@triflux/remote 10.53.0 → 10.55.0

package/hub/team/backend.mjs

@@ -1,11 +1,18 @@
+import { writePromptToTmpFile } from "@triflux/core/hub/lib/prompt-tmp.mjs";
 import { IS_WINDOWS } from "@triflux/core/hub/platform.mjs";
 import { powershellSingleQuote, shellQuote } from "./terminal-opener.mjs";
 
 class ClaudeBackend {
-  buildArgs(prompt, resultFile, { isWindows = IS_WINDOWS } = {}) {
+  // 프롬프트를 argv 로 넘기면 ps 에 보인다. claude --print 는 프롬프트 인자가 없으면 stdin 을 읽는다.
+  buildArgs(prompt, resultFile, { isWindows = IS_WINDOWS, promptFile } = {}) {
+    const file = promptFile || writePromptToTmpFile(prompt);
     const quote = isWindows ? powershellSingleQuote : shellQuote;
-    const args = ["--print", prompt, "--output-format", "text"];
-    return `claude ${args.map(quote).join(" ")} > ${quote(resultFile)} 2>&1`;
+    const run = `claude --print --output-format text > ${quote(resultFile)} 2>&1`;
+    // PowerShell 5.1 은 BOM 없는 파일을 ANSI 로 읽고 파이프를 ASCII 로 보내서 UTF-8 을 명시한다.
+    // -LiteralPath 는 경로의 [] 를 와일드카드로 읽지 않게 한다.
+    return isWindows
+      ? `$OutputEncoding = [System.Text.UTF8Encoding]::new($false); Get-Content -LiteralPath ${quote(file)} -Raw -Encoding UTF8 | ${run}`
+      : `${run} < ${quote(file)}`;
   }
 }
 

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

@@ -41,8 +41,6 @@ function printWorkerPreview(agents, subtasks) {
   console.log("");
 }
 
-export { parseTeamArgs };
-
 export function resolveTeamWorkers({ agents, task, assigns = [] }) {
   if (assigns.length > 0) {
     return {

package/hub/team/handoff.mjs

@@ -1,6 +1,6 @@
 // hub/team/handoff.mjs — Worker → Lead handoff 프로토콜
 // HANDOFF 블록 파싱, 검증, fallback 생성, Lead 포맷팅
-// 설계: docs/design/handoff-schema-v7.md
+// 설계: docs/design/handoff-schema-v7.md (PR #70 에서 삭제, c0722ecd 에 남아 있다)
 
 // ── enum 허용 값 ──
 const STATUS_VALUES = ["ok", "partial", "failed"];

package/hub/team/headless.mjs

@@ -5,18 +5,17 @@ import { execSync } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import {
   existsSync,
-  mkdirSync,
   readFileSync,
   rmSync,
   statSync,
   writeFileSync,
 } from "node:fs";
 import { createRequire } from "node:module";
-import { tmpdir } from "node:os";
-import { dirname, join, resolve } from "node:path";
+import { delimiter, dirname, isAbsolute, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { resolveNestedCodexAgentProfile } from "../../scripts/lib/agent-route-policy.mjs";
 import { escapePwshSingleQuoted } from "@triflux/core/hub/cli-adapter-base.mjs";
+import { privateTmpDir } from "@triflux/core/hub/lib/private-tmp.mjs";
 import {
   createActivityLifecycle,
   isActivityLifecycleEnabled,
@@ -47,7 +46,10 @@ import { createResultsIndex, resultsIndexPath } from "./results-index.mjs";
 import { createLogDashboard } from "./tui.mjs";
 import { createWtManager } from "./wt-manager.mjs";
 
-const RESULT_DIR = join(tmpdir(), "tfx-headless");
+// 결과와 프롬프트, 실행 스크립트가 남으므로 사용자별 0700 디렉터리에 둔다.
+function resultDir() {
+  return privateTmpDir("tfx-headless");
+}
 const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url));
 
 /** CLI별 브랜드 — 이모지 + 공식 색상 (HUD와 통일) */
@@ -85,27 +87,37 @@ function shellQuote(value) {
   return `'${String(value).replace(/'/g, "'\\''")}'`;
 }
 
+// 빈 항목과 상대 경로는 cwd 를 뜻하므로 건너뛴다.
+function findOnPath(name) {
+  for (const dir of String(process.env.PATH || "").split(delimiter)) {
+    if (!dir || !isAbsolute(dir)) continue;
+    const candidate = join(dir, name);
+    if (existsSync(candidate)) return candidate;
+  }
+  return "";
+}
+
+// cwd 의 스크립트는 후보에 넣지 않는다. 신뢰하지 않는 저장소에서 돌리면 그 저장소의 스크립트가
+// 실행된다. bash 에 맨 이름만 넘겨도 cwd 를 먼저 읽으므로 찾지 못하면 실행하지 않는다.
 function resolveHeadlessRouteScript(opts = {}) {
+  if (opts.routeScript) return opts.routeScript;
   const candidates = [
-    opts.routeScript,
     process.env.TFX_ROUTE_SCRIPT,
     process.env.TFX_DELEGATOR_ROUTE_SCRIPT,
-    join(process.cwd(), "scripts", "tfx-route.sh"),
     join(SCRIPT_DIR, "..", "..", "scripts", "tfx-route.sh"),
     process.env.HOME
       ? join(process.env.HOME, ".claude", "scripts", "tfx-route.sh")
       : "",
-    "tfx-route.sh",
   ];
-
-  for (const candidate of candidates) {
-    if (!candidate) continue;
-    if (candidate === "tfx-route.sh" || existsSync(candidate)) {
-      return candidate;
-    }
+  const found =
+    candidates.find((candidate) => candidate && existsSync(candidate)) ||
+    findOnPath("tfx-route.sh");
+  if (!found) {
+    throw new Error(
+      "tfx-route.sh 를 찾지 못했다. TFX_ROUTE_SCRIPT 로 경로를 지정한다.",
+    );
   }
-
-  return "tfx-route.sh";
+  return found;
 }
 
 function resolveRouteAgentForHeadless(resolvedCli, opts = {}) {
@@ -128,11 +140,14 @@ export function normalizeHeadlessRole(role) {
 }
 
 export function headlessResultFile(sessionName, paneName) {
-  return join(RESULT_DIR, `${sessionName}-${paneName}.txt`).replace(/\\/g, "/");
+  return join(resultDir(), `${sessionName}-${paneName}.txt`).replace(
+    /\\/g,
+    "/",
+  );
 }
 
 export function headlessResultsIndexPath(sessionName) {
-  return resultsIndexPath(RESULT_DIR, sessionName).replace(/\\/g, "/");
+  return resultsIndexPath(resultDir(), sessionName).replace(/\\/g, "/");
 }
 
 export function resolveHeadlessDisplayName(assignment = {}, paneName = "") {
@@ -200,25 +215,6 @@ const MCP_PROFILE_HINTS = {
   docs: "Focus on documentation and explanation tasks.",
 };
 
-export function buildDashboardAttachArgs(
-  sessionName,
-  layout,
-  workerCount,
-  anchor = "window",
-) {
-  const safeName = String(sessionName).replace(/[^a-zA-Z0-9_-]/g, "");
-  const base = anchor === "tab" ? ["-w", "0", "nt"] : ["-w", "new"];
-  return [
-    ...base,
-    "--session",
-    safeName,
-    "--layout",
-    layout,
-    "--workers",
-    String(workerCount),
-  ];
-}
-
 export function buildHeadlessCommand(cli, prompt, resultFile, opts = {}) {
   const { handoff = true, mcp, contextFile, model, cwd } = opts;
   const resolvedCli = resolveCliType(cli);
@@ -256,15 +252,9 @@ export function buildHeadlessCommand(cli, prompt, resultFile, opts = {}) {
   const handoffHint = handoff ? `\n\n${HANDOFF_INSTRUCTION_SHORT}` : "";
   const fullPrompt = `${contextPrefix}${prompt}${mcpHint}${workspaceHint}${handoffHint}`;
 
-  // 보안: 프롬프트를 임시 파일에 쓰고 파일 참조로 전달 (셸 주입 방지).
-  // 이전 구현은 `"$(cat 'PATH')"` shell-expansion expression 을 만들어
-  // backend.buildArgs 에 전달했는데, 새 stdin-prompt 모드 (PR #252) 가
-  // 그 literal 을 user message 로 해석해서 codex 가 prompt 가 아닌
-  // shell expression 자체를 받는 회귀가 있었다. 이제 fullPrompt 를 그대로
-  // 전달하고 buildExecCommand 가 자체적으로 tmp file 작성 + stdin redirect.
-  if (!existsSync(RESULT_DIR)) mkdirSync(RESULT_DIR, { recursive: true });
+  // 보안: 프롬프트를 임시 파일에 쓰고 파일 참조로 전달한다(셸 주입 방지).
   const promptFile = join(
-    RESULT_DIR,
+    resultDir(),
     "prompt-" + randomUUID().slice(0, 8) + ".txt",
   ).replace(/\\/g, "/");
   writeFileSync(promptFile, fullPrompt, "utf8");
@@ -655,7 +645,7 @@ async function dispatchBatch(sessionName, assignments, opts = {}) {
           cwd: assignment.cwd || assignment.workdir,
         },
       );
-      const scriptDir = join(RESULT_DIR, sessionName);
+      const scriptDir = join(resultDir(), sessionName);
       const dispatch = dispatchCommand(sessionName, paneName, cmd, {
         scriptDir,
         scriptName: paneName,
@@ -912,7 +902,7 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
     onIntervene,
   };
 
-  mkdirSync(RESULT_DIR, { recursive: true });
+  resultDir();
   const normalizedAssignments = (assignments || []).map((assignment, index) =>
     normalizeHeadlessAssignment(assignment, index),
   );
@@ -970,7 +960,7 @@ export async function runHeadless(sessionName, assignments, opts = {}) {
     }
   } else if (dashboard) {
     // stdout은 결과 파싱 대상이므로 안내는 stderr로 보낸다.
-    const logDir = join(tmpdir(), "tfx-headless");
+    const logDir = resultDir();
     process.stderr.write(
       `\n⚠ stdout is not a TTY; dashboard is skipped.\n` +
         `  Session is running in background. Worker logs:\n` +
@@ -1446,14 +1436,11 @@ export async function autoAttachTerminal(
         opts.dashboardLayout || "single",
         workerCount,
       );
-      const viewerPath = join(import.meta.dirname, "tui-viewer.mjs").replace(
-        /\\/g,
-        "/",
-      );
+      const viewerPath = join(SCRIPT_DIR, "tui-viewer.mjs").replace(/\\/g, "/");
       await wt.createTab({
         title: buildAttachTitle(safeSession, "dashboard"),
         profile: "triflux",
-        command: `node "${viewerPath}" --session ${safeSession} --result-dir "${RESULT_DIR}" --layout ${resolvedLayout}`,
+        command: `node "${viewerPath}" --session ${safeSession} --result-dir "${resultDir()}" --layout ${resolvedLayout}`,
       });
     } else {
       const panes = [];
@@ -1519,15 +1506,12 @@ export async function attachDashboardTab(
   try {
     const safeSession = sanitizeSessionName(sessionName);
     const resolvedLayout = resolveDashboardLayout(dashboardLayout, workerCount);
-    const viewerPath = join(import.meta.dirname, "tui-viewer.mjs").replace(
-      /\\/g,
-      "/",
-    );
+    const viewerPath = join(SCRIPT_DIR, "tui-viewer.mjs").replace(/\\/g, "/");
 
     await wt.createTab({
       title: buildAttachTitle(safeSession, "dashboard"),
       profile: "triflux",
-      command: `node "${viewerPath}" --session ${safeSession} --result-dir "${RESULT_DIR}" --layout ${resolvedLayout}`,
+      command: `node "${viewerPath}" --session ${safeSession} --result-dir "${resultDir()}" --layout ${resolvedLayout}`,
     });
     return true;
   } catch {

package/hub/team/intervention.mjs

@@ -125,10 +125,12 @@ export async function resolveCodexRolloutFile({
   return null;
 }
 
-export function buildResumeArgv({ cli, sessionId, prompt } = {}) {
+// 프롬프트는 argv 에 두면 ps 에 보여서 넣지 않는다. 실행하는 쪽이 prompt 를 stdin 으로 넘긴다.
+// claude -p 는 프롬프트 인자가 없으면, codex exec resume 은 `-` 를 받으면 stdin 을 읽는다.
+export function buildResumeArgv({ cli, sessionId } = {}) {
   if (!sessionId) return null;
-  if (cli === "claude") return ["claude", "-p", "--resume", sessionId, prompt];
-  if (cli === "codex") return ["codex", "exec", "resume", sessionId, prompt];
+  if (cli === "claude") return ["claude", "-p", "--resume", sessionId];
+  if (cli === "codex") return ["codex", "exec", "resume", sessionId, "-"];
   return null;
 }
 
@@ -474,7 +476,7 @@ export function createInterventionLadder({
         sessionId,
         prompt: reinstructPrompt,
         target,
-        argv: buildResumeArgv({ cli, sessionId, prompt: reinstructPrompt }),
+        argv: buildResumeArgv({ cli, sessionId }),
       });
       return resumed?.ok === false
         ? { ok: false, detail: "resume_dispatch_failed" }

package/hub/team/nativeProxy.mjs

@@ -6,7 +6,6 @@ import {
   existsSync,
   mkdirSync,
   renameSync,
-  rmSync,
   unlinkSync,
   writeFileSync,
 } from "node:fs";
@@ -23,7 +22,8 @@ import { isPidAlive } from "@triflux/core/hub/lib/process-utils.mjs";
 import { IS_WINDOWS } from "@triflux/core/hub/platform.mjs";
 
 const TEAM_NAME_RE = /^[a-z0-9][a-z0-9-]*$/;
-const CLAUDE_HOME = join(homedir(), ".claude");
+// Claude Code 와 같은 규칙으로 CLAUDE_CONFIG_DIR 를 따른다. 테스트도 이걸로 실제 ~/.claude 를 피한다.
+const CLAUDE_HOME = process.env.CLAUDE_CONFIG_DIR || join(homedir(), ".claude");
 const TEAMS_ROOT = join(CLAUDE_HOME, "teams");
 const TASKS_ROOT = join(CLAUDE_HOME, "tasks");
 const LOCK_STALE_MS = 30000;
@@ -232,52 +232,6 @@ export async function resolveTeamPaths(teamName) {
   };
 }
 
-export async function forceCleanupTeam(teamName) {
-  validateTeamName(teamName);
-
-  let paths;
-  try {
-    paths = await resolveTeamPaths(teamName);
-  } catch {
-    paths = {
-      team_dir: join(TEAMS_ROOT, teamName),
-      config_path: join(TEAMS_ROOT, teamName, "config.json"),
-      tasks_dir: join(TASKS_ROOT, teamName),
-      lead_session_id: null,
-      config: null,
-    };
-  }
-
-  try {
-    const config = paths.config || (await readJsonSafe(paths.config_path));
-    if (config && Array.isArray(config.members)) {
-      atomicWriteJson(paths.config_path, {
-        ...config,
-        members: config.members.map((member) => ({
-          ...member,
-          isActive: false,
-        })),
-      });
-    }
-  } catch {}
-
-  const cleanupTargets = new Set([
-    paths.team_dir,
-    join(TASKS_ROOT, teamName),
-    paths.tasks_dir,
-  ]);
-  if (paths.lead_session_id) {
-    cleanupTargets.add(join(TASKS_ROOT, paths.lead_session_id));
-  }
-
-  for (const targetPath of cleanupTargets) {
-    if (!targetPath) continue;
-    try {
-      rmSync(targetPath, { recursive: true, force: true });
-    } catch {}
-  }
-}
-
 async function collectTaskFiles(tasksDir) {
   if (!existsSync(tasksDir)) return [];
 

package/hub/team/pane.mjs

@@ -1,15 +1,12 @@
 // hub/team/pane.mjs — pane별 CLI 실행 + stdin 주입
 // 의존성: child_process, fs, os, path (Node.js 내장)만 사용
-import { mkdirSync, unlinkSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
+import { unlinkSync, writeFileSync } from "node:fs";
+import { createRequire } from "node:module";
 import { join } from "node:path";
+import { privateTmpDir } from "@triflux/core/hub/lib/private-tmp.mjs";
 import { psmuxExec } from "./psmux.mjs";
 import { detectMultiplexer, tmuxExec } from "./session.mjs";
 
-function quoteArg(value) {
-  return `"${String(value).replace(/"/g, '\\"')}"`;
-}
-
 function getPsmuxSessionName(target) {
   return String(target).split(":")[0]?.trim() || "";
 }
@@ -46,15 +43,26 @@ function muxExec(args, opts = {}) {
   });
 }
 
+const AGENT_TO_CLI = createRequire(import.meta.url)("./agent-map.json");
+
+// 역할명(designer)과 별칭(agy)을 CLI 종류로 푼다. 실행과 주입 판정이 같은 값을 본다.
+export function resolveCli(cli) {
+  const name = String(cli || "").toLowerCase();
+  return AGENT_TO_CLI[name] ?? name;
+}
+
 /**
- * CLI 에이전트 시작 커맨드 생성
- * @param {'codex'|'antigravity'|'claude'} cli
+ * CLI 에이전트 시작 커맨드 생성. 역할명과 별칭은 agent-map 으로 CLI 를 고른다.
+ * @param {string} cli: CLI 이름, 별칭(agy) 또는 역할명
  * @returns {string} 실행할 셸 커맨드
  */
 export function buildCliCommand(cli) {
-  switch (cli) {
+  switch (resolveCli(cli)) {
     case "codex":
       return "codex --dangerously-bypass-approvals-and-sandbox";
+    case "antigravity":
+      // 실행 파일은 agy 다. antigravity 는 셸 별칭이라 비대화형 셸에 없다.
+      return "agy";
     case "claude":
       // interactive 모드
       return "claude";
@@ -82,7 +90,7 @@ export function startCliInPane(target, command) {
  * @param {{ multiplexer: string, useFileRef: boolean, cli: string|null }} args
  */
 export function shouldUseFileRef({ multiplexer, useFileRef, cli }) {
-  return multiplexer === "psmux" && useFileRef && cli !== "codex";
+  return multiplexer === "psmux" && useFileRef && resolveCli(cli) !== "codex";
 }
 
 /** 동기 sleep — injectPrompt는 sync 경로라 setTimeout을 쓸 수 없다 */
@@ -105,7 +113,7 @@ function capturePaneText(target) {
           "",
       );
     }
-    return String(muxExec(`capture-pane -t ${target} -p`) ?? "");
+    return String(muxExec(["capture-pane", "-t", target, "-p"]) ?? "");
   } catch {
     return "";
   }
@@ -136,7 +144,7 @@ function waitForComposerReady(target) {
  * capture 불가 또는 재시도 소진을 성공으로 숨기지 않고 오류로 반환한다.
  */
 function isAntigravityCli(cli) {
-  return ["agy", "antigravity"].includes(String(cli || "").toLowerCase());
+  return resolveCli(cli) === "antigravity";
 }
 
 function promptComposerNeedle(prompt) {
@@ -239,8 +247,7 @@ export function injectPrompt(
   prompt,
   { useFileRef = false, cli = null } = {},
 ) {
-  const tmpDir = join(tmpdir(), "tfx-multi");
-  mkdirSync(tmpDir, { recursive: true });
+  const tmpDir = privateTmpDir("tfx-multi");
 
   const safeTarget = target.replace(/[:.]/g, "-");
   const tmpFile = join(tmpDir, `prompt-${safeTarget}-${Date.now()}.txt`);
@@ -294,10 +301,11 @@ export function injectPrompt(
 
     // tmux load-buffer → paste-buffer → (정착 지연 + 제출 확인) Enter
     waitForComposerReady(target);
-    muxExec(`load-buffer ${quoteArg(toMuxPath(tmpFile))}`);
-    muxExec(`paste-buffer -t ${target}`);
+    muxExec(["load-buffer", toMuxPath(tmpFile)]);
+    // -p 가 없으면 줄바꿈이 CR(Enter)로 들어가 여러 줄 지시문이 줄마다 제출된다.
+    muxExec(["paste-buffer", "-p", "-t", target]);
     confirmSubmit(target, prompt, cli, () =>
-      muxExec(`send-keys -t ${target} Enter`),
+      muxExec(["send-keys", "-t", target, "Enter"]),
     );
   } finally {
     try {
@@ -312,5 +320,10 @@ export function injectPrompt(
  * @param {string} keys — tmux 키 표현 (예: 'C-c', 'Enter')
  */
 export function sendKeys(target, keys) {
-  muxExec(`send-keys -t ${target} ${keys}`);
+  muxExec([
+    "send-keys",
+    "-t",
+    target,
+    ...String(keys).split(/\s+/u).filter(Boolean),
+  ]);
 }

package/hub/team/psmux.mjs

@@ -19,10 +19,11 @@ import {
   readFileSync,
   writeFileSync,
 } from "node:fs";
-import { homedir, tmpdir } from "node:os";
+import { homedir } from "node:os";
 import { join } from "node:path";
 import { formatPsmuxInstallGuidance } from "../../scripts/lib/psmux-info.mjs";
 import { resolveGitBashExecutable } from "@triflux/core/hub/lib/bash-path.mjs";
+import { privateTmpDir } from "@triflux/core/hub/lib/private-tmp.mjs";
 import childProcess from "@triflux/core/hub/lib/spawn-trace.mjs";
 import { IS_WINDOWS } from "@triflux/core/hub/platform.mjs";
 
@@ -92,12 +93,10 @@ const PWSH_BIN = (() => {
 })();
 const PSMUX_TIMEOUT_MS = 10000;
 const COMPLETION_PREFIX = "__TRIFLUX_DONE__:";
-const CAPTURE_ROOT =
-  process.env.PSMUX_CAPTURE_ROOT || join(tmpdir(), "psmux-steering");
-const CAPTURE_HELPER_PATH = join(
-  CAPTURE_ROOT,
-  IS_WINDOWS ? "pipe-pane-capture.ps1" : "pipe-pane-capture.sh",
-);
+// 실행되는 캡처 스크립트가 있어 남이 바꿀 수 없는 사용자별 0700 디렉터리에 둔다.
+function captureRoot() {
+  return process.env.PSMUX_CAPTURE_ROOT || privateTmpDir("psmux-steering");
+}
 const POLL_INTERVAL_MS = (() => {
   const ms = Number.parseInt(process.env.PSMUX_POLL_INTERVAL_MS || "", 10);
   if (Number.isFinite(ms) && ms > 0) return ms;
@@ -137,7 +136,7 @@ function sleepMsAsync(ms) {
   return new Promise((resolve) => setTimeout(resolve, Math.max(0, ms)));
 }
 
-function tokenizeCommand(command) {
+export function tokenizeCommand(command) {
   const source = String(command || "").trim();
   if (!source) return [];
 
@@ -232,7 +231,7 @@ function ensurePsmuxInstalled() {
 }
 
 function getCaptureSessionDir(sessionName) {
-  return join(CAPTURE_ROOT, sanitizePathPart(sessionName));
+  return join(captureRoot(), sanitizePathPart(sessionName));
 }
 
 function getCaptureLogPath(sessionName, paneName) {
@@ -243,10 +242,15 @@ function getCaptureLogPath(sessionName, paneName) {
 }
 
 function ensureCaptureHelper() {
-  mkdirSync(CAPTURE_ROOT, { recursive: true });
+  const root = captureRoot();
+  mkdirSync(root, { recursive: true });
+  const helperPath = join(
+    root,
+    IS_WINDOWS ? "pipe-pane-capture.ps1" : "pipe-pane-capture.sh",
+  );
   if (IS_WINDOWS) {
     writeFileSync(
-      CAPTURE_HELPER_PATH,
+      helperPath,
       [
         "param(",
         "  [Parameter(Mandatory = $true)][string]$Path",
@@ -276,7 +280,7 @@ function ensureCaptureHelper() {
   } else {
     // macOS/Linux: bash 스크립트로 pipe-pane 캡처
     writeFileSync(
-      CAPTURE_HELPER_PATH,
+      helperPath,
       [
         "#!/bin/bash",
         'mkdir -p "$(dirname "$1")" 2>/dev/null',
@@ -285,9 +289,9 @@ function ensureCaptureHelper() {
       ].join("\n"),
       "utf8",
     );
-    chmodSync(CAPTURE_HELPER_PATH, 0o755);
+    chmodSync(helperPath, 0o755);
   }
-  return CAPTURE_HELPER_PATH;
+  return helperPath;
 }
 
 function readCaptureLog(logPath) {
@@ -454,11 +458,17 @@ function parsePaneDetails(output) {
     .filter((entry) => entry.paneId);
 }
 
+// tmux 는 -t 세션 이름을 접두사로도 매칭해, 대상이 이미 없으면 이름이 이어지는
+// 다른 세션을 잡는다(#548). psmux 는 정확히만 매칭하고 3.3.8 전에는 '=' 를 모른다.
+function exactSessionTarget(sessionName, windowSuffix = "") {
+  return `${IS_WINDOWS ? "" : "="}${sessionName}${windowSuffix}`;
+}
+
 function collectSessionPanes(sessionName) {
   const output = psmuxExec([
     "list-panes",
     "-t",
-    `${sessionName}:0`,
+    exactSessionTarget(sessionName, ":0"),
     "-F",
     "#{pane_index}\t#{session_name}:#{window_index}.#{pane_index}",
   ]);
@@ -762,7 +772,7 @@ function collectPanePids(sessionName) {
     const output = psmuxExec([
       "list-panes",
       "-t",
-      sessionName,
+      exactSessionTarget(sessionName, ":"),
       "-F",
       "#{pane_pid}",
     ]);
@@ -872,7 +882,7 @@ function disableAllPipeCaptures(sessionName, paneIds) {
 function killOrphanPipeHelpers(sessionName) {
   if (!IS_WINDOWS) {
     // macOS/Linux: pipe-pane helper cmdline contains
-    // `<CAPTURE_ROOT>/<session>/<pane>.log`, so anchor on `/<session>/`.
+    // `<captureRoot()>/<session>/<pane>.log`, so anchor on `/<session>/`.
     const safeSessionUnix = escapeRegex(sanitizePathPart(sessionName));
     try {
       const pids = childProcess
@@ -1025,7 +1035,9 @@ export function killPsmuxSession(sessionName) {
 
   // 3. psmux 세션 자체 종료
   try {
-    psmuxExec(["kill-session", "-t", sessionName], { stdio: "ignore" });
+    psmuxExec(["kill-session", "-t", exactSessionTarget(sessionName)], {
+      stdio: "ignore",
+    });
   } catch {
     // 이미 종료된 세션 — 무시
   }
@@ -1064,7 +1076,9 @@ export function killSessionByTitle(titlePattern) {
   const sessions = listSessions({ filterTitle: titlePattern });
   const killed = [];
   for (const session of sessions) {
-    psmuxExec(["kill-session", "-t", session.sessionName], { stdio: "ignore" });
+    psmuxExec(["kill-session", "-t", exactSessionTarget(session.sessionName)], {
+      stdio: "ignore",
+    });
     killed.push(session.sessionName);
   }
   return {
@@ -1130,7 +1144,9 @@ export function pruneStale(opts = {}) {
  */
 export function psmuxSessionExists(sessionName) {
   try {
-    psmuxExec(["has-session", "-t", sessionName], { stdio: "ignore" });
+    psmuxExec(["has-session", "-t", exactSessionTarget(sessionName)], {
+      stdio: "ignore",
+    });
     return true;
   } catch {
     return false;