triflux 10.3.1 → 10.3.2

package/hub/session-fingerprint.mjs

@@ -349,4 +349,4 @@ export function createAdaptiveFingerprintService(options = {}) {
   });
 }
 
-export default createAdaptiveFingerprintService;
+export default createAdaptiveFingerprintService;

package/hub/team/ansi.mjs

@@ -249,39 +249,55 @@ export function padRight(str, len) {
   return str + " ".repeat(pad);
 }
 
-// wcwidth-aware truncate: wide char 경계에서 자름
-export function truncate(str, maxLen) {
-  const plain = stripAnsi(str);
-  const w = wcswidth(plain);
-  if (w <= maxLen) return str;
-
-  let acc = 0;
+// ANSI-preserving slice: ANSI escape를 보존하면서 visible width만큼 자름
+function ansiSlice(str, maxWidth) {
+  let result = "";
+  let visWidth = 0;
+  let hasAnsi = false;
   let i = 0;
-  for (const char of plain) {
-    const cw = charWidth(char.codePointAt(0));
-    if (acc + cw > maxLen - 1) break;
-    acc += cw;
-    i += char.length;
+
+  while (i < str.length) {
+    if (str.charCodeAt(i) === 0x1B) {
+      const rest = str.slice(i);
+      const m = rest.match(/^(\x1b(?:\[[0-9;]*[a-zA-Z]|\].*?(?:\x07|\x1b\\)))/);
+      if (m) {
+        result += m[1];
+        hasAnsi = true;
+        i += m[1].length;
+        continue;
+      }
+    }
+
+    const cp = str.codePointAt(i);
+    const charLen = cp > 0xFFFF ? 2 : 1;
+    const cw = charWidth(cp);
+
+    if (visWidth + cw > maxWidth) break;
+
+    result += str.slice(i, i + charLen);
+    visWidth += cw;
+    i += charLen;
   }
-  return plain.slice(0, i) + "…";
+
+  return { result, visWidth, hasAnsi };
 }
 
-// wcwidth-aware clip: 정확히 width 셀에 맞게 자르고 패딩 (wide char 경계 보정)
+// wcwidth-aware truncate: wide char 경계에서 자름 (ANSI 보존)
+export function truncate(str, maxLen) {
+  if (wcswidth(str) <= maxLen) return str;
+
+  const { result, hasAnsi } = ansiSlice(str, maxLen - 1);
+  return hasAnsi ? result + RESET + "…" : result + "…";
+}
+
+// wcwidth-aware clip: 정확히 width 셀에 맞게 자르고 패딩 (ANSI 보존, wide char 경계 보정)
 export function clip(str, width) {
-  const plain = stripAnsi(str);
-  let acc = 0;
-  let i = 0;
-  for (const char of plain) {
-    const cw = charWidth(char.codePointAt(0));
-    if (acc + cw > width) {
-      // wide char이 경계를 넘으면 공백으로 채움
-      const result = plain.slice(0, i) + " ".repeat(width - acc);
-      return result;
-    }
-    acc += cw;
-    i += char.length;
-  }
-  return str + " ".repeat(width - acc);
+  const vis = wcswidth(str);
+  if (vis <= width) return str + " ".repeat(width - vis);
+
+  const { result, visWidth, hasAnsi } = ansiSlice(str, width);
+  const suffix = hasAnsi ? RESET : "";
+  return result + suffix + " ".repeat(Math.max(0, width - visWidth));
 }
 
 // ── Catppuccin Mocha 색상 상수 ──

package/hub/team/cli/commands/attach.mjs

@@ -1,37 +1,37 @@
-import { attachSession } from "../../session.mjs";
-import { DIM, RESET } from "../../shared.mjs";
-import { buildManualAttachCommand, launchAttachInWindowsTerminal, wantsWtAttachFallback } from "../services/attach-fallback.mjs";
-import { isNativeMode, isTeamAlive, isWtMode } from "../services/runtime-mode.mjs";
-import { loadTeamState } from "../services/state-store.mjs";
-import { fail, ok, warn } from "../render.mjs";
-
-export async function teamAttach(args = []) {
-  const state = loadTeamState();
-  if (!state || !isTeamAlive(state)) {
-    console.log(`\n  ${DIM}활성 팀 세션 없음${RESET}\n`);
-    return;
-  }
-  if (isNativeMode(state)) {
-    console.log(`\n  ${DIM}in-process 모드는 별도 attach가 없습니다.${RESET}\n  ${DIM}상태 확인: tfx multi status${RESET}\n`);
-    return;
-  }
-  if (isWtMode(state)) {
-    console.log(`\n  ${DIM}wt 모드는 attach 개념이 없습니다 (Windows Terminal pane가 독립 실행됨).${RESET}\n  ${DIM}재실행/정리는: tfx multi stop${RESET}\n`);
-    return;
-  }
-
-  try {
-    attachSession(state.sessionName);
-  } catch (error) {
-    const allowWt = wantsWtAttachFallback(args);
-    if (allowWt && await launchAttachInWindowsTerminal(state.sessionName)) {
-      warn(`현재 터미널에서 attach 실패: ${error.message}`);
-      ok("Windows Terminal split-pane로 attach 재시도 창을 열었습니다.");
-      console.log(`  ${DIM}수동 attach 명령: ${buildManualAttachCommand(state.sessionName)}${RESET}\n`);
-      return;
-    }
-    fail(`attach 실패: ${error.message}`);
-    warn(allowWt ? "WT 분할창 attach 자동 검증 실패 (session_attached 증가 없음)" : "자동 WT 분할은 기본 비활성입니다. 필요 시 --wt 옵션으로 실행하세요.");
-    console.log(`  ${DIM}수동 attach 명령: ${buildManualAttachCommand(state.sessionName)}${RESET}\n`);
-  }
-}
+import { attachSession } from "../../session.mjs";
+import { DIM, RESET } from "../../shared.mjs";
+import { buildManualAttachCommand, launchAttachInWindowsTerminal, wantsWtAttachFallback } from "../services/attach-fallback.mjs";
+import { isNativeMode, isTeamAlive, isWtMode } from "../services/runtime-mode.mjs";
+import { loadTeamState } from "../services/state-store.mjs";
+import { fail, ok, warn } from "../render.mjs";
+
+export async function teamAttach(args = []) {
+  const state = loadTeamState();
+  if (!state || !isTeamAlive(state)) {
+    console.log(`\n  ${DIM}활성 팀 세션 없음${RESET}\n`);
+    return;
+  }
+  if (isNativeMode(state)) {
+    console.log(`\n  ${DIM}in-process 모드는 별도 attach가 없습니다.${RESET}\n  ${DIM}상태 확인: tfx multi status${RESET}\n`);
+    return;
+  }
+  if (isWtMode(state)) {
+    console.log(`\n  ${DIM}wt 모드는 attach 개념이 없습니다 (Windows Terminal pane가 독립 실행됨).${RESET}\n  ${DIM}재실행/정리는: tfx multi stop${RESET}\n`);
+    return;
+  }
+
+  try {
+    attachSession(state.sessionName);
+  } catch (error) {
+    const allowWt = wantsWtAttachFallback(args);
+    if (allowWt && await launchAttachInWindowsTerminal(state.sessionName)) {
+      warn(`현재 터미널에서 attach 실패: ${error.message}`);
+      ok("Windows Terminal split-pane로 attach 재시도 창을 열었습니다.");
+      console.log(`  ${DIM}수동 attach 명령: ${buildManualAttachCommand(state.sessionName)}${RESET}\n`);
+      return;
+    }
+    fail(`attach 실패: ${error.message}`);
+    warn(allowWt ? "WT 분할창 attach 자동 검증 실패 (session_attached 증가 없음)" : "자동 WT 분할은 기본 비활성입니다. 필요 시 --wt 옵션으로 실행하세요.");
+    console.log(`  ${DIM}수동 attach 명령: ${buildManualAttachCommand(state.sessionName)}${RESET}\n`);
+  }
+}

package/hub/team/cli/commands/debug.mjs

@@ -1,74 +1,74 @@
-import { AMBER, BOLD, DIM, RESET } from "../../shared.mjs";
-import {
-  capturePaneOutput,
-  detectMultiplexer,
-  getSessionAttachedCount,
-  hasWindowsTerminal,
-  hasWindowsTerminalSession,
-  listSessions,
-} from "../../session.mjs";
-import { getHubInfo, nativeGetStatus } from "../services/hub-client.mjs";
-import { isNativeMode, isTeamAlive, isWtMode } from "../services/runtime-mode.mjs";
-import { loadTeamState, TEAM_PROFILE } from "../services/state-store.mjs";
-import { formatCompletionSuffix } from "../render.mjs";
-
-export async function teamDebug(args = []) {
-  const state = loadTeamState();
-  const flagIndex = args.findIndex((arg) => arg === "--lines" || arg === "-n");
-  const lines = flagIndex === -1 ? 20 : Math.max(3, parseInt(args[flagIndex + 1] || "20", 10) || 20);
-  const hub = await getHubInfo();
-
-  console.log(`\n  ${AMBER}${BOLD}⬡ Team Debug${RESET}\n`);
-  console.log(`    platform:  ${process.platform}`);
-  console.log(`    node:      ${process.version}`);
-  console.log(`    tty:       stdout=${!!process.stdout.isTTY}, stdin=${!!process.stdin.isTTY}`);
-  console.log(`    mux:       ${detectMultiplexer() || "none"}`);
-  console.log(`    hub-pid:   ${hub ? `${hub.pid}` : "-"}`);
-  console.log(`    hub-url:   ${hub?.url || "-"}`);
-  const sessions = listSessions();
-  console.log(`    sessions:  ${sessions.length ? sessions.join(", ") : "-"}`);
-
-  if (!state) {
-    console.log(`\n  ${DIM}team-state 없음 (활성 세션 없음)${RESET}\n`);
-    return;
-  }
-
-  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(", ")}`);
-  console.log(`    alive:     ${isTeamAlive(state) ? "yes" : "no"}`);
-  console.log(`    attached:  ${getSessionAttachedCount(state.sessionName) ?? "-"}`);
-
-  if (isWtMode(state)) {
-    console.log(`\n  ${BOLD}wt-session${RESET}`);
-    console.log(`    window:    ${state?.wt?.windowId ?? 0}`);
-    console.log(`    layout:    ${state?.wt?.layout || state?.layout || "-"}`);
-    console.log(`    panes:     ${state?.wt?.paneCount ?? (state.members || []).length}`);
-    console.log(`    wt.exe:    ${hasWindowsTerminal() ? "yes" : "no"}`);
-    console.log(`    WT_SESSION:${hasWindowsTerminalSession() ? "yes" : "no"}`);
-    console.log("");
-    return;
-  }
-
-  if (isNativeMode(state)) {
-    console.log(`\n  ${BOLD}native-members${RESET}`);
-    const members = (await nativeGetStatus(state))?.data?.members || [];
-    if (!members.length) console.log(`    ${DIM}(no data)${RESET}`);
-    for (const member of members) console.log(`    - ${member.name}: ${member.status}${formatCompletionSuffix(member)}${member.lastPreview ? ` ${DIM}${member.lastPreview}${RESET}` : ""}`);
-    console.log("");
-    return;
-  }
-
-  console.log(`\n  ${BOLD}pane-tail${RESET} ${DIM}(last ${lines} lines)${RESET}`);
-  if (!(state.members || []).length) console.log(`    ${DIM}(members 없음)${RESET}`);
-  for (const member of state.members || []) {
-    console.log(`\n    [${member.name}] ${member.pane}`);
-    for (const line of (capturePaneOutput(member.pane, lines) || "(empty)").split("\n").slice(-lines)) {
-      console.log(`      ${line}`);
-    }
-  }
-  console.log("");
-}
+import { AMBER, BOLD, DIM, RESET } from "../../shared.mjs";
+import {
+  capturePaneOutput,
+  detectMultiplexer,
+  getSessionAttachedCount,
+  hasWindowsTerminal,
+  hasWindowsTerminalSession,
+  listSessions,
+} from "../../session.mjs";
+import { getHubInfo, nativeGetStatus } from "../services/hub-client.mjs";
+import { isNativeMode, isTeamAlive, isWtMode } from "../services/runtime-mode.mjs";
+import { loadTeamState, TEAM_PROFILE } from "../services/state-store.mjs";
+import { formatCompletionSuffix } from "../render.mjs";
+
+export async function teamDebug(args = []) {
+  const state = loadTeamState();
+  const flagIndex = args.findIndex((arg) => arg === "--lines" || arg === "-n");
+  const lines = flagIndex === -1 ? 20 : Math.max(3, parseInt(args[flagIndex + 1] || "20", 10) || 20);
+  const hub = await getHubInfo();
+
+  console.log(`\n  ${AMBER}${BOLD}⬡ Team Debug${RESET}\n`);
+  console.log(`    platform:  ${process.platform}`);
+  console.log(`    node:      ${process.version}`);
+  console.log(`    tty:       stdout=${!!process.stdout.isTTY}, stdin=${!!process.stdin.isTTY}`);
+  console.log(`    mux:       ${detectMultiplexer() || "none"}`);
+  console.log(`    hub-pid:   ${hub ? `${hub.pid}` : "-"}`);
+  console.log(`    hub-url:   ${hub?.url || "-"}`);
+  const sessions = listSessions();
+  console.log(`    sessions:  ${sessions.length ? sessions.join(", ") : "-"}`);
+
+  if (!state) {
+    console.log(`\n  ${DIM}team-state 없음 (활성 세션 없음)${RESET}\n`);
+    return;
+  }
+
+  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(", ")}`);
+  console.log(`    alive:     ${isTeamAlive(state) ? "yes" : "no"}`);
+  console.log(`    attached:  ${getSessionAttachedCount(state.sessionName) ?? "-"}`);
+
+  if (isWtMode(state)) {
+    console.log(`\n  ${BOLD}wt-session${RESET}`);
+    console.log(`    window:    ${state?.wt?.windowId ?? 0}`);
+    console.log(`    layout:    ${state?.wt?.layout || state?.layout || "-"}`);
+    console.log(`    panes:     ${state?.wt?.paneCount ?? (state.members || []).length}`);
+    console.log(`    wt.exe:    ${hasWindowsTerminal() ? "yes" : "no"}`);
+    console.log(`    WT_SESSION:${hasWindowsTerminalSession() ? "yes" : "no"}`);
+    console.log("");
+    return;
+  }
+
+  if (isNativeMode(state)) {
+    console.log(`\n  ${BOLD}native-members${RESET}`);
+    const members = (await nativeGetStatus(state))?.data?.members || [];
+    if (!members.length) console.log(`    ${DIM}(no data)${RESET}`);
+    for (const member of members) console.log(`    - ${member.name}: ${member.status}${formatCompletionSuffix(member)}${member.lastPreview ? ` ${DIM}${member.lastPreview}${RESET}` : ""}`);
+    console.log("");
+    return;
+  }
+
+  console.log(`\n  ${BOLD}pane-tail${RESET} ${DIM}(last ${lines} lines)${RESET}`);
+  if (!(state.members || []).length) console.log(`    ${DIM}(members 없음)${RESET}`);
+  for (const member of state.members || []) {
+    console.log(`\n    [${member.name}] ${member.pane}`);
+    for (const line of (capturePaneOutput(member.pane, lines) || "(empty)").split("\n").slice(-lines)) {
+      console.log(`      ${line}`);
+    }
+  }
+  console.log("");
+}

