@triflux/remote 10.50.2 → 10.51.0

package/hub/team/cli/services/runtime-mode.mjs

@@ -1,37 +1,25 @@
-import {
-  detectMultiplexer,
-  hasWindowsTerminal,
-  hasWindowsTerminalSession,
-  sessionExists,
-} from "../../session.mjs";
+import { detectMultiplexer, sessionExists } from "../../session.mjs";
 
 export function normalizeTeammateMode(mode = "auto", deps = {}) {
   const platform = deps.platform || process.platform;
   const env = deps.env || process.env;
   const detectMux = deps.detectMultiplexer || detectMultiplexer;
   const raw = String(mode).toLowerCase();
-  if (raw === "inline" || raw === "native") return "in-process";
   if (raw === "headless" || raw === "hl") return "headless";
-  if (raw === "in-process" || raw === "tmux") return raw;
-  if (raw === "psmux") return platform === "win32" ? "psmux" : "in-process";
-  if (
-    raw === "wt" ||
-    raw === "windows-terminal" ||
-    raw === "windows_terminal"
-  ) {
-    return platform === "win32" ? "wt" : "in-process";
-  }
-  if (raw === "auto") {
-    if (env.TMUX) return "tmux";
-    const mux = detectMux();
-    if (platform !== "win32") {
-      return mux === "tmux" ? "tmux" : "in-process";
-    }
-    if (mux === "psmux") return "psmux";
-    if (mux === "tmux") return "tmux";
-    return "in-process";
+  if (raw === "tmux") return raw;
+  if (raw === "psmux" && platform === "win32") return raw;
+  if (raw !== "auto") {
+    throw new Error(
+      `지원하지 않는 teammate mode: ${mode}; auto, headless, tmux${platform === "win32" ? ", psmux" : ""}를 사용하세요.`,
+    );
   }
-  return "in-process";
+  if (env.TMUX) return "tmux";
+  const mux = detectMux();
+  if (mux === "tmux") return "tmux";
+  if (platform === "win32" && mux === "psmux") return "psmux";
+  if (platform === "win32" && mux === "git-bash-tmux") return "tmux";
+  if (!(deps.isTTY ?? Boolean(process.stdout.isTTY))) return "headless";
+  return ensureTmuxOrExit(deps);
 }
 
 export function normalizeLayout(layout = "2x2") {
@@ -43,91 +31,32 @@ export function normalizeLayout(layout = "2x2") {
   return "2x2";
 }
 
-export function isNativeMode(state) {
-  return state?.teammateMode === "in-process" && !!state?.native?.controlUrl;
-}
-
-export function isWtMode(state) {
-  return state?.teammateMode === "wt";
-}
-
 export function isTeamAlive(state) {
   if (!state) return false;
-  if (isNativeMode(state)) {
+  if (state.teammateMode === "headless" && state.ownerPid) {
     try {
-      process.kill(state.native.supervisorPid, 0);
+      process.kill(state.ownerPid, 0);
       return true;
     } catch {
       return false;
     }
   }
-  if (isWtMode(state)) {
-    if (!hasWindowsTerminal()) return false;
-    if (hasWindowsTerminalSession()) return true;
-    return Array.isArray(state.members) && state.members.length > 0;
-  }
   return sessionExists(state.sessionName);
 }
 
 export function ensureTmuxOrExit(deps = {}) {
   const platform = deps.platform || process.platform;
-  const detectMux = deps.detectMultiplexer || detectMultiplexer;
-  const mux = detectMux();
-  if (mux && (platform === "win32" || mux === "tmux")) return mux;
-  const error = new Error("tmux 미발견");
+  const mux = (deps.detectMultiplexer || detectMultiplexer)();
+  if (
+    mux === "tmux" ||
+    (platform === "win32" && ["psmux", "git-bash-tmux"].includes(mux))
+  )
+    return mux;
+  const error = new Error(
+    platform === "win32"
+      ? "멀티플렉서 미발견. psmux를 설치하세요: winget install psmux"
+      : `멀티플렉서 미발견. tmux를 설치하세요: ${platform === "darwin" ? "brew install tmux" : "apt install tmux"}`,
+  );
   error.code = "TMUX_REQUIRED";
   throw error;
 }
-
-/**
- * teammateMode + 환경 기반 effective mode 결정 (pure function).
- *
- * - wt → wt.exe 없으면 in-process
- * - wt → WT_SESSION 없으면 in-process
- * - in-process → non-TTY 감지 시 headless (#114: run_in_background 부모 종료 시 자식 SIGTERM 방지)
- * - override: TFX_FORCE_IN_PROCESS=1 로 in-process 유지
- *
- * @param {string} teammateMode
- * @param {{
- *   hasWt?: () => boolean,
- *   hasWtSession?: () => boolean,
- *   isTTY?: boolean,
- *   env?: Record<string,string|undefined>,
- * }} [deps]
- * @returns {{ mode: string, warnings: string[] }}
- */
-export function resolveEffectiveMode(teammateMode, deps = {}) {
-  const hasWt = deps.hasWt || hasWindowsTerminal;
-  const hasWtSession = deps.hasWtSession || hasWindowsTerminalSession;
-  const isTTY =
-    typeof deps.isTTY === "boolean"
-      ? deps.isTTY
-      : Boolean(process.stdout.isTTY);
-  const env = deps.env || process.env;
-
-  const warnings = [];
-  let effective = teammateMode;
-
-  if (effective === "wt" && !hasWt()) {
-    warnings.push("wt.exe 미발견 — in-process 모드로 자동 fallback");
-    effective = "in-process";
-  }
-  if (effective === "wt" && !hasWtSession()) {
-    warnings.push(
-      "WT_SESSION 미감지(Windows Terminal 외부) — in-process 모드로 자동 fallback",
-    );
-    effective = "in-process";
-  }
-  if (
-    effective === "in-process" &&
-    !isTTY &&
-    env.TFX_FORCE_IN_PROCESS !== "1"
-  ) {
-    warnings.push(
-      "non-TTY 환경 감지 (run_in_background 등) — headless 모드로 자동 fallback (#114). 강제 유지: TFX_FORCE_IN_PROCESS=1",
-    );
-    effective = "headless";
-  }
-
-  return { mode: effective, warnings };
-}

package/hub/team/handoff.mjs

@@ -13,37 +13,6 @@ const YES_NO = ["yes", "no"];
 const TOKEN_HARD_CAP = 150;
 const HANDOFF_MARKER = "--- HANDOFF ---";
 
-/**
- * 워커 프롬프트에 삽입할 HANDOFF 블록 생성 지시
- */
-export const HANDOFF_INSTRUCTION = `
-After completing the task, you MUST output a HANDOFF block in exactly this format at the end of your response:
-
---- HANDOFF ---
-status: ok | partial | failed
-lead_action: accept | needs_read | retry | reassign
-task: <1-3 word task type>
-files_changed: <comma-separated repo-root relative file paths, or "none">
-verdict: <one sentence conclusion>
-confidence: high | medium | low
-risk: low | med | high
-detail: <result file path if available, or "none">
-
-If the task failed, also include:
-error_stage: dispatch | execution | timeout
-retryable: yes | no
-partial_output: yes | no
-
-Rules:
-- The HANDOFF block must start with exactly "--- HANDOFF ---"
-- Set status: ok only after you have verified the work (file/diff/test evidence) — unverified claims must use partial or failed.
-- Each field must be on its own line as "key: value"
-- Report files_changed as repo-root relative paths
-- verdict must be a single concise sentence
-- Do not skip any required field
-- This block owns the final output position; this block must be the last thing you output
-`.trim();
-
 /**
  * CLI 프롬프트 길이 제한을 고려한 축약 HANDOFF 지시
  */
@@ -61,7 +30,7 @@ Set status: ok only after you have verified the work (file/diff/test evidence)
  * @param {string} rawText
  * @returns {object|null} 파싱된 필드 객체, 블록이 없으면 null
  */
-export function parseHandoff(rawText) {
+function parseHandoff(rawText) {
   if (!rawText || typeof rawText !== "string") return null;
 
   // P1 fix: 마지막 HANDOFF 블록을 파싱 (프롬프트 에코로 인한 중복 마커 대응)
@@ -137,7 +106,7 @@ function validateEnum(value, allowed) {
  * @param {string[]} [context.gitDiffFiles]
  * @returns {{ handoff: object, valid: boolean, warnings: string[] }}
  */
-export function validateHandoff(parsed, context = {}) {
+function validateHandoff(parsed, context = {}) {
   const warnings = [];
   const h = { ...parsed };
 
@@ -247,7 +216,7 @@ export function validateHandoff(parsed, context = {}) {
  * @param {string[]} [context.filesChanged]
  * @returns {object}
  */
-export function buildFallbackHandoff(exitCode, resultFile, cli, context = {}) {
+function buildFallbackHandoff(exitCode, resultFile, cli, context = {}) {
   const ok = exitCode === 0;
   const filesChanged = Array.isArray(context.filesChanged)
     ? context.filesChanged.filter(Boolean)