@atlasharness/atlascode 0.1.91 → 0.1.93

package/dist/cli.js

@@ -742,7 +742,15 @@ var init_fs_operations = __esm(() => {
 });
 
 // src/shared/debug.ts
-function logForDebugging(_message, _options) {}
+function setDebugSink(sink) {
+  _sink = sink;
+}
+function logForDebugging(message, options) {
+  if (_sink !== null) {
+    _sink(message, options);
+  }
+}
+var _sink = null;
 
 // src/shared/platform.ts
 function memoizeNoArg(fn) {
@@ -1017,6 +1025,89 @@ var init_pdfReference = __esm(() => {
   };
 });
 
+// src/shared/agentSwarmsEnabled.ts
+function isAgentTeamsFlagSet() {
+  return process.argv.includes("--agent-teams");
+}
+function isAgentSwarmsEnabled() {
+  return isEnvTruthy(process.env.ATLAS_EXPERIMENTAL_AGENT_TEAMS) || isAgentTeamsFlagSet();
+}
+var init_agentSwarmsEnabled = () => {};
+
+// src/shared/swarmSchemaFilter.ts
+function filterSwarmFieldsFromSchema(toolName, schema, swarmEnabled) {
+  if (swarmEnabled)
+    return schema;
+  const fieldsToRemove = SWARM_FIELDS_BY_TOOL[toolName];
+  if (!fieldsToRemove || fieldsToRemove.length === 0)
+    return schema;
+  if (!schema || typeof schema !== "object")
+    return schema;
+  const props = schema.properties;
+  if (!props || typeof props !== "object")
+    return schema;
+  const nextProps = { ...props };
+  for (const f of fieldsToRemove)
+    delete nextProps[f];
+  return { ...schema, properties: nextProps };
+}
+var SWARM_FIELDS_BY_TOOL;
+var init_swarmSchemaFilter = __esm(() => {
+  SWARM_FIELDS_BY_TOOL = {
+    Agent: ["name", "team_name", "mode"],
+    ExitPlanMode: ["launchSwarm", "teammateCount"]
+  };
+});
+
+// src/shared/agentRoleTemplates.ts
+function getAgentRoleTemplate(role) {
+  return roleTemplates.get(role);
+}
+function renderTeammatePrompt(parts) {
+  const sections = [];
+  sections.push(`You are the team member "${parts.name}".`);
+  const template = parts.role ? getAgentRoleTemplate(parts.role) : undefined;
+  if (template?.systemPromptFragment) {
+    sections.push(template.systemPromptFragment);
+  }
+  if (parts.role)
+    sections.push(`Role: ${parts.role}`);
+  if (parts.goal)
+    sections.push(`Goal: ${parts.goal}`);
+  if (parts.backstory)
+    sections.push(`Backstory: ${parts.backstory}`);
+  sections.push(parts.prompt);
+  return sections.join(`
+
+`);
+}
+var roleTemplates;
+var init_agentRoleTemplates = __esm(() => {
+  roleTemplates = new Map;
+});
+
+// src/shared/teammateContext.ts
+import { AsyncLocalStorage } from "async_hooks";
+function getTeammateContext() {
+  return teammateContextStorage.getStore();
+}
+function runWithTeammateContext(context, fn) {
+  return teammateContextStorage.run(context, fn);
+}
+function isInProcessTeammate() {
+  return teammateContextStorage.getStore() !== undefined;
+}
+function createTeammateContext(config) {
+  return {
+    ...config,
+    isInProcess: true
+  };
+}
+var teammateContextStorage;
+var init_teammateContext = __esm(() => {
+  teammateContextStorage = new AsyncLocalStorage;
+});
+
 // src/shared/index.ts
 var init_shared = __esm(() => {
   init_feature();
@@ -1034,6 +1125,10 @@ var init_shared = __esm(() => {
   init_fs_operations();
   init_types();
   init_pdfReference();
+  init_agentSwarmsEnabled();
+  init_swarmSchemaFilter();
+  init_agentRoleTemplates();
+  init_teammateContext();
 });
 
 // node_modules/openai/internal/tslib.mjs
@@ -27524,16 +27619,21 @@ async function buildOpenAITools(tools, options, emptyPermissionContext) {
     let desc;
     try {
       desc = await tool.description({}, {
-        isNonInteractiveSession: options.isNonInteractiveSession,
+        isNonInteractiveSession: options?.isNonInteractiveSession,
         toolPermissionContext,
         tools: tools ?? []
       });
     } catch {
       desc = tool.name;
     }
+    const filteredSchema = filterSwarmFieldsFromSchema(tool.name, schema, isAgentSwarmsEnabled());
     out.push({
       type: "function",
-      function: { name: tool.name, description: desc, parameters: schema }
+      function: {
+        name: tool.name,
+        description: desc,
+        parameters: filteredSchema
+      }
     });
   }
   for (const s of options?.extraToolSchemas ?? []) {
@@ -27620,6 +27720,7 @@ async function buildOpenAIParams(args, role = "small", entry, opts) {
 var init_params = __esm(() => {
   init_roles7();
   init_shared();
+  init_shared();
   init_attachmentProjection();
   init_toolPairing();
   init_schema();
@@ -29563,7 +29664,7 @@ var init_state = __esm(() => {
 });
 
 // src/bootstrap/cwd.ts
-import { AsyncLocalStorage } from "async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
 function runWithCwdOverride(cwd, fn) {
   return cwdOverrideStorage.run(cwd, fn);
 }
@@ -29580,7 +29681,7 @@ function getCwd() {
 var cwdOverrideStorage;
 var init_cwd = __esm(() => {
   init_state();
-  cwdOverrideStorage = new AsyncLocalStorage;
+  cwdOverrideStorage = new AsyncLocalStorage2;
 });
 
 // src/bootstrap/index.ts
@@ -34620,7 +34721,7 @@ var init_project = __esm(() => {
 var AGENT_TOOL_NAME = "Agent", MAX_WORKER_SPAWN_DEPTH = 2;
 
 // src/engine/tools/toolNames.ts
-var FILE_READ_TOOL_NAME = "Read", WEB_SEARCH_TOOL_NAME = "WebSearch", TODO_WRITE_TOOL_NAME = "TodoWrite", GREP_TOOL_NAME = "Grep", WEB_FETCH_TOOL_NAME = "WebFetch", GLOB_TOOL_NAME = "Glob", BASH_TOOL_NAME2 = "Bash", POWERSHELL_TOOL_NAME = "PowerShell", FILE_EDIT_TOOL_NAME = "Edit", FILE_WRITE_TOOL_NAME = "Write", NOTEBOOK_EDIT_TOOL_NAME = "NotebookEdit", SKILL_TOOL_NAME = "Skill", SYNTHETIC_OUTPUT_TOOL_NAME = "StructuredOutput", TOOL_SEARCH_TOOL_NAME = "ToolSearch", ENTER_WORKTREE_TOOL_NAME = "EnterWorktree", EXIT_WORKTREE_TOOL_NAME = "ExitWorktree", TEAM_CREATE_TOOL_NAME = "TeamCreate", TEAM_DELETE_TOOL_NAME = "TeamDelete", SNIP_TOOL_NAME = "Snip", SEND_MESSAGE_TOOL_NAME = "SendMessage", TASK_STOP_TOOL_NAME = "TaskStop", TASK_OUTPUT_TOOL_NAME = "TaskOutput", ENTER_PLAN_MODE_TOOL_NAME = "EnterPlanMode", EXIT_PLAN_MODE_V2_TOOL_NAME = "ExitPlanMode", ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion", TASK_CREATE_TOOL_NAME = "TaskCreate", TASK_GET_TOOL_NAME = "TaskGet", TASK_LIST_TOOL_NAME = "TaskList", TASK_UPDATE_TOOL_NAME = "TaskUpdate", CRON_CREATE_TOOL_NAME = "CronCreate", CRON_DELETE_TOOL_NAME = "CronDelete", CRON_LIST_TOOL_NAME = "CronList", CONFIG_TOOL_NAME = "Config", WORKFLOW_TOOL_NAME = "Workflow", REPL_TOOL_NAME = "REPL", LIST_MCP_RESOURCES_TOOL_NAME = "ListMcpResourcesTool", READ_MCP_RESOURCE_TOOL_NAME = "ReadMcpResourceTool", LSP_TOOL_NAME = "LSP", PROPOSE_GOAL_TOOL_NAME = "ProposeGoal", SHELL_TOOL_NAMES, ASYNC_AGENT_ALLOWED_TOOLS, INTERNAL_WORKER_TOOLS, ALL_AGENT_DISALLOWED_TOOLS, CUSTOM_AGENT_DISALLOWED_TOOLS, IN_PROCESS_TEAMMATE_ALLOWED_TOOLS, COORDINATOR_MODE_ALLOWED_TOOLS;
+var FILE_READ_TOOL_NAME = "Read", WEB_SEARCH_TOOL_NAME = "WebSearch", TODO_WRITE_TOOL_NAME = "TodoWrite", GREP_TOOL_NAME = "Grep", WEB_FETCH_TOOL_NAME = "WebFetch", GLOB_TOOL_NAME = "Glob", BASH_TOOL_NAME2 = "Bash", POWERSHELL_TOOL_NAME = "PowerShell", FILE_EDIT_TOOL_NAME = "Edit", FILE_WRITE_TOOL_NAME = "Write", NOTEBOOK_EDIT_TOOL_NAME = "NotebookEdit", SKILL_TOOL_NAME = "Skill", SYNTHETIC_OUTPUT_TOOL_NAME = "StructuredOutput", TOOL_SEARCH_TOOL_NAME = "ToolSearch", ENTER_WORKTREE_TOOL_NAME = "EnterWorktree", EXIT_WORKTREE_TOOL_NAME = "ExitWorktree", TEAM_CREATE_TOOL_NAME = "TeamCreate", TEAM_DELETE_TOOL_NAME = "TeamDelete", WAIT_FOR_TEAMMATES_TOOL_NAME = "WaitForTeammates", SNIP_TOOL_NAME = "Snip", SEND_MESSAGE_TOOL_NAME = "SendMessage", TASK_STOP_TOOL_NAME = "TaskStop", TASK_OUTPUT_TOOL_NAME = "TaskOutput", ENTER_PLAN_MODE_TOOL_NAME = "EnterPlanMode", EXIT_PLAN_MODE_V2_TOOL_NAME = "ExitPlanMode", ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion", TASK_CREATE_TOOL_NAME = "TaskCreate", TASK_GET_TOOL_NAME = "TaskGet", TASK_LIST_TOOL_NAME = "TaskList", TASK_UPDATE_TOOL_NAME = "TaskUpdate", CRON_CREATE_TOOL_NAME = "CronCreate", CRON_DELETE_TOOL_NAME = "CronDelete", CRON_LIST_TOOL_NAME = "CronList", CONFIG_TOOL_NAME = "Config", WORKFLOW_TOOL_NAME = "Workflow", REPL_TOOL_NAME = "REPL", LIST_MCP_RESOURCES_TOOL_NAME = "ListMcpResourcesTool", READ_MCP_RESOURCE_TOOL_NAME = "ReadMcpResourceTool", LSP_TOOL_NAME = "LSP", PROPOSE_GOAL_TOOL_NAME = "ProposeGoal", SHELL_TOOL_NAMES, ASYNC_AGENT_ALLOWED_TOOLS, INTERNAL_WORKER_TOOLS, ALL_AGENT_DISALLOWED_TOOLS, CUSTOM_AGENT_DISALLOWED_TOOLS, IN_PROCESS_TEAMMATE_ALLOWED_TOOLS, COORDINATOR_MODE_ALLOWED_TOOLS;
 var init_toolNames = __esm(() => {
   SHELL_TOOL_NAMES = [BASH_TOOL_NAME2, POWERSHELL_TOOL_NAME];
   ASYNC_AGENT_ALLOWED_TOOLS = new Set([
@@ -35711,9 +35812,22 @@ var init_diskOutput = __esm(() => {
 });
 
 // src/task/task.ts
+import { randomBytes } from "crypto";
 function isTerminalTaskStatus(status) {
   return status === "completed" || status === "failed" || status === "killed";
 }
+function getTaskIdPrefix(type) {
+  return TASK_ID_PREFIXES[type] ?? "x";
+}
+function generateTaskId(type) {
+  const prefix = getTaskIdPrefix(type);
+  const bytes = randomBytes(8);
+  let id = prefix;
+  for (let i = 0;i < 8; i++) {
+    id += TASK_ID_ALPHABET[bytes[i] % TASK_ID_ALPHABET.length];
+  }
+  return id;
+}
 function createTaskStateBase(id, type, description, toolUseId) {
   return {
     id,
@@ -35727,14 +35841,79 @@ function createTaskStateBase(id, type, description, toolUseId) {
     notified: false
   };
 }
+var TASK_ID_PREFIXES, TASK_ID_ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyz";
 var init_task = __esm(() => {
   init_diskOutput();
+  TASK_ID_PREFIXES = {
+    local_bash: "b",
+    local_agent: "a",
+    remote_agent: "r",
+    in_process_teammate: "t",
+    local_workflow: "w",
+    monitor_mcp: "m",
+    dream: "d"
+  };
 });
 
 // src/task/inProcessTeammate.ts
 function isInProcessTeammateTask(task) {
   return task.type === "in_process_teammate";
 }
+function asInProcessTeammate(task) {
+  if (typeof task === "object" && task !== null && isInProcessTeammateTask(task)) {
+    return task;
+  }
+  return;
+}
+function isInProcessTeammateLive(task) {
+  const t = asInProcessTeammate(task);
+  return t !== undefined && t.status === "running";
+}
+function isInProcessTeammateWorking(task) {
+  const t = asInProcessTeammate(task);
+  return t !== undefined && t.status === "running" && !t.isIdle;
+}
+function isInProcessTeammateActiveOrUnknown(task) {
+  const t = asInProcessTeammate(task);
+  const status = t !== undefined ? t.status : task?.status;
+  return status === undefined || status === "running";
+}
+function findInProcessTeammateTaskByAgentId(tasks, agentId) {
+  for (const task of Object.values(tasks ?? {})) {
+    const t = asInProcessTeammate(task);
+    if (t !== undefined && t.identity.agentId === agentId)
+      return t;
+  }
+  return;
+}
+function probeStampAbortController(ac) {
+  let id = probeControllerIds.get(ac);
+  if (id === undefined) {
+    probeControllerSeq += 1;
+    id = `ac-${probeControllerSeq}`;
+    probeControllerIds.set(ac, id);
+  }
+  return id;
+}
+function probeReadAbortControllerId(ac) {
+  if (!ac)
+    return "none";
+  return probeControllerIds.get(ac) ?? "untagged";
+}
+function probeStampTaskRecord(record) {
+  let id = probeTaskRecordIds.get(record);
+  if (id === undefined) {
+    probeTaskRecordSeq += 1;
+    id = `task-${probeTaskRecordSeq}`;
+    probeTaskRecordIds.set(record, id);
+  }
+  return id;
+}
+function probeReadTaskRecordId(record) {
+  if (typeof record !== "object" || record === null)
+    return "none";
+  return probeTaskRecordIds.get(record) ?? "untagged";
+}
 function appendCappedMessage(messages, message, cap = MAX_TEAMMATE_DISPLAY_MESSAGES) {
   const next = [...messages ?? [], message];
   if (next.length > cap) {
@@ -35742,7 +35921,11 @@ function appendCappedMessage(messages, message, cap = MAX_TEAMMATE_DISPLAY_MESSA
   }
   return next;
 }
-var MAX_TEAMMATE_DISPLAY_MESSAGES = 100;
+var probeControllerIds, probeControllerSeq = 0, probeTaskRecordIds, probeTaskRecordSeq = 0, MAX_TEAMMATE_DISPLAY_MESSAGES = 100;
+var init_inProcessTeammate = __esm(() => {
+  probeControllerIds = new WeakMap;
+  probeTaskRecordIds = new WeakMap;
+});
 
 // src/task/outputLimits.ts
 function getMaxOutputLength() {
@@ -36024,6 +36207,7 @@ var init_outputFormatting = __esm(() => {
 // src/task/index.ts
 var init_task2 = __esm(() => {
   init_task();
+  init_inProcessTeammate();
   init_TaskOutput();
   init_fsRange();
   init_outputLimits();
@@ -36274,28 +36458,6 @@ function isLocalShellTask(task) {
   return typeof task === "object" && task !== null && "type" in task && task.type === "local_bash";
 }
 
-// src/engine/messaging/teammateContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
-function getTeammateContext() {
-  return teammateContextStorage.getStore();
-}
-function runWithTeammateContext(context, fn) {
-  return teammateContextStorage.run(context, fn);
-}
-function isInProcessTeammate() {
-  return teammateContextStorage.getStore() !== undefined;
-}
-function createTeammateContext(config) {
-  return {
-    ...config,
-    isInProcess: true
-  };
-}
-var teammateContextStorage;
-var init_teammateContext = __esm(() => {
-  teammateContextStorage = new AsyncLocalStorage2;
-});
-
 // src/engine/messaging/teammate.ts
 function getParentSessionId() {
   const inProcessCtx = getTeammateContext();
@@ -36426,7 +36588,7 @@ var init_teammate = __esm(() => {
   init_teammateContext();
   init_shared();
   init_task2();
-  init_teammateContext();
+  init_shared();
 });
 
 // src/engine/messaging/agentId.ts
@@ -37411,14 +37573,8 @@ var init_queueManager = __esm(() => {
 });
 
 // src/engine/messaging/agentSwarmsEnabled.ts
-function isAgentTeamsFlagSet() {
-  return process.argv.includes("--agent-teams");
-}
-function isAgentSwarmsEnabled() {
-  return isEnvTruthy(process.env.ATLAS_EXPERIMENTAL_AGENT_TEAMS) || isAgentTeamsFlagSet();
-}
-var init_agentSwarmsEnabled = __esm(() => {
-  init_shared();
+var init_agentSwarmsEnabled2 = __esm(() => {
+  init_agentSwarmsEnabled();
 });
 
 // src/engine/messaging/index.ts
@@ -37428,7 +37584,7 @@ var init_messaging = __esm(() => {
   init_lockfile();
   init_constants4();
   init_queueManager();
-  init_agentSwarmsEnabled();
+  init_agentSwarmsEnabled2();
 });
 
 // src/engine/coordinator/tasks/killShellTasks.ts
@@ -37805,7 +37961,8 @@ async function runAgent(args) {
     spawnDepth,
     signal,
     forkContextMessages,
-    checkPermission
+    checkPermission,
+    toolContext
   } = args;
   const role = resolveRole(overrideRole, agentDefinition, parentRole);
   const startTime = Date.now();
@@ -37815,7 +37972,7 @@ async function runAgent(args) {
     ...forkContextMessages ?? [],
     { type: "user", role: "user", content: prompt }
   ];
-  const loopResult = await queryAgentLoop({ modelProvider, role, signal, checkPermission }, { messages, tools });
+  const loopResult = await queryAgentLoop({ modelProvider, role, signal, checkPermission, toolContext }, { messages, tools });
   const result = finalizeAgentTool(loopResult.messages, agentId, {
     agentType: agentDefinition.agentType,
     startTime
@@ -37922,6 +38079,65 @@ var init_backgroundTracker = __esm(() => {
   pendingBackgroundAgents = new Set;
 });
 
+// src/engine/tools/agent/teammateSpawnPort.ts
+function setTeammateSpawnTrigger(fn) {
+  trigger = fn;
+}
+function resetTeammateSpawnTrigger() {
+  trigger = null;
+}
+function requireTeammateSpawnTrigger() {
+  if (!trigger) {
+    throw new Error("TeammateSpawnTrigger not wired — call setTeammateSpawnTrigger at composition root first (0.1.93 W-D-A spawn seam)");
+  }
+  return trigger;
+}
+var trigger = null;
+
+// src/engine/tools/team/teamServices.ts
+function setTeamServices(services) {
+  active = services;
+}
+function resetTeamServices() {
+  active = undefined;
+}
+function requireTeamServices() {
+  if (!active) {
+    throw new Error("TeamServices not wired — call setTeamServices at composition root first (swarm team-file seam, C 桶 ③ S-E2d)");
+  }
+  return active;
+}
+function peekTeamContext() {
+  return active?.getTeamContext();
+}
+function createDefaultTeamContextStore() {
+  return {
+    getTeamContext: () => teamContext,
+    setTeamContext: (ctx) => {
+      teamContext = ctx;
+    }
+  };
+}
+function registerSpawnedTeammate(input) {
+  const services = requireTeamServices();
+  const ctx = services.getTeamContext();
+  if (!ctx) {
+    throw new Error("registerSpawnedTeammate: no active team — call TeamCreate before spawning teammates");
+  }
+  ctx.teammates[input.agentId] = {
+    name: input.name,
+    agentType: input.agentType,
+    color: services.assignTeammateColor(input.agentId),
+    tmuxSessionName: "",
+    tmuxPaneId: "",
+    cwd: input.cwd ?? "",
+    spawnedAt: Date.now(),
+    ...input.taskId ? { taskId: input.taskId } : {}
+  };
+  services.setTeamContext(ctx);
+}
+var active, teamContext;
+
 // src/engine/tools/agent/AgentTool.ts
 import { randomUUID as randomUUID5 } from "crypto";
 function isAgentBackgroundByDefault() {
@@ -37945,6 +38161,45 @@ function resolveAgentDefinition(subagentType, agents) {
     whenToUse: "Custom agent type: " + subagentType
   };
 }
+async function spawnTeammateFromRoster(args) {
+  const services = requireTeamServices();
+  const teamCtx = services.getTeamContext();
+  if (!teamCtx) {
+    throw new Error(`No active team — call TeamCreate before spawning teammates (wanted team "${args.teamName}")`);
+  }
+  if (teamCtx.teamName !== args.teamName) {
+    throw new Error(`Team "${args.teamName}" is not the active team (leading "${teamCtx.teamName}") — one team per leader`);
+  }
+  if (!args.name || args.name.trim().length === 0) {
+    throw new Error("name (the teammate identity) is required for team-based delegation");
+  }
+  const rosterEntry = teamCtx.roster?.find((r) => r.name === args.name);
+  const composedPrompt = renderTeammatePrompt({
+    name: args.name,
+    role: rosterEntry?.role,
+    goal: rosterEntry?.goal,
+    backstory: rosterEntry?.backstory,
+    prompt: args.prompt
+  });
+  const trigger = requireTeammateSpawnTrigger();
+  const result = await trigger({
+    name: args.name,
+    teamName: args.teamName,
+    prompt: composedPrompt,
+    ...args.model ? { model: args.model } : {},
+    allowPermissionPrompts: false
+  });
+  if (!result.success) {
+    throw new Error(result.error ?? `teammate spawn failed for "${args.name}"`);
+  }
+  registerSpawnedTeammate({
+    name: args.name,
+    agentId: result.agentId,
+    agentType: rosterEntry?.role,
+    ...result.taskId ? { taskId: result.taskId } : {}
+  });
+  return result;
+}
 var AGENT_TOOL_INPUT_SCHEMA, AgentTool;
 var init_AgentTool = __esm(() => {
   init_modelprovider2();
@@ -37958,6 +38213,7 @@ var init_AgentTool = __esm(() => {
   init_localAgentTask();
   init_shared();
   init_backgroundTracker();
+  init_shared();
   AGENT_TOOL_INPUT_SCHEMA = {
     type: "object",
     properties: {
@@ -37980,6 +38236,18 @@ var init_AgentTool = __esm(() => {
       run_in_background: {
         type: "boolean",
         description: "Set to true to run this agent in the background. You will be notified when it completes."
+      },
+      name: {
+        type: "string",
+        description: "Teammate name for team-based delegation. Provide together with team_name to spawn a teammate into that team (TeamCreate first)."
+      },
+      team_name: {
+        type: "string",
+        description: "Name of the team to spawn the teammate into (must match an active TeamCreate team)."
+      },
+      mode: {
+        type: "string",
+        description: "Teammate mode (upstream contract field)."
       }
     },
     required: ["description", "prompt"]
@@ -37997,6 +38265,25 @@ var init_AgentTool = __esm(() => {
       behavior: "passthrough",
       message: "Agent tool requires permission."
     }),
+    async validateInput(input, _context) {
+      const i = input ?? {};
+      const hasTeammateFields = !!(i.name || i.team_name || i.mode);
+      if (hasTeammateFields && !isAgentSwarmsEnabled()) {
+        return {
+          result: false,
+          message: "Agent teammate parameters (name/team_name/mode) require the agent-teams gate (ATLAS_EXPERIMENTAL_AGENT_TEAMS=1 or --agent-teams)",
+          errorCode: 9
+        };
+      }
+      if (i.team_name && !i.name) {
+        return {
+          result: false,
+          message: "team_name requires name (the teammate identity) for team-based delegation",
+          errorCode: 9
+        };
+      }
+      return { result: true };
+    },
     toAutoClassifierInput: (input) => input,
     description: async () => getPrompt(getBuiltInAgents()),
     userFacingName: (input) => {
@@ -38032,6 +38319,30 @@ var init_AgentTool = __esm(() => {
     async call(args, context) {
       const input = args ?? {};
       const ctx = context ?? {};
+      if (input.name || input.team_name) {
+        if (!isAgentSwarmsEnabled()) {
+          throw new Error("Agent teammate spawn requires the agent-teams gate (ATLAS_EXPERIMENTAL_AGENT_TEAMS=1 or --agent-teams)");
+        }
+        const teamName = input.team_name;
+        if (!teamName) {
+          throw new Error("team_name is required when spawning a teammate (name alone is ambiguous)");
+        }
+        const spawnResult = await spawnTeammateFromRoster({
+          name: input.name ?? "",
+          teamName,
+          prompt: input.prompt,
+          model: input.model
+        });
+        return {
+          data: {
+            status: "teammate_spawned",
+            agentId: spawnResult.agentId,
+            ...spawnResult.taskId ? { taskId: spawnResult.taskId } : {},
+            name: input.name,
+            team_name: teamName
+          }
+        };
+      }
       const parentRole = ctx.parentRole ?? "small";
       const modelProvider = ctx.modelProvider ?? getModelProvider();
       const agentDefinition = resolveAgentDefinition(input.subagent_type, getBuiltInAgents());
@@ -43588,9 +43899,9 @@ function createSubcommandPrefixExtractor(getPrefix, splitCommand) {
 }
 
 // src/engine/tools/bash/heredoc.ts
-import { randomBytes } from "crypto";
+import { randomBytes as randomBytes2 } from "crypto";
 function generatePlaceholderSalt() {
-  return randomBytes(8).toString("hex");
+  return randomBytes2(8).toString("hex");
 }
 function extractHeredocs(command, options) {
   const heredocs = new Map;
@@ -44380,9 +44691,9 @@ var init_shellQuote = __esm(() => {
 });
 
 // src/engine/tools/bash/commands.ts
-import { randomBytes as randomBytes2 } from "crypto";
+import { randomBytes as randomBytes3 } from "crypto";
 function generatePlaceholders() {
-  const salt = randomBytes2(8).toString("hex");
+  const salt = randomBytes3(8).toString("hex");
   return {
     SINGLE_QUOTE: `__SINGLE_QUOTE_${salt}__`,
     DOUBLE_QUOTE: `__DOUBLE_QUOTE_${salt}__`,
@@ -50771,13 +51082,13 @@ function getExecutorSandboxPort() {
 var activePort3 = null;
 
 // src/executor/shell/ShellCommand.ts
-import { randomBytes as randomBytes3 } from "crypto";
+import { randomBytes as randomBytes4 } from "crypto";
 import { stat as stat5 } from "fs/promises";
 function generateLocalTaskId() {
-  const bytes = randomBytes3(8);
+  const bytes = randomBytes4(8);
   let id = "b";
   for (let i = 0;i < 8; i++) {
-    id += TASK_ID_ALPHABET[bytes[i] % TASK_ID_ALPHABET.length];
+    id += TASK_ID_ALPHABET2[bytes[i] % TASK_ID_ALPHABET2.length];
   }
   return id;
 }
@@ -51043,7 +51354,7 @@ function createFailedCommand(preSpawnError) {
     cleanup() {}
   };
 }
-var SIGKILL = 137, SIGTERM = 143, SIZE_WATCHDOG_INTERVAL_MS = 5000, TASK_ID_ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyz";
+var SIGKILL = 137, SIGTERM = 143, SIZE_WATCHDOG_INTERVAL_MS = 5000, TASK_ID_ALPHABET2 = "0123456789abcdefghijklmnopqrstuvwxyz";
 var init_ShellCommand = __esm(() => {
   init_shared();
 });
@@ -53872,9 +54183,9 @@ Remember: DO NOT write or edit any files yet. This is a read-only exploration an
 });
 
 // src/engine/tools/plan/planWords.ts
-import { randomBytes as randomBytes4 } from "crypto";
+import { randomBytes as randomBytes5 } from "crypto";
 function randomInt(max) {
-  const bytes = randomBytes4(4);
+  const bytes = randomBytes5(4);
   const value = bytes.readUInt32BE(0);
   return value % max;
 }
@@ -70157,15 +70468,21 @@ function parseAddress(to) {
     return { scheme: "uds", target: to };
   return { scheme: "other", target: to };
 }
-// src/swarm/teammateContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
-function runWithTeammateContext2(context, fn) {
-  return teammateContextStorage2.run(context, fn);
+
+// src/swarm/agentId.ts
+function formatAgentId2(agentName, teamName) {
+  return `${agentName}@${teamName}`;
+}
+function parseAgentId2(agentId) {
+  const atIndex = agentId.indexOf("@");
+  if (atIndex === -1) {
+    return null;
+  }
+  return {
+    agentName: agentId.slice(0, atIndex),
+    teamName: agentId.slice(atIndex + 1)
+  };
 }
-var teammateContextStorage2;
-var init_teammateContext2 = __esm(() => {
-  teammateContextStorage2 = new AsyncLocalStorage3;
-});
 
 // src/swarm/standaloneAgent.ts
 var init_standaloneAgent = __esm(() => {
@@ -70260,6 +70577,10 @@ var init_types5 = __esm(() => {
 });
 
 // src/swarm/cleanupRegistry.ts
+function registerCleanup(cleanupFn) {
+  cleanupFunctions.add(cleanupFn);
+  return () => cleanupFunctions.delete(cleanupFn);
+}
 var cleanupFunctions;
 var init_cleanupRegistry = __esm(() => {
   cleanupFunctions = new Set;
@@ -70323,11 +70644,30 @@ async function readTeamFileAsync(teamName) {
     return null;
   }
 }
+function writeTeamFile(teamName, teamFile) {
+  const teamDir = getTeamDir(teamName);
+  mkdirSync3(teamDir, { recursive: true });
+  writeFileSync2(getTeamFilePath(teamName), jsonStringify(teamFile, 2));
+}
 async function writeTeamFileAsync(teamName, teamFile) {
   const teamDir = getTeamDir(teamName);
   await mkdir5(teamDir, { recursive: true });
   await writeFile4(getTeamFilePath(teamName), jsonStringify(teamFile, 2));
 }
+function removeMemberByAgentId(teamName, agentId) {
+  const teamFile = readTeamFile(teamName);
+  if (!teamFile) {
+    return false;
+  }
+  const memberIndex = teamFile.members.findIndex((m) => m.agentId === agentId);
+  if (memberIndex === -1) {
+    return false;
+  }
+  teamFile.members.splice(memberIndex, 1);
+  writeTeamFile(teamName, teamFile);
+  logForDebugging(`[TeammateTool] Removed member ${agentId} from team ${teamName}`);
+  return true;
+}
 async function destroyWorktree(worktreePath) {
   const gitFilePath = join25(worktreePath, ".git");
   let mainRepoPath = null;
@@ -70424,17 +70764,152 @@ var init_teamMemoryOps = __esm(() => {
 });
 
 // src/swarm/spawnInProcess.ts
+async function spawnInProcessTeammate(config, context) {
+  const { name, teamName, prompt, color, planModeRequired, model } = config;
+  const { setAppState } = context;
+  const agentId = formatAgentId2(name, teamName);
+  const taskId = generateTaskId("in_process_teammate");
+  logForDebugging(`[spawnInProcessTeammate] Spawning ${agentId} (taskId: ${taskId})`);
+  try {
+    const abortController = createAbortController();
+    logForDebugging(`[probe-R1][spawn] agent=${agentId} taskId=${taskId} controller=${probeStampAbortController(abortController)}`);
+    const parentSessionId = getSessionId();
+    const identity = {
+      agentId,
+      agentName: name,
+      teamName,
+      color,
+      planModeRequired,
+      parentSessionId
+    };
+    const teammateContext = createTeammateContext({
+      agentId,
+      agentName: name,
+      teamName,
+      color,
+      planModeRequired,
+      parentSessionId,
+      abortController
+    });
+    const description = `${name}: ${prompt.substring(0, 50)}${prompt.length > 50 ? "..." : ""}`;
+    const taskState = {
+      ...createTaskStateBase(taskId, "in_process_teammate", description, context.toolUseId),
+      type: "in_process_teammate",
+      status: "running",
+      identity,
+      prompt,
+      model,
+      abortController,
+      awaitingPlanApproval: false,
+      permissionMode: planModeRequired ? "plan" : "default",
+      isIdle: false,
+      shutdownRequested: false,
+      lastReportedToolCount: 0,
+      lastReportedTokenCount: 0,
+      pendingUserMessages: [],
+      messages: []
+    };
+    logForDebugging(`[probe-R6][spawn-record] agent=${agentId} taskId=${taskId} record=${probeStampTaskRecord(taskState)}`);
+    const unregisterCleanup = registerCleanup(async () => {
+      logForDebugging(`[spawnInProcessTeammate] Cleanup called for ${agentId}`);
+      abortController.abort();
+    });
+    taskState.unregisterCleanup = unregisterCleanup;
+    registerTask(taskState, setAppState);
+    logForDebugging(`[spawnInProcessTeammate] Registered ${agentId} in AppState`);
+    return {
+      success: true,
+      agentId,
+      taskId,
+      abortController,
+      teammateContext
+    };
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : "Unknown error during spawn";
+    logForDebugging(`[spawnInProcessTeammate] Failed to spawn ${agentId}: ${errorMessage}`);
+    return {
+      success: false,
+      agentId,
+      error: errorMessage
+    };
+  }
+}
+function killInProcessTeammate(taskId, setAppState) {
+  let killed = false;
+  let teamName = null;
+  let agentId = null;
+  let toolUseId;
+  let description;
+  setAppState((prev) => {
+    const task = prev.tasks[taskId];
+    if (!task || !isInProcessTeammateTask(task)) {
+      return prev;
+    }
+    const teammateTask = task;
+    if (teammateTask.status !== "running") {
+      return prev;
+    }
+    teamName = teammateTask.identity.teamName;
+    agentId = teammateTask.identity.agentId;
+    toolUseId = teammateTask.toolUseId;
+    description = teammateTask.description;
+    teammateTask.abortController?.abort();
+    teammateTask.unregisterCleanup?.();
+    killed = true;
+    teammateTask.onIdleCallbacks?.forEach((cb) => cb());
+    return {
+      ...prev,
+      tasks: {
+        ...prev.tasks,
+        [taskId]: {
+          ...teammateTask,
+          status: "killed",
+          notified: true,
+          endTime: Date.now(),
+          onIdleCallbacks: [],
+          messages: teammateTask.messages?.length ? [teammateTask.messages[teammateTask.messages.length - 1]] : undefined,
+          pendingUserMessages: [],
+          abortController: undefined,
+          unregisterCleanup: undefined
+        }
+      }
+    };
+  });
+  if (teamName && agentId) {
+    removeMemberByAgentId(teamName, agentId);
+  }
+  if (killed) {
+    evictTaskOutput(taskId);
+    emitTaskTerminatedSdk(taskId, "stopped", {
+      toolUseId,
+      summary: description
+    });
+    setTimeout(evictTerminalTask.bind(null, taskId, setAppState), STOPPED_DISPLAY_MS);
+  }
+  return killed;
+}
 var init_spawnInProcess = __esm(() => {
   init_bootstrap();
   init_task2();
   init_engine();
   init_shared();
-  init_teammateContext2();
+  init_shared();
   init_cleanupRegistry();
   init_teamHelpers();
 });
 
 // src/swarm/inProcessTeammateTask.ts
+function requestTeammateShutdown(taskId, setAppState) {
+  updateTaskState(taskId, setAppState, (task) => {
+    if (task.status !== "running" || task.shutdownRequested) {
+      return task;
+    }
+    return {
+      ...task,
+      shutdownRequested: true
+    };
+  });
+}
 function appendTeammateMessage(taskId, message, setAppState) {
   updateTaskState(taskId, setAppState, (task) => {
     if (task.status !== "running") {
@@ -70446,6 +70921,83 @@ function appendTeammateMessage(taskId, message, setAppState) {
     };
   });
 }
+function findTeammateTaskByAgentId(agentId, tasks) {
+  let fallback;
+  for (const task of Object.values(tasks)) {
+    if (isInProcessTeammateTask(task) && task.identity.agentId === agentId) {
+      if (task.status === "running") {
+        return task;
+      }
+      if (!fallback) {
+        fallback = task;
+      }
+    }
+  }
+  return fallback;
+}
+function getAllInProcessTeammateTasks(tasks) {
+  return Object.values(tasks).filter(isInProcessTeammateTask);
+}
+async function gracefulShutdownInProcessTeammates(deps) {
+  const running = getAllInProcessTeammateTasks(deps.getAppState().tasks ?? {}).filter((t) => t.status === "running");
+  if (running.length === 0) {
+    return { requested: 0, drained: 0, forced: 0, hardTerminated: 0 };
+  }
+  const toRequest = running.filter((t) => !t.shutdownRequested);
+  const requestIdBase = Date.now();
+  for (const teammate of toRequest) {
+    const shutdownRequest = createShutdownRequestMessage({
+      requestId: `shutdown-${teammate.identity.agentId}-session-end-${requestIdBase}`,
+      from: TEAM_LEAD_NAME2,
+      reason: "session end (headless terminal state)"
+    });
+    await writeToMailbox(teammate.identity.agentName, {
+      from: TEAM_LEAD_NAME2,
+      text: jsonStringify(shutdownRequest),
+      timestamp: new Date().toISOString()
+    }, teammate.identity.teamName);
+    requestTeammateShutdown(teammate.id, deps.setAppState);
+  }
+  const freshTasks = () => getAllInProcessTeammateTasks(deps.getAppState().tasks ?? {});
+  const countStillRunning = () => freshTasks().filter((t) => t.status === "running" && running.some((prev) => prev.id === t.id)).length;
+  const waitForDrain = async (timeoutMs) => {
+    const deadline = Date.now() + timeoutMs;
+    for (;; ) {
+      if (countStillRunning() === 0 || Date.now() >= deadline)
+        return;
+      await new Promise((resolve) => setTimeout(resolve, TEAMMATE_GRACEFUL_SHUTDOWN_POLL_MS));
+    }
+  };
+  await waitForDrain(deps.timeoutMs ?? TEAMMATE_GRACEFUL_SHUTDOWN_TIMEOUT_MS);
+  let drained = running.length - countStillRunning();
+  if (drained === running.length) {
+    return { requested: toRequest.length, drained, forced: 0, hardTerminated: 0 };
+  }
+  let forced = 0;
+  for (const prev of running) {
+    const now = freshTasks().find((t) => t.id === prev.id);
+    if (now?.status === "running" && now.abortController) {
+      now.abortController.abort();
+      forced++;
+    }
+  }
+  if (forced > 0) {
+    await waitForDrain(deps.forcedTimeoutMs ?? TEAMMATE_FORCED_SHUTDOWN_TIMEOUT_MS);
+    drained = running.length - countStillRunning();
+    if (drained === running.length) {
+      return { requested: toRequest.length, drained, forced, hardTerminated: 0 };
+    }
+  }
+  let hardTerminated = 0;
+  for (const prev of running) {
+    const now = freshTasks().find((t) => t.id === prev.id);
+    if (now?.status === "running" && killInProcessTeammate(now.id, deps.setAppState)) {
+      hardTerminated++;
+    }
+  }
+  return { requested: toRequest.length, drained, forced, hardTerminated };
+}
+var TEAMMATE_GRACEFUL_SHUTDOWN_TIMEOUT_MS = 15000, TEAMMATE_FORCED_SHUTDOWN_TIMEOUT_MS = 5000, TEAMMATE_GRACEFUL_SHUTDOWN_POLL_MS = 250;
 var init_inProcessTeammateTask = __esm(() => {
   init_task2();
   init_task2();
@@ -70559,9 +71111,159 @@ var init_it2Setup = __esm(() => {
 function setStartInProcessTeammate(fn) {
   startFn = fn;
 }
+function requireStartInProcessTeammate() {
+  if (!startFn) {
+    throw new Error("StartInProcessTeammate not wired — call setStartInProcessTeammate at composition root first (swarm inProcessRunner seam ②)");
+  }
+  return startFn;
+}
 var startFn = null;
 
 // src/swarm/backends/InProcessBackend.ts
+class InProcessBackend {
+  type = "in-process";
+  context = null;
+  setContext(context) {
+    this.context = context;
+  }
+  async isAvailable() {
+    return true;
+  }
+  async spawn(config) {
+    if (!this.context) {
+      logForDebugging(`[InProcessBackend] spawn() called without context for ${config.name}`);
+      return {
+        success: false,
+        agentId: `${config.name}@${config.teamName}`,
+        error: "InProcessBackend not initialized. Call setContext() before spawn()."
+      };
+    }
+    logForDebugging(`[InProcessBackend] spawn() called for ${config.name}`);
+    const result = await spawnInProcessTeammate({
+      name: config.name,
+      teamName: config.teamName,
+      prompt: config.prompt,
+      color: config.color,
+      planModeRequired: config.planModeRequired ?? false
+    }, this.context);
+    if (result.success && result.taskId && result.teammateContext && result.abortController) {
+      requireStartInProcessTeammate()({
+        identity: {
+          agentId: result.agentId,
+          agentName: config.name,
+          teamName: config.teamName,
+          color: config.color,
+          planModeRequired: config.planModeRequired ?? false,
+          parentSessionId: result.teammateContext.parentSessionId
+        },
+        taskId: result.taskId,
+        prompt: config.prompt,
+        teammateContext: result.teammateContext,
+        toolUseContext: { ...this.context, messages: [] },
+        abortController: result.abortController,
+        model: config.model,
+        systemPrompt: config.systemPrompt,
+        systemPromptMode: config.systemPromptMode,
+        allowedTools: config.permissions,
+        allowPermissionPrompts: config.allowPermissionPrompts,
+        ...config.termination ? { termination: config.termination } : {}
+      });
+      logForDebugging(`[InProcessBackend] Started agent execution for ${result.agentId}`);
+    }
+    return {
+      success: result.success,
+      agentId: result.agentId,
+      taskId: result.taskId,
+      abortController: result.abortController,
+      error: result.error
+    };
+  }
+  async sendMessage(agentId, message) {
+    logForDebugging(`[InProcessBackend] sendMessage() to ${agentId}: ${message.text.substring(0, 50)}...`);
+    const parsed = parseAgentId2(agentId);
+    if (!parsed) {
+      logForDebugging(`[InProcessBackend] Invalid agentId format: ${agentId}`);
+      throw new Error(`Invalid agentId format: ${agentId}. Expected format: agentName@teamName`);
+    }
+    const { agentName, teamName } = parsed;
+    await writeToMailbox(agentName, {
+      text: message.text,
+      from: message.from,
+      color: message.color,
+      timestamp: message.timestamp ?? new Date().toISOString()
+    }, teamName);
+    logForDebugging(`[InProcessBackend] sendMessage() completed for ${agentId}`);
+  }
+  async terminate(agentId, reason) {
+    logForDebugging(`[InProcessBackend] terminate() called for ${agentId}: ${reason}`);
+    if (!this.context) {
+      logForDebugging(`[InProcessBackend] terminate() failed: no context set for ${agentId}`);
+      return false;
+    }
+    const state = this.context.getAppState();
+    const task = findTeammateTaskByAgentId(agentId, state.tasks);
+    if (!task) {
+      logForDebugging(`[InProcessBackend] terminate() failed: task not found for ${agentId}`);
+      return false;
+    }
+    if (task.shutdownRequested) {
+      logForDebugging(`[InProcessBackend] terminate(): shutdown already requested for ${agentId}`);
+      return true;
+    }
+    const requestId = `shutdown-${agentId}-${Date.now()}`;
+    const shutdownRequest = createShutdownRequestMessage({
+      requestId,
+      from: "team-lead",
+      reason
+    });
+    const teammateAgentName = task.identity.agentName;
+    await writeToMailbox(teammateAgentName, {
+      from: "team-lead",
+      text: jsonStringify(shutdownRequest),
+      timestamp: new Date().toISOString()
+    }, task.identity.teamName);
+    requestTeammateShutdown(task.id, this.context.setAppState);
+    logForDebugging(`[InProcessBackend] terminate() sent shutdown request to ${agentId}`);
+    return true;
+  }
+  async kill(agentId) {
+    logForDebugging(`[InProcessBackend] kill() called for ${agentId}`);
+    if (!this.context) {
+      logForDebugging(`[InProcessBackend] kill() failed: no context set for ${agentId}`);
+      return false;
+    }
+    const state = this.context.getAppState();
+    const task = findTeammateTaskByAgentId(agentId, state.tasks);
+    if (!task) {
+      logForDebugging(`[InProcessBackend] kill() failed: task not found for ${agentId}`);
+      return false;
+    }
+    const killed = killInProcessTeammate(task.id, this.context.setAppState);
+    logForDebugging(`[InProcessBackend] kill() ${killed ? "succeeded" : "failed"} for ${agentId}`);
+    return killed;
+  }
+  async isActive(agentId) {
+    logForDebugging(`[InProcessBackend] isActive() called for ${agentId}`);
+    if (!this.context) {
+      logForDebugging(`[InProcessBackend] isActive() failed: no context set for ${agentId}`);
+      return false;
+    }
+    const state = this.context.getAppState();
+    const task = findTeammateTaskByAgentId(agentId, state.tasks);
+    if (!task) {
+      logForDebugging(`[InProcessBackend] isActive(): task not found for ${agentId}`);
+      return false;
+    }
+    const isRunning = task.status === "running";
+    const isAborted = task.abortController?.signal.aborted ?? true;
+    const active = isRunning && !isAborted;
+    logForDebugging(`[InProcessBackend] isActive() for ${agentId}: ${active} (running=${isRunning}, aborted=${isAborted})`);
+    return active;
+  }
+}
+function createInProcessBackend() {
+  return new InProcessBackend;
+}
 var init_InProcessBackend = __esm(() => {
   init_engine();
   init_shared();
@@ -71317,7 +72019,13 @@ function getBackendByType(type) {
       return createITermBackend();
   }
 }
-var cachedBackend = null, cachedDetectionResult = null, backendsRegistered = false, TmuxBackendClass = null, ITermBackendClass = null;
+function getInProcessBackend() {
+  if (!cachedInProcessBackend) {
+    cachedInProcessBackend = createInProcessBackend();
+  }
+  return cachedInProcessBackend;
+}
+var cachedBackend = null, cachedDetectionResult = null, backendsRegistered = false, cachedInProcessBackend = null, TmuxBackendClass = null, ITermBackendClass = null;
 var init_registry = __esm(() => {
   init_bootstrap();
   init_shared();
@@ -71454,6 +72162,110 @@ var init_permissionSync = __esm(() => {
   });
 });
 
+// src/swarm/teammateTermination.ts
+function resolveTerminationSpec(spec) {
+  return spec ?? DEFAULT_TEAMMATE_TERMINATION_SPEC;
+}
+function validateTerminationSpec(spec) {
+  if (spec.op !== "or" && spec.op !== "and") {
+    throw new Error(`teammate-termination config: op must be "or" or "and" (got ${String(spec.op)})`);
+  }
+  if (!Array.isArray(spec.conditions) || spec.conditions.length === 0) {
+    throw new Error("teammate-termination config: conditions must be a non-empty array");
+  }
+  for (const c of spec.conditions) {
+    switch (c.kind) {
+      case "max-turns":
+        if (!Number.isInteger(c.maxTurns) || c.maxTurns < 1) {
+          throw new Error(`teammate-termination config: maxTurns must be an integer >= 1 (got ${String(c.maxTurns)})`);
+        }
+        break;
+      case "text-confirm":
+        if (!Array.isArray(c.phrases) || c.phrases.length === 0 || c.phrases.some((p) => typeof p !== "string" || p.length === 0)) {
+          throw new Error("teammate-termination config: text-confirm phrases must be a non-empty array of non-empty strings");
+        }
+        break;
+      case "stall":
+        if (!Number.isInteger(c.maxConsecutive) || c.maxConsecutive < 2) {
+          throw new Error(`teammate-termination config: stall maxConsecutive must be an integer >= 2 (got ${String(c.maxConsecutive)})`);
+        }
+        break;
+      case "external-kill":
+        break;
+      default:
+        throw new Error(`teammate-termination config: unknown condition kind (got ${JSON.stringify(c)})`);
+    }
+  }
+}
+function createInitialTerminationLoopState() {
+  return { turns: 0, stallConsecutive: 0 };
+}
+function advanceTerminationLoopState(state, outcome) {
+  const finalText = outcome.finalText;
+  const stalled = typeof finalText === "string" && finalText.length > 0 && finalText === state.lastFinalText;
+  return {
+    turns: state.turns + 1,
+    lastFinalText: finalText,
+    stallConsecutive: stalled ? state.stallConsecutive + 1 : 0
+  };
+}
+function evaluateCondition(c, state) {
+  switch (c.kind) {
+    case "max-turns":
+      return state.turns >= c.maxTurns ? { type: "max-turns", turns: state.turns } : undefined;
+    case "text-confirm": {
+      const text = (state.lastFinalText ?? "").toLowerCase();
+      const matched = c.phrases.find((p) => text.includes(p.toLowerCase()));
+      return matched !== undefined ? { type: "text-confirm", matched } : undefined;
+    }
+    case "external-kill":
+      return state.aborted ? { type: "external-kill" } : undefined;
+    case "stall":
+      return state.stallConsecutive >= c.maxConsecutive ? { type: "stall", consecutive: state.stallConsecutive } : undefined;
+  }
+}
+function evaluateTerminationSpec(spec, state) {
+  const reasons = spec.conditions.map((c) => evaluateCondition(c, state)).filter((r) => r !== undefined);
+  if (spec.op === "or") {
+    if (reasons.length === 0)
+      return { terminate: false };
+    return {
+      terminate: true,
+      reason: spec.conditions.length === 1 ? reasons[0] : { type: "or", satisfied: reasons }
+    };
+  }
+  if (reasons.length !== spec.conditions.length)
+    return { terminate: false };
+  return {
+    terminate: true,
+    reason: spec.conditions.length === 1 ? reasons[0] : { type: "and", satisfied: reasons }
+  };
+}
+function extractFinalAssistantText(messages) {
+  for (let i = messages.length - 1;i >= 0; i--) {
+    const m = messages[i];
+    if (m?.role !== "assistant")
+      continue;
+    const content = m.content;
+    if (typeof content === "string") {
+      return content.length > 0 ? content : undefined;
+    }
+    if (Array.isArray(content)) {
+      const text = content.map((b) => b && typeof b === "object" && b.type === "text" ? b.text : "").filter((t) => typeof t === "string").join("").trim();
+      return text.length > 0 ? text : undefined;
+    }
+    return;
+  }
+  return;
+}
+var DEFAULT_TEAMMATE_MAX_TURNS = 200, DEFAULT_TEAMMATE_TERMINATION_SPEC;
+var init_teammateTermination = __esm(() => {
+  DEFAULT_TEAMMATE_TERMINATION_SPEC = {
+    op: "or",
+    conditions: [{ kind: "max-turns", maxTurns: DEFAULT_TEAMMATE_MAX_TURNS }]
+  };
+});
+
 // src/swarm/inProcessRunner.ts
 import { randomUUID as randomUUID9 } from "node:crypto";
 function buildTeammateToolPermissionContext(narrow) {
@@ -71804,7 +72616,7 @@ async function tryClaimNextTask(taskListId, agentName) {
 }
 async function waitForNextPromptOrShutdown(identity, abortController, taskId, getAppState, setAppState, taskListId) {
   const POLL_INTERVAL_MS = 500;
-  logForDebugging(`[inProcessRunner] ${identity.agentName} starting poll loop (abort=${abortController.signal.aborted})`);
+  logForDebugging(`[probe-R2][anchor3-poll-start] [inProcessRunner] ${identity.agentName} starting poll loop (abort=${abortController.signal.aborted}, controller=${probeReadAbortControllerId(abortController)})`);
   let pollCount = 0;
   while (!abortController.signal.aborted) {
     const appState = getAppState();
@@ -71923,6 +72735,7 @@ async function runInProcessTeammate(config) {
   const modelProvider = getModelProvider();
   const contextWindow = getProviderContextWindow(getRoleModel(role) ?? "") ?? HARD_DEFAULT_CONTEXT_WINDOW;
   logForDebugging(`[inProcessRunner] Starting agent loop for ${identity.agentId}`);
+  logForDebugging(`[probe-R1][runner] agent=${identity.agentId} taskId=${taskId} controller=${probeReadAbortControllerId(abortController)}`);
   const teammateSystemPrompt = await buildTeammateSystemPrompt({
     systemPrompt,
     systemPromptMode,
@@ -71950,6 +72763,10 @@ async function runInProcessTeammate(config) {
     turnCounter: 0,
     turnId: "turn-0"
   };
+  let termState = createInitialTerminationLoopState();
+  let terminationReason;
+  const effectiveTermination = resolveTerminationSpec(config.termination);
+  validateTerminationSpec(effectiveTermination);
   try {
     updateTaskState(taskId, setAppState, (task) => ({
       ...task,
@@ -71998,7 +72815,7 @@ async function runInProcessTeammate(config) {
       const forkContextMessages = contextMessages.length > 0 ? [...contextMessages] : undefined;
       allMessages.push(userMessage);
       let workWasAborted = false;
-      await runWithTeammateContext2(teammateContext, async () => {
+      await runWithTeammateContext(teammateContext, async () => {
         updateTaskState(taskId, setAppState, (task) => ({ ...task, status: "running", isIdle: false }));
         const agentResult = await runAgent({
           agentDefinition: resolvedAgentDefinition,
@@ -72010,11 +72827,16 @@ async function runInProcessTeammate(config) {
           agentId: identity.agentId,
           signal: currentWorkAbortController.signal,
           forkContextMessages,
-          checkPermission: createInProcessPermissionGate(identity, currentWorkAbortController, tools, getAppState, buildTeammateTpc)
+          checkPermission: createInProcessPermissionGate(identity, currentWorkAbortController, tools, getAppState, buildTeammateTpc),
+          toolContext: { getAppState, setAppState }
         });
+        logForDebugging(`[probe-R2][anchor1-runagent-returned] agent=${identity.agentId} lifecycleAborted=${abortController.signal.aborted}`);
         const prefixLen = 2 + (forkContextMessages?.length ?? 0);
         const newMessages = agentResult.messages.slice(prefixLen);
         allMessages.push(...newMessages);
+        termState = advanceTerminationLoopState(termState, {
+          finalText: extractFinalAssistantText(newMessages)
+        });
         updateTaskState(taskId, setAppState, (task) => ({
           ...task,
           messages: allMessages.slice(-MAX_TEAMMATE_DISPLAY_MESSAGES)
@@ -72047,13 +72869,24 @@ async function runInProcessTeammate(config) {
         return { ...task, isIdle: true, onIdleCallbacks: [] };
       });
       if (!wasAlreadyIdle) {
+        logForDebugging(`[probe-R2][anchor2-idle-in] agent=${identity.agentName} lifecycleAborted=${abortController.signal.aborted}`);
         await sendIdleNotification(identity.agentName, identity.color, identity.teamName, {
           idleReason: workWasAborted ? "interrupted" : "available",
           summary: getLastPeerDmSummary(allMessages)
         });
+        logForDebugging(`[probe-R2][anchor2-idle-out] agent=${identity.agentName} lifecycleAborted=${abortController.signal.aborted}`);
       } else {
         logForDebugging(`[inProcessRunner] Skipping duplicate idle notification for ${identity.agentName}`);
       }
+      const terminationVerdict = evaluateTerminationSpec(effectiveTermination, {
+        ...termState,
+        aborted: abortController.signal.aborted
+      });
+      if (terminationVerdict.terminate) {
+        logForDebugging(`[inProcessRunner] ${identity.agentId} termination condition met (${JSON.stringify(terminationVerdict.reason)}) — graceful exit`);
+        terminationReason = terminationVerdict.reason;
+        shouldExit = true;
+      }
       logForDebugging(`[inProcessRunner] ${identity.agentId} finished prompt, waiting for next`);
       const waitResult = await waitForNextPromptOrShutdown(identity, abortController, taskId, getAppState, setAppState, identity.parentSessionId);
       switch (waitResult.type) {
@@ -72079,26 +72912,37 @@ async function runInProcessTeammate(config) {
     }
     let alreadyTerminal = false;
     let toolUseId;
+    logForDebugging(`[probe-R6][completed-in] agent=${identity.agentId} taskId=${taskId}`);
     updateTaskState(taskId, setAppState, (task) => {
-      if (task.status !== "running") {
-        alreadyTerminal = true;
-        return task;
+      logForDebugging(`[probe-R6][completed-updater-enter] agent=${identity.agentId} status=${task.status} recordId=${probeReadTaskRecordId(task)}`);
+      try {
+        if (!isInProcessTeammateLive(task)) {
+          logForDebugging(`[probe-R6][completed-updater-notlive] agent=${identity.agentId}`);
+          alreadyTerminal = true;
+          return task;
+        }
+        toolUseId = task.toolUseId;
+        task.onIdleCallbacks?.forEach((cb) => cb());
+        task.unregisterCleanup?.();
+        const completed = {
+          ...task,
+          status: "completed",
+          notified: true,
+          endTime: Date.now(),
+          messages: task.messages?.length ? [task.messages.at(-1)] : undefined,
+          pendingUserMessages: [],
+          abortController: undefined,
+          unregisterCleanup: undefined,
+          onIdleCallbacks: []
+        };
+        logForDebugging(`[probe-R6][completed-updater-apply] agent=${identity.agentId} recordId=${probeReadTaskRecordId(completed)}`);
+        return completed;
+      } catch (error) {
+        logForDebugging(`[probe-R6][completed-updater-throw] agent=${identity.agentId} ${error instanceof Error ? error.stack ?? error.message : String(error)}`);
+        throw error;
       }
-      toolUseId = task.toolUseId;
-      task.onIdleCallbacks?.forEach((cb) => cb());
-      task.unregisterCleanup?.();
-      return {
-        ...task,
-        status: "completed",
-        notified: true,
-        endTime: Date.now(),
-        messages: task.messages?.length ? [task.messages.at(-1)] : undefined,
-        pendingUserMessages: [],
-        abortController: undefined,
-        unregisterCleanup: undefined,
-        onIdleCallbacks: []
-      };
     });
+    logForDebugging(`[probe-R6][completed-out] agent=${identity.agentId}`);
     evictTaskOutput(taskId);
     if (!alreadyTerminal) {
       emitTaskTerminatedSdk(taskId, "completed", {
@@ -72106,14 +72950,18 @@ async function runInProcessTeammate(config) {
         summary: identity.agentId
       });
     }
-    return { success: true, messages: allMessages };
+    return {
+      success: true,
+      messages: allMessages,
+      ...terminationReason ? { terminationReason } : {}
+    };
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : "Unknown error";
     logForDebugging(`[inProcessRunner] Agent ${identity.agentId} failed: ${errorMessage}`);
     let alreadyTerminal = false;
     let toolUseId;
     updateTaskState(taskId, setAppState, (task) => {
-      if (task.status !== "running") {
+      if (!isInProcessTeammateLive(task)) {
         alreadyTerminal = true;
         return task;
       }
@@ -72167,15 +73015,16 @@ var init_inProcessRunner = __esm(() => {
   init_task2();
   init_engine();
   init_permissions3();
-  init_teammateContext2();
+  init_shared();
   init_inProcessTeammateTask();
   init_permissionPoller();
   init_permissionSync();
+  init_teammateTermination();
 });
 
 // src/swarm/index.ts
 var init_swarm = __esm(() => {
-  init_teammateContext2();
+  init_teammateContext();
   init_standaloneAgent();
   init_teammateModel();
   init_permissionPoller();
@@ -72202,6 +73051,7 @@ var init_swarm = __esm(() => {
   init_PaneBackendExecutor();
   init_wireBackends();
   init_inProcessRunner();
+  init_teammateTermination();
   init_shared();
   init_permissionSync();
 });
@@ -72238,6 +73088,18 @@ var init_remote = __esm(() => {
   init_udsInboxEnabled();
 });
 
+// src/engine/session/sessionContextPort.ts
+function setSessionContextPort(port) {
+  _sessionContextPort = port;
+}
+function getSessionContextPort() {
+  return _sessionContextPort;
+}
+function resetSessionContextPort() {
+  _sessionContextPort = null;
+}
+var _sessionContextPort = null;
+
 // src/engine/tools/team/sendMessagePrompt.ts
 function buildPrompt(udsRow, udsSection) {
   return `
@@ -72265,7 +73127,9 @@ If you receive a JSON message with \`type: "shutdown_request"\` or \`type: "plan
 {"to": "researcher", "message": {"type": "plan_approval_response", "request_id": "...", "approve": false, "feedback": "add error handling"}}
 \`\`\`
 
-Approving shutdown terminates your process. Rejecting plan sends the teammate back to revise. Don't originate \`shutdown_request\` unless asked. Don't send structured JSON status messages — use TaskUpdate.`.trim();
+Approving shutdown terminates your process. Rejecting plan sends the teammate back to revise. Don't originate \`shutdown_request\` unless asked. Don't send structured JSON status messages — use TaskUpdate.
+
+Always send protocol responses as JSON **objects** in the \`message\` field, exactly as shown above — never stringify them into a string. (String-encoded JSON of the three protocol types is tolerated as a fallback, but the object form is authoritative.)`.trim();
 }
 function getSendMessagePrompt() {
   const on = isUdsInboxEnabled();
@@ -72291,12 +73155,34 @@ var init_sendMessagePrompt = __esm(() => {
 });
 
 // src/engine/tools/team/sendMessageTool.ts
+function tryParseStructuredMessage(text) {
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return;
+  }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    return;
+  }
+  const type = parsed.type;
+  if (type === "shutdown_request" || type === "shutdown_response" || type === "plan_approval_response") {
+    return parsed;
+  }
+  return;
+}
 function setTeamFileLoader(loader) {
   teamFileLoader = loader;
 }
 function resetTeamFileLoader() {
   teamFileLoader = async () => null;
 }
+function resolveOutgoingTeamName(teamContext) {
+  return getTeamName(teamContext) ?? peekTeamContext()?.teamName;
+}
+function unresolvedTeamMailboxError(recipient) {
+  return new Error(`Cannot route message to "${recipient}": no team mailbox is resolvable ` + "(no teamContext in appState, no in-process teammate context, and no team " + "registered via TeamCreate). Create a team with TeamCreate first; the " + "message was NOT delivered.");
+}
 function truncatePreview(text, maxWidth) {
   if (text.length <= maxWidth)
     return text;
@@ -72304,7 +73190,9 @@ function truncatePreview(text, maxWidth) {
 }
 async function handleMessage(recipientName, content, summary, context) {
   const appState = context.getAppState();
-  const teamName = getTeamName(appState.teamContext);
+  const teamName = resolveOutgoingTeamName(appState.teamContext);
+  if (!teamName)
+    throw unresolvedTeamMailboxError(recipientName);
   const senderName = getAgentName() || (isTeammate() ? "teammate" : TEAM_LEAD_NAME);
   const senderColor = getTeammateColor();
   await writeToMailbox(recipientName, {
@@ -72331,13 +73219,49 @@ async function handleMessage(recipientName, content, summary, context) {
 }
 async function handleBroadcast(content, summary, context) {
   const appState = context.getAppState();
-  const teamName = getTeamName(appState.teamContext);
+  const teamName = resolveOutgoingTeamName(appState.teamContext);
   if (!teamName) {
     throw new Error("Not in a team context. Create a team with Teammate spawnTeam first, or set ATLAS_TEAM_NAME.");
   }
-  const teamFile = await teamFileLoader(teamName);
-  if (!teamFile) {
-    throw new Error(`Team "${teamName}" does not exist`);
+  const memberNames = [];
+  const seenNames = new Set;
+  const pushMember = (raw) => {
+    if (!raw)
+      return;
+    const key = raw.toLowerCase();
+    if (!seenNames.has(key)) {
+      seenNames.add(key);
+      memberNames.push(raw);
+    }
+  };
+  const servicesCtx = peekTeamContext();
+  if (servicesCtx && servicesCtx.teamName === teamName) {
+    for (const [agentId, m] of Object.entries(servicesCtx.teammates ?? {})) {
+      pushMember(m.name || agentId);
+    }
+    for (const r of servicesCtx.roster ?? []) {
+      pushMember(r.name);
+    }
+  } else if (appState.teamContext && appState.teamContext.teamName === teamName) {
+    for (const [agentId, m] of Object.entries(appState.teamContext.teammates ?? {})) {
+      pushMember(m.name || agentId);
+    }
+  }
+  let teamFile = null;
+  if (memberNames.length === 0) {
+    teamFile = await teamFileLoader(teamName);
+    if (!teamFile) {
+      return {
+        data: {
+          success: true,
+          message: "No teammates to broadcast to (team has no members yet)",
+          recipients: []
+        }
+      };
+    }
+    for (const member of teamFile.members) {
+      pushMember(member.name);
+    }
   }
   const senderName = getAgentName() || (isTeammate() ? "teammate" : TEAM_LEAD_NAME);
   if (!senderName) {
@@ -72345,11 +73269,11 @@ async function handleBroadcast(content, summary, context) {
   }
   const senderColor = getTeammateColor();
   const recipients = [];
-  for (const member of teamFile.members) {
-    if (member.name.toLowerCase() === senderName.toLowerCase()) {
+  for (const name of memberNames) {
+    if (name.toLowerCase() === senderName.toLowerCase()) {
       continue;
     }
-    recipients.push(member.name);
+    recipients.push(name);
   }
   if (recipients.length === 0) {
     return {
@@ -72386,7 +73310,9 @@ async function handleBroadcast(content, summary, context) {
 }
 async function handleShutdownRequest(targetName, reason, context) {
   const appState = context.getAppState();
-  const teamName = getTeamName(appState.teamContext);
+  const teamName = resolveOutgoingTeamName(appState.teamContext);
+  if (!teamName)
+    throw unresolvedTeamMailboxError(targetName);
   const senderName = getAgentName() || TEAM_LEAD_NAME;
   const requestId = generateRequestId("shutdown", targetName);
   const shutdownMessage = createShutdownRequestMessage({
@@ -72410,7 +73336,9 @@ async function handleShutdownRequest(targetName, reason, context) {
   };
 }
 async function handleShutdownApproval(requestId, _context) {
-  const teamName = getTeamName();
+  const teamName = resolveOutgoingTeamName();
+  if (!teamName)
+    throw unresolvedTeamMailboxError(TEAM_LEAD_NAME);
   const agentId = getAgentId();
   const agentName = getAgentName() || "teammate";
   logForDebugging(`[SendMessageTool] handleShutdownApproval: teamName=${teamName}, agentId=${agentId}, agentName=${agentName}`);
@@ -72424,16 +73352,32 @@ async function handleShutdownApproval(requestId, _context) {
     timestamp: new Date().toISOString(),
     color: getTeammateColor()
   }, teamName);
+  let exitTriggered = false;
+  try {
+    const port = getSessionContextPort();
+    const memberTask = port ? findInProcessTeammateTaskByAgentId(port.get().tasks, agentId ?? "") : undefined;
+    if (port) {
+      const tasksAll = port.get().tasks ?? {};
+      const sameAgentEntries = Object.entries(tasksAll).filter(([, t]) => t?.identity?.agentId === agentId);
+      logForDebugging(`[probe-R1][trigger] agent=${agentId} taskEntries=${Object.keys(tasksAll).length} sameAgentId=${sameAgentEntries.map(([k, t]) => `${k}:${t.status ?? "unknown"}`).join("|") || "none"} firstHit=${memberTask ? "yes" : "no"} controller=${probeReadAbortControllerId(memberTask?.abortController)} live=${isInProcessTeammateLive(memberTask)} recordId=${probeReadTaskRecordId(memberTask)}`);
+    }
+    if (isInProcessTeammateLive(memberTask) && memberTask.abortController) {
+      memberTask.abortController.abort();
+      exitTriggered = true;
+    }
+  } catch {}
   return {
     data: {
       success: true,
-      message: `Shutdown approved. Sent confirmation to team-lead. Agent ${agentName} is now exiting.`,
+      message: exitTriggered ? `Shutdown approved. Confirmation sent to team-lead; exit sequence triggered for agent ${agentName}.` : `Shutdown approved. Confirmation sent to team-lead; agent ${agentName} will exit on its next lifecycle check.`,
       request_id: requestId
     }
   };
 }
 async function handleShutdownRejection(requestId, reason) {
-  const teamName = getTeamName();
+  const teamName = resolveOutgoingTeamName();
+  if (!teamName)
+    throw unresolvedTeamMailboxError(TEAM_LEAD_NAME);
   const agentName = getAgentName() || "teammate";
   const rejectedMessage = createShutdownRejectedMessage({
     requestId,
@@ -72456,7 +73400,9 @@ async function handleShutdownRejection(requestId, reason) {
 }
 async function handlePlanApproval(recipientName, requestId, context) {
   const appState = context.getAppState();
-  const teamName = appState.teamContext?.teamName;
+  const teamName = resolveOutgoingTeamName(appState.teamContext);
+  if (!teamName)
+    throw unresolvedTeamMailboxError(recipientName);
   if (!isTeamLead(appState.teamContext)) {
     throw new Error("Only the team lead can approve plans. Teammates cannot approve their own or other plans.");
   }
@@ -72484,7 +73430,9 @@ async function handlePlanApproval(recipientName, requestId, context) {
 }
 async function handlePlanRejection(recipientName, requestId, feedback, context) {
   const appState = context.getAppState();
-  const teamName = appState.teamContext?.teamName;
+  const teamName = resolveOutgoingTeamName(appState.teamContext);
+  if (!teamName)
+    throw unresolvedTeamMailboxError(recipientName);
   if (!isTeamLead(appState.teamContext)) {
     throw new Error("Only the team lead can reject plans. Teammates cannot reject their own or other plans.");
   }
@@ -72508,12 +73456,29 @@ async function handlePlanRejection(recipientName, requestId, feedback, context)
     }
   };
 }
+async function dispatchStructuredMessage(message, to, ctx) {
+  switch (message.type) {
+    case "shutdown_request":
+      return handleShutdownRequest(to, message.reason, ctx);
+    case "shutdown_response":
+      if (message.approve) {
+        return handleShutdownApproval(message.request_id, ctx);
+      }
+      return handleShutdownRejection(message.request_id, message.reason);
+    case "plan_approval_response":
+      if (message.approve) {
+        return handlePlanApproval(to, message.request_id, ctx);
+      }
+      return handlePlanRejection(to, message.request_id, message.feedback ?? "Plan needs revision", ctx);
+  }
+}
 var SEND_MESSAGE_TOOL_INPUT_SCHEMA, teamFileLoader = async () => null, SendMessageTool;
 var init_sendMessageTool = __esm(() => {
   init_shared();
   init_remote();
   init_messaging();
   init_json();
+  init_task2();
   init_toolNames();
   init_sendMessagePrompt();
   SEND_MESSAGE_TOOL_INPUT_SCHEMA = {
@@ -72611,6 +73576,8 @@ var init_sendMessageTool = __esm(() => {
     },
     async validateInput(input, _context) {
       const i = input;
+      const sniffedMessage = typeof i.message === "string" ? tryParseStructuredMessage(i.message) : undefined;
+      const message = sniffedMessage ?? i.message;
       if (i.to.trim().length === 0) {
         return {
           result: false,
@@ -72634,7 +73601,7 @@ var init_sendMessageTool = __esm(() => {
         };
       }
       if (isUdsInboxEnabled() && parseAddress(i.to).scheme === "bridge") {
-        if (typeof i.message !== "string") {
+        if (typeof message !== "string") {
           return {
             result: false,
             message: "structured messages cannot be sent cross-session — only plain text",
@@ -72650,10 +73617,10 @@ var init_sendMessageTool = __esm(() => {
         }
         return { result: true };
       }
-      if (isUdsInboxEnabled() && parseAddress(i.to).scheme === "uds" && typeof i.message === "string") {
+      if (isUdsInboxEnabled() && parseAddress(i.to).scheme === "uds" && typeof message === "string") {
         return { result: true };
       }
-      if (typeof i.message === "string") {
+      if (typeof message === "string") {
         if (!i.summary || i.summary.trim().length === 0) {
           return {
             result: false,
@@ -72677,14 +73644,14 @@ var init_sendMessageTool = __esm(() => {
           errorCode: 9
         };
       }
-      if (i.message.type === "shutdown_response" && i.to !== TEAM_LEAD_NAME) {
+      if (message.type === "shutdown_response" && i.to !== TEAM_LEAD_NAME) {
         return {
           result: false,
           message: `shutdown_response must be sent to "${TEAM_LEAD_NAME}"`,
           errorCode: 9
         };
       }
-      if (i.message.type === "shutdown_response" && !i.message.approve && (!i.message.reason || i.message.reason.trim().length === 0)) {
+      if (message.type === "shutdown_response" && !message.approve && (!message.reason || message.reason.trim().length === 0)) {
         return {
           result: false,
           message: "reason is required when rejecting a shutdown request",
@@ -72751,6 +73718,13 @@ var init_sendMessageTool = __esm(() => {
           }
         }
       }
+      const sniffed = typeof input.message === "string" ? tryParseStructuredMessage(input.message) : undefined;
+      if (sniffed !== undefined) {
+        if (input.to === "*") {
+          throw new Error("structured messages cannot be broadcast");
+        }
+        return dispatchStructuredMessage(sniffed, input.to, ctx);
+      }
       if (typeof input.message === "string") {
         if (input.to === "*") {
           return handleBroadcast(input.message, input.summary, ctx);
@@ -72760,20 +73734,7 @@ var init_sendMessageTool = __esm(() => {
       if (input.to === "*") {
         throw new Error("structured messages cannot be broadcast");
       }
-      switch (input.message.type) {
-        case "shutdown_request":
-          return handleShutdownRequest(input.to, input.message.reason, ctx);
-        case "shutdown_response":
-          if (input.message.approve) {
-            return handleShutdownApproval(input.message.request_id, ctx);
-          }
-          return handleShutdownRejection(input.message.request_id, input.message.reason);
-        case "plan_approval_response":
-          if (input.message.approve) {
-            return handlePlanApproval(input.to, input.message.request_id, ctx);
-          }
-          return handlePlanRejection(input.to, input.message.request_id, input.message.feedback ?? "Plan needs revision", ctx);
-      }
+      return dispatchStructuredMessage(input.message, input.to, ctx);
     },
     renderToolUseMessage(input) {
       const { message, to } = input ?? {};
@@ -73365,29 +74326,6 @@ var init_tasks2 = __esm(() => {
   init_tasks();
 });
 
-// src/engine/tools/team/teamServices.ts
-function setTeamServices(services) {
-  active = services;
-}
-function resetTeamServices() {
-  active = undefined;
-}
-function requireTeamServices() {
-  if (!active) {
-    throw new Error("TeamServices not wired — call setTeamServices at composition root first (swarm team-file seam, C 桶 ③ S-E2d)");
-  }
-  return active;
-}
-function createDefaultTeamContextStore() {
-  return {
-    getTeamContext: () => teamContext,
-    setTeamContext: (ctx) => {
-      teamContext = ctx;
-    }
-  };
-}
-var active, teamContext;
-
 // src/engine/tools/team/teamCreatePrompt.ts
 var PROMPT4;
 var init_teamCreatePrompt = __esm(() => {
@@ -73423,7 +74361,7 @@ Create a new team to coordinate multiple agents working on a project. Teams have
 \`\`\`
 
 This creates:
-- A team file at \`~/.atlas/teams/{team-name}/config.json\`
+- An in-memory team context on the leader (Form A is zero-persistence — no team file is written to \`~/.atlas/teams/\`; the member roster lives in the leader's team context)
 - A corresponding task list directory at \`~/.atlas/tasks/{team-name}/\`
 
 ## Team Workflow
@@ -73465,23 +74403,14 @@ Teammates go idle after every turn—this is completely normal and expected. A t
 
 ## Discovering Team Members
 
-Teammates can read the team config file to discover other team members:
-- **Team config location**: \`~/.atlas/teams/{team-name}/config.json\`
-
-The config file contains a \`members\` array with each teammate's:
+Form A teams are zero-persistence: no team config file is written to disk. Team members come from the \`members\` roster passed to TeamCreate (carried in the leader's team context). Each roster entry has:
 - \`name\`: Human-readable name (**always use this** for messaging and task assignment)
-- \`agentId\`: Unique identifier (for reference only - do not use for communication)
-- \`agentType\`: Role/type of the agent
+- \`role\`/\`goal\`/\`backstory\`: Role triplet used to compose the member's prompt when spawned via Agent(name, team_name)
 
 **IMPORTANT**: Always refer to teammates by their NAME (e.g., "team-lead", "researcher", "tester"). Names are used for:
 - \`to\` when sending messages
 - Identifying task owners
 
-Example of reading team config:
-\`\`\`
-Use the Read tool to read ~/.atlas/teams/{team-name}/config.json
-\`\`\`
-
 ## Task List Coordination
 
 Teams share a task list that all teammates can access at \`~/.atlas/tasks/{team-name}/\`.
@@ -73515,7 +74444,6 @@ function generateUniqueTeamName(providedName) {
 var TEAM_CREATE_TOOL_INPUT_SCHEMA, TeamCreateTool;
 var init_teamCreateTool = __esm(() => {
   init_bootstrap();
-  init_modelprovider2();
   init_tasks2();
   init_messaging();
   init_json();
@@ -73536,6 +74464,33 @@ var init_teamCreateTool = __esm(() => {
       agent_type: {
         type: "string",
         description: 'Type/role of the team lead (e.g., "researcher", "test-runner"). ' + "Used for team file and inter-agent coordination."
+      },
+      members: {
+        type: "array",
+        description: "Optional roster of team members to plan for this team. Each entry " + "carries an optional role/goal/backstory triplet used to compose the " + "member's prompt when spawned via Agent(name, team_name).",
+        items: {
+          type: "object",
+          properties: {
+            name: {
+              type: "string",
+              description: "Member name (used as the spawn identity)."
+            },
+            role: {
+              type: "string",
+              description: "Role label resolved against the role template registry."
+            },
+            goal: {
+              type: "string",
+              description: "This member's goal for the team's current task."
+            },
+            backstory: {
+              type: "string",
+              description: "This member's background/context for prompt composition."
+            }
+          },
+          required: ["name"],
+          additionalProperties: false
+        }
       }
     },
     required: ["team_name"],
@@ -73569,6 +74524,17 @@ var init_teamCreateTool = __esm(() => {
           errorCode: 9
         };
       }
+      if (i.members) {
+        for (const m of i.members) {
+          if (!m || typeof m !== "object" || !m.name || m.name.trim().length === 0) {
+            return {
+              result: false,
+              message: "each team member requires a non-empty name",
+              errorCode: 9
+            };
+          }
+        }
+      }
       return { result: true };
     },
     async description() {
@@ -73596,29 +74562,8 @@ var init_teamCreateTool = __esm(() => {
       const finalTeamName = generateUniqueTeamName(input.team_name);
       const leadAgentId = formatAgentId(TEAM_LEAD_NAME, finalTeamName);
       const leadAgentType = input.agent_type || TEAM_LEAD_NAME;
-      const leadModel = getRoleModel("premium");
       const teamFilePath = services.getTeamFilePath(finalTeamName);
-      const teamFile = {
-        name: finalTeamName,
-        description: input.description,
-        createdAt: Date.now(),
-        leadAgentId,
-        leadSessionId: getSessionId(),
-        members: [
-          {
-            agentId: leadAgentId,
-            name: TEAM_LEAD_NAME,
-            agentType: leadAgentType,
-            model: leadModel,
-            joinedAt: Date.now(),
-            tmuxPaneId: "",
-            cwd: getCwd(),
-            subscriptions: []
-          }
-        ]
-      };
-      await services.writeTeamFileAsync(finalTeamName, teamFile);
-      services.registerTeamForSessionCleanup(finalTeamName);
+      const roster = input.members && input.members.length > 0 ? input.members : undefined;
       const taskListId = services.sanitizeName(finalTeamName);
       await resetTaskList(taskListId);
       await ensureTasksDir(taskListId);
@@ -73627,6 +74572,7 @@ var init_teamCreateTool = __esm(() => {
         teamName: finalTeamName,
         teamFilePath,
         leadAgentId,
+        roster,
         teammates: {
           [leadAgentId]: {
             name: TEAM_LEAD_NAME,
@@ -73679,6 +74625,7 @@ var init_teamDeleteTool = __esm(() => {
   init_tasks2();
   init_messaging();
   init_json();
+  init_task2();
   init_toolNames();
   init_teamDeletePrompt();
   TEAM_DELETE_TOOL_INPUT_SCHEMA = {
@@ -73720,7 +74667,8 @@ var init_teamDeleteTool = __esm(() => {
     },
     async call(_args, _context) {
       const services = requireTeamServices();
-      const teamName = services.getTeamContext()?.teamName;
+      const teamContext = services.getTeamContext();
+      const teamName = teamContext?.teamName;
       if (teamName) {
         const teamFile = services.readTeamFile(teamName);
         if (teamFile) {
@@ -73731,7 +74679,22 @@ var init_teamDeleteTool = __esm(() => {
             return {
               data: {
                 success: false,
-                message: `Cannot cleanup team with ${activeMembers.length} active member(s): ${memberNames}. Use requestShutdown to gracefully terminate teammates first.`,
+                message: `Cannot cleanup team with ${activeMembers.length} active member(s): ${memberNames}. Send each active member a shutdown request via SendMessage first (message: {"type":"shutdown_request","request_id":"<id>","reason":"<why>"}), and wait for their shutdown approval and exit before retrying TeamDelete.`,
+                team_name: teamName
+              }
+            };
+          }
+        }
+        const teammateEntries = Object.entries(teamContext?.teammates ?? {}).filter(([, member]) => member.name !== TEAM_LEAD_NAME);
+        if (teammateEntries.length > 0) {
+          const tasks = getSessionContextPort()?.get().tasks;
+          const alive = teammateEntries.filter(([, member]) => isInProcessTeammateActiveOrUnknown(tasks?.[member.taskId ?? ""]));
+          if (alive.length > 0) {
+            const memberNames = alive.map(([, member]) => member.name).join(", ");
+            return {
+              data: {
+                success: false,
+                message: `Cannot cleanup team with ${alive.length} active member(s): ${memberNames}. Send each active member a shutdown request via SendMessage first (message: {"type":"shutdown_request","request_id":"<id>","reason":"<why>"}), and wait for their shutdown approval and exit before retrying TeamDelete.`,
                 team_name: teamName
               }
             };
@@ -73757,6 +74720,171 @@ var init_teamDeleteTool = __esm(() => {
   };
 });
 
+// src/engine/tools/team/waitForTeammatesPrompt.ts
+var PROMPT6 = `Wait for all currently working in-process teammates to become idle, then return.
+
+Use this tool instead of repeatedly polling with other tools when you are waiting for teammates to finish their work, to acknowledge a shutdown request, or to exit after you sent them instructions. One call replaces many polling rounds.
+
+The call blocks (event-driven, no busy-waiting) until every working teammate is idle, or until the timeout expires:
+
+- On success it returns { status: 'idle', waited_ms, idle }.
+- On timeout it returns { status: 'timeout', waited_ms, still_working } listing the teammates that are still working — it never blocks forever. You may call again with a longer timeout, or proceed without those teammates.
+
+This tool never aborts or kills teammates; it only waits. Graceful termination is driven by shutdown requests via SendMessage, and cleanup remains TeamDelete's responsibility. When no teammates are working, it returns immediately with status 'idle'.
+
+Parameters:
+- timeout: Maximum time to wait in milliseconds (default 120000, maximum 600000).
+`;
+
+// src/engine/tools/team/waitForTeammatesTool.ts
+function sessionStateUnavailableError() {
+  return new Error("No session state is available in the current context " + "(SessionContextPort is not injected). WaitForTeammates requires the " + "engine composition root (in-process teammates live in the session " + "task registry). Create a team with TeamCreate and spawn teammates first.");
+}
+function listWorkingTeammateNames(appState) {
+  const names = [];
+  for (const task of Object.values(appState.tasks)) {
+    if (isInProcessTeammateWorking(task)) {
+      names.push(task.identity.agentName);
+    }
+  }
+  return names;
+}
+var WAIT_FOR_TEAMMATES_TOOL_INPUT_SCHEMA, WAIT_FOR_TEAMMATES_DEFAULT_TIMEOUT_MS = 120000, WAIT_FOR_TEAMMATES_MAX_TIMEOUT_MS = 600000, WaitForTeammatesTool;
+var init_waitForTeammatesTool = __esm(() => {
+  init_messaging();
+  init_task2();
+  init_json();
+  init_toolNames();
+  WAIT_FOR_TEAMMATES_TOOL_INPUT_SCHEMA = {
+    type: "object",
+    properties: {
+      timeout: {
+        type: "number",
+        minimum: 0,
+        maximum: 600000,
+        default: 120000,
+        description: "Max time to wait in milliseconds (default 120000)"
+      }
+    },
+    additionalProperties: false
+  };
+  WaitForTeammatesTool = {
+    name: WAIT_FOR_TEAMMATES_TOOL_NAME,
+    inputSchema: WAIT_FOR_TEAMMATES_TOOL_INPUT_SCHEMA,
+    inputJSONSchema: WAIT_FOR_TEAMMATES_TOOL_INPUT_SCHEMA,
+    strict: true,
+    searchHint: "wait for teammates to finish or acknowledge",
+    maxResultSizeChars: 1e5,
+    shouldDefer: true,
+    isEnabled: () => isAgentSwarmsEnabled(),
+    isReadOnly: () => true,
+    isDestructive: () => false,
+    isConcurrencySafe: () => true,
+    userFacingName: () => "Wait For Teammates",
+    toAutoClassifierInput: () => "",
+    async checkPermissions(input) {
+      return { behavior: "allow", updatedInput: input };
+    },
+    async description() {
+      return PROMPT6;
+    },
+    mapToolResultToToolResultBlockParam(data, toolUseID) {
+      return {
+        tool_use_id: toolUseID,
+        type: "tool_result",
+        content: [
+          {
+            type: "text",
+            text: jsonStringify(data)
+          }
+        ]
+      };
+    },
+    renderToolUseMessage(input) {
+      const { timeout } = input ?? {};
+      if (timeout !== undefined) {
+        return `waiting for teammates (up to ${timeout}ms)`;
+      }
+      return "waiting for teammates";
+    },
+    async call(args) {
+      const { timeout = WAIT_FOR_TEAMMATES_DEFAULT_TIMEOUT_MS } = args;
+      const effectiveTimeout = Math.min(Math.max(0, timeout), WAIT_FOR_TEAMMATES_MAX_TIMEOUT_MS);
+      const port = getSessionContextPort();
+      if (!port) {
+        throw sessionStateUnavailableError();
+      }
+      const snapshot = port.get();
+      const appState = {
+        tasks: snapshot.tasks ?? {}
+      };
+      const startedAt = Date.now();
+      const workingNames = listWorkingTeammateNames(appState);
+      if (workingNames.length === 0) {
+        return {
+          data: { status: "idle", waited_ms: 0, idle: [], still_working: [] }
+        };
+      }
+      const setAppState = (updater) => {
+        port.set((prev) => {
+          const next = updater({
+            tasks: prev.tasks ?? {}
+          });
+          return {
+            ...prev,
+            tasks: next.tasks
+          };
+        });
+      };
+      let timer;
+      try {
+        const outcome = await Promise.race([
+          waitForTeammatesToBecomeIdle(setAppState, appState).then(() => "idle"),
+          new Promise((resolve) => {
+            timer = setTimeout(() => resolve("timeout"), effectiveTimeout);
+          })
+        ]);
+        const waitedMs = Date.now() - startedAt;
+        const nowWorking = listWorkingTeammateNames({
+          tasks: port.get().tasks ?? {}
+        });
+        const idleNames = workingNames.filter((name) => !nowWorking.includes(name));
+        if (outcome === "timeout" && nowWorking.length === 0) {
+          return {
+            data: {
+              status: "idle",
+              waited_ms: waitedMs,
+              idle: idleNames,
+              still_working: []
+            }
+          };
+        }
+        if (outcome === "idle") {
+          return {
+            data: {
+              status: "idle",
+              waited_ms: waitedMs,
+              idle: idleNames,
+              still_working: []
+            }
+          };
+        }
+        return {
+          data: {
+            status: "timeout",
+            waited_ms: waitedMs,
+            idle: idleNames,
+            still_working: nowWorking
+          }
+        };
+      } finally {
+        if (timer)
+          clearTimeout(timer);
+      }
+    }
+  };
+});
+
 // src/engine/tools/team/index.ts
 var init_team = __esm(() => {
   init_sendMessageTool();
@@ -73767,6 +74895,7 @@ var init_team = __esm(() => {
   init_teamCreatePrompt();
   init_teamDeleteTool();
   init_teamDeletePrompt();
+  init_waitForTeammatesTool();
 });
 
 // src/engine/scheduler/cron.ts
@@ -75009,7 +76138,7 @@ var init_taskCreateTool = __esm(() => {
 });
 
 // src/engine/tools/tasks/taskGetPrompt.ts
-var PROMPT6 = `Use this tool to retrieve a task by its ID from the task list.
+var PROMPT7 = `Use this tool to retrieve a task by its ID from the task list.
 
 ## When to Use This Tool
 
@@ -75064,7 +76193,7 @@ var init_taskGetTool = __esm(() => {
       behavior: "allow",
       updatedInput: input
     }),
-    description: async () => PROMPT6,
+    description: async () => PROMPT7,
     async call(args) {
       const { taskId } = args;
       const taskListId = getTaskListId();
@@ -75231,7 +76360,7 @@ var init_taskListTool = __esm(() => {
 });
 
 // src/engine/tools/tasks/taskUpdatePrompt.ts
-var PROMPT7 = `Use this tool to update a task in the task list.
+var PROMPT8 = `Use this tool to update a task in the task list.
 
 ## When to Use This Tool
 
@@ -75385,7 +76514,7 @@ var init_taskUpdateTool = __esm(() => {
       behavior: "allow",
       updatedInput: input
     }),
-    description: async () => PROMPT7,
+    description: async () => PROMPT8,
     async call(args, context) {
       const {
         taskId,
@@ -75556,7 +76685,7 @@ Task completed. Call TaskList now to find your next available task or see if you
 });
 
 // src/engine/tools/tasks/taskStopPrompt.ts
-var DESCRIPTION10 = `
+var DESCRIPTION11 = `
 - Stops a running background task by its ID
 - Takes a task_id parameter identifying the task to stop
 - Returns a success or failure status
@@ -75602,7 +76731,7 @@ var init_taskStopTool = __esm(() => {
       behavior: "allow",
       updatedInput: input
     }),
-    description: async () => DESCRIPTION10,
+    description: async () => DESCRIPTION11,
     async validateInput(input, context) {
       const { task_id, shell_id } = input;
       const ctx = context;
@@ -75665,10 +76794,10 @@ var init_taskStopTool = __esm(() => {
 });
 
 // src/engine/tools/tasks/todoWritePrompt.ts
-var PROMPT8;
+var PROMPT9;
 var init_todoWritePrompt = __esm(() => {
   init_toolNames();
-  PROMPT8 = `Use this tool to create and manage a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
+  PROMPT9 = `Use this tool to create and manage a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
 It also helps the user understand the progress of the task and overall progress of their requests.
 
 ## When to Use This Tool
@@ -75906,7 +77035,7 @@ var init_todoWriteTool = __esm(() => {
       behavior: "allow",
       updatedInput: input
     }),
-    description: async () => PROMPT8,
+    description: async () => PROMPT9,
     async call(args, context) {
       const { todos } = args;
       const ctx = context;
@@ -75941,7 +77070,7 @@ var init_todoWriteTool = __esm(() => {
 });
 
 // src/engine/tools/tasks/taskOutputPrompt.ts
-var PROMPT9 = `DEPRECATED: Prefer using the Read tool on the task's output file path instead. Background tasks return their output file path in the tool result, and you receive a <task-notification> with the same path when the task completes — Read that file directly.
+var PROMPT10 = `DEPRECATED: Prefer using the Read tool on the task's output file path instead. Background tasks return their output file path in the tool result, and you receive a <task-notification> with the same path when the task completes — Read that file directly.
 
 - Retrieves output from a running or completed task (background shell, agent, or remote session)
 - Takes a task_id parameter identifying the task
@@ -76068,7 +77197,7 @@ var init_taskOutputTool = __esm(() => {
       behavior: "allow",
       updatedInput: input
     }),
-    description: async () => PROMPT9,
+    description: async () => PROMPT10,
     async validateInput(input, context) {
       const { task_id } = input;
       const ctx = context;
@@ -76080,6 +77209,13 @@ var init_taskOutputTool = __esm(() => {
         };
       }
       const appState = ctx.getAppState();
+      if (!appState?.tasks) {
+        return {
+          result: false,
+          message: `No task registry is available in the current context ` + `(task_id: ${task_id}). For in-process teammates, communicate via ` + "SendMessage (the mailbox is the coordination channel) instead of " + "polling TaskOutput.",
+          errorCode: 2
+        };
+      }
       const task = appState.tasks[task_id];
       if (!task) {
         return {
@@ -76094,6 +77230,9 @@ var init_taskOutputTool = __esm(() => {
       const { task_id, block = true, timeout = 30000 } = args;
       const ctx = context;
       const appState = ctx.getAppState();
+      if (!appState?.tasks) {
+        throw new Error(`No task registry is available in the current context ` + `(task_id: ${task_id}). For in-process teammates, communicate via ` + "SendMessage (the mailbox is the coordination channel) instead of " + "polling TaskOutput.");
+      }
       const task = appState.tasks[task_id];
       if (!task) {
         throw new Error(`No task found with ID: ${task_id}`);
@@ -82643,18 +83782,6 @@ var init_restore = __esm(() => {
   init_goalState();
 });
 
-// src/engine/session/sessionContextPort.ts
-function setSessionContextPort(port) {
-  _sessionContextPort = port;
-}
-function getSessionContextPort() {
-  return _sessionContextPort;
-}
-function resetSessionContextPort() {
-  _sessionContextPort = null;
-}
-var _sessionContextPort = null;
-
 // src/engine/session/index.ts
 var init_session = __esm(() => {
   init_env();
@@ -84565,6 +85692,7 @@ async function queryAgentLoop(deps, args) {
         assistantMessage: lastRound.messages[roundInputLen],
         toolResultMessages: lastRound.messages.slice(roundInputLen + 1)
       });
+      await deps.afterRound?.();
       break;
     }
     if (lastRound.deferred) {
@@ -84870,6 +85998,7 @@ async function createAgentLoopDeps(config = {}) {
       SnipTool,
       TeamCreateTool,
       TeamDeleteTool,
+      WaitForTeammatesTool,
       ProposeGoalTool
     ],
     mcpTools: [...config.toolRegistryDeps?.mcpTools ?? [], ...mcpTools],
@@ -84916,6 +86045,8 @@ async function createAgentLoopDeps(config = {}) {
               messages: [...compactMsgs, prompt],
               role,
               sessionModel,
+              systemPrompt: config.systemPrompt,
+              tools: tools.length > 0 ? tools : undefined,
               signal: config.signal
             });
             const content = resp.message?.content;
@@ -84964,6 +86095,7 @@ var init_loopDeps = __esm(() => {
   init_snipTool();
   init_teamCreateTool();
   init_teamDeleteTool();
+  init_waitForTeammatesTool();
   init_ProposeGoal();
   init_context();
 });
@@ -84979,6 +86111,7 @@ class EngineState {
   set(f) {
     return new Promise((resolve, reject) => {
       this.queue.push({ f, resolve, reject });
+      logForDebugging(`[probe-R6][es-enqueue] q=${this.queue.length} processing=${this.processing}`);
       this.process();
     });
   }
@@ -84989,6 +86122,7 @@ class EngineState {
     try {
       while (this.queue.length > 0) {
         const item = this.queue.shift();
+        logForDebugging(`[probe-R6][es-apply] q=${this.queue.length}`);
         await Promise.resolve();
         try {
           this.state = item.f(this.state);
@@ -85005,9 +86139,14 @@ class EngineState {
     return this.state;
   }
 }
+var init_EngineState = __esm(() => {
+  init_shared();
+});
 
 // src/engine/state/index.ts
-var init_state2 = () => {};
+var init_state2 = __esm(() => {
+  init_EngineState();
+});
 
 // src/engine/hooks/index.ts
 var init_hooks2 = __esm(() => {
@@ -87614,6 +88753,8 @@ function initDebugSink() {
   if (initialized)
     return;
   initialized = true;
+  sharedDebugSinkRegistered = true;
+  setDebugSink(sharedLogForDebugging);
   toStderr = argvHas("--debug-to-stderr") || argvHas("-d2e");
   const file = argvValue("--debug-file");
   if (file)
@@ -87656,7 +88797,9 @@ function logForDebugging2(message, { level } = {}) {
 function flushDebugSink() {
   return pendingWrite;
 }
-var LEVEL_ORDER, initialized = false, enabled = false, toStderr = false, sinkFile = null, minLevel = "debug", filter = null, pendingWrite;
+var LEVEL_ORDER, initialized = false, enabled = false, toStderr = false, sinkFile = null, minLevel = "debug", filter = null, pendingWrite, sharedDebugSinkRegistered = false, sharedLogForDebugging = (message, options) => {
+  logForDebugging2(message, options);
+};
 var init_debugSink = __esm(() => {
   init_bootstrap();
   init_shared();
@@ -88745,7 +89888,7 @@ function handleControlRequestLocal(request, structuredIO, sessionId) {
       logForDebugging2(`[headless] unknown control_request subtype: ${String(request.request.subtype)}`);
   }
 }
-function extractFinalAssistantText(loopResult) {
+function extractFinalAssistantText2(loopResult) {
   const contentOf = (m) => {
     const msg = m.message;
     return m.content !== undefined ? m.content : msg?.content;
@@ -89052,6 +90195,8 @@ async function runHeadless(inputPrompt, options) {
       const resp = await modelProvider.chat({
         messages: [...msgs, prompt],
         role: "small",
+        systemPrompt: bundle.deps.systemPrompt,
+        tools,
         signal: abortController.signal
       });
       return resp.message.content.filter((block) => block.type === "text" && typeof block.text === "string").map((block) => block.text).join("");
@@ -89062,6 +90207,7 @@ async function runHeadless(inputPrompt, options) {
   const loopDeps = {
     ...bundle.deps,
     signal: abortController.signal,
+    afterRound: () => drainToOutput(),
     checkPermission,
     toolContext: makeCtx()
   };
@@ -89082,7 +90228,10 @@ async function runHeadless(inputPrompt, options) {
     return queryAgentLoop(loopDeps, {
       messages: turnMessages,
       tools,
-      context: { autoCompact, maxTurns: options.maxTurns }
+      context: {
+        autoCompact,
+        maxTurns: options.maxTurns ?? DEFAULT_AGENT_LOOP_MAX_TURNS
+      }
     }).then((r) => {
       logForDebugging2(turnEndLine(n, r));
       return r;
@@ -89096,7 +90245,7 @@ async function runHeadless(inputPrompt, options) {
     }
   };
   const buildResultMessage = (loopResult, isError) => {
-    const resultText = extractFinalAssistantText(loopResult);
+    const resultText = extractFinalAssistantText2(loopResult);
     return {
       type: "result",
       subtype: loopResult.terminated ? "success" : "error_max_turns",
@@ -89194,6 +90343,7 @@ async function runHeadless(inputPrompt, options) {
     dir: getSchedulerEnv().getProjectRoot()
   });
   cronScheduler.start();
+  let teammateDrainRequested = 0;
   try {
     const deferredState = findDeferredToolUseState(conversation);
     let reSuspended = false;
@@ -89275,7 +90425,7 @@ async function runHeadless(inputPrompt, options) {
                 process.stdout.write(`Execution error`);
                 break;
               case "error_max_turns":
-                process.stdout.write(`Error: Reached max turns (${String(options.maxTurns)})`);
+                process.stdout.write(`Error: Reached max turns (${String(options.maxTurns ?? DEFAULT_AGENT_LOOP_MAX_TURNS)})`);
                 break;
               default:
                 break;
@@ -89306,6 +90456,19 @@ async function runHeadless(inputPrompt, options) {
     cronScheduler.stop();
     await drainToOutput();
     await drainPendingBackgroundAgents(abortController.signal);
+    {
+      const sessionPort = getSessionContextPort();
+      if (sessionPort) {
+        const drain = await gracefulShutdownInProcessTeammates({
+          getAppState: () => sessionPort.get(),
+          setAppState: (f) => sessionPort.set(f)
+        });
+        teammateDrainRequested = drain.requested;
+        if (drain.requested > 0) {
+          logForDebugging2(`[headless] teammate shutdown ladder: requested=${drain.requested} drained=${drain.drained} forced=${drain.forced} hardTerminated=${drain.hardTerminated}`);
+        }
+      }
+    }
     await runHeadlessSessionEndHooks("prompt_input_exit");
   } catch (error) {
     cronScheduler.stop();
@@ -89325,10 +90488,32 @@ async function runHeadless(inputPrompt, options) {
       });
     } catch {}
     abortController.abort();
+    {
+      const sessionPort = getSessionContextPort();
+      if (sessionPort) {
+        try {
+          const drain = await gracefulShutdownInProcessTeammates({
+            getAppState: () => sessionPort.get(),
+            setAppState: (f) => sessionPort.set(f)
+          });
+          teammateDrainRequested = drain.requested;
+          if (drain.requested > 0) {
+            logForDebugging2(`[headless] teammate shutdown ladder (error path): requested=${drain.requested} drained=${drain.drained} forced=${drain.forced} hardTerminated=${drain.hardTerminated}`);
+          }
+        } catch {}
+      }
+    }
     await runHeadlessSessionEndHooks("other");
     process.exitCode = 1;
   }
+  if (teammateDrainRequested > 0) {
+    logForDebugging2(`[headless] teammate lifecycle exit guard: forcing process exit after drain (requested=${teammateDrainRequested})`);
+  }
   await flushDebugSink();
+  if (teammateDrainRequested > 0) {
+    await new Promise((resolve) => setTimeout(resolve, 2000));
+    process.exit(process.exitCode ?? 0);
+  }
 }
 async function loadResumedMessages(options) {
   await Promise.resolve().then(() => init_engine());
@@ -89368,6 +90553,7 @@ async function loadResumedMessages(options) {
 }
 var init_print = __esm(() => {
   init_engine();
+  init_swarm();
   init_mcp3();
   init_modelprovider2();
   init_structuredIO();
@@ -124809,7 +125995,7 @@ var init_teamMemPaths = __esm(() => {
 });
 
 // src/tui/utils/config.ts
-import { randomBytes as randomBytes5 } from "crypto";
+import { randomBytes as randomBytes6 } from "crypto";
 import { unwatchFile as unwatchFile2, watchFile as watchFile2 } from "fs";
 import { basename as basename10, dirname as dirname29, join as join57, resolve as resolve23 } from "path";
 function createDefaultGlobalConfig() {
@@ -125399,7 +126585,7 @@ function getOrCreateUserID() {
   if (config.userID) {
     return config.userID;
   }
-  const userID = randomBytes5(32).toString("hex");
+  const userID = randomBytes6(32).toString("hex");
   saveGlobalConfig((current) => ({ ...current, userID }));
   return userID;
 }
@@ -126523,7 +127709,7 @@ var init_constants6 = __esm(() => {
 var TASK_OUTPUT_TOOL_NAME2 = "TaskOutput";
 
 // src/tui/tools/TaskStopTool/prompt.ts
-var TASK_STOP_TOOL_NAME2 = "TaskStop", DESCRIPTION17 = `
+var TASK_STOP_TOOL_NAME2 = "TaskStop", DESCRIPTION18 = `
 - Stops a running background task by its ID
 - Takes a task_id parameter identifying the task to stop
 - Returns a success or failure status
@@ -135324,7 +136510,7 @@ ${lineFormat}
 - You will regularly be asked to read screenshots. If the user provides a path to a screenshot, ALWAYS use this tool to view the file at the path. This tool will work with all temporary file paths.
 - If you read a file that exists but has empty contents you will receive a system reminder warning in place of file contents.`;
 }
-var FILE_READ_TOOL_NAME2 = "Read", FILE_UNCHANGED_STUB2 = "File unchanged since last read. The content from the earlier Read tool_result in this conversation is still current — refer to that instead of re-reading.", MAX_LINES_TO_READ2 = 2000, DESCRIPTION18 = "Read a file from the local filesystem.", LINE_FORMAT_INSTRUCTION2 = "- Results are returned using cat -n format, with line numbers starting at 1", OFFSET_INSTRUCTION_DEFAULT2 = "- You can optionally specify a line offset and limit (especially handy for long files), but it's recommended to read the whole file by not providing these parameters", OFFSET_INSTRUCTION_TARGETED2 = "- When you already know which part of the file you need, only read that part. This can be important for larger files.";
+var FILE_READ_TOOL_NAME2 = "Read", FILE_UNCHANGED_STUB2 = "File unchanged since last read. The content from the earlier Read tool_result in this conversation is still current — refer to that instead of re-reading.", MAX_LINES_TO_READ2 = 2000, DESCRIPTION19 = "Read a file from the local filesystem.", LINE_FORMAT_INSTRUCTION2 = "- Results are returned using cat -n format, with line numbers starting at 1", OFFSET_INSTRUCTION_DEFAULT2 = "- You can optionally specify a line offset and limit (especially handy for long files), but it's recommended to read the whole file by not providing these parameters", OFFSET_INSTRUCTION_TARGETED2 = "- When you already know which part of the file you need, only read that part. This can be important for larger files.";
 var init_prompt2 = __esm(() => {
   init_pdfUtils2();
   init_toolName();
@@ -135347,9 +136533,9 @@ var init_outputsScanner = __esm(() => {
 });
 
 // src/tui/utils/words.ts
-import { randomBytes as randomBytes6 } from "crypto";
+import { randomBytes as randomBytes7 } from "crypto";
 function randomInt2(max) {
-  const bytes = randomBytes6(4);
+  const bytes = randomBytes7(4);
   const value = bytes.readUInt32BE(0);
   return value % max;
 }
@@ -153304,28 +154490,28 @@ function getEventPriority(eventType) {
     case "focus":
     case "blur":
     case "paste":
-      return import_constants56.DiscreteEventPriority;
+      return import_constants57.DiscreteEventPriority;
     case "resize":
     case "scroll":
     case "mousemove":
-      return import_constants56.ContinuousEventPriority;
+      return import_constants57.ContinuousEventPriority;
     default:
-      return import_constants56.DefaultEventPriority;
+      return import_constants57.DefaultEventPriority;
   }
 }
 
 class Dispatcher {
   currentEvent = null;
-  currentUpdatePriority = import_constants56.DefaultEventPriority;
+  currentUpdatePriority = import_constants57.DefaultEventPriority;
   discreteUpdates = null;
   resolveEventPriority() {
-    if (this.currentUpdatePriority !== import_constants56.NoEventPriority) {
+    if (this.currentUpdatePriority !== import_constants57.NoEventPriority) {
       return this.currentUpdatePriority;
     }
     if (this.currentEvent) {
       return getEventPriority(this.currentEvent.type);
     }
-    return import_constants56.DefaultEventPriority;
+    return import_constants57.DefaultEventPriority;
   }
   dispatch(target, event) {
     const previousEvent = this.currentEvent;
@@ -153350,18 +154536,18 @@ class Dispatcher {
   dispatchContinuous(target, event) {
     const previousPriority = this.currentUpdatePriority;
     try {
-      this.currentUpdatePriority = import_constants56.ContinuousEventPriority;
+      this.currentUpdatePriority = import_constants57.ContinuousEventPriority;
       return this.dispatch(target, event);
     } finally {
       this.currentUpdatePriority = previousPriority;
     }
   }
 }
-var import_constants56;
+var import_constants57;
 var init_dispatcher = __esm(() => {
   init_log5();
   init_event_handlers();
-  import_constants56 = __toESM(require_constants2(), 1);
+  import_constants57 = __toESM(require_constants2(), 1);
 });
 
 // src/tui/ink/events/terminal-event.ts
@@ -162168,7 +163354,7 @@ function applyPositionedHighlight(screen, stylePool, positions, rowOffset, curre
   }
   return true;
 }
-var import_constants58, timing;
+var import_constants59, timing;
 var init_render_to_screen = __esm(() => {
   init_debug();
   init_dom();
@@ -162177,7 +163363,7 @@ var init_render_to_screen = __esm(() => {
   init_reconciler();
   init_render_node_to_output();
   init_screen();
-  import_constants58 = __toESM(require_constants2(), 1);
+  import_constants59 = __toESM(require_constants2(), 1);
   timing = { reconcile: 0, yoga: 0, paint: 0, scan: 0, calls: 0 };
 });
 
@@ -162483,7 +163669,7 @@ class Ink {
         };
       }
     };
-    this.container = reconciler_default.createContainer(this.rootNode, import_constants59.ConcurrentRoot, null, false, null, "id", noop_default, noop_default, noop_default, noop_default);
+    this.container = reconciler_default.createContainer(this.rootNode, import_constants60.ConcurrentRoot, null, false, null, "id", noop_default, noop_default, noop_default, noop_default);
     if (false) {}
   }
   handleResume = () => {
@@ -163296,7 +164482,7 @@ function drainStdin(stdin = process.stdin) {
     }
   }
 }
-var import_constants59, jsx_dev_runtime8, ALT_SCREEN_ANCHOR_CURSOR, CURSOR_HOME_PATCH, ERASE_THEN_HOME_PATCH, CONSOLE_STDOUT_METHODS, CONSOLE_STDERR_METHODS;
+var import_constants60, jsx_dev_runtime8, ALT_SCREEN_ANCHOR_CURSOR, CURSOR_HOME_PATCH, ERASE_THEN_HOME_PATCH, CONSOLE_STDOUT_METHODS, CONSOLE_STDERR_METHODS;
 var init_ink = __esm(() => {
   init_noop();
   init_throttle2();
@@ -163329,7 +164515,7 @@ var init_ink = __esm(() => {
   init_dec();
   init_osc();
   init_useTerminalNotification();
-  import_constants59 = __toESM(require_constants2(), 1);
+  import_constants60 = __toESM(require_constants2(), 1);
   jsx_dev_runtime8 = __toESM(require_jsx_dev_runtime(), 1);
   ALT_SCREEN_ANCHOR_CURSOR = Object.freeze({
     x: 0,
@@ -173089,7 +174275,7 @@ var init_agentMemorySnapshot = __esm(() => {
 });
 
 // src/tui/tools/GlobTool/prompt.ts
-var GLOB_TOOL_NAME2 = "Glob", DESCRIPTION19 = `- Fast file pattern matching tool that works with any codebase size
+var GLOB_TOOL_NAME2 = "Glob", DESCRIPTION20 = `- Fast file pattern matching tool that works with any codebase size
 - Supports glob patterns like "**/*.js" or "src/**/*.ts"
 - Returns matching file paths sorted by modification time
 - Use this tool when you need to find files by name patterns
@@ -173136,7 +174322,7 @@ ${prompt}
 ${guidelines}
 `;
 }
-var WEB_FETCH_TOOL_NAME2 = "WebFetch", DESCRIPTION20 = `
+var WEB_FETCH_TOOL_NAME2 = "WebFetch", DESCRIPTION21 = `
 - Fetches content from a specified URL and processes it using an AI model
 - Takes a URL and a prompt as input
 - Fetches the URL content, converts HTML to markdown
@@ -182359,7 +183545,7 @@ var TODO_WRITE_TOOL_NAME2 = "TodoWrite";
 var TASK_CREATE_TOOL_NAME2 = "TaskCreate";
 
 // src/tui/tools/AskUserQuestionTool/prompt.ts
-var ASK_USER_QUESTION_TOOL_NAME2 = "AskUserQuestion", ASK_USER_QUESTION_TOOL_CHIP_WIDTH2 = 12, DESCRIPTION21 = "Asks the user multiple choice questions to gather information, clarify ambiguity, understand preferences, make decisions or offer them choices.", PREVIEW_FEATURE_PROMPT2, ASK_USER_QUESTION_TOOL_PROMPT2;
+var ASK_USER_QUESTION_TOOL_NAME2 = "AskUserQuestion", ASK_USER_QUESTION_TOOL_CHIP_WIDTH2 = 12, DESCRIPTION22 = "Asks the user multiple choice questions to gather information, clarify ambiguity, understand preferences, make decisions or offer them choices.", PREVIEW_FEATURE_PROMPT2, ASK_USER_QUESTION_TOOL_PROMPT2;
 var init_prompt8 = __esm(() => {
   PREVIEW_FEATURE_PROMPT2 = {
     markdown: `
@@ -182900,6 +184086,7 @@ __export(exports_engineCompat, {
   WEB_SEARCH_TOOL_NAME: () => WEB_SEARCH_TOOL_NAME,
   WORKER_AGENT: () => WORKER_AGENT,
   WORKFLOW_TOOL_NAME: () => WORKFLOW_TOOL_NAME,
+  WaitForTeammatesTool: () => WaitForTeammatesTool,
   WebFetchTool: () => WebFetchTool,
   WebSearchTool: () => WebSearchTool,
   WriteTool: () => WriteTool,
@@ -183362,6 +184549,7 @@ __export(exports_engineCompat, {
   removeExtraFields: () => removeExtraFields,
   renderableSearchText: () => renderableSearchText,
   reportAutoCompactCircuitFailures: () => reportAutoCompactCircuitFailures,
+  requireTeammateSpawnTrigger: () => requireTeammateSpawnTrigger,
   resetAutoCompactCircuitForTesting: () => resetAutoCompactCircuitForTesting,
   resetBackgroundAgentTracker: () => resetBackgroundAgentTracker,
   resetBuiltinCommandNamesSourceForTesting: () => resetBuiltinCommandNamesSourceForTesting,
@@ -183389,6 +184577,7 @@ __export(exports_engineCompat, {
   resetTaskNotificationHandler: () => resetTaskNotificationHandler,
   resetTeamFileLoader: () => resetTeamFileLoader,
   resetTeamServices: () => resetTeamServices,
+  resetTeammateSpawnTrigger: () => resetTeammateSpawnTrigger,
   resetWorktreeGitCaches: () => resetWorktreeGitCaches,
   resolveAgentTools: () => resolveAgentTools,
   resolveAutoCompactWindow: () => resolveAutoCompactWindow,
@@ -183451,6 +184640,7 @@ __export(exports_engineCompat, {
   setTaskNotificationHandler: () => setTaskNotificationHandler,
   setTeamFileLoader: () => setTeamFileLoader,
   setTeamServices: () => setTeamServices,
+  setTeammateSpawnTrigger: () => setTeammateSpawnTrigger,
   setTimeBasedMCConfigSource: () => setTimeBasedMCConfigSource,
   setWebSearchSettingsKeyProvider: () => setWebSearchSettingsKeyProvider,
   setWebSearchTransportForTesting: () => setWebSearchTransportForTesting,
@@ -192614,14 +193804,14 @@ var init_terminal2 = __esm(() => {
 });
 
 // src/tui/tools/ListMcpResourcesTool/prompt.ts
-var LIST_MCP_RESOURCES_TOOL_NAME2 = "ListMcpResourcesTool", DESCRIPTION22 = `
+var LIST_MCP_RESOURCES_TOOL_NAME2 = "ListMcpResourcesTool", DESCRIPTION23 = `
 Lists available resources from configured MCP servers.
 Each resource object includes a 'server' field indicating which server it's from.
 
 Usage examples:
 - List all resources from all servers: \`listMcpResources\`
 - List resources from a specific server: \`listMcpResources({ server: "myserver" })\`
-`, PROMPT10 = `
+`, PROMPT11 = `
 List available resources from configured MCP servers.
 Each returned resource will include all standard MCP resource fields plus a 'server' field 
 indicating which server the resource belongs to.
@@ -192860,10 +194050,10 @@ var init_ListMcpResourcesTool = __esm(() => {
     searchHint: "list resources from connected MCP servers",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION22;
+      return DESCRIPTION23;
     },
     async prompt() {
-      return PROMPT10;
+      return PROMPT11;
     },
     get inputSchema() {
       return inputSchema4();
@@ -192916,7 +194106,7 @@ var init_ListMcpResourcesTool = __esm(() => {
 });
 
 // src/tui/tools/MCPTool/prompt.ts
-var PROMPT11 = "", DESCRIPTION23 = "";
+var PROMPT12 = "", DESCRIPTION24 = "";
 
 // src/tui/components/Spinner/utils.ts
 function getDefaultCharacters() {
@@ -194217,10 +195407,10 @@ var init_MCPTool = __esm(() => {
     name: "mcp",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION23;
+      return DESCRIPTION24;
     },
     async prompt() {
-      return PROMPT11;
+      return PROMPT12;
     },
     get inputSchema() {
       return inputSchema5();
@@ -197597,7 +198787,7 @@ var init_xaa = __esm(() => {
 });
 
 // src/tui/services/mcp/xaaIdpLogin.ts
-import { randomBytes as randomBytes7 } from "crypto";
+import { randomBytes as randomBytes8 } from "crypto";
 import { createServer as createServer2 } from "http";
 import { parse as parse10 } from "url";
 function isXaaEnabled() {
@@ -197822,7 +199012,7 @@ async function acquireIdpIdToken(opts) {
   const metadata = await discoverOidc(idpIssuer);
   const port = opts.callbackPort ?? await findAvailablePort();
   const redirectUri = buildRedirectUri(port);
-  const state = randomBytes7(32).toString("base64url");
+  const state = randomBytes8(32).toString("base64url");
   const clientInformation = {
     client_id: idpClientId,
     ...opts.idpClientSecret ? { client_secret: opts.idpClientSecret } : {}
@@ -197881,7 +199071,7 @@ var init_xaaIdpLogin = __esm(() => {
 });
 
 // src/tui/services/mcp/auth.ts
-import { createHash as createHash5, randomBytes as randomBytes8, randomUUID as randomUUID24 } from "crypto";
+import { createHash as createHash5, randomBytes as randomBytes9, randomUUID as randomUUID24 } from "crypto";
 import { mkdir as mkdir17 } from "fs/promises";
 import { createServer as createServer3 } from "http";
 import { join as join80 } from "path";
@@ -198664,7 +199854,7 @@ class ClaudeAuthProvider {
   }
   async state() {
     if (!this._state) {
-      this._state = randomBytes8(32).toString("base64url");
+      this._state = randomBytes9(32).toString("base64url");
       logMCPDebug(this.serverName, "Generated new OAuth state");
     }
     return this._state;
@@ -199853,14 +201043,14 @@ var init_mcpOutputStorage = __esm(() => {
 });
 
 // src/tui/tools/ReadMcpResourceTool/prompt.ts
-var DESCRIPTION24 = `
+var DESCRIPTION25 = `
 Reads a specific resource from an MCP server.
 - server: The name of the MCP server to read from
 - uri: The URI of the resource to read
 
 Usage examples:
 - Read a resource from a server: \`readMcpResource({ server: "myserver", uri: "my-resource-uri" })\`
-`, PROMPT12 = `
+`, PROMPT13 = `
 Reads a specific resource from an MCP server, identified by server name and resource URI.
 
 Parameters:
@@ -199948,10 +201138,10 @@ var init_ReadMcpResourceTool = __esm(() => {
     searchHint: "read a specific MCP resource by URI",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION24;
+      return DESCRIPTION25;
     },
     async prompt() {
-      return PROMPT12;
+      return PROMPT13;
     },
     get inputSchema() {
       return inputSchema7();
@@ -200552,7 +201742,7 @@ var init_auth4 = __esm(() => {
 });
 
 // src/tui/utils/workloadContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage4 } from "async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
 function getWorkload() {
   return workloadStorage.getStore()?.workload;
 }
@@ -200561,7 +201751,7 @@ function runWithWorkload(workload, fn) {
 }
 var WORKLOAD_CRON = "cron", workloadStorage;
 var init_workloadContext = __esm(() => {
-  workloadStorage = new AsyncLocalStorage4;
+  workloadStorage = new AsyncLocalStorage3;
 });
 
 // src/tui/utils/http.ts
@@ -203273,10 +204463,10 @@ function parseProxyResponse(socket) {
     read();
   });
 }
-var import_debug54, debug;
+var import_debug55, debug;
 var init_parse_proxy_response = __esm(() => {
-  import_debug54 = __toESM(require_src(), 1);
-  debug = import_debug54.default("https-proxy-agent:parse-proxy-response");
+  import_debug55 = __toESM(require_src(), 1);
+  debug = import_debug55.default("https-proxy-agent:parse-proxy-response");
 });
 
 // node_modules/proxy-agent-negotiate/dist/index.js
@@ -203329,7 +204519,7 @@ function omit2(obj, ...keys) {
   }
   return ret;
 }
-var import_debug55, debug2, setServernameFromNonIpHost = (options) => {
+var import_debug56, debug2, setServernameFromNonIpHost = (options) => {
   if (options.servername === undefined && options.host && !net2.isIP(options.host)) {
     return {
       ...options,
@@ -203341,8 +204531,8 @@ var import_debug55, debug2, setServernameFromNonIpHost = (options) => {
 var init_dist7 = __esm(() => {
   init_dist6();
   init_parse_proxy_response();
-  import_debug55 = __toESM(require_src(), 1);
-  debug2 = import_debug55.default("https-proxy-agent");
+  import_debug56 = __toESM(require_src(), 1);
+  debug2 = import_debug56.default("https-proxy-agent");
   HttpsProxyAgent2 = class HttpsProxyAgent2 extends Agent2 {
     constructor(proxy, opts) {
       super(opts);
@@ -204462,7 +205652,7 @@ var init_use_declared_cursor = __esm(() => {
 });
 
 // src/tui/utils/imagePaste.ts
-import { randomBytes as randomBytes9 } from "crypto";
+import { randomBytes as randomBytes10 } from "crypto";
 import { basename as basename20, extname as extname8, isAbsolute as isAbsolute18, join as join86 } from "path";
 function getClipboardCommands() {
   const platform = process.platform;
@@ -204621,7 +205811,7 @@ function stripBackslashEscapes(path) {
   if (platform === "win32") {
     return path;
   }
-  const salt = randomBytes9(8).toString("hex");
+  const salt = randomBytes10(8).toString("hex");
   const placeholder = `__DOUBLE_BACKSLASH_${salt}__`;
   const withPlaceholder = path.replace(/\\\\/g, placeholder);
   const withoutEscapes = withPlaceholder.replace(/\\(.)/g, "$1");
@@ -207029,7 +208219,7 @@ __export(exports_terminalSetup, {
   setupTerminal: () => setupTerminal,
   shouldOfferTerminalSetup: () => shouldOfferTerminalSetup
 });
-import { randomBytes as randomBytes10 } from "crypto";
+import { randomBytes as randomBytes11 } from "crypto";
 import { copyFile as copyFile3, mkdir as mkdir20, readFile as readFile25, writeFile as writeFile14 } from "fs/promises";
 import { homedir as homedir27, platform as platform3 } from "os";
 import { dirname as dirname45, join as join89 } from "path";
@@ -207186,7 +208376,7 @@ async function installBindingsForVSCodeTerminal(editor = "VSCode", theme) {
         throw e;
     }
     if (fileExists) {
-      const randomSha = randomBytes10(4).toString("hex");
+      const randomSha = randomBytes11(4).toString("hex");
       const backupPath = `${keybindingsPath}.${randomSha}.bak`;
       try {
         await copyFile3(keybindingsPath, backupPath);
@@ -207345,7 +208535,7 @@ chars = "\\u001B\\r"`;
       if (configContent.includes('mods = "Shift"') && configContent.includes('key = "Return"')) {
         return `${color("warning", theme)("Found existing Alacritty Shift+Enter key binding. Remove it to continue.")}${EOL}${source_default.dim(`See ${formatPathLink(configPath)}`)}${EOL}`;
       }
-      const randomSha = randomBytes10(4).toString("hex");
+      const randomSha = randomBytes11(4).toString("hex");
       const backupPath = `${configPath}.${randomSha}.bak`;
       try {
         await copyFile3(configPath, backupPath);
@@ -207397,7 +208587,7 @@ async function installBindingsForZed(theme) {
       if (keymapContent.includes("shift-enter")) {
         return `${color("warning", theme)("Found existing Zed Shift+Enter key binding. Remove it to continue.")}${EOL}${source_default.dim(`See ${formatPathLink(keymapPath)}`)}${EOL}`;
       }
-      const randomSha = randomBytes10(4).toString("hex");
+      const randomSha = randomBytes11(4).toString("hex");
       const backupPath = `${keymapPath}.${randomSha}.bak`;
       try {
         await copyFile3(keymapPath, backupPath);
@@ -261406,7 +262596,7 @@ var init_GlobTool = __esm(() => {
     searchHint: "find files by name pattern or wildcard",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION19;
+      return DESCRIPTION20;
     },
     userFacingName: userFacingName3,
     getToolUseSummary: getToolUseSummary3,
@@ -261478,7 +262668,7 @@ var init_GlobTool = __esm(() => {
       return checkReadPermissionForTool2(GlobTool2, input, appState.toolPermissionContext);
     },
     async prompt() {
-      return DESCRIPTION19;
+      return DESCRIPTION20;
     },
     renderToolUseMessage: renderToolUseMessage6,
     renderToolUseErrorMessage: renderToolUseErrorMessage3,
@@ -262009,52 +263199,30 @@ function getMaxBashTimeoutMs2(env = process.env) {
 }
 var DEFAULT_TIMEOUT_MS2 = 120000, MAX_TIMEOUT_MS2 = 600000;
 
-// src/tui/utils/teammateContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage5 } from "async_hooks";
-function getTeammateContext3() {
-  return teammateContextStorage3.getStore();
-}
-function runWithTeammateContext3(context, fn) {
-  return teammateContextStorage3.run(context, fn);
-}
-function isInProcessTeammate3() {
-  return teammateContextStorage3.getStore() !== undefined;
-}
-function createTeammateContext3(config) {
-  return {
-    ...config,
-    isInProcess: true
-  };
-}
-var teammateContextStorage3;
-var init_teammateContext3 = __esm(() => {
-  teammateContextStorage3 = new AsyncLocalStorage5;
-});
-
 // src/tui/utils/teammate.ts
 var exports_teammate = {};
 __export(exports_teammate, {
   clearDynamicTeamContext: () => clearDynamicTeamContext2,
-  createTeammateContext: () => createTeammateContext3,
+  createTeammateContext: () => createTeammateContext,
   getAgentId: () => getAgentId2,
   getAgentName: () => getAgentName2,
   getDynamicTeamContext: () => getDynamicTeamContext2,
   getParentSessionId: () => getParentSessionId2,
   getTeamName: () => getTeamName2,
   getTeammateColor: () => getTeammateColor3,
-  getTeammateContext: () => getTeammateContext3,
+  getTeammateContext: () => getTeammateContext,
   hasActiveInProcessTeammates: () => hasActiveInProcessTeammates2,
   hasWorkingInProcessTeammates: () => hasWorkingInProcessTeammates2,
-  isInProcessTeammate: () => isInProcessTeammate3,
+  isInProcessTeammate: () => isInProcessTeammate,
   isPlanModeRequired: () => isPlanModeRequired2,
   isTeamLead: () => isTeamLead2,
   isTeammate: () => isTeammate2,
-  runWithTeammateContext: () => runWithTeammateContext3,
+  runWithTeammateContext: () => runWithTeammateContext,
   setDynamicTeamContext: () => setDynamicTeamContext2,
   waitForTeammatesToBecomeIdle: () => waitForTeammatesToBecomeIdle2
 });
 function getParentSessionId2() {
-  const inProcessCtx = getTeammateContext3();
+  const inProcessCtx = getTeammateContext();
   if (inProcessCtx)
     return inProcessCtx.parentSessionId;
   return dynamicTeamContext2?.parentSessionId;
@@ -262069,19 +263237,19 @@ function getDynamicTeamContext2() {
   return dynamicTeamContext2;
 }
 function getAgentId2() {
-  const inProcessCtx = getTeammateContext3();
+  const inProcessCtx = getTeammateContext();
   if (inProcessCtx)
     return inProcessCtx.agentId;
   return dynamicTeamContext2?.agentId;
 }
 function getAgentName2() {
-  const inProcessCtx = getTeammateContext3();
+  const inProcessCtx = getTeammateContext();
   if (inProcessCtx)
     return inProcessCtx.agentName;
   return dynamicTeamContext2?.agentName;
 }
 function getTeamName2(teamContext) {
-  const inProcessCtx = getTeammateContext3();
+  const inProcessCtx = getTeammateContext();
   if (inProcessCtx)
     return inProcessCtx.teamName;
   if (dynamicTeamContext2?.teamName)
@@ -262089,19 +263257,19 @@ function getTeamName2(teamContext) {
   return teamContext?.teamName;
 }
 function isTeammate2() {
-  const inProcessCtx = getTeammateContext3();
+  const inProcessCtx = getTeammateContext();
   if (inProcessCtx)
     return true;
   return !!(dynamicTeamContext2?.agentId && dynamicTeamContext2?.teamName);
 }
 function getTeammateColor3() {
-  const inProcessCtx = getTeammateContext3();
+  const inProcessCtx = getTeammateContext();
   if (inProcessCtx)
     return inProcessCtx.color;
   return dynamicTeamContext2?.color;
 }
 function isPlanModeRequired2() {
-  const inProcessCtx = getTeammateContext3();
+  const inProcessCtx = getTeammateContext();
   if (inProcessCtx)
     return inProcessCtx.planModeRequired;
   if (dynamicTeamContext2 !== null) {
@@ -262178,9 +263346,9 @@ function waitForTeammatesToBecomeIdle2(setAppState, appState) {
 }
 var dynamicTeamContext2 = null;
 var init_teammate2 = __esm(() => {
-  init_teammateContext3();
+  init_teammateContext();
   init_envUtils2();
-  init_teammateContext3();
+  init_shared();
 });
 
 // src/tui/utils/tasks.ts
@@ -262264,7 +263432,7 @@ function getTaskListId2() {
   if (process.env.ATLAS_TASK_LIST_ID) {
     return process.env.ATLAS_TASK_LIST_ID;
   }
-  const teammateCtx = getTeammateContext3();
+  const teammateCtx = getTeammateContext();
   if (teammateCtx) {
     return teammateCtx.teamName;
   }
@@ -262488,7 +263656,7 @@ var init_tasks5 = __esm(() => {
   init_log5();
   init_slowOperations();
   init_teammate2();
-  init_teammateContext3();
+  init_shared();
   tasksUpdated2 = createSignal3();
   onTasksUpdated2 = tasksUpdated2.subscribe;
   TaskStatusSchema2 = lazySchema2(() => _enum(["pending", "in_progress", "completed"]));
@@ -262526,10 +263694,10 @@ var init_types13 = __esm(() => {
 });
 
 // src/tui/tools/TodoWriteTool/prompt.ts
-var PROMPT13, DESCRIPTION25 = "Update the todo list for the current session. To be used proactively and often to track progress and pending tasks. Make sure that at least one task is in_progress at all times. Always provide both content (imperative) and activeForm (present continuous) for each task.";
+var PROMPT14, DESCRIPTION26 = "Update the todo list for the current session. To be used proactively and often to track progress and pending tasks. Make sure that at least one task is in_progress at all times. Always provide both content (imperative) and activeForm (present continuous) for each task.";
 var init_prompt10 = __esm(() => {
   init_constants8();
-  PROMPT13 = `Use this tool to create and manage a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
+  PROMPT14 = `Use this tool to create and manage a structured task list for your current coding session. This helps you track progress, organize complex tasks, and demonstrate thoroughness to the user.
 It also helps the user understand the progress of the task and overall progress of their requests.
 
 ## When to Use This Tool
@@ -262736,10 +263904,10 @@ var init_TodoWriteTool = __esm(() => {
     maxResultSizeChars: 1e5,
     strict: true,
     async description() {
-      return DESCRIPTION25;
+      return DESCRIPTION26;
     },
     async prompt() {
-      return PROMPT13;
+      return PROMPT14;
     },
     get inputSchema() {
       return inputSchema11();
@@ -263406,7 +264574,7 @@ function isAgentSwarmsEnabled2() {
   }
   return true;
 }
-var init_agentSwarmsEnabled2 = __esm(() => {
+var init_agentSwarmsEnabled3 = __esm(() => {
   init_growthbook();
   init_envUtils2();
 });
@@ -264563,14 +265731,14 @@ var init_agent2 = __esm(() => {
 });
 
 // src/tui/utils/uuid.ts
-import { randomBytes as randomBytes11 } from "crypto";
+import { randomBytes as randomBytes12 } from "crypto";
 function validateUuid2(maybeUuid) {
   if (typeof maybeUuid !== "string")
     return null;
   return uuidRegex2.test(maybeUuid) ? maybeUuid : null;
 }
 function createAgentId(label) {
-  const suffix = randomBytes11(8).toString("hex");
+  const suffix = randomBytes12(8).toString("hex");
   return label ? `a${label}-${suffix}` : `a${suffix}`;
 }
 var uuidRegex2;
@@ -266580,7 +267748,7 @@ var init_notebook3 = __esm(() => {
 });
 
 // src/tui/tools/NotebookEditTool/prompt.ts
-var DESCRIPTION26 = "Replace the contents of a specific cell in a Jupyter notebook.", PROMPT14 = `Completely replaces the contents of a specific cell in a Jupyter notebook (.ipynb file) with new source. Jupyter notebooks are interactive documents that combine code, text, and visualizations, commonly used for data analysis and scientific computing. The notebook_path parameter must be an absolute path, not a relative path. The cell_number is 0-indexed. Use edit_mode=insert to add a new cell at the index specified by cell_number. Use edit_mode=delete to delete the cell at the index specified by cell_number.`;
+var DESCRIPTION27 = "Replace the contents of a specific cell in a Jupyter notebook.", PROMPT15 = `Completely replaces the contents of a specific cell in a Jupyter notebook (.ipynb file) with new source. Jupyter notebooks are interactive documents that combine code, text, and visualizations, commonly used for data analysis and scientific computing. The notebook_path parameter must be an absolute path, not a relative path. The cell_number is 0-indexed. Use edit_mode=insert to add a new cell at the index specified by cell_number. Use edit_mode=delete to delete the cell at the index specified by cell_number.`;
 
 // src/tui/components/NotebookEditToolUseRejectedMessage.tsx
 import { relative as relative16 } from "path";
@@ -266871,10 +268039,10 @@ var init_NotebookEditTool = __esm(() => {
     maxResultSizeChars: 1e5,
     shouldDefer: true,
     async description() {
-      return DESCRIPTION26;
+      return DESCRIPTION27;
     },
     async prompt() {
-      return PROMPT14;
+      return PROMPT15;
     },
     userFacingName() {
       return "Edit Notebook";
@@ -274796,7 +275964,7 @@ var import_compiler_runtime85, jsx_dev_runtime93;
 var init_UserTextMessage = __esm(() => {
   init_shared();
   init_xml();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_messages3();
   init_InterruptedByUser();
   init_MessageResponse();
@@ -275787,7 +276955,7 @@ var init_AttachmentMessage = __esm(() => {
   init_ink3();
   init_slowOperations();
   init_stringUtils2();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_PlanApprovalMessage();
   init_figures2();
   init_UserTeammateMessage();
@@ -279972,7 +281140,7 @@ var init_UI9 = __esm(() => {
 });
 
 // src/tui/utils/agentContext.ts
-import { AsyncLocalStorage as AsyncLocalStorage6 } from "async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage4 } from "async_hooks";
 function getAgentContext() {
   return agentContextStorage.getStore();
 }
@@ -279981,8 +281149,8 @@ function runWithAgentContext(context, fn) {
 }
 var agentContextStorage;
 var init_agentContext = __esm(() => {
-  init_agentSwarmsEnabled2();
-  agentContextStorage = new AsyncLocalStorage6;
+  init_agentSwarmsEnabled3();
+  agentContextStorage = new AsyncLocalStorage4;
 });
 
 // src/tui/utils/generators.ts
@@ -282930,7 +284098,7 @@ function filterToolsForAgent2({
       return false;
     }
     if (isAsync && !ASYNC_AGENT_ALLOWED_TOOLS.has(tool.name)) {
-      if (isAgentSwarmsEnabled2() && isInProcessTeammate3()) {
+      if (isAgentSwarmsEnabled2() && isInProcessTeammate()) {
         if (toolMatchesName(tool, AGENT_TOOL_NAME2)) {
           return true;
         }
@@ -283274,7 +284442,7 @@ var init_agentToolUtils2 = __esm(() => {
   init_Tool();
   init_LocalAgentTask();
   init_ids();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_debug();
   init_errors4();
   init_messages3();
@@ -283282,7 +284450,7 @@ var init_agentToolUtils2 = __esm(() => {
   init_mcpStringUtils();
   init_yoloClassifier();
   init_sdkProgress();
-  init_teammateContext3();
+  init_shared();
   init_tokens();
   init_constants6();
   agentToolResultSchema = lazySchema2(() => object({
@@ -283478,7 +284646,7 @@ ${whenNotToUseSection}
 
 Usage notes:
 - Always include a short description (3-5 words) summarizing what the agent will do${concurrencyNote}
-- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.${!isEnvTruthy2(process.env.ATLAS_DISABLE_BACKGROUND_TASKS) && !isInProcessTeammate3() && !forkEnabled ? `
+- When the agent is done, it will return a single message back to you. The result returned by the agent is not visible to the user. To show the user the result, you should send a text message back to the user with a concise summary of the result.${!isEnvTruthy2(process.env.ATLAS_DISABLE_BACKGROUND_TASKS) && !isInProcessTeammate() && !forkEnabled ? `
 - Agents run in the background by default. When an agent runs in the background, you will be automatically notified when it completes — do NOT sleep, poll, or proactively check on its progress. Continue with other work or respond to the user instead.
 - **Foreground vs background**: Agents run in the background by default. Use foreground (set run_in_background to false) when you need the agent's results before you can proceed — e.g., research agents whose findings inform your next steps. Use background when you have genuinely independent work to do in parallel.` : ""}
 - To continue a previously spawned agent, use ${SEND_MESSAGE_TOOL_NAME3} with the agent's ID or name as the \`to\` field. The agent resumes with its full context preserved. ${forkEnabled ? "Each fresh Agent invocation with a subagent_type starts without context — provide a complete task description." : "Each Agent invocation starts fresh — provide a complete task description."}
@@ -283486,7 +284654,7 @@ Usage notes:
 - Clearly tell the agent whether you expect it to write code or just to do research (search, file reads, web fetches, etc.)${forkEnabled ? "" : ", since it is not aware of the user's intent"}
 - If the agent description mentions that it should be used proactively, then you should try your best to use it without the user having to ask for it first. Use your judgement.
 - If the user specifies that they want you to run agents "in parallel", you MUST send a single message with multiple ${AGENT_TOOL_NAME2} tool use content blocks. For example, if you need to launch both a build-validator agent and a test-runner agent in parallel, send a single message with both tool calls.
-- You can optionally set \`isolation: "worktree"\` to run the agent in a temporary git worktree, giving it an isolated copy of the repository. The worktree is automatically cleaned up if the agent makes no changes; if changes are made, the worktree path and branch are returned in the result.${isInProcessTeammate3() ? `
+- You can optionally set \`isolation: "worktree"\` to run the agent in a temporary git worktree, giving it an isolated copy of the repository. The worktree is automatically cleaned up if the agent makes no changes; if changes are made, the worktree path and branch are returned in the result.${isInProcessTeammate() ? `
 - The run_in_background, name, team_name, and mode parameters are not available in this context. Only synchronous subagents are supported.` : isTeammate2() ? `
 - The name, team_name, and mode parameters are not available in this context — teammates cannot spawn other teammates. Omit them to spawn a subagent.` : ""}${whenToForkSection}${writingThePromptSection}
 
@@ -283497,7 +284665,7 @@ var init_prompt13 = __esm(() => {
   init_embeddedTools();
   init_envUtils2();
   init_teammate2();
-  init_teammateContext3();
+  init_shared();
   init_prompt2();
   init_prompt3();
   init_constants6();
@@ -302427,7 +303595,7 @@ var init_WebFetchTool = __esm(() => {
     },
     async prompt(_options) {
       return `IMPORTANT: WebFetch WILL FAIL for authenticated or private URLs. Before using this tool, check if the URL points to an authenticated service (e.g. Google Docs, Confluence, Jira, GitHub). If so, look for a specialized MCP tool that provides authenticated access.
-${DESCRIPTION20}`;
+${DESCRIPTION21}`;
     },
     async validateInput(input) {
       const { url } = input;
@@ -302903,7 +304071,7 @@ var init_TaskStopTool = __esm(() => {
       return `Stop a running background task by ID`;
     },
     async prompt() {
-      return DESCRIPTION17;
+      return DESCRIPTION18;
     },
     mapToolResultToToolResultBlockParam(output, toolUseID) {
       return {
@@ -304126,7 +305294,7 @@ var init_ExitPlanModeV2Tool = __esm(() => {
   init_v4();
   init_bootstrapState();
   init_Tool();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_debug();
   init_inProcessTeammateHelpers2();
   init_log5();
@@ -304609,7 +305777,7 @@ var init_AskUserQuestionTool = __esm(() => {
     maxResultSizeChars: 1e5,
     shouldDefer: true,
     async description() {
-      return DESCRIPTION21;
+      return DESCRIPTION22;
     },
     async prompt() {
       const format = getQuestionPreviewFormat();
@@ -305105,7 +306273,7 @@ var init_formatters = __esm(() => {
 });
 
 // src/tui/tools/LSPTool/prompt.ts
-var LSP_TOOL_NAME2 = "LSP", DESCRIPTION27 = `Interact with Language Server Protocol (LSP) servers to get code intelligence features.
+var LSP_TOOL_NAME2 = "LSP", DESCRIPTION28 = `Interact with Language Server Protocol (LSP) servers to get code intelligence features.
 
 Supported operations:
 - goToDefinition: Find where a symbol is defined
@@ -305852,7 +307020,7 @@ var init_LSPTool = __esm(() => {
     maxResultSizeChars: 1e5,
     isLsp: true,
     async description() {
-      return DESCRIPTION27;
+      return DESCRIPTION28;
     },
     userFacingName: userFacingName5,
     shouldDefer: true,
@@ -305921,7 +307089,7 @@ var init_LSPTool = __esm(() => {
       return checkReadPermissionForTool2(LSPTool2, input, appState.toolPermissionContext);
     },
     async prompt() {
-      return DESCRIPTION27;
+      return DESCRIPTION28;
     },
     renderToolUseMessage: renderToolUseMessage16,
     renderToolUseErrorMessage: renderToolUseErrorMessage7,
@@ -307854,7 +309022,7 @@ ${lines.join(`
 - model - Override the default model (sonnet, opus, haiku, best, or full model ID)`;
   }
 }
-var DESCRIPTION28 = "Get or set Atlas configuration settings.";
+var DESCRIPTION29 = "Get or set Atlas configuration settings.";
 var init_prompt16 = __esm(() => {
   init_shared();
   init_modelOptions();
@@ -308380,7 +309548,7 @@ var init_ConfigTool = __esm(() => {
     searchHint: "get or set Atlas settings (theme, model)",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION28;
+      return DESCRIPTION29;
     },
     async prompt() {
       return generatePrompt2();
@@ -308676,9 +309844,9 @@ All tasks are created with status \`pending\`.
 ${teammateTips}- Check TaskList first to avoid creating duplicate tasks
 `;
 }
-var DESCRIPTION29 = "Create a new task in the task list";
+var DESCRIPTION30 = "Create a new task in the task list";
 var init_prompt17 = __esm(() => {
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
 });
 
 // src/tui/tools/TaskCreateTool/TaskCreateTool.ts
@@ -308707,7 +309875,7 @@ var init_TaskCreateTool = __esm(() => {
     searchHint: "create a task in the task list",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION29;
+      return DESCRIPTION30;
     },
     async prompt() {
       return getPrompt23();
@@ -308786,7 +309954,7 @@ var init_TaskCreateTool = __esm(() => {
 var TASK_GET_TOOL_NAME2 = "TaskGet";
 
 // src/tui/tools/TaskGetTool/prompt.ts
-var DESCRIPTION30 = "Get a task by ID from the task list", PROMPT15 = `Use this tool to retrieve a task by its ID from the task list.
+var DESCRIPTION31 = "Get a task by ID from the task list", PROMPT16 = `Use this tool to retrieve a task by its ID from the task list.
 
 ## When to Use This Tool
 
@@ -308833,10 +310001,10 @@ var init_TaskGetTool = __esm(() => {
     searchHint: "retrieve a task by ID",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION30;
+      return DESCRIPTION31;
     },
     async prompt() {
-      return PROMPT15;
+      return PROMPT16;
     },
     get inputSchema() {
       return inputSchema30();
@@ -308920,7 +310088,7 @@ var init_TaskGetTool = __esm(() => {
 var TASK_UPDATE_TOOL_NAME2 = "TaskUpdate";
 
 // src/tui/tools/TaskUpdateTool/prompt.ts
-var DESCRIPTION31 = "Update a task in the task list", PROMPT16 = `Use this tool to update a task in the task list.
+var DESCRIPTION32 = "Update a task in the task list", PROMPT17 = `Use this tool to update a task in the task list.
 
 ## When to Use This Tool
 
@@ -309003,7 +310171,7 @@ var init_TaskUpdateTool = __esm(() => {
   init_v4();
   init_growthbook();
   init_Tool();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_hooks7();
   init_tasks5();
   init_teammate2();
@@ -309039,10 +310207,10 @@ var init_TaskUpdateTool = __esm(() => {
     searchHint: "update a task",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION31;
+      return DESCRIPTION32;
     },
     async prompt() {
-      return PROMPT16;
+      return PROMPT17;
     },
     get inputSchema() {
       return inputSchema31();
@@ -309307,9 +310475,9 @@ ${idDescription}
 Use TaskGet with a specific task ID to view full details including description and comments.
 ${teammateWorkflow}`;
 }
-var DESCRIPTION32 = "List all tasks in the task list";
+var DESCRIPTION33 = "List all tasks in the task list";
 var init_prompt18 = __esm(() => {
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
 });
 
 // src/tui/tools/TaskListTool/TaskListTool.ts
@@ -309334,7 +310502,7 @@ var init_TaskListTool = __esm(() => {
     searchHint: "list all tasks",
     maxResultSizeChars: 1e5,
     async description() {
-      return DESCRIPTION32;
+      return DESCRIPTION33;
     },
     async prompt() {
       return getPrompt24();
@@ -309962,7 +311130,7 @@ var init_CronCreateTool = __esm(() => {
   init_cron2();
   init_cronTasks2();
   init_semanticBoolean();
-  init_teammateContext3();
+  init_shared();
   init_prompt19();
   init_UI20();
   inputSchema33 = lazySchema2(() => strictObject({
@@ -310026,7 +311194,7 @@ var init_CronCreateTool = __esm(() => {
           errorCode: 3
         };
       }
-      if (input.durable && getTeammateContext3()) {
+      if (input.durable && getTeammateContext()) {
         return {
           result: false,
           message: "durable crons are not supported for teammates (teammates do not persist across sessions)",
@@ -310037,7 +311205,7 @@ var init_CronCreateTool = __esm(() => {
     },
     async call({ cron, prompt, recurring = true, durable = false }) {
       const effectiveDurable = durable && isDurableCronEnabled2();
-      const id = await addCronTask2(cron, prompt, recurring, effectiveDurable, getTeammateContext3()?.agentId);
+      const id = await addCronTask2(cron, prompt, recurring, effectiveDurable, getTeammateContext()?.agentId);
       setScheduledTasksEnabled(true);
       return {
         data: {
@@ -310071,7 +311239,7 @@ var init_CronDeleteTool = __esm(() => {
   init_v4();
   init_Tool();
   init_cronTasks2();
-  init_teammateContext3();
+  init_shared();
   init_prompt19();
   init_UI20();
   inputSchema34 = lazySchema2(() => strictObject({
@@ -310116,7 +311284,7 @@ var init_CronDeleteTool = __esm(() => {
           errorCode: 1
         };
       }
-      const ctx = getTeammateContext3();
+      const ctx = getTeammateContext();
       if (ctx && task.agentId !== ctx.agentId) {
         return {
           result: false,
@@ -310154,7 +311322,7 @@ var init_CronListTool = __esm(() => {
   init_cron2();
   init_cronTasks2();
   init_format2();
-  init_teammateContext3();
+  init_shared();
   init_prompt19();
   init_UI20();
   inputSchema35 = lazySchema2(() => strictObject({}));
@@ -310196,7 +311364,7 @@ var init_CronListTool = __esm(() => {
     },
     async call() {
       const allTasks = await listAllCronTasks2();
-      const ctx = getTeammateContext3();
+      const ctx = getTeammateContext();
       const tasks = ctx ? allTasks.filter((t) => t.agentId === ctx.agentId) : allTasks;
       const jobs = tasks.map((t) => ({
         id: t.id,
@@ -310454,7 +311622,7 @@ var init_spawnInProcess2 = __esm(() => {
   init_sdkEventQueue2();
   init_diskOutput2();
   init_framework2();
-  init_teammateContext3();
+  init_shared();
   init_perfettoTracing();
   init_teamHelpers2();
 });
@@ -314750,9 +315918,9 @@ var init_ParsedCommand2 = __esm(() => {
 });
 
 // src/tui/utils/bash/heredoc.ts
-import { randomBytes as randomBytes12 } from "crypto";
+import { randomBytes as randomBytes13 } from "crypto";
 function generatePlaceholderSalt2() {
-  return randomBytes12(8).toString("hex");
+  return randomBytes13(8).toString("hex");
 }
 function extractHeredocs2(command, options) {
   const heredocs = new Map;
@@ -317183,7 +318351,7 @@ var init_inProcessRunner2 = __esm(() => {
   init_sdkEventQueue2();
   init_slowOperations();
   init_tasks5();
-  init_teammateContext3();
+  init_shared();
   init_teammateMailbox();
   init_perfettoTracing();
   init_toolResultStorage();
@@ -318122,7 +319290,7 @@ async function readTeamFileAsync2(teamName) {
     return null;
   }
 }
-function writeTeamFile(teamName, teamFile) {
+function writeTeamFile2(teamName, teamFile) {
   const teamDir = getTeamDir2(teamName);
   mkdirSync7(teamDir, { recursive: true });
   writeFileSync6(getTeamFilePath2(teamName), jsonStringify5(teamFile, null, 2));
@@ -318155,7 +319323,7 @@ function removeTeammateFromTeamFile2(teamName, identifier) {
     logForDebugging3(`[TeammateTool] Teammate ${identifierStr} not found in team file for "${teamName}"`);
     return false;
   }
-  writeTeamFile(teamName, teamFile);
+  writeTeamFile2(teamName, teamFile);
   logForDebugging3(`[TeammateTool] Removed teammate from team file: ${identifierStr}`);
   return true;
 }
@@ -318175,7 +319343,7 @@ function removeMemberFromTeam2(teamName, tmuxPaneId) {
       teamFile.hiddenPaneIds.splice(hiddenIndex, 1);
     }
   }
-  writeTeamFile(teamName, teamFile);
+  writeTeamFile2(teamName, teamFile);
   logForDebugging3(`[TeammateTool] Removed member with pane ${tmuxPaneId} from team ${teamName}`);
   return true;
 }
@@ -318189,7 +319357,7 @@ function removeMemberByAgentId2(teamName, agentId) {
     return false;
   }
   teamFile.members.splice(memberIndex, 1);
-  writeTeamFile(teamName, teamFile);
+  writeTeamFile2(teamName, teamFile);
   logForDebugging3(`[TeammateTool] Removed member ${agentId} from team ${teamName}`);
   return true;
 }
@@ -318207,7 +319375,7 @@ function setMemberMode2(teamName, memberName, mode) {
     return true;
   }
   const updatedMembers = teamFile.members.map((m) => m.name === memberName ? { ...m, mode } : m);
-  writeTeamFile(teamName, { ...teamFile, members: updatedMembers });
+  writeTeamFile2(teamName, { ...teamFile, members: updatedMembers });
   logForDebugging3(`[TeammateTool] Set member ${memberName} in team ${teamName} to mode: ${mode}`);
   return true;
 }
@@ -318236,7 +319404,7 @@ function setMultipleMemberModes2(teamName, modeUpdates) {
     return member;
   });
   if (anyChanged) {
-    writeTeamFile(teamName, { ...teamFile, members: updatedMembers });
+    writeTeamFile2(teamName, { ...teamFile, members: updatedMembers });
     logForDebugging3(`[TeammateTool] Set ${modeUpdates.length} member modes in team ${teamName}`);
   }
   return true;
@@ -318290,9 +319458,6 @@ async function destroyWorktree2(worktreePath) {
     logForDebugging3(`[TeammateTool] Failed to remove worktree ${worktreePath}: ${errorMessage2(error)}`);
   }
 }
-function registerTeamForSessionCleanup2(teamName) {
-  getSessionCreatedTeams().add(teamName);
-}
 function unregisterTeamForSessionCleanup2(teamName) {
   getSessionCreatedTeams().delete(teamName);
 }
@@ -318412,7 +319577,7 @@ Create a new team to coordinate multiple agents working on a project. Teams have
 \`\`\`
 
 This creates:
-- A team file at \`~/.atlas/teams/{team-name}/config.json\`
+- An in-memory team context on the leader (Form A is zero-persistence — no team file is written to \`~/.atlas/teams/\`; the member roster lives in the leader's team context)
 - A corresponding task list directory at \`~/.atlas/tasks/{team-name}/\`
 
 ## Team Workflow
@@ -318454,23 +319619,14 @@ Teammates go idle after every turn—this is completely normal and expected. A t
 
 ## Discovering Team Members
 
-Teammates can read the team config file to discover other team members:
-- **Team config location**: \`~/.atlas/teams/{team-name}/config.json\`
-
-The config file contains a \`members\` array with each teammate's:
+Form A teams are zero-persistence: no team config file is written to disk. Team members come from the \`members\` roster passed to TeamCreate (carried in the leader's team context). Each roster entry has:
 - \`name\`: Human-readable name (**always use this** for messaging and task assignment)
-- \`agentId\`: Unique identifier (for reference only - do not use for communication)
-- \`agentType\`: Role/type of the agent
+- \`role\`/\`goal\`/\`backstory\`: Role triplet used to compose the member's prompt when spawned via Agent(name, team_name)
 
 **IMPORTANT**: Always refer to teammates by their NAME (e.g., "team-lead", "researcher", "tester"). Names are used for:
 - \`to\` when sending messages
 - Identifying task owners
 
-Example of reading team config:
-\`\`\`
-Use the Read tool to read ~/.atlas/teams/{team-name}/config.json
-\`\`\`
-
 ## Task List Coordination
 
 Teams share a task list that all teammates can access at \`~/.atlas/tasks/{team-name}/\`.
@@ -318512,11 +319668,9 @@ function generateUniqueTeamName2(providedName) {
 var inputSchema37, TeamCreateTool2;
 var init_TeamCreateTool = __esm(() => {
   init_v4();
-  init_bootstrap();
   init_Tool();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_cwd3();
-  init_model();
   init_slowOperations();
   init_teamHelpers2();
   init_teammateLayoutManager2();
@@ -318525,7 +319679,13 @@ var init_TeamCreateTool = __esm(() => {
   inputSchema37 = lazySchema2(() => strictObject({
     team_name: string2().describe("Name for the new team to create."),
     description: string2().optional().describe("Team description/purpose."),
-    agent_type: string2().optional().describe('Type/role of the team lead (e.g., "researcher", "test-runner"). ' + "Used for team file and inter-agent coordination.")
+    agent_type: string2().optional().describe('Type/role of the team lead (e.g., "researcher", "test-runner"). ' + "Used for team file and inter-agent coordination."),
+    members: array(strictObject({
+      name: string2().describe("Member name (used as the spawn identity)."),
+      role: string2().optional().describe("Role label resolved against the role template registry."),
+      goal: string2().optional().describe("This member's goal for the team's current task."),
+      backstory: string2().optional().describe("This member's background/context for prompt composition.")
+    })).optional().describe("Optional roster of team members to plan for this team. Each entry " + "carries an optional role/goal/backstory triplet used to compose the " + "member's prompt when spawned via Agent(name, team_name).")
   }));
   TeamCreateTool2 = buildTool({
     name: TEAM_CREATE_TOOL_NAME2,
@@ -318552,6 +319712,17 @@ var init_TeamCreateTool = __esm(() => {
           errorCode: 9
         };
       }
+      if (input.members) {
+        for (const m of input.members) {
+          if (!m || typeof m !== "object" || !m.name || m.name.trim().length === 0) {
+            return {
+              result: false,
+              message: "each team member requires a non-empty name",
+              errorCode: 9
+            };
+          }
+        }
+      }
       return { result: true };
     },
     async description() {
@@ -318574,7 +319745,7 @@ var init_TeamCreateTool = __esm(() => {
     },
     async call(input, context) {
       const { setAppState, getAppState } = context;
-      const { team_name, description: _description, agent_type } = input;
+      const { team_name, agent_type } = input;
       const appState = getAppState();
       const existingTeam = appState.teamContext?.teamName;
       if (existingTeam) {
@@ -318583,29 +319754,8 @@ var init_TeamCreateTool = __esm(() => {
       const finalTeamName = generateUniqueTeamName2(team_name);
       const leadAgentId = formatAgentId3(TEAM_LEAD_NAME3, finalTeamName);
       const leadAgentType = agent_type || TEAM_LEAD_NAME3;
-      const leadModel = parseUserSpecifiedModel2(appState.mainLoopModelForSession ?? appState.mainLoopModel ?? getDefaultMainLoopModel());
       const teamFilePath = getTeamFilePath2(finalTeamName);
-      const teamFile = {
-        name: finalTeamName,
-        description: _description,
-        createdAt: Date.now(),
-        leadAgentId,
-        leadSessionId: getSessionId(),
-        members: [
-          {
-            agentId: leadAgentId,
-            name: TEAM_LEAD_NAME3,
-            agentType: leadAgentType,
-            model: leadModel,
-            joinedAt: Date.now(),
-            tmuxPaneId: "",
-            cwd: getCwd(),
-            subscriptions: []
-          }
-        ]
-      };
-      await writeTeamFileAsync2(finalTeamName, teamFile);
-      registerTeamForSessionCleanup2(finalTeamName);
+      const roster = input.members && input.members.length > 0 ? input.members : undefined;
       const taskListId = sanitizeName3(finalTeamName);
       await resetTaskList2(taskListId);
       await ensureTasksDir2(taskListId);
@@ -318616,6 +319766,7 @@ var init_TeamCreateTool = __esm(() => {
           teamName: finalTeamName,
           teamFilePath,
           leadAgentId,
+          roster,
           teammates: {
             [leadAgentId]: {
               name: TEAM_LEAD_NAME3,
@@ -318685,7 +319836,7 @@ var inputSchema38, TeamDeleteTool2;
 var init_TeamDeleteTool = __esm(() => {
   init_v4();
   init_Tool();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_slowOperations();
   init_teamHelpers2();
   init_teammateLayoutManager2();
@@ -318738,7 +319889,7 @@ var init_TeamDeleteTool = __esm(() => {
             return {
               data: {
                 success: false,
-                message: `Cannot cleanup team with ${activeMembers.length} active member(s): ${memberNames}. Use requestShutdown to gracefully terminate teammates first.`,
+                message: `Cannot cleanup team with ${activeMembers.length} active member(s): ${memberNames}. Send each active member a shutdown request via SendMessage first (message: {"type":"shutdown_request","request_id":"<id>","reason":"<why>"}), and wait for their shutdown approval and exit before retrying TeamDelete.`,
                 team_name: teamName
               }
             };
@@ -318770,12 +319921,12 @@ var init_TeamDeleteTool = __esm(() => {
 });
 
 // src/tui/tasks/LocalMainSessionTask.ts
-import { randomBytes as randomBytes13 } from "crypto";
+import { randomBytes as randomBytes14 } from "crypto";
 function generateMainSessionTaskId() {
-  const bytes = randomBytes13(8);
+  const bytes = randomBytes14(8);
   let id = "s";
   for (let i = 0;i < 8; i++) {
-    id += TASK_ID_ALPHABET2[bytes[i] % TASK_ID_ALPHABET2.length];
+    id += TASK_ID_ALPHABET3[bytes[i] % TASK_ID_ALPHABET3.length];
   }
   return id;
 }
@@ -318991,7 +320142,7 @@ function startBackgroundSession({
   });
   return taskId;
 }
-var DEFAULT_MAIN_SESSION_AGENT, TASK_ID_ALPHABET2 = "0123456789abcdefghijklmnopqrstuvwxyz", MAX_RECENT_ACTIVITIES3 = 5;
+var DEFAULT_MAIN_SESSION_AGENT, TASK_ID_ALPHABET3 = "0123456789abcdefghijklmnopqrstuvwxyz", MAX_RECENT_ACTIVITIES3 = 5;
 var init_LocalMainSessionTask = __esm(() => {
   init_xml();
   init_loopEvents();
@@ -319519,7 +320670,7 @@ If you receive a JSON message with \`type: "shutdown_request"\` or \`type: "plan
 Approving shutdown terminates your process. Rejecting plan sends the teammate back to revise. Don't originate \`shutdown_request\` unless asked. Don't send structured JSON status messages — use TaskUpdate.
 `.trim();
 }
-var DESCRIPTION33 = "Send a message to another agent";
+var DESCRIPTION34 = "Send a message to another agent";
 var init_prompt20 = __esm(() => {
   init_shared();
 });
@@ -319841,7 +320992,7 @@ var init_SendMessageTool = __esm(() => {
   init_LocalAgentTask();
   init_LocalMainSessionTask();
   init_ids();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_debug();
   init_errors4();
   init_format2();
@@ -320034,7 +321185,7 @@ var init_SendMessageTool = __esm(() => {
       return { result: true };
     },
     async description() {
-      return DESCRIPTION33;
+      return DESCRIPTION34;
     },
     async prompt() {
       return getPrompt27();
@@ -328991,7 +330142,7 @@ var init_tools3 = __esm(() => {
   init_embeddedTools();
   init_envUtils2();
   init_shellToolUtils();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_constants9();
   IS_ATLAS_DEV = process.env.ATLAS_DEV === "1" || process.env.ATLAS_DEV === "true";
   REPLTool2 = IS_ATLAS_DEV ? __toCommonJS(exports_REPLTool).REPLTool : null;
@@ -329046,21 +330197,8 @@ var init_zodToJsonSchema2 = __esm(() => {
 });
 
 // src/tui/utils/api.ts
-function filterSwarmFieldsFromSchema(toolName, schema) {
-  const fieldsToRemove = SWARM_FIELDS_BY_TOOL[toolName];
-  if (!fieldsToRemove || fieldsToRemove.length === 0) {
-    return schema;
-  }
-  const filtered = { ...schema };
-  const props = filtered.properties;
-  if (props && typeof props === "object") {
-    const filteredProps = { ...props };
-    for (const field of fieldsToRemove) {
-      delete filteredProps[field];
-    }
-    filtered.properties = filteredProps;
-  }
-  return filtered;
+function filterSwarmFieldsFromSchema2(toolName, schema) {
+  return filterSwarmFieldsFromSchema(toolName, schema, !isAgentSwarmsEnabled2());
 }
 async function toolToAPISchema(tool, options) {
   const cacheKey = "inputJSONSchema" in tool && tool.inputJSONSchema ? `${tool.name}:${jsonStringify5(tool.inputJSONSchema)}` : tool.name;
@@ -329070,7 +330208,7 @@ async function toolToAPISchema(tool, options) {
     const strictToolsEnabled = checkStatsigFeatureGate_CACHED_MAY_BE_STALE("atlas_tool_pear");
     let input_schema = "inputJSONSchema" in tool && tool.inputJSONSchema ? tool.inputJSONSchema : zodToJsonSchema(tool.inputSchema);
     if (!isAgentSwarmsEnabled2()) {
-      input_schema = filterSwarmFieldsFromSchema(tool.name, input_schema);
+      input_schema = filterSwarmFieldsFromSchema2(tool.name, input_schema);
     }
     base = {
       name: tool.name,
@@ -329219,7 +330357,7 @@ function normalizeToolInputForAPI(tool, input) {
       return input;
   }
 }
-var SWARM_FIELDS_BY_TOOL, loggedStrip = false;
+var loggedStrip = false;
 var init_api2 = __esm(() => {
   init_prompts2();
   init_context5();
@@ -329233,8 +330371,7 @@ var init_api2 = __esm(() => {
   init_tools3();
   init_system();
   init_tokenEstimation();
-  init_constants6();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_betas2();
   init_cwd3();
   init_debug();
@@ -329248,10 +330385,7 @@ var init_api2 = __esm(() => {
   init_toolSchemaCache();
   init_windowsPaths2();
   init_zodToJsonSchema2();
-  SWARM_FIELDS_BY_TOOL = {
-    [EXIT_PLAN_MODE_V2_TOOL_NAME2]: ["launchSwarm", "teammateCount"],
-    [AGENT_TOOL_NAME2]: ["name", "team_name", "mode"]
-  };
+  init_shared();
 });
 
 // src/tui/loopPermissionBridge.ts
@@ -329894,7 +331028,7 @@ Format: 2-12 words, match the user's style. Or nothing.
 Reply with ONLY the suggestion, no quotes or explanation.`, SUGGESTION_PROMPTS;
 var init_promptSuggestion = __esm(() => {
   init_bootstrap();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_envUtils2();
   init_errors4();
   init_forkedAgent2();
@@ -332336,7 +333470,7 @@ var init_LocalShellTask = __esm(() => {
 });
 
 // src/tui/tools/BashTool/sedEditParser.ts
-import { randomBytes as randomBytes14 } from "crypto";
+import { randomBytes as randomBytes15 } from "crypto";
 function parseSedEditCommand2(command) {
   const trimmed = command.trim();
   const sedMatch = trimmed.match(/^\s*sed\s+/);
@@ -332488,7 +333622,7 @@ function applySedSubstitution2(content, sedInfo) {
   if (!sedInfo.extendedRegex) {
     jsPattern = jsPattern.replace(/\\\\/g, BACKSLASH_PLACEHOLDER2).replace(/\\\+/g, PLUS_PLACEHOLDER2).replace(/\\\?/g, QUESTION_PLACEHOLDER2).replace(/\\\|/g, PIPE_PLACEHOLDER2).replace(/\\\(/g, LPAREN_PLACEHOLDER2).replace(/\\\)/g, RPAREN_PLACEHOLDER2).replace(/\+/g, "\\+").replace(/\?/g, "\\?").replace(/\|/g, "\\|").replace(/\(/g, "\\(").replace(/\)/g, "\\)").replace(BACKSLASH_PLACEHOLDER_RE2, "\\\\").replace(PLUS_PLACEHOLDER_RE2, "+").replace(QUESTION_PLACEHOLDER_RE2, "?").replace(PIPE_PLACEHOLDER_RE2, "|").replace(LPAREN_PLACEHOLDER_RE2, "(").replace(RPAREN_PLACEHOLDER_RE2, ")");
   }
-  const salt = randomBytes14(8).toString("hex");
+  const salt = randomBytes15(8).toString("hex");
   const ESCAPED_AMP_PLACEHOLDER = `___ESCAPED_AMPERSAND_${salt}___`;
   const jsReplacement = sedInfo.replacement.replace(/\\\//g, "/").replace(/\\&/g, ESCAPED_AMP_PLACEHOLDER).replace(/&/g, "$$&").replace(new RegExp(ESCAPED_AMP_PLACEHOLDER, "g"), "&");
   try {
@@ -335556,7 +336690,7 @@ var init_FileReadTool = __esm(() => {
     maxResultSizeChars: Infinity,
     strict: true,
     async description() {
-      return DESCRIPTION18;
+      return DESCRIPTION19;
     },
     async prompt() {
       const limits = getDefaultFileReadingLimits2();
@@ -337463,7 +338597,7 @@ var init_attachments = __esm(() => {
   init_pdfUtils2();
   init_common();
   init_pdf2();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_findRelevantMemories();
   init_paths3();
   init_factory();
@@ -338252,7 +339386,7 @@ var init_zip = __esm(() => {
 });
 
 // src/tui/utils/plugins/zipCache.ts
-import { randomBytes as randomBytes15 } from "crypto";
+import { randomBytes as randomBytes16 } from "crypto";
 import {
   chmod as chmod5,
   lstat as lstat8,
@@ -338274,7 +339408,7 @@ async function getSessionPluginCachePath() {
   }
   if (!sessionPluginCachePromise) {
     sessionPluginCachePromise = (async () => {
-      const suffix = randomBytes15(8).toString("hex");
+      const suffix = randomBytes16(8).toString("hex");
       const dir = join120(tmpdir7(), `atlas-plugin-session-${suffix}`);
       await getFsImplementation2().mkdir(dir);
       sessionPluginCachePath = dir;
@@ -338287,7 +339421,7 @@ async function getSessionPluginCachePath() {
 async function atomicWriteToZipCache(targetPath, data) {
   const dir = dirname62(targetPath);
   await getFsImplementation2().mkdir(dir);
-  const tmpName = `.${basename35(targetPath)}.tmp.${randomBytes15(4).toString("hex")}`;
+  const tmpName = `.${basename35(targetPath)}.tmp.${randomBytes16(4).toString("hex")}`;
   const tmpPath = join120(dir, tmpName);
   try {
     if (typeof data === "string") {
@@ -340728,7 +341862,7 @@ function mtimeAwareMemoize(fn, watchFiles, options) {
 var init_mtimeAwareMemoize = () => {};
 
 // src/tui/utils/plugins/installCounts.ts
-import { randomBytes as randomBytes16 } from "crypto";
+import { randomBytes as randomBytes17 } from "crypto";
 import { readFile as readFile46, rename as rename5, unlink as unlink19, writeFile as writeFile33 } from "fs/promises";
 import { join as join126 } from "path";
 function normalizeStatsBase(raw) {
@@ -340802,7 +341936,7 @@ async function loadInstallCountsCache() {
 }
 async function saveInstallCountsCache(cache) {
   const cachePath = getInstallCountsCachePath();
-  const tempPath = `${cachePath}.${randomBytes16(8).toString("hex")}.tmp`;
+  const tempPath = `${cachePath}.${randomBytes17(8).toString("hex")}.tmp`;
   try {
     const pluginsDir = getPluginsDirectory();
     await getFsImplementation2().mkdir(pluginsDir);
@@ -340981,7 +342115,7 @@ var init_pluginVersioning = __esm(() => {
 });
 
 // src/tui/utils/plugins/pluginInstallationHelpers.ts
-import { randomBytes as randomBytes17 } from "crypto";
+import { randomBytes as randomBytes18 } from "crypto";
 import { rename as rename6, rm as rm9 } from "fs/promises";
 import { dirname as dirname66, join as join127, resolve as resolve48, sep as sep28 } from "path";
 function getCurrentTimestamp() {
@@ -341012,7 +342146,7 @@ async function cacheAndRegisterPlugin(pluginId, entry, scope = "user", projectPa
     const normalizedCachePath = cacheResult.path.endsWith(sep28) ? cacheResult.path : cacheResult.path + sep28;
     const isSubdirectory = versionedPath.startsWith(normalizedCachePath);
     if (isSubdirectory) {
-      const tempPath = join127(dirname66(cacheResult.path), `.atlas-plugin-temp-${Date.now()}-${randomBytes17(4).toString("hex")}`);
+      const tempPath = join127(dirname66(cacheResult.path), `.atlas-plugin-temp-${Date.now()}-${randomBytes18(4).toString("hex")}`);
       await rename6(cacheResult.path, tempPath);
       await getFsImplementation2().mkdir(dirname66(versionedPath));
       await rename6(tempPath, versionedPath);
@@ -346002,7 +347136,7 @@ var init_messages3 = __esm(() => {
   init_paths3();
   init_growthbook();
   init_modelprovider2();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_attachments();
   init_shellQuote2();
   init_format2();
@@ -346219,9 +347353,9 @@ var init_prefix = __esm(() => {
 });
 
 // src/tui/utils/bash/commands.ts
-import { randomBytes as randomBytes18 } from "crypto";
+import { randomBytes as randomBytes19 } from "crypto";
 function generatePlaceholders2() {
-  const salt = randomBytes18(8).toString("hex");
+  const salt = randomBytes19(8).toString("hex");
   return {
     SINGLE_QUOTE: `__SINGLE_QUOTE_${salt}__`,
     DOUBLE_QUOTE: `__DOUBLE_QUOTE_${salt}__`,
@@ -360924,7 +362058,7 @@ var init_Config = __esm(() => {
   init_outputStyles();
   init_envUtils2();
   init_growthbook();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_teammateModeSnapshot2();
   init_teammateModel2();
   init_modelprovider2();
@@ -370648,7 +371782,7 @@ var init_TaskListV2 = __esm(() => {
   init_AppState();
   init_types15();
   init_agentColorManager();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_collapseReadSearch();
   init_format2();
   init_tasks5();
@@ -410478,7 +411612,7 @@ var init_ManageMarketplaces = __esm(() => {
 });
 
 // src/tui/utils/plugins/pluginFlagging.ts
-import { randomBytes as randomBytes19 } from "crypto";
+import { randomBytes as randomBytes20 } from "crypto";
 import { readFile as readFile56, rename as rename10, unlink as unlink22, writeFile as writeFile42 } from "fs/promises";
 import { join as join149 } from "path";
 function getFlaggedPluginsPath() {
@@ -410516,7 +411650,7 @@ async function readFromDisk() {
 }
 async function writeToDisk(plugins) {
   const filePath = getFlaggedPluginsPath();
-  const tempPath = `${filePath}.${randomBytes19(8).toString("hex")}.tmp`;
+  const tempPath = `${filePath}.${randomBytes20(8).toString("hex")}.tmp`;
   try {
     await getFsImplementation2().mkdir(getPluginsDirectory());
     const content = jsonStringify5({ plugins }, null, 2);
@@ -420010,7 +421144,7 @@ var require_asciichart = __commonJS(function(exports) {
 });
 
 // src/tui/utils/statsCache.ts
-import { randomBytes as randomBytes20 } from "crypto";
+import { randomBytes as randomBytes21 } from "crypto";
 import { open as open18 } from "fs/promises";
 import { join as join159 } from "path";
 async function withStatsCacheLock(fn) {
@@ -420106,7 +421240,7 @@ async function loadStatsCache() {
 async function saveStatsCache(cache) {
   const fs = getFsImplementation2();
   const cachePath = getStatsCachePath();
-  const tempPath = `${cachePath}.${randomBytes20(8).toString("hex")}.tmp`;
+  const tempPath = `${cachePath}.${randomBytes21(8).toString("hex")}.tmp`;
   try {
     const configDir = getAtlasConfigHomeDir3();
     try {
@@ -429091,7 +430225,7 @@ var init_plans = __esm(() => {
 });
 
 // src/tui/utils/permissions/filesystem.ts
-import { randomBytes as randomBytes21 } from "crypto";
+import { randomBytes as randomBytes22 } from "crypto";
 import { homedir as homedir38, tmpdir as tmpdir11 } from "os";
 import { join as join165, normalize as normalize15, posix as posix9, resolve as resolve57, sep as sep37 } from "path";
 function normalizeCaseForComparison2(path) {
@@ -430019,7 +431153,7 @@ var init_filesystem2 = __esm(() => {
     return join165(resolvedBaseTmpDir, getAtlasTempDirName2()) + sep37;
   });
   getBundledSkillsRoot2 = memoize_default(function getBundledSkillsRoot() {
-    const nonce = randomBytes21(16).toString("hex");
+    const nonce = randomBytes22(16).toString("hex");
     return join165(getAtlasTempDir2(), "bundled-skills", MACRO.VERSION, nonce);
   });
   worktreeCwdProbeCache2 = new Map;
@@ -430240,22 +431374,22 @@ var init_diskOutput2 = __esm(() => {
 });
 
 // src/tui/Task.ts
-import { randomBytes as randomBytes22 } from "crypto";
+import { randomBytes as randomBytes23 } from "crypto";
 function isTerminalTaskStatus2(status) {
   return status === "completed" || status === "failed" || status === "killed";
 }
 function hasNonTerminalTasks(tasks) {
   return Object.values(tasks).some((t) => !isTerminalTaskStatus2(t.status));
 }
-function getTaskIdPrefix(type) {
-  return TASK_ID_PREFIXES[type] ?? "x";
+function getTaskIdPrefix2(type) {
+  return TASK_ID_PREFIXES2[type] ?? "x";
 }
 function generateTaskId2(type) {
-  const prefix = getTaskIdPrefix(type);
-  const bytes = randomBytes22(8);
+  const prefix = getTaskIdPrefix2(type);
+  const bytes = randomBytes23(8);
   let id = prefix;
   for (let i = 0;i < 8; i++) {
-    id += TASK_ID_ALPHABET3[bytes[i] % TASK_ID_ALPHABET3.length];
+    id += TASK_ID_ALPHABET4[bytes[i] % TASK_ID_ALPHABET4.length];
   }
   return id;
 }
@@ -430272,10 +431406,10 @@ function createTaskStateBase2(id, type, description, toolUseId) {
     notified: false
   };
 }
-var TASK_ID_PREFIXES, TASK_ID_ALPHABET3 = "0123456789abcdefghijklmnopqrstuvwxyz";
+var TASK_ID_PREFIXES2, TASK_ID_ALPHABET4 = "0123456789abcdefghijklmnopqrstuvwxyz";
 var init_Task = __esm(() => {
   init_diskOutput2();
-  TASK_ID_PREFIXES = {
+  TASK_ID_PREFIXES2 = {
     local_bash: "b",
     local_agent: "a",
     remote_agent: "r",
@@ -432168,7 +433302,7 @@ var init_betaSessionTracing = __esm(() => {
 });
 
 // src/tui/utils/telemetry/sessionTracing.ts
-import { AsyncLocalStorage as AsyncLocalStorage7 } from "async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage5 } from "async_hooks";
 function getSpanId(span) {
   return span.spanContext().spanId || "";
 }
@@ -432353,8 +433487,8 @@ var init_sessionTracing = __esm(() => {
   init_betaSessionTracing();
   init_perfettoTracing();
   import_api5 = __toESM(require_src3(), 1);
-  interactionContext = new AsyncLocalStorage7;
-  toolContext = new AsyncLocalStorage7;
+  interactionContext = new AsyncLocalStorage5;
+  toolContext = new AsyncLocalStorage5;
   activeSpans = new Map;
   strongSpans = new Map;
   SPAN_TTL_MS = 30 * 60 * 1000;
@@ -432604,7 +433738,7 @@ var init_hookInputMaterialize = __esm(() => {
 });
 
 // src/tui/utils/hooks/hookReentrancy.ts
-import { AsyncLocalStorage as AsyncLocalStorage8 } from "async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage6 } from "async_hooks";
 function getCallbackId(fn) {
   let id = callbackIds.get(fn);
   if (id === undefined) {
@@ -432631,7 +433765,7 @@ function runWithHookReentrancy(hookEvent, hook, pluginRoot, fn) {
 }
 var hookReentrancyStorage, callbackIds, nextCallbackId = 1;
 var init_hookReentrancy = __esm(() => {
-  hookReentrancyStorage = new AsyncLocalStorage8;
+  hookReentrancyStorage = new AsyncLocalStorage6;
   callbackIds = new WeakMap;
 });
 
@@ -437109,12 +438243,6 @@ async function streamCompactSummary({
       let hasStartedStreaming = false;
       let response;
       context.setResponseLength?.(() => 0);
-      const useToolSearch = await isToolSearchEnabled(compactModel, context.options.tools, async () => appState.toolPermissionContext, context.options.agentDefinitions.activeAgents, "compact");
-      const tools = useToolSearch ? uniqBy_default([
-        FileReadTool,
-        ToolSearchTool2,
-        ...context.options.tools.filter((t) => t.isMcp)
-      ], "name") : [FileReadTool];
       const compactMessages = normalizeMessagesForAPI(stripImagesFromMessages2(stripReinjectedAttachments([
         ...getMessagesAfterCompactBoundary(messages),
         summaryRequest
@@ -437122,11 +438250,9 @@ async function streamCompactSummary({
       const compactRole = modelToRole(compactModel);
       const params = await buildOpenAIParams({
         messages: compactMessages,
-        systemPrompt: asSystemPrompt2([
-          "You are a helpful AI assistant tasked with summarizing conversations."
-        ]),
+        systemPrompt: asSystemPrompt2(appendSystemContext(cacheSafeParams.systemPrompt, cacheSafeParams.systemContext)),
         thinkingConfig: { type: "disabled" },
-        tools,
+        tools: context.options.tools,
         options: {
           model: compactModel,
           async getToolPermissionContext() {
@@ -437356,14 +438482,12 @@ var POST_COMPACT_MAX_FILES_TO_RESTORE = 5, POST_COMPACT_TOKEN_BUDGET = 50000, PO
 var init_compact4 = __esm(() => {
   init_shared();
   init_shared();
-  init_uniqBy();
+  init_api2();
   init_atlas();
   init_compactModelSwitch();
   init_bootstrapState();
   init_bootstrapState();
-  init_FileReadTool();
   init_prompt2();
-  init_ToolSearchTool();
   init_attachments();
   init_config6();
   init_context2();
@@ -441400,7 +442524,7 @@ function useLogMessages(messages, ignore = false) {
 var import_react178;
 var init_useLogMessages = __esm(() => {
   init_AppState();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_sessionStorage();
   import_react178 = __toESM(require_react(), 1);
 });
@@ -450546,7 +451670,7 @@ var init_ExitPlanModePermissionRequest = __esm(() => {
   init_generateSessionName();
   init_ink2();
   init_constants6();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_context2();
   init_editor();
   init_file();
@@ -461223,7 +462347,7 @@ var init_useTypeahead = __esm(() => {
   init_useKeybinding();
   init_useShortcutDisplay();
   init_AppState();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_argumentSubstitution2();
   init_shellCompletion();
   init_format2();
@@ -466469,7 +467593,7 @@ var init_PromptInputFooterLeftSide = __esm(() => {
   init_BackgroundTaskStatus();
   init_types14();
   init_taskStatusUtils();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_TeamStatus();
   init_registry3();
   init_AppState();
@@ -466747,7 +467871,7 @@ var init_PromptInputModeIndicator = __esm(() => {
   init_ink2();
   init_agentColorManager();
   init_teammate2();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   import_compiler_runtime297 = __toESM(require_compiler_runtime(), 1);
   jsx_dev_runtime405 = __toESM(require_jsx_dev_runtime(), 1);
 });
@@ -467164,7 +468288,7 @@ function useSwarmBanner() {
     isInsideTmux3().then(setInsideTmux);
   }, []);
   const state = store.getState();
-  if (isTeammate2() && !isInProcessTeammate3()) {
+  if (isTeammate2() && !isInProcessTeammate()) {
     const agentName = getAgentName2();
     if (agentName && getTeamName2()) {
       return {
@@ -467236,7 +468360,7 @@ var init_useSwarmBanner = __esm(() => {
   init_detection2();
   init_registry3();
   init_teammate2();
-  init_teammateContext3();
+  init_shared();
   React127 = __toESM(require_react(), 1);
 });
 
@@ -468748,7 +469872,7 @@ function PromptInput({
     if (modeColors[mode]) {
       return modeColors[mode];
     }
-    if (isInProcessTeammate3()) {
+    if (isInProcessTeammate()) {
       return "promptBorder";
     }
     const teammateColorName = getTeammateColor3();
@@ -468989,7 +470113,7 @@ var init_PromptInput = __esm(() => {
   init_InProcessTeammateTask();
   init_types14();
   init_agentColorManager();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_Cursor();
   init_config6();
   init_debug();
@@ -469013,7 +470137,7 @@ var init_PromptInput = __esm(() => {
   init_registry3();
   init_teamHelpers2();
   init_teammate2();
-  init_teammateContext3();
+  init_shared();
   init_teammateMailbox();
   init_thinking();
   init_tokenBudget();
@@ -471621,7 +472745,7 @@ function useSwarmInitialization(setAppState, initialMessages, { enabled = true }
 var import_react248;
 var init_useSwarmInitialization = __esm(() => {
   init_bootstrap();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_reconnection2();
   init_teamHelpers2();
   init_teammateInit();
@@ -472416,7 +473540,7 @@ async function handleSwarmWorkerPermission(params) {
 }
 var init_swarmWorkerHandler = __esm(() => {
   init_shared();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_errors4();
   init_log5();
   init_permissionSync2();
@@ -474930,7 +476054,7 @@ var init_sessionRestore = __esm(() => {
 // src/tui/hooks/useInboxPoller.ts
 import { randomUUID as randomUUID51 } from "crypto";
 function getAgentNameToPoll(appState) {
-  if (isInProcessTeammate3()) {
+  if (isInProcessTeammate()) {
     return;
   }
   if (isTeammate2()) {
@@ -475509,7 +476633,7 @@ var init_useInboxPoller = __esm(() => {
   init_teamHelpers2();
   init_tasks5();
   init_teammate2();
-  init_teammateContext3();
+  init_shared();
   init_teammateMailbox();
   init_useSwarmPermissionPoller();
   import_react257 = __toESM(require_react(), 1);
@@ -485412,7 +486536,7 @@ var init_REPL = __esm(() => {
   init_concurrentSessions2();
   init_types15();
   init_useInboxPoller();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_ide();
   init_useIDEIntegration();
   init_exit2();
@@ -493237,7 +494361,7 @@ var init_setup4 = __esm(() => {
   init_commands5();
   init_sessionMemory2();
   init_ids();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_appleTerminalBackup();
   init_auth4();
   init_memoryFiles();
@@ -498418,7 +499542,7 @@ var init_main3 = __esm(() => {
   init_growthbook();
   init_SyntheticOutputTool();
   init_tools3();
-  init_agentSwarmsEnabled2();
+  init_agentSwarmsEnabled3();
   init_asciicast();
   init_auth4();
   init_config6();
@@ -498848,6 +499972,38 @@ function createCoreDependencies() {
   setTeammateToolRegistryDeps({
     baseTools: [SnipTool, TeamCreateTool, TeamDeleteTool]
   });
+  getInProcessBackend().setContext({
+    getAppState: () => appState.get(),
+    setAppState: (f) => {
+      appState.set(f);
+    },
+    messages: []
+  });
+  setTeammateSpawnTrigger(async (config) => {
+    if (isTeammate()) {
+      return {
+        success: false,
+        agentId: `${config.name}@${config.teamName}`,
+        error: "nested teammate spawn is not supported (a teammate cannot spawn teammates)"
+      };
+    }
+    const result = await getInProcessBackend().spawn({
+      name: config.name,
+      teamName: config.teamName,
+      prompt: config.prompt,
+      ...config.model ? { model: config.model } : {},
+      ...config.allowedTools ? { permissions: config.allowedTools } : {},
+      allowPermissionPrompts: config.allowPermissionPrompts ?? false,
+      ...config.systemPrompt ? { systemPrompt: config.systemPrompt } : {},
+      ...config.systemPromptMode ? { systemPromptMode: config.systemPromptMode } : {}
+    });
+    return {
+      success: result.success,
+      agentId: result.agentId,
+      ...result.taskId ? { taskId: result.taskId } : {},
+      ...result.error ? { error: result.error } : {}
+    };
+  });
   setAgentLoopDepsTeammatePoolSync(setTeammateToolRegistryDeps);
   setAgentLoopDepsMcpConnectionsProvider(() => buildMcpEngineConnections(getMcpConnectionManager()));
   setWebSearchSettingsKeyProvider(() => {