package/hub/team/cli/commands/focus.mjs

@@ -1,53 +1,53 @@
-import { attachSession, focusPane, focusWtPane } from "../../session.mjs";
-import { DIM, RESET, WHITE } from "../../shared.mjs";
-import { buildManualAttachCommand, launchAttachInWindowsTerminal, wantsWtAttachFallback } from "../services/attach-fallback.mjs";
-import { resolveMember } from "../services/member-selector.mjs";
-import { isNativeMode, isTeamAlive, isWtMode } from "../services/runtime-mode.mjs";
-import { loadTeamState } from "../services/state-store.mjs";
-import { fail, ok, warn } from "../render.mjs";
-
-export async function teamFocus(args = []) {
-  const state = loadTeamState();
-  if (!state || !isTeamAlive(state)) {
-    console.log(`\n  ${DIM}활성 팀 세션 없음${RESET}\n`);
-    return;
-  }
-  if (isNativeMode(state)) {
-    console.log(`\n  ${DIM}in-process 모드는 focus/attach 개념이 없습니다.${RESET}\n  ${DIM}직접 지시: tfx multi send <대상> "메시지"${RESET}\n`);
-    return;
-  }
-
-  const member = resolveMember(state, args[0]);
-  if (!member) {
-    console.log(`\n  사용법: ${WHITE}tfx multi focus <lead|이름|번호>${RESET}\n`);
-    return;
-  }
-
-  if (isWtMode(state)) {
-    const paneIndex = Number(/^wt:(\d+)$/.exec(member.pane || "")?.[1]);
-    if (!Number.isFinite(paneIndex)) {
-      console.log(`\n  ${DIM}wt pane 인덱스 파싱 실패: ${member.pane}${RESET}\n`);
-      return;
-    }
-    if (focusWtPane(paneIndex, { layout: state?.wt?.layout || state?.layout || "1xN" })) ok(`${member.name} pane 포커스 이동 (wt)`);
-    else warn("wt pane 포커스 이동 실패 (WT_SESSION/wt.exe 상태 확인 필요)");
-    console.log("");
-    return;
-  }
-
-  focusPane(member.pane, { zoom: false });
-  try {
-    attachSession(state.sessionName);
-  } catch (error) {
-    const allowWt = wantsWtAttachFallback(args);
-    if (allowWt && await launchAttachInWindowsTerminal(state.sessionName)) {
-      warn(`현재 터미널에서 attach 실패: ${error.message}`);
-      ok("Windows Terminal split-pane로 attach 재시도 창을 열었습니다.");
-      console.log(`  ${DIM}수동 attach 명령: ${buildManualAttachCommand(state.sessionName)}${RESET}\n`);
-      return;
-    }
-    fail(`attach 실패: ${error.message}`);
-    warn(allowWt ? "WT 분할창 attach 자동 검증 실패 (session_attached 증가 없음)" : "자동 WT 분할은 기본 비활성입니다. 필요 시 --wt 옵션으로 실행하세요.");
-    console.log(`  ${DIM}수동 attach 명령: ${buildManualAttachCommand(state.sessionName)}${RESET}\n`);
-  }
-}
+import { attachSession, focusPane, focusWtPane } from "../../session.mjs";
+import { DIM, RESET, WHITE } from "../../shared.mjs";
+import { buildManualAttachCommand, launchAttachInWindowsTerminal, wantsWtAttachFallback } from "../services/attach-fallback.mjs";
+import { resolveMember } from "../services/member-selector.mjs";
+import { isNativeMode, isTeamAlive, isWtMode } from "../services/runtime-mode.mjs";
+import { loadTeamState } from "../services/state-store.mjs";
+import { fail, ok, warn } from "../render.mjs";
+
+export async function teamFocus(args = []) {
+  const state = loadTeamState();
+  if (!state || !isTeamAlive(state)) {
+    console.log(`\n  ${DIM}활성 팀 세션 없음${RESET}\n`);
+    return;
+  }
+  if (isNativeMode(state)) {
+    console.log(`\n  ${DIM}in-process 모드는 focus/attach 개념이 없습니다.${RESET}\n  ${DIM}직접 지시: tfx multi send <대상> "메시지"${RESET}\n`);
+    return;
+  }
+
+  const member = resolveMember(state, args[0]);
+  if (!member) {
+    console.log(`\n  사용법: ${WHITE}tfx multi focus <lead|이름|번호>${RESET}\n`);
+    return;
+  }
+
+  if (isWtMode(state)) {
+    const paneIndex = Number(/^wt:(\d+)$/.exec(member.pane || "")?.[1]);
+    if (!Number.isFinite(paneIndex)) {
+      console.log(`\n  ${DIM}wt pane 인덱스 파싱 실패: ${member.pane}${RESET}\n`);
+      return;
+    }
+    if (focusWtPane(paneIndex, { layout: state?.wt?.layout || state?.layout || "1xN" })) ok(`${member.name} pane 포커스 이동 (wt)`);
+    else warn("wt pane 포커스 이동 실패 (WT_SESSION/wt.exe 상태 확인 필요)");
+    console.log("");
+    return;
+  }
+
+  focusPane(member.pane, { zoom: false });
+  try {
+    attachSession(state.sessionName);
+  } catch (error) {
+    const allowWt = wantsWtAttachFallback(args);
+    if (allowWt && await launchAttachInWindowsTerminal(state.sessionName)) {
+      warn(`현재 터미널에서 attach 실패: ${error.message}`);
+      ok("Windows Terminal split-pane로 attach 재시도 창을 열었습니다.");
+      console.log(`  ${DIM}수동 attach 명령: ${buildManualAttachCommand(state.sessionName)}${RESET}\n`);
+      return;
+    }
+    fail(`attach 실패: ${error.message}`);
+    warn(allowWt ? "WT 분할창 attach 자동 검증 실패 (session_attached 증가 없음)" : "자동 WT 분할은 기본 비활성입니다. 필요 시 --wt 옵션으로 실행하세요.");
+    console.log(`  ${DIM}수동 attach 명령: ${buildManualAttachCommand(state.sessionName)}${RESET}\n`);
+  }
+}

