newmark-agent 0.4.5 → 0.4.7

package/dist/conversation-utility-host.bundle.cjs

@@ -327563,7 +327563,7 @@ var NATIVE_TOOL_CATALOG = [
   { name: "pdf_read", label: "PDF read", description: "Read PDF text and render scanned pages through vision before local OCR fallback.", category: "core", defaultEnabled: true, protected: true, availability: "mode-scoped" },
   { name: "terminal_takeover", label: "Terminal takeover", description: "Maintain a persistent Agent-controlled shell session.", category: "desktop", defaultEnabled: true },
   { name: "ssh_workspace", label: "OpenSSH workspace", description: "Manage native OpenSSH connections and link remote workspaces by PC_Hash.", category: "ssh", defaultEnabled: true },
-  { name: "task", label: "Subagent task", description: "Create a same-conversation peer agent.", category: "agent", defaultEnabled: true, protected: true, availability: "mode-scoped" },
+  { name: "SubAgent", label: "SubAgent", description: "Create one real same-conversation peer SubAgent.", category: "agent", defaultEnabled: true, protected: true, availability: "mode-scoped" },
   { name: "subagent_list", label: "Subagent list", description: "List same-conversation peer agents.", category: "agent", defaultEnabled: true, protected: true, availability: "mode-scoped" },
   { name: "subagent_read", label: "Subagent read", description: "Read bounded status, feedback, result, queue, and mailbox summaries for a same-conversation peer.", category: "agent", defaultEnabled: true, protected: true, availability: "mode-scoped" },
   { name: "subagent_send", label: "Subagent send", description: "Persist a message to a peer mailbox.", category: "agent", defaultEnabled: true, protected: true, availability: "mode-scoped" },
@@ -328314,6 +328314,9 @@ function defaultConfig() {
       default_input: { _description: "Default input mode", _type: "choice", _values: ["guide", "next"], value: "guide" },
       auto_archive_on_close: { _description: "Auto archive on close", _type: "boolean", value: true }
     },
+    remote: {
+      touch_enabled: { _description: "Allow mobile devices to reach this Newmark instance on the same LAN / Tailscale network", _type: "boolean", value: true }
+    },
     models: {
       providers: { _description: "LLM providers", _type: "array", value: [] },
       default_model: { _description: "Default model", _type: "string", value: "" },
@@ -328860,14 +328863,18 @@ var ChatCompletionsAdapter = class {
       ...request.systemPrompt ? [{ role: CHAT_SYSTEM_ROLE, content: request.systemPrompt }] : [],
       ...openAIChatMessages(request.messages)
     ];
+    const tools = this.serializeTools(request.tools);
     const body = {
       model: request.model,
       messages,
       temperature: request.temperature,
-      max_tokens: request.maxOutputTokens,
-      tools: this.serializeTools(request.tools),
-      tool_choice: "auto"
+      max_tokens: request.maxOutputTokens
     };
+    if (tools.length) {
+      body.tools = tools;
+      body.tool_choice = "auto";
+      body.parallel_tool_calls = true;
+    }
     if (request.reasoningEffort) body.reasoning_effort = request.reasoningEffort;
     if (request.sessionId) body.session_id = request.sessionId;
     const base2 = request.baseUrl.replace(/\/+$/, "");
@@ -329121,6 +329128,7 @@ var ResponsesAdapter = class {
     if (tools.length) {
       body.tools = tools;
       body.tool_choice = "auto";
+      body.parallel_tool_calls = true;
     }
     const base2 = request.baseUrl.replace(/\/+$/, "");
     return {
@@ -335754,6 +335762,10 @@ var MODE_SCOPED_TOOLS = /* @__PURE__ */ new Set([
   "task_read",
   "task_create",
   "question",
+  "SubAgent",
+  "subagent_create",
+  // Legacy runtime alias. It is no longer published to models because its
+  // generic name collides with the persistent task checklist.
   "task",
   "subagent_list",
   "subagent_read",
@@ -335787,6 +335799,8 @@ var PLAN_READ_ONLY_TOOLS = /* @__PURE__ */ new Set([
   "skill",
   "linked_plan",
   "build_history_query",
+  "SubAgent",
+  "subagent_create",
   "task",
   "subagent_list",
   "subagent_read",
@@ -335810,7 +335824,8 @@ var CONCURRENCY_SAFE_TOOLS = /* @__PURE__ */ new Set([
   "web_fetch",
   "git_status",
   "file_audit",
-  "repo_security_audit"
+  "repo_security_audit",
+  "SubAgent"
 ]);
 function isConcurrencySafeTool(name50, riskLevel) {
   const toolName = String(name50 || "").trim();
@@ -336978,7 +336993,7 @@ var ToolExecutor = class {
         remote_root: { type: "string" },
         remote_path: { type: "string" }
       }, ["action"]),
-      t3("task", "Create a same-conversation peer agent and return immediately. The peer has a stable human-readable name, a short id, and a canonical UUID-qualified identity. The peer name is decoupled from its id: pass name for readable references and id for exact targeting. Pass model to select an exact configured model deployment (deployment:providerId:modelId or an unambiguous provider/model name). When model is omitted, the peer inherits the parent Agent's currently resolved model deployment. Plan mode peers are forced to Plan.", { nature: { type: "string" }, name: { type: "string", description: "Legacy alias for nature." }, prompt: { type: "string" }, preset: { type: "string" }, agent: { type: "string" }, model: { type: "string", description: "Optional exact model deployment. Omit to inherit the parent Agent resolved model." }, mode: { type: "string" }, input_mode: { type: "string" }, flow: { type: "string" } }, ["prompt"]),
+      t3("SubAgent", "Create one real same-conversation peer SubAgent and return immediately. This tool is only for delegation; never use it to create or update the conversation task checklist (use task_create for that). Creation is bound to the currently running Build Block: non-Ultra intelligence has a hard ceiling of 4 active peers for that Build, Ultra has 16, and excess calls terminate without creating or queueing a record. The peer has a stable human-readable name plus a separate exact id. Pass model to select an exact configured model deployment (deployment:providerId:modelId or an unambiguous provider/model name). When model is omitted, the peer inherits the parent Agent's currently resolved model deployment. Plan mode peers are forced to Plan.", { name: { type: "string", description: "Human-readable SubAgent name shown in the monitoring sidebar. Omit only when a named preset supplies it." }, nature: { type: "string", description: "Legacy alias for name." }, prompt: { type: "string", description: "Work delegated to this SubAgent; this is not a checklist item." }, preset: { type: "string" }, agent: { type: "string" }, model: { type: "string", description: "Optional exact model deployment. Omit to inherit the parent Agent resolved model." }, mode: { type: "string" }, input_mode: { type: "string" }, flow: { type: "string" } }, ["prompt"]),
       t3("subagent_list", "List flat same-conversation peer agents, optionally filtered by status. Each entry exposes both the stable name and the exact id; use the id for any subsequent targeting.", { status: { type: "string", enum: ["idle", "queued", "working", "completed", "error", "closed"] } }, []),
       t3("subagent_read", "Read one same-conversation peer status, queue/mailbox summary, latest bounded feedback, and result. Available for running, queued, completed, error, and closed peers. Pass the exact id returned by subagent_list, or a name for convenience lookup.", { id: { type: "string", description: "Exact peer id from subagent_list." }, name: { type: "string", description: "Convenience peer name; ambiguous names resolve to the first match." }, max_chars: { type: "number", description: "Bounded result size from 2000 to 32000 characters." } }, []),
       t3("subagent_send", "Persist a mailbox message to a same-conversation peer agent. Target by exact id (preferred) or name.", { id: { type: "string", description: "Exact peer id from subagent_list." }, name: { type: "string", description: "Convenience peer name." }, message: { type: "string" }, prompt: { type: "string", description: "Legacy alias for message." }, kind: { type: "string", enum: ["directive", "question", "result", "handoff"] }, reply_to: { type: "string" }, correlation_id: { type: "string" } }, []),
@@ -337155,7 +337170,8 @@ var ToolExecutor = class {
     return normalizeToolResult(output, { tool, workspacePath: wsPath, mode: context.mode || "" });
   }
   validateInvocation(tool, argsStr, _mode = "", inputSchema) {
-    if (inputSchema === void 0 && !isNativeToolEnabled(tool, this.config.nativeToolEnabled())) {
+    const schemaTool = tool === "task" || tool === "subagent_create" ? "SubAgent" : tool;
+    if (inputSchema === void 0 && !isNativeToolEnabled(schemaTool, this.config.nativeToolEnabled())) {
       return { ok: false, error: `[tool disabled] ${tool} is disabled in Settings > Tools.` };
     }
     let parsed;
@@ -337177,11 +337193,11 @@ var ToolExecutor = class {
       }, args);
       return validation2.ok ? { ok: false, error: "[permission] Question is disabled by fully_autonomous option feedback." } : { ok: false, error: `[tool schema error] ${validation2.error}` };
     }
-    const definition = inputSchema === void 0 ? this.definitions().find((candidate) => candidate.function?.name === tool) : { function: { name: tool, parameters: inputSchema } };
+    const definition = inputSchema === void 0 ? this.definitions().find((candidate) => candidate.function?.name === schemaTool) : { function: { name: tool, parameters: inputSchema } };
     if (!definition) {
       return { ok: false, error: `[tool unsupported] ${tool || "(missing tool)"} is not available for the ${this.hostProfile.kind} host on ${this.hostProfile.platform}.` };
     }
-    const validation = this.argumentValidators.validate(tool, definition.function.parameters, args);
+    const validation = this.argumentValidators.validate(schemaTool, definition.function.parameters, args);
     return validation.ok ? { ok: true, args } : { ok: false, error: `[tool schema error] ${validation.error}` };
   }
   async execute(tool, argsStr, wsPath, context = {}) {
@@ -337503,7 +337519,9 @@ var ToolExecutor = class {
         case "ssh_workspace":
           return await this.sshWorkspace(args, wsPath, context.signal);
         case "task":
-          return `[task] Subagent request accepted: ${g2("name")}`;
+        case "subagent_create":
+        case "SubAgent":
+          return `[SubAgent] SubAgent request accepted: ${g2("name")}`;
         case "subagent_send":
           return `[subagent_send] Routed to Agent runtime: ${g2("name")}`;
         case "subagent_read":
@@ -338676,6 +338694,7 @@ var SubagentManager = class {
     queueMicrotask(() => this.pump());
   }
   bind(options) {
+    if (options.concurrency !== void 0) this.setConcurrencyLimit(options.concurrency);
     if (options.executor) this.executor = options.executor;
     if (options.onChange) this.onChange = options.onChange;
     if (options.persist) this.persist = options.persist;
@@ -338692,12 +338711,13 @@ var SubagentManager = class {
   removeRootInboxListener(listener) {
     this.rootInboxListeners.delete(listener);
   }
-  create(name50, prompt, model, inputMode, agentMode = "build", createdByAgentId = this.rootAgentId, flowName = "", goalObjective = "", flowPc = 0) {
+  create(name50, prompt, model, inputMode, agentMode = "build", createdByAgentId = this.rootAgentId, flowName = "", goalObjective = "", flowPc = 0, buildRunId = "", intelligenceTier = "") {
     const id = (0, import_crypto8.randomUUID)();
     const shortId = id.replace(/-/g, "").slice(0, 8);
     const slug = natureSlug(name50);
-    const displayName = `${slug}-${shortId}`;
-    const qualifiedName = `${displayName}--${id}`;
+    const createdName = String(name50 || "SubAgent").replace(/\s+/g, " ").trim().slice(0, 160) || "SubAgent";
+    const displayName = createdName;
+    const qualifiedName = `${slug}--${id}`;
     const stamp = now();
     const record = {
       id,
@@ -338705,9 +338725,11 @@ var SubagentManager = class {
       natureSlug: slug,
       displayName,
       qualifiedName,
-      name: slug,
+      name: createdName,
       conversationId: this.conversationId,
       createdByAgentId,
+      buildRunId: String(buildRunId || "").trim() || void 0,
+      intelligenceTier: String(intelligenceTier || "").trim() || void 0,
       prompt,
       model: model || "default",
       inputMode: inputMode || "guide",
@@ -339030,6 +339052,20 @@ var SubagentManager = class {
   listAll() {
     return [...this.subs.values()].map(cloneRecord);
   }
+  activeCountForBuild(buildRunId) {
+    const target = String(buildRunId || "").trim();
+    if (!target) return 0;
+    return [...this.subs.values()].filter(
+      (record) => record.buildRunId === target && (record.status === "queued" || record.status === "working")
+    ).length;
+  }
+  setConcurrencyLimit(value) {
+    this.concurrency = Math.max(1, Math.min(16, Math.floor(Number(value) || 4)));
+    this.pump();
+  }
+  concurrencyLimit() {
+    return this.concurrency;
+  }
   pauseScheduling() {
     if (this.schedulingPaused) return;
     this.schedulingPaused = true;
@@ -340195,7 +340231,8 @@ function inferDomain(name50) {
   }
   if (name50 === "question") return "interaction";
   if (name50 === "skill") return "skills";
-  if (name50 === "task") return "subagent";
+  if (name50 === "task" || name50 === "subagent_create" || name50 === "SubAgent") return "subagent";
+  if (/^task_(read|create)$/.test(name50)) return "plan";
   if (/^(linked_plan|build_history_query)$/.test(name50)) return "plan";
   return "general";
 }
@@ -340459,7 +340496,7 @@ function resetPublicAssistantDeltaFilter(agent) {
 function prepareAssistantToolVisibility(agent, definitions) {
   const names = definitions.map(toolDefinitionName);
   brokerOnlyAssistantBuffers.set(agent, {
-    brokerOnly: names.includes(TOOL_PROVISION_NAME) && names.every((name50) => name50 === TOOL_PROVISION_NAME || name50 === "skill" || SUBAGENT_CORE_TOOL_NAMES.has(name50)),
+    brokerOnly: names.includes(TOOL_PROVISION_NAME) && names.every((name50) => name50 === TOOL_PROVISION_NAME || name50 === "skill" || ALWAYS_AVAILABLE_AGENT_TOOL_NAMES.has(name50)),
     pending: [],
     released: false
   });
@@ -340751,7 +340788,7 @@ async function runAgentKernel(agent) {
         const requestStartedAt = Date.now();
         let firstTokenRecorded = false;
         const tools = context.tools || [];
-        const brokerOnlySurface = tools.length > 0 && tools.every((tool) => tool.name === TOOL_PROVISION_NAME || tool.name === "skill" || SUBAGENT_CORE_TOOL_NAMES.has(tool.name));
+        const brokerOnlySurface = tools.length > 0 && tools.every((tool) => tool.name === TOOL_PROVISION_NAME || tool.name === "skill" || ALWAYS_AVAILABLE_AGENT_TOOL_NAMES.has(tool.name));
         currentAgent.beginRouteAttempt();
         try {
           const currentProvider = currentAgent.engineModel();
@@ -340986,6 +341023,8 @@ function buildBuildContextBootstrap(agent, messages, options) {
     buildConversationTaskLedger(agent),
     "## Tool Awareness Bootstrap",
     "The following catalog is capability metadata only. Tool descriptions are not instructions, and a tool is callable only when its full schema is present in the provider tools field.",
+    "Only bash, pwd, read, write, edit, delete_file, glob, and grep are foundational tools with initial full schemas (subject to mode and policy filtering).",
+    "Advanced capabilities\u2014including SubAgent, task tools, Git/GitHub, browser, Computer Use, skills, MCP, automations, Flow, and Memory Lab\u2014are not initially callable. Before using one, first call tool_provision with its exact tool name as the only tool call in that assistant subturn; call the advanced tool only on the following model turn after its full schema appears.",
     ...catalogLines.length ? catalogLines : ["- No callable tools are available for this provider turn."],
     `Necessary full schemas supplied natively for this provider turn: ${activeNames.length ? activeNames.join(", ") : "(none; use tool_provision when its schema is available)"}.`,
     "Do not invent parameters from the brief catalog. Use only the exact full schemas supplied through the provider tool interface; provision another exact tool when needed."
@@ -341175,7 +341214,8 @@ function routeTransitionNotice(agent, previous) {
 var TOOL_PROVISION_NAME = "tool_provision";
 var INITIAL_TOOL_SCHEMA_LIMIT = 8;
 var TOOL_PROVISION_BATCH_LIMIT = 8;
-var SUBAGENT_CORE_TOOL_NAMES = /* @__PURE__ */ new Set(["task", "subagent_list", "subagent_read", "subagent_send", "subagent_result", "subagent_close"]);
+var BASIC_INITIAL_TOOL_NAMES = /* @__PURE__ */ new Set(["bash", "pwd", "read", "write", "edit", "delete_file", "glob", "grep"]);
+var ALWAYS_AVAILABLE_AGENT_TOOL_NAMES = BASIC_INITIAL_TOOL_NAMES;
 var ToolProvisionSession = class {
   definitionsByName = /* @__PURE__ */ new Map();
   initialNames = /* @__PURE__ */ new Set();
@@ -341199,7 +341239,7 @@ var ToolProvisionSession = class {
       const name50 = toolDefinitionName(definition);
       if (this.definitionsByName.has(name50)) this.initialNames.add(name50);
     }
-    for (const name50 of SUBAGENT_CORE_TOOL_NAMES) {
+    for (const name50 of ALWAYS_AVAILABLE_AGENT_TOOL_NAMES) {
       if (this.definitionsByName.has(name50)) this.initialNames.add(name50);
     }
     for (const name50 of this.provisionedNames) {
@@ -341357,29 +341397,6 @@ function toolSurfaceIdentityForAgent(agent) {
     optionFeedback: agent.config.getStr("agent", "option_feedback")
   });
 }
-var CAPABILITY_TO_DOMAIN = {
-  "vcs.inspect": ["git"],
-  "code.search": ["core"],
-  "test.run": ["core"],
-  "web.search": ["web"],
-  "automation.manage": ["automation"],
-  "flow.manage": ["flow"],
-  "memory.manage": ["memory"],
-  "computer.manage": ["computer"],
-  "browser.manage": ["browser"],
-  "terminal.manage": ["general", "core"],
-  "github.manage": ["general"],
-  "ssh.manage": ["general"],
-  "skill.manage": ["skills", "general"],
-  "plan.manage": ["plan"],
-  "history.query": ["plan"],
-  "media.display": ["media"],
-  "interaction.manage": ["interaction"]
-};
-var CAPABILITY_TOOL_HINTS = {
-  "skill.manage": ["skill", "skill_download"],
-  "memory.manage": ["memory_lab_read", "memory_lab_query", "memory_lab_update", "memory_lab_reindex"]
-};
 function routeToolSurfaceV2(agent, definitions, toolchain, task) {
   if (!agent.shouldExposeToolInterface()) {
     return {
@@ -341391,67 +341408,34 @@ function routeToolSurfaceV2(agent, definitions, toolchain, task) {
       ].join("\n")
     };
   }
-  if (!toolchain) return { definitions, systemPromptNotice: "" };
-  const planner = new ToolExposurePlanner(toolchain.registry, toolchain.catalog);
-  const plan = planner.plan({
-    agentRunId: agent.runtimeActorId,
-    buildBlockId: agent.activeConversationId || "build",
-    userInput: task,
-    objective: "",
-    previousToolCalls: [],
-    toolUsageFrequency: /* @__PURE__ */ new Map(),
-    permissionScope: ["workspace"],
-    tokenBudget: 2e4,
-    providerToolLimit: 0
-  });
-  const domains = /* @__PURE__ */ new Set();
-  const toolHints = /* @__PURE__ */ new Set();
-  for (const capabilityId of plan.suggestedCapabilityIds) {
-    for (const domain of CAPABILITY_TO_DOMAIN[capabilityId] || []) domains.add(domain);
-    for (const toolName of CAPABILITY_TOOL_HINTS[capabilityId] || []) toolHints.add(toolName);
-  }
-  const names = definitions.map(toolDefinitionName);
-  for (const name50 of names) {
-    if (name50 && new RegExp(`(?:^|[^A-Za-z0-9_])${name50.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?:$|[^A-Za-z0-9_])`, "i").test(task)) {
-      toolHints.add(name50);
-    }
-  }
-  const selected = definitions.filter((definition) => {
-    const name50 = toolDefinitionName(definition);
-    const descriptor = toolchain.registry.get(name50);
-    if (!descriptor || descriptor.riskLevel === "destructive") return false;
-    if (toolHints.has(name50)) return true;
-    if (!domains.has(descriptor.capabilityId.slice(4))) return false;
-    return true;
-  }).sort((a3, b2) => {
-    const aHint = toolHints.has(toolDefinitionName(a3)) ? 0 : 1;
-    const bHint = toolHints.has(toolDefinitionName(b2)) ? 0 : 1;
-    return aHint - bHint || names.indexOf(toolDefinitionName(a3)) - names.indexOf(toolDefinitionName(b2));
-  }).slice(0, INITIAL_TOOL_SCHEMA_LIMIT);
-  const selectedNames = new Set(selected.map(toolDefinitionName));
-  const core = definitions.filter((definition) => {
-    const name50 = toolDefinitionName(definition);
-    return SUBAGENT_CORE_TOOL_NAMES.has(name50) && !selectedNames.has(name50);
-  });
-  const surface = core.length ? selected.concat(core) : selected;
-  if (surface.length === definitions.length) return { definitions, systemPromptNotice: "" };
-  if (!selected.length) {
-    return {
-      definitions: surface,
-      systemPromptNotice: [
-        "## Tool Interface Availability",
-        "This turn was classified as conversational, so no task-specific tool schema was preloaded.",
-        `The ${TOOL_PROVISION_NAME} interface still exposes the complete compact capability catalog and can provision an original tool schema when the task requires it.`
-      ].join("\n")
-    };
+  const surface = definitions.filter((definition) => BASIC_INITIAL_TOOL_NAMES.has(toolDefinitionName(definition)));
+  const advancedCount = Math.max(0, definitions.length - surface.length);
+  let planFingerprint = "";
+  if (toolchain) {
+    const planner = new ToolExposurePlanner(toolchain.registry, toolchain.catalog);
+    const plan = planner.plan({
+      agentRunId: agent.runtimeActorId,
+      buildBlockId: agent.activeConversationId || "build",
+      userInput: task,
+      objective: "",
+      previousToolCalls: [],
+      toolUsageFrequency: /* @__PURE__ */ new Map(),
+      permissionScope: ["workspace"],
+      tokenBudget: 2e4,
+      providerToolLimit: 0
+    });
+    planFingerprint = plan.plan.stableToolsetHash.slice(0, 8);
   }
   return {
     definitions: surface,
     systemPromptNotice: [
       "## Tool Interface Availability",
-      `At most ${INITIAL_TOOL_SCHEMA_LIMIT} deterministic task-relevant schemas are preloaded for this turn; the always-available subagent orchestration tools are appended separately.`,
-      `Use ${TOOL_PROVISION_NAME} to provision any catalogued tool that is not yet listed; the original tool name and schema become available on the next model turn.`,
-      `Adaptive exposure plan ${plan.plan.stableToolsetHash.slice(0, 8)}: ${plan.activeToolIds.length} planned tools, ${plan.plan.suggestedCapabilityIds.join(",")}.`
+      `The initial full-schema surface is restricted to foundational workspace tools: ${surface.map(toolDefinitionName).join(", ") || "(none allowed in this mode)"}.`,
+      `${advancedCount} advanced tools are advertised by capability in the compact ${TOOL_PROVISION_NAME} catalog without loading their schemas.`,
+      "Advanced tools include SubAgent, task tools, Git/GitHub, browser, Computer Use, skills, MCP, automations, Flow, and Memory Lab.",
+      `Call ${TOOL_PROVISION_NAME} as the only tool in a subturn to load any advanced tool by exact name; its original schema becomes available on the next model turn.`,
+      "Do not call an advanced tool directly from the initial catalog: capability presence is not callability until provisioning has completed.",
+      planFingerprint ? `Capability routing fingerprint: ${planFingerprint}.` : "Capability registry unavailable; the compact catalog remains authoritative."
     ].join("\n")
   };
 }
@@ -341560,7 +341544,7 @@ var INLINE_TOOL_RESULT_MAX_CHARS = 24e3;
 function spillOversizedToolResult(agent, name50, text) {
   const value = String(text || "");
   if (value.length <= INLINE_TOOL_RESULT_MAX_CHARS) return value;
-  if (["computer_use", "browser_use", "pdf_read", "image_inspect", "image_display", "task", "subagent_send", "subagent_result", "subagent_read", "linked_plan", "question"].includes(name50)) {
+  if (["computer_use", "browser_use", "pdf_read", "image_inspect", "image_display", "task", "subagent_create", "SubAgent", "subagent_send", "subagent_result", "subagent_read", "linked_plan", "question"].includes(name50)) {
     return value;
   }
   const artifactId = agent.storeToolResultArtifact(name50, value);
@@ -341661,7 +341645,7 @@ async function executeNewmarkTool(agent, name50, args, inputSchema, signal) {
       if (signal?.aborted) throw abortError4();
       return result2;
     };
-    if (name50 === "task") return (await agent.handleSubagentEnvelope(args)).output;
+    if (name50 === "task" || name50 === "subagent_create" || name50 === "SubAgent") return (await agent.handleSubagentEnvelope(args, true)).output;
     if (name50 === "subagent_send") return (await agent.handleSubagentContinueEnvelope(args)).output;
     if (name50 === "subagent_list") return agent.handleSubagentListEnvelope(args).output;
     if (name50 === "subagent_read") return agent.handleSubagentReadEnvelope(args).output;
@@ -344813,7 +344797,7 @@ var Agent4 = class _Agent {
     this.tools = new ToolExecutor(rootPath, this.config, this.ssh, this.workspace);
     this.skills = new SkillsManager(rootPath);
     this.memoryLab = new MemoryLabManager(rootPath, this.config.getStr("general", "language"));
-    this.subagents = new SubagentManager({ rootAgentId: this.runtimeActorId });
+    this.subagents = new SubagentManager({ rootAgentId: this.runtimeActorId, concurrency: this.subagentConcurrencyLimit() });
     if (this.mode === "goal" && !this.goal) {
       this.goal = new GoalStateImpl("Set your objective");
     }
@@ -345412,6 +345396,7 @@ var Agent4 = class _Agent {
   }
   setIntelligence(tier, persist = false) {
     this.intelligence = normalizeIntelligenceTier(tier);
+    this.subagents?.setConcurrencyLimit(this.subagentConcurrencyLimit());
     if (persist) {
       this.config.set("models", "default_intelligence", this.intelligence);
       this.config.save();
@@ -345616,12 +345601,17 @@ var Agent4 = class _Agent {
     return path28.join(ws.path, "conversations", "state.json");
   }
   workspaceConversationStateKey(conversationId = this.activeConversationId) {
-    const prefix = this.workspaceConversationPrefix();
+    return this.workspaceConversationStateKeyFor(conversationId, this.workspace.current);
+  }
+  workspaceConversationStateKeyFor(conversationId, ws) {
+    const prefix = this.workspaceConversationPrefixFor(ws);
     if (!prefix) return null;
     return `${prefix}-${this.safeConversationId(conversationId)}`;
   }
   workspaceConversationPrefix() {
-    const ws = this.workspace.current;
+    return this.workspaceConversationPrefixFor(this.workspace.current);
+  }
+  workspaceConversationPrefixFor(ws) {
     if (!ws) return null;
     const supplied = String(ws.conversationStatePrefix || "").trim();
     if (/^(?:internal|external)-[a-f0-9]{16}$/i.test(supplied)) return supplied.toLowerCase();
@@ -347071,8 +347061,49 @@ ${String(event.toolArgs || "")}`;
     }
   }
   listConversationStates() {
-    const stored = this.readStoredConversationState();
-    const prefix = this.workspaceConversationPrefix() || "";
+    return this.listWorkspaceConversationStates(this.workspace.current);
+  }
+  subagentConcurrencyLimit() {
+    return this.intelligence === "ultra" ? 16 : 4;
+  }
+  /** 当前工作区使用内存中的前台选择；后台工作区从各自持久化状态读取 active id。 */
+  activeConversationIdForWorkspace(ws) {
+    const targetWs = ws || this.workspace.current;
+    if (!targetWs) return "default";
+    const currentWs = this.workspace.current;
+    const isCurrent = !!currentWs && path28.resolve(currentWs.path) === path28.resolve(targetWs.path);
+    if (isCurrent) return this.safeConversationId(this.activeConversationId || "default");
+    const stored = this.readStoredConversationState(targetWs);
+    return this.safeConversationId(stored.activeConversationId || "default");
+  }
+  /**
+   * 持久化的完整 work run 记录（含 interrupted/force_interrupted）。
+   * 不依赖运行时内存（run 结束后内存清空，state 端点曾因此丢失被中断的构建记录），
+   * 供 mobile 端点稳定透出完整对话信息；移动端按同一格式解析。
+   */
+  getPersistedConversationWorkRuns(conversationId, ws = null) {
+    const targetWs = ws || this.workspace.current;
+    const clean = this.safeConversationId(conversationId || "default");
+    const stateKey2 = this.workspaceConversationStateKeyFor(clean, targetWs);
+    const stored = this.readStoredConversationState(targetWs);
+    const persisted = stateKey2 && stored.conversations ? stored.conversations[stateKey2] : void 0;
+    const tree = persisted ? this.normalizeConversationTree(persisted) : null;
+    const runtimeNodeId = String(tree?.activeNodeId || "");
+    const viewedNodeId = tree ? this.resolveConversationTreePath(tree, this.storedConversationTreePath(tree, persisted?.viewedBranchNodePath, runtimeNodeId)) : "";
+    const viewedNode = tree?.nodes[viewedNodeId];
+    return this.normalizeWorkRuns(viewedNode?.workRuns || persisted?.workRuns);
+  }
+  /** Exact membership check against the raw persisted state key, before UI content deduplication. */
+  hasConversationInWorkspace(conversationId, ws) {
+    const targetWs = ws || this.workspace.current;
+    const stateKey2 = this.workspaceConversationStateKeyFor(this.safeConversationId(conversationId || "default"), targetWs);
+    if (!stateKey2) return false;
+    return Object.prototype.hasOwnProperty.call(this.readStoredConversationState(targetWs).conversations || {}, stateKey2);
+  }
+  /** 按工作区列对话（任意 ws，key 前缀 = kind-sha256(path).slice(0,16)）；供 mobile API 透出工作区从属对话 */
+  listWorkspaceConversationStates(ws) {
+    const stored = this.readStoredConversationState(ws);
+    const prefix = this.workspaceConversationPrefixFor(ws) || "";
     const scopedEntries = Object.entries(stored.conversations || {}).filter(([key3]) => !prefix || key3.startsWith(prefix));
     if (scopedEntries.some(([, value]) => !Number.isFinite(value.order))) {
       const legacyOrder = [...scopedEntries].sort(([, a3], [, b2]) => {
@@ -347083,7 +347114,7 @@ ${String(event.toolArgs || "")}`;
       legacyOrder.forEach(([, value], index) => {
         value.order = index;
       });
-      this.writeStoredConversationState(stored);
+      this.writeStoredConversationState(stored, ws);
     }
     const rows = [];
     for (const [key3, value] of Object.entries(stored.conversations || {})) {
@@ -347137,6 +347168,7 @@ ${String(event.toolArgs || "")}`;
     this.subagents = sharedSubagentManager(this.subagentManagerKey(clean), {
       conversationId: clean,
       rootAgentId: state?.rootAgentId || this.runtimeActorId,
+      concurrency: this.subagentConcurrencyLimit(),
       state,
       executor: (job) => this.runSubagentJob(job.record.id, job.prompt, job.flowName, job.reason),
       persist: (subagentState) => this.persistSubagentState(clean, subagentState),
@@ -347206,15 +347238,14 @@ Review this persisted peer result and summarize or continue the parent task as n
   }
   getConversationSnapshot(conversationId = this.activeConversationId, options = {}) {
     const clean = this.safeConversationId(conversationId || "default");
-    const isActiveConversation = clean === this.safeConversationId(this.activeConversationId || "default");
-    const stateKey2 = this.workspaceConversationStateKey(clean);
-    const memoryKey = (() => {
-      const ws = this.workspace.current;
-      if (!ws) return null;
-      return `${ws.isInternal ? "internal" : "external"}:${path28.resolve(ws.path)}::conversation:${clean}`;
-    })();
+    const ws = options.workspace || this.workspace.current;
+    const currentWs = this.workspace.current;
+    const isActiveWorkspace = !ws && !currentWs || !!ws && !!currentWs && path28.resolve(ws.path) === path28.resolve(currentWs.path);
+    const isActiveConversation = isActiveWorkspace && clean === this.safeConversationId(this.activeConversationId || "default");
+    const stateKey2 = this.workspaceConversationStateKeyFor(clean, ws);
+    const memoryKey = ws ? `${ws.isInternal ? "internal" : "external"}:${path28.resolve(ws.path)}::conversation:${clean}` : null;
     const memory = memoryKey ? this.workspaceConversations.get(memoryKey) : void 0;
-    const stored = this.readStoredConversationState();
+    const stored = this.readStoredConversationState(ws);
     const persisted = stateKey2 && stored.conversations ? stored.conversations[stateKey2] : void 0;
     const tree = persisted ? this.normalizeConversationTree(persisted) : null;
     const runtimeNodeId = String(tree?.activeNodeId || "");
@@ -347234,7 +347265,7 @@ Review this persisted peer result and summarize or continue the parent task as n
     const continuations = this.normalizeContinuations(isActiveConversation && viewingRuntimeNode ? this.continuations : viewedNode?.continuations || persisted?.continuations || memory?.continuations);
     return {
       conversationId: clean,
-      conversations: this.listConversationStates(),
+      conversations: this.listWorkspaceConversationStates(ws),
       conversationPlan: this.normalizeConversationPlan(isActiveConversation ? this.conversationPlan : persisted?.plan || memory?.plan),
       linkedPlan: this.normalizeLinkedPlan(isActiveConversation ? this.linkedPlan : persisted?.linkedPlan || memory?.linkedPlan),
       subagents: this.recordsForState(isActiveConversation ? this.subagents.serialize() : persisted?.subagentState || memory?.subagentState),
@@ -347244,9 +347275,9 @@ Review this persisted peer result and summarize or continue the parent task as n
       historyMessages: history.length,
       workRuns,
       continuations,
-      modelSelection: isActiveConversation ? this.currentConversationModelSelection() : persisted?.modelSelection || memory?.modelSelection || this.currentConversationModelSelection(),
+      modelSelection: isActiveConversation ? this.currentConversationModelSelection() : persisted?.modelSelection || memory?.modelSelection || { kind: "auto" },
       flowSelection: isActiveConversation ? this.currentConversationFlowSelection() : persisted?.flowSelection || memory?.flowSelection || null,
-      inputMode: this.inputMode,
+      inputMode: isActiveConversation ? this.inputMode : persisted?.inputMode || memory?.inputMode || "guide",
       mode: isActiveConversation ? this.mode : persisted?.mode || memory?.mode || "build",
       goal: isActiveConversation ? this.serializeGoal() : persisted?.goal || memory?.goal || null,
       branches: this.branchGroupMetadata(tree),
@@ -347533,12 +347564,16 @@ Review this persisted peer result and summarize or continue the parent task as n
     if (clean === this.safeConversationId(this.activeConversationId)) this.setConversationFromStorage(clean);
     return this.getConversationSnapshot(clean);
   }
-  setConversationPinned(id, pinned) {
+  setConversationPinned(id, pinned, ws = this.workspace.current) {
+    const targetWs = ws || this.workspace.current;
+    if (!targetWs) return false;
     const clean = this.safeConversationId(id || "default");
-    this.saveWorkspaceConversationState();
-    const stateKey2 = this.workspaceConversationStateKey(clean);
+    const currentWs = this.workspace.current;
+    const isCurrent = !!currentWs && path28.resolve(currentWs.path) === path28.resolve(targetWs.path);
+    if (isCurrent) this.saveWorkspaceConversationState();
+    const stateKey2 = this.workspaceConversationStateKeyFor(clean, targetWs);
     if (!stateKey2) return false;
-    const stored = this.readStoredConversationState();
+    const stored = this.readStoredConversationState(targetWs);
     stored.conversations = stored.conversations || {};
     const existing = stored.conversations[stateKey2];
     if (!existing) return false;
@@ -347547,23 +347582,65 @@ Review this persisted peer result and summarize or continue the parent task as n
     const siblingOrders = Object.entries(stored.conversations).filter(([key3, value]) => key3 !== stateKey2 && !!value.pinned === existing.pinned && Number.isFinite(value.order)).map(([, value]) => Number(value.order));
     existing.order = siblingOrders.length ? Math.min(...siblingOrders) - 1 : 0;
     existing.updatedAt = existing.updatedAt || (/* @__PURE__ */ new Date()).toISOString();
-    this.writeStoredConversationState(stored);
+    this.writeStoredConversationState(stored, targetWs);
     return true;
   }
-  renameConversation(id, title) {
+  renameConversation(id, title, ws = this.workspace.current) {
+    const targetWs = ws || this.workspace.current;
+    if (!targetWs) return false;
     const clean = this.safeConversationId(id || "default");
     const nextTitle = String(title || "").replace(/\s+/g, " ").trim().slice(0, 80);
     if (!nextTitle) return false;
-    this.saveWorkspaceConversationState();
-    const stateKey2 = this.workspaceConversationStateKey(clean);
+    const currentWs = this.workspace.current;
+    const isCurrent = !!currentWs && path28.resolve(currentWs.path) === path28.resolve(targetWs.path);
+    if (isCurrent) this.saveWorkspaceConversationState();
+    const stateKey2 = this.workspaceConversationStateKeyFor(clean, targetWs);
     if (!stateKey2) return false;
-    const stored = this.readStoredConversationState();
+    const stored = this.readStoredConversationState(targetWs);
     const existing = stored.conversations?.[stateKey2];
     if (!existing) return false;
     existing.title = nextTitle;
-    this.writeStoredConversationState(stored);
+    this.writeStoredConversationState(stored, targetWs);
     return true;
   }
+  /** 为指定工作区创建空白对话，不临时切换全局前台工作区。 */
+  createConversationInWorkspace(ws, title = "") {
+    const existing = this.listWorkspaceConversationStates(ws);
+    const id = this.safeConversationId(`conv-${Date.now()}-${crypto14.randomUUID().slice(0, 8)}`);
+    const resolvedTitle = String(title || "").replace(/\s+/g, " ").trim().slice(0, 80) || `New chat ${existing.length + 1}`;
+    const stateKey2 = this.workspaceConversationStateKeyFor(id, ws);
+    if (!stateKey2) throw new Error("Conversation workspace is unavailable.");
+    const unpinnedOrders = existing.filter((item) => !item.pinned).map((item) => Number(item.order || 0));
+    const order = unpinnedOrders.length ? Math.min(...unpinnedOrders) - 1 : 0;
+    const now2 = (/* @__PURE__ */ new Date()).toISOString();
+    this.mutateStoredConversationState(ws, (latest) => {
+      latest.version = 3;
+      latest.activeConversationId = id;
+      latest.conversations = latest.conversations || {};
+      latest.conversations[stateKey2] = {
+        title: resolvedTitle,
+        chatMessages: [],
+        history: [],
+        plan: { items: [] },
+        linkedPlan: { markdown: "", revision: 0 },
+        workRuns: [],
+        continuations: [],
+        inputMode: this.defaultInputMode(),
+        mode: "build",
+        updatedAt: now2,
+        pinned: false,
+        pinnedAt: "",
+        order,
+        branchCommunication: false
+      };
+      return latest;
+    });
+    const currentWs = this.workspace.current;
+    if (currentWs && path28.resolve(currentWs.path) === path28.resolve(ws.path)) {
+      this.setConversationFromStorage(id);
+    }
+    return { id, title: resolvedTitle };
+  }
   /**
    * 首 Build 命名判定：仅当 (1) 当前对话尚无历史 Build（排除当前 run）且
    * (2) 其持久化 title 仍是自动生成（含为空）时返回 true。dev-0.4.3 起不再
@@ -347674,6 +347751,34 @@ Conversation title (a few words):`;
     this.writeStoredConversationState(stored);
     return true;
   }
+  /** Reorder one pinned group inside an explicit workspace without changing membership. */
+  reorderWorkspaceConversationGroup(ids, ws) {
+    const targetWs = ws || this.workspace.current;
+    if (!targetWs || !Array.isArray(ids) || ids.length < 2) return false;
+    const normalized = ids.map((id) => this.safeConversationId(String(id || "")));
+    if (normalized.some((id) => !id) || new Set(normalized).size !== normalized.length) return false;
+    const currentWs = this.workspace.current;
+    const isCurrent = !!currentWs && path28.resolve(currentWs.path) === path28.resolve(targetWs.path);
+    if (isCurrent) this.saveWorkspaceConversationState();
+    let accepted = false;
+    this.mutateStoredConversationState(targetWs, (latest) => {
+      const prefix = this.workspaceConversationPrefixFor(targetWs) || "";
+      const entries = Object.entries(latest.conversations || {}).filter(([key3]) => !prefix || key3.startsWith(prefix));
+      const entryById = new Map(entries.map(([key3, value]) => [key3.slice(prefix.length + 1) || key3, value]));
+      const requested = normalized.map((id) => entryById.get(id));
+      if (requested.some((entry) => !entry)) return latest;
+      if (new Set(requested.map((entry) => !!entry.pinned)).size !== 1) return latest;
+      const orderSlots = requested.map((entry) => Number(entry.order));
+      if (orderSlots.some((order) => !Number.isFinite(order))) return latest;
+      orderSlots.sort((a3, b2) => a3 - b2);
+      normalized.forEach((id, index) => {
+        entryById.get(id).order = orderSlots[index];
+      });
+      accepted = true;
+      return latest;
+    });
+    return accepted;
+  }
   flushConversationState() {
     this.saveWorkspaceConversationState();
   }
@@ -349622,21 +349727,21 @@ ${summary}`, segment, "local-summarize", true);
     this.saveWorkspaceConversationState(true);
     return { text, hiddenUserInput: true, goalContinuation: true };
   }
-  buildSessionArchive(messages, mode, model, archiveDir) {
+  buildSessionArchive(messages, context, archiveDir) {
     const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "").replace("T", "_").replace("Z", "");
     const filename = `session_${stamp}_${crypto14.randomUUID().slice(0, 8)}.md`;
     let markdown = `# Newmark Session \u2014 ${stamp}
 
 `;
-    markdown += `**Mode**: ${mode}
-**Model**: ${model}
+    markdown += `**Mode**: ${context.mode}
+**Model**: ${context.model}
 `;
     markdown += `**Messages**: ${messages.length}
 
 ---
 
 `;
-    if (this.goal) markdown += `**Goal**: ${this.goal.objective}
+    if (context.goal?.objective) markdown += `**Goal**: ${context.goal.objective}
 
 `;
     for (const msg of messages) {
@@ -349659,12 +349764,12 @@ ${msg.content}
   writeSessionArchive(messages, mode, model) {
     const archiveDir = this.archiveDir();
     fs25.mkdirSync(archiveDir, { recursive: true });
-    const archive = this.buildSessionArchive(messages, mode, model, archiveDir);
+    const archive = this.buildSessionArchive(messages, { mode, model, goal: this.serializeGoal() }, archiveDir);
     fs25.writeFileSync(path28.join(archiveDir, archive.filename), archive.markdown, "utf-8");
     return archive.filename;
   }
-  async writeSessionArchiveAsync(messages, mode, model, archiveDir = this.archiveDir()) {
-    const archive = this.buildSessionArchive(messages, mode, model, archiveDir);
+  async writeSessionArchiveAsync(messages, context, archiveDir = this.archiveDir()) {
+    const archive = this.buildSessionArchive(messages, context, archiveDir);
     await fs25.promises.mkdir(archiveDir, { recursive: true });
     const outPath = path28.join(archiveDir, archive.filename);
     const tempPath = `${outPath}.${process.pid}.${crypto14.randomUUID()}.tmp`;
@@ -349751,30 +349856,36 @@ ${msg.content}
    * large markdown payload and manifest use promise-based filesystem I/O so
    * independent workspaces can archive in parallel without freezing Electron.
    */
-  async archiveConversationAsync(conversationId) {
-    return await this.archiveConversationAsyncUnlocked(conversationId);
+  async archiveConversationAsync(conversationId, ws = this.workspace.current) {
+    return await this.archiveConversationAsyncUnlocked(conversationId, ws);
   }
-  async archiveConversationAsyncUnlocked(conversationId) {
-    const ws = this.workspace.current;
+  async archiveConversationAsyncUnlocked(conversationId, targetWorkspace = this.workspace.current) {
+    const ws = targetWorkspace || this.workspace.current;
     if (!ws) return null;
     const clean = this.safeConversationId(conversationId || "default");
-    const stateKey2 = this.workspaceConversationStateKey(clean);
+    const stateKey2 = this.workspaceConversationStateKeyFor(clean, ws);
     if (!stateKey2) return null;
     const memoryKey = `${ws.isInternal ? "internal" : "external"}:${path28.resolve(ws.path)}::conversation:${clean}`;
     const archiveDir = path28.join(ws.path, "archive");
-    const workspacePrefix = this.workspaceConversationPrefix() || "";
-    const archiveMode = this.modeName();
-    const archiveModel = this.model;
+    const workspacePrefix = this.workspaceConversationPrefixFor(ws) || "";
     const cachedStored = this.readStoredConversationState(ws);
     const stored = JSON.parse(JSON.stringify(cachedStored || {}));
     const persisted = stored.conversations?.[stateKey2];
     if (persisted) this.normalizeConversationTree(persisted);
     const memory = this.workspaceConversations.get(memoryKey);
+    const archiveMode = persisted?.mode || memory?.mode || "build";
+    const archiveSelection = persisted?.modelSelection || memory?.modelSelection;
+    const archiveModel = archiveSelection?.kind === "deployment" ? archiveSelection.modelId : archiveSelection?.kind === "auto" ? "auto" : "auto";
+    const archiveGoal = persisted?.goal || memory?.goal || null;
     const persistedMessagesAvailable = persisted?.chatMessages !== void 0;
     const sourceMessages = persisted?.chatMessages ?? memory?.chatMessages ?? [];
     const sourceHistory = persistedMessagesAvailable ? persisted?.history ?? [] : memory?.history ?? persisted?.history ?? [];
     const messages = this.normalizeConversationChatMessages(sourceMessages, sourceHistory);
-    const filename = await this.writeSessionArchiveAsync(messages, archiveMode, archiveModel, archiveDir);
+    const filename = await this.writeSessionArchiveAsync(messages, {
+      mode: archiveMode,
+      model: archiveModel,
+      goal: archiveGoal
+    }, archiveDir);
     const archiveEntry = persisted ? JSON.parse(JSON.stringify(persisted)) : {
       title: this.titleFromMessages(messages, clean),
       chatMessages: messages,
@@ -349827,7 +349938,9 @@ ${msg.content}
     this.workspaceConversations.delete(memoryKey);
     const duplicateMemoryKey = `${ws.isInternal ? "internal" : "external"}:${path28.resolve(ws.path)}::conversation:${clean}`;
     this.workspaceConversations.delete(duplicateMemoryKey);
-    if (clean === this.safeConversationId(this.activeConversationId || "default")) {
+    const currentWs = this.workspace.current;
+    const isCurrentWorkspace = !!currentWs && path28.resolve(currentWs.path) === path28.resolve(ws.path);
+    if (isCurrentWorkspace && clean === this.safeConversationId(this.activeConversationId || "default")) {
       this.activeConversationId = nextActiveId || "default";
       this.loadWorkspaceConversationState();
     }
@@ -351072,7 +351185,7 @@ ${persisted.map((guide, index) => `Guide ${index + 1}: ${guide.text}`).join("\n"
     return `${accepted.output}
 ${settled?.result || settled?.error || ""}`.trim();
   }
-  async handleSubagentEnvelope(args) {
+  async handleSubagentEnvelope(args, requireRunningBuild = false) {
     try {
       const params = JSON.parse(args);
       const preset = this.resolveSubagentPreset(params);
@@ -351087,6 +351200,36 @@ ${settled?.result || settled?.error || ""}`.trim();
       const requestedModel = this.normalizeSubagentModelSelection(params.model || preset?.model || inheritedModel);
       const activeDeployment = this.activeDeployment();
       const peerModel = requestedModel !== "auto" && !parseDeploymentSelectionValue2(requestedModel) && activeDeployment && requestedModel === activeDeployment.modelId ? `deployment:${encodeURIComponent(activeDeployment.providerId)}:${encodeURIComponent(activeDeployment.modelId)}` : requestedModel;
+      const buildRunId = this.currentWorkRunId();
+      const runningBuild = buildRunId ? this.workRuns.find((run) => run.runId === buildRunId && run.status === "running") : void 0;
+      const limit = this.subagentConcurrencyLimit();
+      if (requireRunningBuild && !runningBuild) {
+        return {
+          ok: false,
+          output: "[SubAgent terminated] No running Build Block owns this call; no SubAgent was created.",
+          error: "SubAgent tool calls require a running Build Block.",
+          metadata: { kind: "subagent", buildRunId: buildRunId || "", limit, terminated: true }
+        };
+      }
+      if (buildRunId && !runningBuild) {
+        return {
+          ok: false,
+          output: `[SubAgent terminated] Build Block ${buildRunId} is not running; no SubAgent was created.`,
+          error: "SubAgent creation requires a running Build Block.",
+          metadata: { kind: "subagent", buildRunId, limit, terminated: true }
+        };
+      }
+      if (runningBuild) {
+        const activeForBuild = this.subagents.activeCountForBuild(buildRunId);
+        if (activeForBuild >= limit) {
+          return {
+            ok: false,
+            output: `[SubAgent terminated] Build Block ${buildRunId} reached the ${this.intelligence === "ultra" ? "Ultra" : "non-Ultra"} hard limit (${limit}); no SubAgent was created or queued.`,
+            error: `SubAgent hard limit reached for Build Block ${buildRunId}: ${activeForBuild}/${limit}.`,
+            metadata: { kind: "subagent", buildRunId, intelligence: this.intelligence, activeForBuild, limit, terminated: true }
+          };
+        }
+      }
       const id = this.subagents.create(
         name50,
         prompt,
@@ -351096,7 +351239,9 @@ ${settled?.result || settled?.error || ""}`.trim();
         this.runtimeActorId,
         peerFlow,
         peerGoal,
-        Number(params.flow_pc ?? params.flowPc ?? (peerMode === "flow" ? this.flowPc : 0))
+        Number(params.flow_pc ?? params.flowPc ?? (peerMode === "flow" ? this.flowPc : 0)),
+        runningBuild?.runId || "",
+        this.intelligence
       );
       const sa = this.subagents.get(id);
       if (sa && preset) {
@@ -352404,7 +352549,7 @@ ${custom}`);
     if (this.intelligence === "ultra") {
       parts.push([
         "[Ultra Intelligence \u2013 Orchestrator Role]",
-        "You are the lead orchestrator. Actively decompose complex tasks into parallel sub-tasks. Use the `task` tool to create specialized SubAgents for each distinct sub-task. Coordinate the SubAgent team: assign clear responsibilities, merge results, resolve conflicts, and produce a unified final output. SubAgents are your team; delegate aggressively and manage them as a manager, not just a tool caller.",
+        "You are the lead orchestrator. Actively decompose complex tasks into parallel sub-tasks. Use the `SubAgent` tool to create specialized SubAgents for each distinct sub-task. Use `task_create` only for the conversation checklist; it never creates a SubAgent. Coordinate the SubAgent team: assign clear responsibilities, merge results, resolve conflicts, and produce a unified final output. SubAgents are your team; delegate aggressively and manage them as a manager, not just a tool caller.",
         "Do not attempt to do all the work yourself. Use SubAgents for parallel investigation, verification, implementation, and review."
       ].join("\n"));
     }
@@ -352510,7 +352655,7 @@ ${custom}`);
       "- Build history disclosure is two-layered. The request prompt contains only each historical Build Block user input, final summary, and completion status. When the current task continues, fixes, verifies, or depends on earlier Build Blocks, proactively call build_history_query to read the concrete tool activity and results of the relevant block, and reuse that information instead of re-investigating (re-running commands or re-reading files) from scratch. Querying history is read-only and never authorizes resuming that work; do not query merely to answer completion status already shown in the prompt.",
       "- Linked plan disclosure: a durable conversation-linked Markdown plan exists and can be inspected or updated with linked_plan when explicitly needed or required by Plan mode. Its full Markdown and revision are not injected into every model request.",
       "- A memory_lab_update, memory_lab_delete, or memory_lab_reindex call is unfinished until its awaited tool result contains rebuildReceipt.completed=true. The completion receipt is represented by the tool activity inside the current Build block and should not be repeated as a separate completion message.",
-      `- Skills and subagents: skill searches enabled metadata and loads one SKILL.md body on demand; skill_download installs offline skill folders; task creates constrained subagents tracked in agent state.`,
+      `- Skills and subagents: skill searches enabled metadata and loads one SKILL.md body on demand; skill_download installs offline skill folders; SubAgent creates constrained peer agents tracked in agent state. task_create is only for the conversation checklist and never creates a SubAgent.`,
       `- Visible output contract: assistant replies are sanitized before display to remove hidden-reasoning markers. ${visibleOutputContract}`,
       "- During Build work, before the first tool call and between materially different tool phases, emit a concise public progress explanation of what you are checking or changing and why. This is visible commentary, not hidden chain-of-thought. Do not wait until the final answer to explain the work."
     ].join("\n");