@opencow-ai/opencow-agent-sdk 0.4.6 → 0.4.7

package/dist/sdk.js

@@ -63345,7 +63345,7 @@ function getToolNameForPermissionCheck(tool) {
 var init_mcpStringUtils = () => {};
 
 // src/constants/toolNames.ts
-var AGENT_TOOL_NAME2 = "Agent", ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion", BASH_TOOL_NAME = "Bash", ENTER_PLAN_MODE_TOOL_NAME = "EnterPlanMode", ENTER_WORKTREE_TOOL_NAME = "EnterWorktree", EXIT_PLAN_MODE_TOOL_NAME = "ExitPlanMode", EXIT_PLAN_MODE_V2_TOOL_NAME = "ExitPlanMode", EXIT_WORKTREE_TOOL_NAME = "ExitWorktree", FILE_EDIT_TOOL_NAME = "Edit", FILE_READ_TOOL_NAME = "Read", FILE_WRITE_TOOL_NAME = "Write", GLOB_TOOL_NAME = "Glob", GREP_TOOL_NAME = "Grep", NOTEBOOK_EDIT_TOOL_NAME = "NotebookEdit", POWERSHELL_TOOL_NAME = "PowerShell", REPL_TOOL_NAME = "REPL", SEND_MESSAGE_TOOL_NAME = "SendMessage", SKILL_TOOL_NAME = "Skill", SLEEP_TOOL_NAME = "Sleep", SYNTHETIC_OUTPUT_TOOL_NAME = "StructuredOutput", TASK_CREATE_TOOL_NAME = "TaskCreate", TASK_GET_TOOL_NAME = "TaskGet", TASK_LIST_TOOL_NAME = "TaskList", TASK_OUTPUT_TOOL_NAME = "TaskOutput", TASK_STOP_TOOL_NAME = "TaskStop", TASK_UPDATE_TOOL_NAME = "TaskUpdate", TEAM_CREATE_TOOL_NAME = "TeamCreate", TEAM_DELETE_TOOL_NAME = "TeamDelete", TODO_WRITE_TOOL_NAME = "TodoWrite", TOOL_SEARCH_TOOL_NAME = "ToolSearch", EXPLORE_AGENT_TYPE = "Explore", PLAN_AGENT_TYPE = "Plan", WEB_FETCH_TOOL_NAME = "WebFetch", WEB_SEARCH_TOOL_NAME = "WebSearch";
+var AGENT_TOOL_NAME = "Agent", ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion", BASH_TOOL_NAME = "Bash", ENTER_PLAN_MODE_TOOL_NAME = "EnterPlanMode", ENTER_WORKTREE_TOOL_NAME = "EnterWorktree", EXIT_PLAN_MODE_TOOL_NAME = "ExitPlanMode", EXIT_PLAN_MODE_V2_TOOL_NAME = "ExitPlanMode", EXIT_WORKTREE_TOOL_NAME = "ExitWorktree", FILE_EDIT_TOOL_NAME = "Edit", FILE_READ_TOOL_NAME = "Read", FILE_WRITE_TOOL_NAME = "Write", GLOB_TOOL_NAME = "Glob", GREP_TOOL_NAME = "Grep", NOTEBOOK_EDIT_TOOL_NAME = "NotebookEdit", POWERSHELL_TOOL_NAME = "PowerShell", REPL_TOOL_NAME = "REPL", SEND_MESSAGE_TOOL_NAME = "SendMessage", SKILL_TOOL_NAME = "Skill", SLEEP_TOOL_NAME = "Sleep", SYNTHETIC_OUTPUT_TOOL_NAME = "StructuredOutput", TASK_CREATE_TOOL_NAME = "TaskCreate", TASK_GET_TOOL_NAME = "TaskGet", TASK_LIST_TOOL_NAME = "TaskList", TASK_OUTPUT_TOOL_NAME = "TaskOutput", TASK_STOP_TOOL_NAME = "TaskStop", TASK_UPDATE_TOOL_NAME = "TaskUpdate", TEAM_CREATE_TOOL_NAME = "TeamCreate", TEAM_DELETE_TOOL_NAME = "TeamDelete", TODO_WRITE_TOOL_NAME = "TodoWrite", TOOL_SEARCH_TOOL_NAME = "ToolSearch", EXPLORE_AGENT_TYPE = "Explore", PLAN_AGENT_TYPE = "Plan", WEB_FETCH_TOOL_NAME = "WebFetch", WEB_SEARCH_TOOL_NAME = "WebSearch";
 
 // src/permissions/permissionRuleParser.ts
 function normalizeLegacyToolName(name) {
@@ -63430,7 +63430,7 @@ function findLastUnescapedChar(str, char) {
 var LEGACY_TOOL_NAME_ALIASES;
 var init_permissionRuleParser = __esm(() => {
   LEGACY_TOOL_NAME_ALIASES = {
-    Task: AGENT_TOOL_NAME2,
+    Task: AGENT_TOOL_NAME,
     KillShell: TASK_STOP_TOOL_NAME,
     AgentOutputTool: TASK_OUTPUT_TOOL_NAME,
     BashOutputTool: TASK_OUTPUT_TOOL_NAME,
@@ -96694,7 +96694,8 @@ class OpenAIShimMessages {
     const self2 = this;
     let httpResponse;
     const promise3 = (async () => {
-      const request = resolveProviderRequest({ model: self2.providerOverride?.model ?? params.model, baseUrl: self2.providerOverride?.baseURL, reasoningEffortOverride: self2.reasoningEffort });
+      const overrideTransport = self2.providerOverride?.transport === "anthropic" ? undefined : self2.providerOverride?.transport;
+      const request = resolveProviderRequest({ model: self2.providerOverride?.model ?? params.model, baseUrl: self2.providerOverride?.baseURL, reasoningEffortOverride: self2.reasoningEffort, transportOverride: overrideTransport });
       const response = await self2._doRequest(request, params, options);
       httpResponse = response;
       if (params.stream) {
@@ -96719,7 +96720,7 @@ class OpenAIShimMessages {
   }
   async _doRequest(request, params, options) {
     if (request.transport === "openai_responses") {
-      const credentials = resolveOpenAIResponsesCredentials();
+      const credentials = this.providerOverride?.apiKey ? { apiKey: this.providerOverride.apiKey, source: "env-openai" } : resolveOpenAIResponsesCredentials();
       if (!credentials.apiKey) {
         const safeModel = redactSecretValueForDisplay(request.requestedModel, process.env) ?? "the requested model";
         const codexAuthHint = credentials.authPath ? `, set CODEX_API_KEY, or place a Codex auth.json at ${credentials.authPath}` : " or set CODEX_API_KEY";
@@ -96738,7 +96739,7 @@ class OpenAIShimMessages {
           ...options?.headers ?? {}
         },
         signal: options?.signal,
-        providerSpecific: readOpenAIResponsesProviderSpecific()
+        providerSpecific: this.providerOverride?.providerSpecific?.openaiResponses ?? readOpenAIResponsesProviderSpecific()
       });
     }
     return this._doOpenAIRequest(request, params, options);
@@ -97045,7 +97046,6 @@ async function getNormalizedClient({
     }
   };
   if (providerOverride) {
-    const { createOpenAIShimClient: createOpenAIShimClient2 } = await Promise.resolve().then(() => (init_shim2(), exports_shim));
     const safeHeaders = {};
     for (const [k, v] of Object.entries(defaultHeaders)) {
       const lower = k.toLowerCase();
@@ -97053,6 +97053,18 @@ async function getNormalizedClient({
         continue;
       safeHeaders[k] = v;
     }
+    if (providerOverride.transport === "anthropic") {
+      const overrideToken = providerOverride.apiKey ?? getQueryEnvVar("ANTHROPIC_AUTH_TOKEN");
+      return new Anthropic({
+        apiKey: null,
+        ...overrideToken ? { authToken: overrideToken } : {},
+        ...providerOverride.baseURL ? { baseURL: providerOverride.baseURL } : {},
+        ...ARGS,
+        defaultHeaders: safeHeaders,
+        ...isDebugToStdErr() && { logger: createStderrLogger() }
+      });
+    }
+    const { createOpenAIShimClient: createOpenAIShimClient2 } = await Promise.resolve().then(() => (init_shim2(), exports_shim));
     return createOpenAIShimClient2({
       defaultHeaders: safeHeaders,
       maxRetries,
@@ -97530,6 +97542,13 @@ function resolveProviderFromEnv(envOverride) {
     const model = readEnv2(envOverride, "OPENAI_MODEL")?.trim() ?? "";
     return model && isCodexAlias(model) ? providers.codex() : providers.openai();
   }
+  const transport = readEnv2(envOverride, QUERY_ENV_KEY_TRANSPORT_OVERRIDE)?.trim();
+  if (transport === "openai_responses" || transport === "codex_responses") {
+    return providers.codex();
+  }
+  if (transport === "chat_completions") {
+    return providers.openai();
+  }
   if (envOverride) {
     const hasOAuthToken = Boolean(readEnv2(envOverride, "CLAUDE_CODE_OAUTH_TOKEN"));
     return providers.anthropic({
@@ -107602,7 +107621,7 @@ var init_paths2 = __esm(() => {
 });
 
 // src/capabilities/tools/AgentTool/constants.ts
-var AGENT_TOOL_NAME3 = "Agent", LEGACY_AGENT_TOOL_NAME = "Task", VERIFICATION_AGENT_TYPE2 = "verification", ONE_SHOT_BUILTIN_AGENT_TYPES;
+var AGENT_TOOL_NAME2 = "Agent", LEGACY_AGENT_TOOL_NAME = "Task", VERIFICATION_AGENT_TYPE = "verification", ONE_SHOT_BUILTIN_AGENT_TYPES;
 var init_constants4 = __esm(() => {
   ONE_SHOT_BUILTIN_AGENT_TYPES = new Set([
     "Explore",
@@ -107714,7 +107733,7 @@ function getDescription() {
   - Supports full regex syntax (e.g., "log.*Error", "function\\s+\\w+")
   - Filter files with glob parameter (e.g., "*.js", "**/*.tsx") or type parameter (e.g., "js", "py", "rust")
   - Output modes: "content" shows matching lines, "files_with_matches" shows only file paths (default), "count" shows match counts
-  - Use ${AGENT_TOOL_NAME3} tool for open-ended searches requiring multiple rounds
+  - Use ${AGENT_TOOL_NAME2} tool for open-ended searches requiring multiple rounds
   - Pattern syntax: Uses ripgrep (not grep) - literal braces need escaping (use \`interface\\{\\}\` to find \`interface{}\` in Go code)
   - Multiline matching: By default patterns match within single lines only. For cross-line patterns like \`struct \\{[\\s\\S]*?field\`, use \`multiline: true\`
 `;
@@ -107751,7 +107770,7 @@ var init_constants5 = __esm(() => {
     GREP_TOOL_NAME2,
     BASH_TOOL_NAME2,
     NOTEBOOK_EDIT_TOOL_NAME2,
-    AGENT_TOOL_NAME3
+    AGENT_TOOL_NAME2
   ]);
 });
 
@@ -223847,7 +223866,7 @@ var init_tools = __esm(() => {
     TASK_OUTPUT_TOOL_NAME,
     EXIT_PLAN_MODE_V2_TOOL_NAME,
     ENTER_PLAN_MODE_TOOL_NAME,
-    ...process.env.USER_TYPE === "ant" ? [] : [AGENT_TOOL_NAME2],
+    ...process.env.USER_TYPE === "ant" ? [] : [AGENT_TOOL_NAME],
     ASK_USER_QUESTION_TOOL_NAME,
     TASK_STOP_TOOL_NAME,
     ...[]
@@ -223881,7 +223900,7 @@ var init_tools = __esm(() => {
     ...[]
   ]);
   COORDINATOR_MODE_ALLOWED_TOOLS = new Set([
-    AGENT_TOOL_NAME2,
+    AGENT_TOOL_NAME,
     TASK_STOP_TOOL_NAME,
     SEND_MESSAGE_TOOL_NAME,
     SYNTHETIC_OUTPUT_TOOL_NAME
@@ -231969,7 +231988,7 @@ var init_exploreAgent = __esm(() => {
     agentType: "Explore",
     whenToUse: EXPLORE_WHEN_TO_USE,
     disallowedTools: [
-      AGENT_TOOL_NAME2,
+      AGENT_TOOL_NAME,
       EXIT_PLAN_MODE_TOOL_NAME,
       FILE_EDIT_TOOL_NAME,
       FILE_WRITE_TOOL_NAME,
@@ -232075,7 +232094,7 @@ var init_planAgent = __esm(() => {
     agentType: "Plan",
     whenToUse: "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a task. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs.",
     disallowedTools: [
-      AGENT_TOOL_NAME3,
+      AGENT_TOOL_NAME2,
       EXIT_PLAN_MODE_TOOL_NAME,
       FILE_EDIT_TOOL_NAME,
       FILE_WRITE_TOOL_NAME,
@@ -232363,7 +232382,23 @@ Use the literal string \`VERDICT: \` followed by exactly one of \`PASS\`, \`FAIL
 - **PARTIAL**: what was verified, what could not be and why (missing tool/env), what the implementer should know.`;
 });
 
+// src/capabilities/tools/AgentTool/agentMerge.ts
+function mergeAgentsByType(base2, override) {
+  const byType = new Map;
+  for (const agent of base2)
+    byType.set(agent.agentType, agent);
+  for (const agent of override)
+    byType.set(agent.agentType, agent);
+  return [...byType.values()];
+}
+
 // src/capabilities/tools/AgentTool/builtInAgents.ts
+var exports_builtInAgents = {};
+__export(exports_builtInAgents, {
+  resolveSdkAgents: () => resolveSdkAgents,
+  getBuiltInAgents: () => getBuiltInAgents,
+  areExplorePlanAgentsEnabled: () => areExplorePlanAgentsEnabled
+});
 function areExplorePlanAgentsEnabled() {
   if (false) {}
   return false;
@@ -232387,6 +232422,9 @@ function getBuiltInAgents() {
   if (false) {}
   return agents;
 }
+function resolveSdkAgents(hostAgents) {
+  return mergeAgentsByType(getBuiltInAgents(), hostAgents);
+}
 var init_builtInAgents = __esm(() => {
   init_state();
   init_envUtils();
@@ -234457,6 +234495,34 @@ var init_registerFrontmatterHooks = __esm(() => {
   init_sessionHooks();
 });
 
+// src/session/backgroundAbortRegistry.ts
+function registerBackgroundAgentAbort(agentId, controller) {
+  runs.set(agentId, { controller, stopFired: false });
+}
+function unregisterBackgroundAgentAbort(agentId) {
+  runs.delete(agentId);
+}
+function abortBackgroundAgentById(agentId) {
+  const run = runs.get(agentId);
+  if (!run)
+    return false;
+  run.controller.abort();
+  return true;
+}
+function markSubagentStopFired(agentId) {
+  const run = runs.get(agentId);
+  if (run) {
+    run.stopFired = true;
+  }
+}
+function hasSubagentStopFired(agentId) {
+  return runs.get(agentId)?.stopFired ?? false;
+}
+var runs;
+var init_backgroundAbortRegistry = __esm(() => {
+  runs = new Map;
+});
+
 // src/providers/shared/model/agent.ts
 function getDefaultSubagentModel() {
   return "inherit";
@@ -234508,6 +234574,12 @@ var init_agent = __esm(() => {
 });
 
 // src/providers/shared/routing.ts
+function resolveModelProvider(model, modelProviders) {
+  const config2 = modelProviders?.[model];
+  if (!config2)
+    return null;
+  return { model, ...config2 };
+}
 function normalize10(key) {
   return key.toLowerCase().replace(/[-_]/g, "");
 }
@@ -234811,6 +234883,12 @@ var init_caching = __esm(() => {
 });
 
 // src/providers/shared/model/antModels.ts
+function getAntModelOverrideConfig2() {
+  if (process.env.USER_TYPE !== "ant") {
+    return null;
+  }
+  return getFeatureValue_CACHED_MAY_BE_STALE("tengu_ant_model_override", null);
+}
 var init_antModels = () => {};
 
 // src/lib/fingerprint.ts
@@ -235043,7 +235121,7 @@ function filterToolsForAgent({
     }
     if (isAsync2 && !ASYNC_AGENT_ALLOWED_TOOLS.has(tool.name)) {
       if (isAgentSwarmsEnabled() && isInProcessTeammate()) {
-        if (toolMatchesName(tool, AGENT_TOOL_NAME3)) {
+        if (toolMatchesName(tool, AGENT_TOOL_NAME2)) {
           return true;
         }
         if (IN_PROCESS_TEAMMATE_ALLOWED_TOOLS.has(tool.name)) {
@@ -235093,7 +235171,7 @@ function resolveAgentTools(agentDefinition, availableTools, isAsync2 = false, is
   let allowedAgentTypes;
   for (const toolSpec of agentTools) {
     const { toolName, ruleContent } = permissionRuleValueFromString(toolSpec);
-    if (toolName === AGENT_TOOL_NAME3) {
+    if (toolName === AGENT_TOOL_NAME2) {
       if (ruleContent) {
         allowedAgentTypes = ruleContent.split(",").map((s) => s.trim());
       }
@@ -235312,6 +235390,8 @@ async function runAsyncAgentLifecycle({
       return;
     }
     const msg = errorMessage(error41);
+    logForDebugging(`Background agent ${taskId} failed: ${msg}
+${error41 instanceof Error ? error41.stack ?? "" : ""}`, { level: "error" });
     failAgentTask(taskId, msg, rootSetAppState);
     const worktreeResult = await getWorktreeResult();
     enqueueAgentNotification({
@@ -235466,6 +235546,49 @@ async function initializeAgentMcpServers(agentDefinition, parentClients) {
 function isRecordableMessage(msg) {
   return msg.type === "assistant" || msg.type === "user" || msg.type === "progress" || msg.type === "system" && "subtype" in msg && msg.subtype === "compact_boundary";
 }
+function simplifySubagentMessageBlocks(msg) {
+  const content = msg.message.content;
+  if (!Array.isArray(content))
+    return [];
+  const out = [];
+  for (const raw of content) {
+    if (!raw || typeof raw !== "object")
+      continue;
+    const block2 = raw;
+    switch (block2.type) {
+      case "text":
+        if (typeof block2.text === "string" && block2.text) {
+          out.push({ type: "text", text: block2.text });
+        }
+        break;
+      case "thinking":
+        if (typeof block2.thinking === "string" && block2.thinking) {
+          out.push({ type: "thinking", thinking: block2.thinking });
+        }
+        break;
+      case "tool_use":
+        out.push({
+          type: "tool_use",
+          tool_use_id: block2.id,
+          name: block2.name,
+          input: block2.input ?? {}
+        });
+        break;
+      case "tool_result": {
+        const c6 = block2.content;
+        const text = typeof c6 === "string" ? c6 : Array.isArray(c6) ? c6.map((p) => p && typeof p === "object" && p.type === "text" ? String(p.text ?? "") : "").join("") : "";
+        out.push({
+          type: "tool_result",
+          tool_use_id: block2.tool_use_id,
+          content: text,
+          is_error: Boolean(block2.is_error)
+        });
+        break;
+      }
+    }
+  }
+  return out;
+}
 async function* runAgent({
   agentDefinition,
   promptMessages,
@@ -235488,13 +235611,14 @@ async function* runAgent({
   description,
   transcriptSubdir,
   onQueryProgress,
+  onPartialAssistant,
   agentName
 }) {
   const appState = toolUseContext.getAppState();
   const permissionMode = appState.toolPermissionContext.mode;
   const rootSetAppState = toolUseContext.setAppStateForTasks ?? toolUseContext.setAppState;
   const resolvedAgentModel = getAgentModel(agentDefinition.model, toolUseContext.options.mainLoopModel, model, permissionMode);
-  const providerOverride = resolveAgentProvider(agentName, agentDefinition.agentType, getInitialSettings());
+  const providerOverride = resolveAgentProvider(agentName, agentDefinition.agentType, getInitialSettings()) ?? resolveModelProvider(resolvedAgentModel, toolUseContext.options.modelProviders);
   const effectiveModel = providerOverride ? providerOverride.model : resolvedAgentModel;
   const agentId = override?.agentId ? override.agentId : createAgentId();
   if (transcriptSubdir) {
@@ -235565,8 +235689,11 @@ async function* runAgent({
   const additionalWorkingDirectories = Array.from(appState.toolPermissionContext.additionalWorkingDirectories.keys());
   const agentSystemPrompt = override?.systemPrompt ? override.systemPrompt : asSystemPrompt(await getAgentSystemPrompt(agentDefinition, toolUseContext, resolvedAgentModel, additionalWorkingDirectories, resolvedTools));
   const agentAbortController = override?.abortController ? override.abortController : isAsync2 ? new AbortController : toolUseContext.abortController;
+  if (isAsync2) {
+    registerBackgroundAgentAbort(agentId, agentAbortController);
+  }
   const additionalContexts = [];
-  for await (const hookResult of executeSubagentStartHooks(agentId, agentDefinition.agentType, agentAbortController.signal)) {
+  for await (const hookResult of executeSubagentStartHooks(agentId, agentDefinition.agentType, agentAbortController.signal, undefined, toolUseContext.toolUseId, isAsync2)) {
     if (hookResult.additionalContexts && hookResult.additionalContexts.length > 0) {
       additionalContexts.push(...hookResult.additionalContexts);
     }
@@ -235631,7 +235758,7 @@ async function* runAgent({
     verbose: toolUseContext.options.verbose,
     mainLoopModel: effectiveModel,
     providerOverride: providerOverride ?? undefined,
-    thinkingConfig: useExactTools ? toolUseContext.options.thinkingConfig : { type: "disabled" },
+    thinkingConfig: toolUseContext.options.thinkingConfig,
     mcpClients: mergedMcpClients,
     mcpResources: toolUseContext.options.mcpResources,
     agentDefinitions: toolUseContext.options.agentDefinitions,
@@ -235669,6 +235796,12 @@ async function* runAgent({
     ...description && { description }
   }).catch((_err) => logForDebugging(`Failed to write agent metadata: ${_err}`));
   let lastRecordedUuid = initialMessages.at(-1)?.uuid ?? null;
+  let partialBaseMessage = null;
+  const partialTextByIndex = new Map;
+  const PARTIAL_PROGRESS_HOOK_INTERVAL_MS = 100;
+  let lastPartialProgressHookAt = 0;
+  let lastAssistantForFallback = null;
+  let agentRunError;
   try {
     for await (const message of query({
       messages: initialMessages,
@@ -235681,8 +235814,37 @@ async function* runAgent({
       maxTurns: maxTurns ?? agentDefinition.maxTurns
     })) {
       onQueryProgress?.();
-      if (message.type === "stream_event" && message.event.type === "message_start" && message.ttftMs != null) {
-        toolUseContext.pushApiMetricsEntry?.(message.ttftMs);
+      if (message.type === "stream_event") {
+        const ev = message.event;
+        if (ev.type === "message_start") {
+          if (message.ttftMs != null) {
+            toolUseContext.pushApiMetricsEntry?.(message.ttftMs);
+          }
+          if ((onPartialAssistant || isAsync2) && ev.message) {
+            partialBaseMessage = ev.message;
+            partialTextByIndex.clear();
+          }
+        } else if ((onPartialAssistant || isAsync2) && partialBaseMessage && ev.type === "content_block_delta" && ev.delta?.type === "text_delta" && typeof ev.delta.text === "string") {
+          const idx = ev.index ?? 0;
+          const acc = (partialTextByIndex.get(idx) ?? "") + ev.delta.text;
+          partialTextByIndex.set(idx, acc);
+          onPartialAssistant?.({
+            type: "assistant",
+            message: {
+              ...partialBaseMessage,
+              content: [{ type: "text", text: acc, citations: null }]
+            },
+            uuid: randomUUID6(),
+            timestamp: new Date().toISOString()
+          });
+          if (isAsync2) {
+            const now = Date.now();
+            if (now - lastPartialProgressHookAt >= PARTIAL_PROGRESS_HOOK_INTERVAL_MS) {
+              lastPartialProgressHookAt = now;
+              executeSubagentProgressHooks(agentId, agentDefinition.agentType, partialBaseMessage.id, toolUseContext.toolUseId, [{ type: "text", text: acc }]).catch(() => {});
+            }
+          }
+        }
         continue;
       }
       if (message.type === "attachment") {
@@ -235707,6 +235869,16 @@ async function* runAgent({
         if (message.type !== "progress") {
           lastRecordedUuid = message.uuid;
         }
+        if (isAsync2 && message.type === "assistant" && message.message.content.some((b) => b.type === "text" && b.text.trim().length > 0)) {
+          lastAssistantForFallback = message;
+        }
+        if (isAsync2 && (message.type === "assistant" || message.type === "user")) {
+          const blocks = simplifySubagentMessageBlocks(message);
+          if (blocks.length > 0) {
+            const messageId = (message.type === "assistant" ? message.message.id : undefined) ?? message.uuid;
+            executeSubagentProgressHooks(agentId, agentDefinition.agentType, messageId, toolUseContext.toolUseId, blocks).catch(() => {});
+          }
+        }
         yield message;
       }
     }
@@ -235716,7 +235888,30 @@ async function* runAgent({
     if (isBuiltInAgent(agentDefinition) && agentDefinition.callback) {
       agentDefinition.callback();
     }
+  } catch (err2) {
+    agentRunError = err2;
+    throw err2;
   } finally {
+    const naturalStopAlreadyFired = isAsync2 && hasSubagentStopFired(agentId);
+    if (isAsync2) {
+      unregisterBackgroundAgentAbort(agentId);
+    }
+    if (isAsync2 && agentRunError !== undefined) {
+      logForDebugging(`Background agent ${agentId} crashed: ${errorMessage(agentRunError)}
+${agentRunError instanceof Error ? agentRunError.stack ?? "" : ""}`, { level: "error" });
+    }
+    if (isAsync2 && !naturalStopAlreadyFired) {
+      try {
+        const fallbackAppState = agentToolRuntimeContext.getAppState();
+        const terminal = agentAbortController.signal.aborted ? { status: "stopped" } : agentRunError !== undefined ? { status: "failed", errorMessage: errorMessage(agentRunError) } : { status: "completed" };
+        const fallbackStop = executeStopHooks(fallbackAppState.toolPermissionContext.mode, undefined, undefined, false, agentId, agentToolRuntimeContext, lastAssistantForFallback ? [lastAssistantForFallback] : undefined, agentDefinition.agentType, undefined, terminal);
+        for await (const evt of fallbackStop) {}
+      } catch (err2) {
+        logForDebugging(`Fallback SubagentStop failed for ${agentId}: ${err2}`, {
+          level: "warn"
+        });
+      }
+    }
     await mcpCleanup();
     if (agentDefinition.hooks) {
       clearSessionHooks(rootSetAppState, agentId);
@@ -235812,6 +236007,7 @@ var init_runAgent = __esm(() => {
   init_registerFrontmatterHooks();
   init_sessionHooks();
   init_hooks2();
+  init_backgroundAbortRegistry();
   init_messages4();
   init_agent();
   init_settings2();
@@ -236597,7 +236793,7 @@ var init_TodoWriteTool = __esm(() => {
       const base2 = `Todos have been modified successfully. Ensure that you continue to use the todo list to track your progress. Please proceed with the current tasks if applicable`;
       const nudge = verificationNudgeNeeded ? `
 
-NOTE: You just closed out 3+ tasks and none of them was a verification step. Before writing your final summary, spawn the verification agent (subagent_type="${VERIFICATION_AGENT_TYPE2}"). You cannot self-assign PARTIAL by listing caveats in your summary — only the verifier issues a verdict.` : "";
+NOTE: You just closed out 3+ tasks and none of them was a verification step. Before writing your final summary, spawn the verification agent (subagent_type="${VERIFICATION_AGENT_TYPE}"). You cannot self-assign PARTIAL by listing caveats in your summary — only the verifier issues a verdict.` : "";
       return {
         tool_use_id: toolUseID,
         type: "tool_result",
@@ -238522,7 +238718,9 @@ var init_coreSchemas = __esm(() => {
   SubagentStartHookInputSchema = lazySchema(() => BaseHookInputSchema().and(exports_external2.object({
     hook_event_name: exports_external2.literal("SubagentStart"),
     agent_id: exports_external2.string(),
-    agent_type: exports_external2.string()
+    agent_type: exports_external2.string(),
+    tool_use_id: exports_external2.string().optional().describe("tool_use id of the Agent tool call that launched this subagent. " + "Lets hosts correlate the subagent lifecycle back to the launching " + "tool call (e.g. to render an inline running indicator on its pill)."),
+    is_background: exports_external2.boolean().optional().describe("True when the subagent was launched with run_in_background (async). " + "Lets hosts scope background-specific UI/notifications to async agents.")
   })));
   SubagentStopHookInputSchema = lazySchema(() => BaseHookInputSchema().and(exports_external2.object({
     hook_event_name: exports_external2.literal("SubagentStop"),
@@ -238530,7 +238728,9 @@ var init_coreSchemas = __esm(() => {
     agent_id: exports_external2.string(),
     agent_transcript_path: exports_external2.string(),
     agent_type: exports_external2.string(),
-    last_assistant_message: exports_external2.string().optional().describe("Text content of the last assistant message before stopping. " + "Avoids the need to read and parse the transcript file.")
+    last_assistant_message: exports_external2.string().optional().describe("Text content of the last assistant message before stopping. " + "Avoids the need to read and parse the transcript file."),
+    status: exports_external2.enum(["completed", "failed", "stopped"]).optional().describe("Terminal outcome carried by the guaranteed terminal delivery for " + "background subagents (fired from the run teardown). Absent on the " + "natural-stop path — hosts treat a missing status as completed."),
+    error_message: exports_external2.string().optional().describe("Present when status is failed: the error that aborted the run.")
   })));
   PreCompactHookInputSchema = lazySchema(() => BaseHookInputSchema().and(exports_external2.object({
     hook_event_name: exports_external2.literal("PreCompact"),
@@ -250244,7 +250444,7 @@ ${forkEnabled ? "For fresh agents, terse" : "Terse"} command-style prompts produ
 <example>
 user: "What's left on this branch before we can ship?"
 assistant: <thinking>Forking this — it's a survey question. I want the punch list, not the git output in my context.</thinking>
-${AGENT_TOOL_NAME3}({
+${AGENT_TOOL_NAME2}({
   name: "ship-audit",
   description: "Branch ship-readiness audit",
   prompt: "Audit what's left before this branch can ship. Check: uncommitted changes, commits ahead of main, whether tests exist, whether the GrowthBook gate is wired up, whether CI-relevant files changed. Report a punch list — done vs. missing. Under 200 words."
@@ -250271,7 +250471,7 @@ assistant: <thinking>I'll ask the code-reviewer agent — it won't see my analys
 <commentary>
 A subagent_type is specified, so the agent starts fresh. It needs full context in the prompt. The briefing explains what to assess and why.
 </commentary>
-${AGENT_TOOL_NAME3}({
+${AGENT_TOOL_NAME2}({
   name: "migration-review",
   description: "Independent migration review",
   subagent_type: "code-reviewer",
@@ -250301,7 +250501,7 @@ function isPrime(n) {
 <commentary>
 Since a significant piece of code was written and the task was completed, now use the test-runner agent to run the tests
 </commentary>
-assistant: Uses the ${AGENT_TOOL_NAME3} tool to launch the test-runner agent
+assistant: Uses the ${AGENT_TOOL_NAME2} tool to launch the test-runner agent
 </example>
 
 <example>
@@ -250309,7 +250509,7 @@ user: "Hello"
 <commentary>
 Since the user is greeting, use the greeting-responder agent to respond with a friendly joke
 </commentary>
-assistant: "I'm going to use the ${AGENT_TOOL_NAME3} tool to launch the greeting-responder agent"
+assistant: "I'm going to use the ${AGENT_TOOL_NAME2} tool to launch the greeting-responder agent"
 </example>
 `;
   const listViaAttachment = shouldInjectAgentListInMessages();
@@ -250318,11 +250518,11 @@ ${effectiveAgents.map((agent) => formatAgentLine(agent)).join(`
 `)}`;
   const shared2 = `Launch a new agent to handle complex, multi-step tasks autonomously.
 
-The ${AGENT_TOOL_NAME3} tool launches specialized agents (subprocesses) that autonomously handle complex tasks. Each agent type has specific capabilities and tools available to it.
+The ${AGENT_TOOL_NAME2} tool launches specialized agents (subprocesses) that autonomously handle complex tasks. Each agent type has specific capabilities and tools available to it.
 
 ${agentListSection}
 
-${forkEnabled ? `When using the ${AGENT_TOOL_NAME3} tool, specify a subagent_type to use a specialized agent, or omit it to fork yourself — a fork inherits your full conversation context.` : `When using the ${AGENT_TOOL_NAME3} tool, specify a subagent_type parameter to select which agent type to use. If omitted, the general-purpose agent is used.`}`;
+${forkEnabled ? `When using the ${AGENT_TOOL_NAME2} tool, specify a subagent_type to use a specialized agent, or omit it to fork yourself — a fork inherits your full conversation context.` : `When using the ${AGENT_TOOL_NAME2} tool, specify a subagent_type parameter to select which agent type to use. If omitted, the general-purpose agent is used.`}`;
   if (isCoordinator) {
     return shared2;
   }
@@ -250330,10 +250530,10 @@ ${forkEnabled ? `When using the ${AGENT_TOOL_NAME3} tool, specify a subagent_typ
   const fileSearchHint = embedded ? "`find` via the Bash tool" : `the ${GLOB_TOOL_NAME2} tool`;
   const contentSearchHint = embedded ? "`grep` via the Bash tool" : `the ${GLOB_TOOL_NAME2} tool`;
   const whenNotToUseSection = forkEnabled ? "" : `
-When NOT to use the ${AGENT_TOOL_NAME3} tool:
-- If you want to read a specific file path, use the ${FILE_READ_TOOL_NAME2} tool or ${fileSearchHint} instead of the ${AGENT_TOOL_NAME3} tool, to find the match more quickly
+When NOT to use the ${AGENT_TOOL_NAME2} tool:
+- If you want to read a specific file path, use the ${FILE_READ_TOOL_NAME2} tool or ${fileSearchHint} instead of the ${AGENT_TOOL_NAME2} tool, to find the match more quickly
 - If you are searching for a specific class definition like "class Foo", use ${contentSearchHint} instead, to find the match more quickly
-- If you are searching for code within a specific file or set of 2-3 files, use the ${FILE_READ_TOOL_NAME2} tool instead of the ${AGENT_TOOL_NAME3} tool, to find the match more quickly
+- If you are searching for code within a specific file or set of 2-3 files, use the ${FILE_READ_TOOL_NAME2} tool instead of the ${AGENT_TOOL_NAME2} tool, to find the match more quickly
 - Other tasks that are not related to the agent descriptions above
 `;
   const concurrencyNote = !listViaAttachment && getSubscriptionType() !== "pro" ? `
@@ -250350,7 +250550,7 @@ Usage notes:
 - The agent's outputs should generally be trusted
 - 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_NAME3} 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.
+- 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.${process.env.USER_TYPE === "ant" ? `
 - You can set \`isolation: "remote"\` to run the agent in a remote CCR environment. This is always a background task; you'll be notified when it completes. Use for long-running tasks that need a fresh sandbox.` : ""}${isInProcessTeammate() ? `
 - The run_in_background, name, team_name, and mode parameters are not available in this context. Only synchronous subagents are supported.` : isTeammate() ? `
@@ -250500,11 +250700,11 @@ var init_AgentTool = __esm(() => {
         }
       }
       const agentsWithMcpRequirementsMet = filterAgentsByMcpRequirements(agents, mcpServersWithTools);
-      const filteredAgents = filterDeniedAgents(agentsWithMcpRequirementsMet, toolPermissionContext, AGENT_TOOL_NAME3);
+      const filteredAgents = filterDeniedAgents(agentsWithMcpRequirementsMet, toolPermissionContext, AGENT_TOOL_NAME2);
       const isCoordinator = false;
       return await getPrompt2(filteredAgents, isCoordinator, allowedAgentTypes);
     },
-    name: AGENT_TOOL_NAME3,
+    name: AGENT_TOOL_NAME2,
     searchHint: "delegate work to a subagent",
     aliases: [LEGACY_AGENT_TOOL_NAME],
     maxResultSizeChars: 1e5,
@@ -250584,13 +250784,13 @@ var init_AgentTool = __esm(() => {
         const {
           allowedAgentTypes
         } = toolUseContext.options.agentDefinitions;
-        const agents = filterDeniedAgents(allowedAgentTypes ? allAgents.filter((a2) => allowedAgentTypes.includes(a2.agentType)) : allAgents, appState.toolPermissionContext, AGENT_TOOL_NAME3);
+        const agents = filterDeniedAgents(allowedAgentTypes ? allAgents.filter((a2) => allowedAgentTypes.includes(a2.agentType)) : allAgents, appState.toolPermissionContext, AGENT_TOOL_NAME2);
         const found = agents.find((agent) => agent.agentType === effectiveType);
         if (!found) {
           const agentExistsButDenied = allAgents.find((agent) => agent.agentType === effectiveType);
           if (agentExistsButDenied) {
-            const denyRule = getDenyRuleForAgent(appState.toolPermissionContext, AGENT_TOOL_NAME3, effectiveType);
-            throw new Error(`Agent type '${effectiveType}' has been denied by permission rule '${AGENT_TOOL_NAME3}(${effectiveType})' from ${denyRule?.source ?? "settings"}.`);
+            const denyRule = getDenyRuleForAgent(appState.toolPermissionContext, AGENT_TOOL_NAME2, effectiveType);
+            throw new Error(`Agent type '${effectiveType}' has been denied by permission rule '${AGENT_TOOL_NAME2}(${effectiveType})' from ${denyRule?.source ?? "settings"}.`);
           }
           throw new Error(`Agent type '${effectiveType}' not found. Available agents: ${agents.map((a2) => a2.agentType).join(", ")}`);
         }
@@ -250961,6 +251161,19 @@ ${reasons}`);
               ...runAgentParams.override,
               agentId: syncAgentId
             },
+            onPartialAssistant: onProgress ? (partial2) => {
+              if (partial2.message.content.length === 0)
+                return;
+              onProgress({
+                toolUseID: `agent_${assistantMessage.message.id}`,
+                data: {
+                  message: partial2,
+                  type: "agent_progress",
+                  prompt: "",
+                  agentId: syncAgentId
+                }
+              });
+            } : undefined,
             onCacheSafeParams: summaryTaskId && getSdkAgentProgressSummariesEnabled() ? (params) => {
               const {
                 stop
@@ -251143,21 +251356,16 @@ ${reasons}`);
               }
               const normalizedNew = normalizeMessages([message]);
               for (const m of normalizedNew) {
-                for (const content of m.message.content) {
-                  if (content.type !== "tool_use" && content.type !== "tool_result") {
-                    continue;
-                  }
-                  if (onProgress) {
-                    onProgress({
-                      toolUseID: `agent_${assistantMessage.message.id}`,
-                      data: {
-                        message: m,
-                        type: "agent_progress",
-                        prompt: "",
-                        agentId: syncAgentId
-                      }
-                    });
-                  }
+                if (onProgress && m.message.content.length > 0) {
+                  onProgress({
+                    toolUseID: `agent_${assistantMessage.message.id}`,
+                    data: {
+                      message: m,
+                      type: "agent_progress",
+                      prompt: "",
+                      agentId: syncAgentId
+                    }
+                  });
                 }
               }
             }
@@ -251305,10 +251513,9 @@ Briefly tell the user what you launched and end your response.`
       if (data.status === "async_launched") {
         const prefix = `Async agent launched successfully.
 agentId: ${data.agentId} (internal ID - do not mention to user. Use SendMessage with to: '${data.agentId}' to continue this agent.)
-The agent is working in the background. You will be notified automatically when it completes.`;
-        const instructions = data.canReadOutputFile ? `Do not duplicate this agent's work — avoid working with the same files or topics it is using. Work on non-overlapping tasks, or briefly tell the user what you launched and end your response.
-output_file: ${data.outputFile}
-If asked, you can check progress before completion by using ${FILE_READ_TOOL_NAME2} or ${BASH_TOOL_NAME2} tail on the output file.` : `Briefly tell the user what you launched and end your response. Do not generate any other text — agent results will arrive in a subsequent message.`;
+The agent is working in the background. Its result will be delivered to you automatically when it completes.`;
+        const instructions = `Do not duplicate this agent's work — avoid working with the same files or topics it is using. Work on non-overlapping tasks, or briefly tell the user what you launched and end your response.
+Do NOT read its output/transcript file to check progress — its result will arrive automatically in a subsequent message.`;
         const text = `${prefix}
 ${instructions}`;
         return {
@@ -256809,7 +257016,7 @@ function toComparable(p) {
   return IS_WINDOWS ? posixForm.toLowerCase() : posixForm;
 }
 function detectSessionFileType(filePath) {
-  const configDir = getClaudeConfigHomeDir();
+  const configDir = resolveConfigHomeDir();
   const normalized = toComparable(filePath);
   const configDirCmp = toComparable(configDir);
   if (!normalized.startsWith(configDirCmp)) {
@@ -256855,6 +257062,7 @@ var init_memoryFileDetection = __esm(() => {
   init_agentMemory();
   init_state2();
   init_paths();
+  init_envUtils();
   init_windowsPaths();
   IS_WINDOWS = process.platform === "win32";
 });
@@ -258095,7 +258303,7 @@ Git Safety Protocol:
 
 Important notes:
 - NEVER run additional commands to read or explore code, besides git bash commands
-- NEVER use the ${TodoWriteTool.name} or ${AGENT_TOOL_NAME3} tools
+- NEVER use the ${TodoWriteTool.name} or ${AGENT_TOOL_NAME2} tools
 - DO NOT push to the remote repository unless the user explicitly asks you to do so
 - IMPORTANT: Never use git commands with the -i flag (like git rebase -i or git add -i) since they require interactive input which is not supported.
 - IMPORTANT: Do not use --no-edit with git rebase commands, as the --no-edit flag is not a valid option for git rebase.
@@ -258141,7 +258349,7 @@ EOF
 </example>
 
 Important:
-- DO NOT use the ${TodoWriteTool.name} or ${AGENT_TOOL_NAME3} tools
+- DO NOT use the ${TodoWriteTool.name} or ${AGENT_TOOL_NAME2} tools
 - Return the PR URL when you're done, so the user can see it
 
 # Other common operations
@@ -282266,7 +282474,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("2026-06-03T14:42:10.545Z").getTime();
+  const buildTime = new Date("2026-06-10T13:40:16.658Z").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -286658,7 +286866,7 @@ function getDeferredToolsDeltaAttachment(tools, model, messages, scanContext) {
 function getAgentListingDeltaAttachment(toolUseContext, messages) {
   if (!shouldInjectAgentListInMessages())
     return [];
-  if (!toolUseContext.options.tools.some((t) => toolMatchesName2(t, AGENT_TOOL_NAME2))) {
+  if (!toolUseContext.options.tools.some((t) => toolMatchesName2(t, AGENT_TOOL_NAME))) {
     return [];
   }
   const { activeAgents, allowedAgentTypes } = toolUseContext.options.agentDefinitions;
@@ -286669,7 +286877,7 @@ function getAgentListingDeltaAttachment(toolUseContext, messages) {
       mcpServers.add(info.serverName);
   }
   const permissionContext = toolUseContext.getAppState().toolPermissionContext;
-  let filtered = filterDeniedAgents(filterAgentsByMcpRequirements(activeAgents, [...mcpServers]), permissionContext, AGENT_TOOL_NAME2);
+  let filtered = filterDeniedAgents(filterAgentsByMcpRequirements(activeAgents, [...mcpServers]), permissionContext, AGENT_TOOL_NAME);
   if (allowedAgentTypes) {
     filtered = filtered.filter((a2) => allowedAgentTypes.includes(a2.agentType));
   }
@@ -288796,6 +289004,7 @@ __export(exports_hooks, {
   executeTaskCreatedHooks: () => executeTaskCreatedHooks,
   executeTaskCompletedHooks: () => executeTaskCompletedHooks,
   executeSubagentStartHooks: () => executeSubagentStartHooks,
+  executeSubagentProgressHooks: () => executeSubagentProgressHooks,
   executeStopHooks: () => executeStopHooks,
   executeStopFailureHooks: () => executeStopFailureHooks,
   executeStatusLineCommand: () => executeStatusLineCommand,
@@ -290856,13 +291065,16 @@ async function executeStopFailureHooks(lastMessage, toolUseContext, timeoutMs =
     matchQuery: error41
   });
 }
-async function* executeStopHooks(permissionMode, signal, timeoutMs = TOOL_HOOK_EXECUTION_TIMEOUT_MS, stopHookActive = false, subagentId, toolUseContext, messages, agentType, requestPrompt) {
+async function* executeStopHooks(permissionMode, signal, timeoutMs = TOOL_HOOK_EXECUTION_TIMEOUT_MS, stopHookActive = false, subagentId, toolUseContext, messages, agentType, requestPrompt, terminal2) {
   const hookEvent = subagentId ? "SubagentStop" : "Stop";
   const appState = toolUseContext?.getAppState();
   const sessionId = toolUseContext?.agentId ?? getSessionId();
   if (!hasHookForEvent(hookEvent, appState, sessionId)) {
     return;
   }
+  if (subagentId) {
+    markSubagentStopFired(subagentId);
+  }
   const lastAssistantMessage = messages ? getLastAssistantMessage(messages) : undefined;
   const lastAssistantText = lastAssistantMessage ? extractTextContent(lastAssistantMessage.message.content, `
 `).trim() || undefined : undefined;
@@ -290873,7 +291085,8 @@ async function* executeStopHooks(permissionMode, signal, timeoutMs = TOOL_HOOK_E
     agent_id: subagentId,
     agent_transcript_path: getAgentTranscriptPath(subagentId),
     agent_type: agentType ?? "",
-    last_assistant_message: lastAssistantText
+    last_assistant_message: lastAssistantText,
+    ...terminal2 ? { status: terminal2.status, error_message: terminal2.errorMessage } : {}
   } : {
     ...createBaseHookInput(permissionMode),
     hook_event_name: "Stop",
@@ -290992,12 +291205,14 @@ async function* executeSetupHooks(trigger, signal, timeoutMs = TOOL_HOOK_EXECUTI
     forceSyncExecution
   });
 }
-async function* executeSubagentStartHooks(agentId, agentType, signal, timeoutMs = TOOL_HOOK_EXECUTION_TIMEOUT_MS) {
+async function* executeSubagentStartHooks(agentId, agentType, signal, timeoutMs = TOOL_HOOK_EXECUTION_TIMEOUT_MS, toolUseId, isBackground) {
   const hookInput = {
     ...createBaseHookInput(undefined),
     hook_event_name: "SubagentStart",
     agent_id: agentId,
-    agent_type: agentType
+    agent_type: agentType,
+    ...toolUseId !== undefined ? { tool_use_id: toolUseId } : {},
+    ...isBackground !== undefined ? { is_background: isBackground } : {}
   };
   yield* executeHooks({
     hookInput,
@@ -291007,6 +291222,24 @@ async function* executeSubagentStartHooks(agentId, agentType, signal, timeoutMs
     timeoutMs
   });
 }
+async function executeSubagentProgressHooks(agentId, agentType, messageId, parentToolUseId, blocks, signal) {
+  const hookInput = {
+    ...createBaseHookInput(undefined),
+    hook_event_name: "SubagentProgress",
+    agent_id: agentId,
+    agent_type: agentType,
+    message_id: messageId,
+    ...parentToolUseId !== undefined ? { parent_tool_use_id: parentToolUseId } : {},
+    blocks
+  };
+  for await (const _hookResult of executeHooks({
+    hookInput,
+    toolUseID: randomUUID16(),
+    matchQuery: agentType,
+    signal,
+    timeoutMs: TOOL_HOOK_EXECUTION_TIMEOUT_MS
+  })) {}
+}
 async function executePreCompactHooks(compactData, signal, timeoutMs = TOOL_HOOK_EXECUTION_TIMEOUT_MS) {
   const hookInput = {
     ...createBaseHookInput(undefined),
@@ -291646,6 +291879,7 @@ var init_hooks2 = __esm(() => {
   init_envUtils();
   init_errors5();
   init_state2();
+  init_backgroundAbortRegistry();
   TOOL_HOOK_EXECUTION_TIMEOUT_MS = 10 * 60 * 1000;
 });
 
@@ -292012,7 +292246,7 @@ function getAntModelOverrideSection() {
     return null;
   if (isUndercover())
     return null;
-  return getAntModelOverrideConfig()?.defaultSystemPromptSuffix || null;
+  return getAntModelOverrideConfig2()?.defaultSystemPromptSuffix || null;
 }
 function getLanguageSection(languagePreference) {
   if (!languagePreference)
@@ -292431,6 +292665,7 @@ var init_prompts2 = __esm(() => {
   init_debug();
   init_memdir();
   init_mcpInstructionsDelta();
+  init_antModels();
   init_state2();
   CLAUDE_4_5_OR_4_6_MODEL_IDS = {
     opus: "claude-opus-4-6",
@@ -292794,7 +293029,7 @@ var init_api3 = __esm(() => {
   init_zodToJsonSchema2();
   SWARM_FIELDS_BY_TOOL = {
     [EXIT_PLAN_MODE_V2_TOOL_NAME]: ["launchSwarm", "teammateCount"],
-    [AGENT_TOOL_NAME2]: ["name", "team_name", "mode"]
+    [AGENT_TOOL_NAME]: ["name", "team_name", "mode"]
   };
 });
 
@@ -298112,7 +298347,7 @@ ${attachment.removedNames.join(`
     }
     case "verify_plan_reminder": {
       const toolName = resolveEnvVar("VERIFY_PLAN") === "true" ? "VerifyPlanExecution" : "";
-      const content = `You have completed implementing the plan. Please call the "${toolName}" tool directly (NOT the ${AGENT_TOOL_NAME2} tool or an agent) to verify that all plan items were completed correctly.`;
+      const content = `You have completed implementing the plan. Please call the "${toolName}" tool directly (NOT the ${AGENT_TOOL_NAME} tool or an agent) to verify that all plan items were completed correctly.`;
       return wrapMessagesInSystemReminder([
         createUserMessage({ content, isMeta: true })
       ]);
@@ -299393,7 +299628,7 @@ var init_mappers = __esm(() => {
 // src/session/messages/systemInit.ts
 import { randomUUID as randomUUID22 } from "crypto";
 function sdkCompatToolName(name) {
-  return name === AGENT_TOOL_NAME3 ? LEGACY_AGENT_TOOL_NAME : name;
+  return name === AGENT_TOOL_NAME2 ? LEGACY_AGENT_TOOL_NAME : name;
 }
 function buildSystemInitMessage(inputs) {
   const settings = getSettings_DEPRECATED();
@@ -299562,7 +299797,8 @@ class QueryEngine {
         theme: resolveThemeSetting(getGlobalConfig().theme),
         maxBudgetUsd,
         maxOutputTokens,
-        contextWindow
+        contextWindow,
+        modelProviders: this.config.modelProviders
       },
       getAppState,
       setAppState,
@@ -299664,7 +299900,8 @@ class QueryEngine {
         agentDefinitions: { activeAgents: agents, allAgents: [] },
         maxBudgetUsd,
         maxOutputTokens,
-        contextWindow
+        contextWindow,
+        modelProviders: this.config.modelProviders
       },
       getAppState,
       setAppState,
@@ -300159,6 +300396,7 @@ async function* ask({
   appendSystemPrompt,
   userSpecifiedModel,
   fallbackModel,
+  modelProviders,
   jsonSchema,
   getAppState,
   setAppState,
@@ -300186,6 +300424,7 @@ async function* ask({
     appendSystemPrompt,
     userSpecifiedModel,
     fallbackModel,
+    modelProviders,
     thinkingConfig,
     maxTurns,
     maxBudgetUsd,
@@ -328902,6 +329141,8 @@ function registerSdkInlineSkillHandler() {
 }
 
 // src/session/sdkRuntime.ts
+init_LocalAgentTask();
+init_backgroundAbortRegistry();
 init_hooks2();
 init_debug();
 init_errors5();
@@ -329211,6 +329452,10 @@ function createQueryLike(generator, runtimeState, onClose) {
       runtimeState.abortController.abort();
       runtimeState.abortController = createAbortController();
     },
+    killAgent(agentId) {
+      abortBackgroundAgentById(agentId);
+      killAsyncAgent(agentId, runtimeState.setAppState);
+    },
     async close() {
       if (runtimeState.closed)
         return;
@@ -329378,6 +329623,9 @@ function runSdkQueryRuntime(params) {
           break;
         }
         runtimeState.runningTurn = true;
+        const { resolveSdkAgents: resolveSdkAgents2 } = (init_builtInAgents(), __toCommonJS(exports_builtInAgents));
+        const hostProvidedAgents = Array.isArray(options2.agents) ? options2.agents : [];
+        const mergedAgents = resolveSdkAgents2(hostProvidedAgents);
         for await (const message of getAsk()({
           commands: allCommands,
           prompt: turn.prompt,
@@ -329403,12 +329651,13 @@ function runSdkQueryRuntime(params) {
           userSpecifiedModel: typeof options2.model === "string" && options2.model.length > 0 ? options2.model : undefined,
           fallbackModel: typeof options2.fallbackModel === "string" && options2.fallbackModel.length > 0 ? options2.fallbackModel : undefined,
           jsonSchema: options2.jsonSchema && typeof options2.jsonSchema === "object" ? options2.jsonSchema : undefined,
+          modelProviders: options2.modelProviders && typeof options2.modelProviders === "object" ? options2.modelProviders : undefined,
           getAppState: appStateStore.getAppState,
           setAppState: appStateStore.setAppState,
           abortController: runtimeState.abortController,
           replayUserMessages: Boolean(options2.replayUserMessages),
           includePartialMessages: Boolean(options2.includePartialMessages),
-          agents: Array.isArray(options2.agents) ? options2.agents : [],
+          agents: mergedAgents,
           onToolInvoke: typeof options2.onToolInvoke === "function" ? options2.onToolInvoke : undefined
         })) {
           if (runtimeState.closed)
@@ -329584,6 +329833,7 @@ function createSession(options2) {
 
 // src/client.ts
 init_observer();
+init_backgroundAbortRegistry();
 init_log2();
 init_log2();
 init_coreTypes();
@@ -331986,6 +332236,7 @@ function getTaskByType(type) {
 
 // src/tasks/stopTask.ts
 init_sdkEventQueue();
+init_backgroundAbortRegistry();
 
 class StopTaskError extends Error {
   code;
@@ -332000,6 +332251,9 @@ async function stopTask(taskId, context4) {
   const appState = getAppState();
   const task = appState.tasks?.[taskId];
   if (!task) {
+    if (abortBackgroundAgentById(taskId)) {
+      return { taskId, taskType: "local_agent", command: undefined };
+    }
     throw new StopTaskError(`No task found with ID: ${taskId}`, "not_found");
   }
   if (task.status !== "running") {
@@ -332387,7 +332641,7 @@ var ExitPlanModeV2Tool = buildToolRuntime({
         }
       };
     });
-    const hasTaskTool = isAgentSwarmsEnabled() && context4.options.tools.some((t) => toolMatchesName(t, AGENT_TOOL_NAME3));
+    const hasTaskTool = isAgentSwarmsEnabled() && context4.options.tools.some((t) => toolMatchesName(t, AGENT_TOOL_NAME2));
     return {
       data: {
         plan,
@@ -333328,7 +333582,7 @@ Task completed. Call TaskList now to find your next available task or see if you
     if (verificationNudgeNeeded) {
       resultContent += `
 
-NOTE: You just closed out 3+ tasks and none of them was a verification step. Before writing your final summary, spawn the verification agent (subagent_type="${VERIFICATION_AGENT_TYPE2}"). You cannot self-assign PARTIAL by listing caveats in your summary — only the verifier issues a verdict.`;
+NOTE: You just closed out 3+ tasks and none of them was a verification step. Before writing your final summary, spawn the verification agent (subagent_type="${VERIFICATION_AGENT_TYPE}"). You cannot self-assign PARTIAL by listing caveats in your summary — only the verifier issues a verdict.`;
     }
     return {
       tool_use_id: toolUseID,
@@ -335403,6 +335657,7 @@ export {
   query2 as query,
   parseScopes,
   listSessions,
+  abortBackgroundAgentById as killBackgroundAgent,
   isOAuthTokenExpired,
   getSessionMessages2 as getSessionMessages,
   getSessionInfo,
@@ -335447,4 +335702,4 @@ export {
   AbortError2 as AbortError
 };
 
-//# debugId=FBE6B15D8EFBA32B64756E2164756E21
+//# debugId=2EFAF3B7FC2E44DC64756E2164756E21