package/hub/team/cli/commands/list.mjs

@@ -1,24 +1,24 @@
-import { AMBER, BOLD, DIM, GREEN, RESET } from "../../shared.mjs";
-import { listSessions } from "../../session.mjs";
-import { isNativeMode, isTeamAlive, isWtMode } from "../services/runtime-mode.mjs";
-import { loadTeamState } from "../services/state-store.mjs";
-
-export function teamList() {
-  const state = loadTeamState();
-  if (state && isTeamAlive(state) && (isNativeMode(state) || isWtMode(state))) {
-    console.log(`\n  ${AMBER}${BOLD}⬡ 팀 세션 목록${RESET}\n`);
-    console.log(`    ${GREEN}●${RESET} ${state.sessionName} ${DIM}(${isNativeMode(state) ? "in-process" : "wt"})${RESET}`);
-    console.log("");
-    return;
-  }
-
-  const sessions = listSessions();
-  if (!sessions.length) {
-    console.log(`\n  ${DIM}활성 팀 세션 없음${RESET}\n`);
-    return;
-  }
-
-  console.log(`\n  ${AMBER}${BOLD}⬡ 팀 세션 목록${RESET}\n`);
-  for (const session of sessions) console.log(`    ${GREEN}●${RESET} ${session}`);
-  console.log("");
-}
+import { AMBER, BOLD, DIM, GREEN, RESET } from "../../shared.mjs";
+import { listSessions } from "../../session.mjs";
+import { isNativeMode, isTeamAlive, isWtMode } from "../services/runtime-mode.mjs";
+import { loadTeamState } from "../services/state-store.mjs";
+
+export function teamList() {
+  const state = loadTeamState();
+  if (state && isTeamAlive(state) && (isNativeMode(state) || isWtMode(state))) {
+    console.log(`\n  ${AMBER}${BOLD}⬡ 팀 세션 목록${RESET}\n`);
+    console.log(`    ${GREEN}●${RESET} ${state.sessionName} ${DIM}(${isNativeMode(state) ? "in-process" : "wt"})${RESET}`);
+    console.log("");
+    return;
+  }
+
+  const sessions = listSessions();
+  if (!sessions.length) {
+    console.log(`\n  ${DIM}활성 팀 세션 없음${RESET}\n`);
+    return;
+  }
+
+  console.log(`\n  ${AMBER}${BOLD}⬡ 팀 세션 목록${RESET}\n`);
+  for (const session of sessions) console.log(`    ${GREEN}●${RESET} ${session}`);
+  console.log("");
+}

package/hub/team/cli/commands/start/start-in-process.mjs

@@ -1,40 +1,40 @@
-import { startNativeSupervisor } from "../../services/native-control.mjs";
-import { buildTasks } from "../../services/task-model.mjs";
-
-export async function startInProcessTeam({ sessionId, task, lead, agents, subtasks, hubUrl }) {
-  const { runtime, members } = await startNativeSupervisor({
-    sessionId,
-    task,
-    lead,
-    agents,
-    subtasks,
-    hubUrl,
-  });
-
-  if (!runtime?.controlUrl) return null;
-
-  return {
-    sessionName: sessionId,
-    task,
-    lead,
-    agents,
-    layout: "native",
-    teammateMode: "in-process",
-    startedAt: Date.now(),
-    hubUrl,
-    members: members.map((member, index) => ({
-      role: member.role,
-      name: member.name,
-      cli: member.cli,
-      agentId: member.agentId,
-      pane: `native:${index}`,
-      subtask: member.subtask || null,
-    })),
-    panes: {},
-    tasks: buildTasks(subtasks, members.filter((member) => member.role === "worker")),
-    native: {
-      controlUrl: runtime.controlUrl,
-      supervisorPid: runtime.supervisorPid,
-    },
-  };
-}
+import { startNativeSupervisor } from "../../services/native-control.mjs";
+import { buildTasks } from "../../services/task-model.mjs";
+
+export async function startInProcessTeam({ sessionId, task, lead, agents, subtasks, hubUrl }) {
+  const { runtime, members } = await startNativeSupervisor({
+    sessionId,
+    task,
+    lead,
+    agents,
+    subtasks,
+    hubUrl,
+  });
+
+  if (!runtime?.controlUrl) return null;
+
+  return {
+    sessionName: sessionId,
+    task,
+    lead,
+    agents,
+    layout: "native",
+    teammateMode: "in-process",
+    startedAt: Date.now(),
+    hubUrl,
+    members: members.map((member, index) => ({
+      role: member.role,
+      name: member.name,
+      cli: member.cli,
+      agentId: member.agentId,
+      pane: `native:${index}`,
+      subtask: member.subtask || null,
+    })),
+    panes: {},
+    tasks: buildTasks(subtasks, members.filter((member) => member.role === "worker")),
+    native: {
+      controlUrl: runtime.controlUrl,
+      supervisorPid: runtime.supervisorPid,
+    },
+  };
+}