@dimi-agent/cli 0.5.3 → 0.5.5

package/dist/main.mjs

@@ -99274,18 +99274,34 @@ var init_loginShellPath = __esmMin((() => {
 * live in `dimi-wire` (Rust) and `@dimi-agent/transcript` (zod) and are
 * cross-checked by the differential test suite.
 */
+function loadPlatformSubpackage() {
+	try {
+		return nodeRequire$4(PLATFORM_SUBPACKAGE);
+	} catch {
+		return null;
+	}
+}
 /**
-* Loads the native binding, building nothing. Throws with a pointer to the
-* build command when `dist/dimi_bridge.node` is missing.
+* Loads the native binding, building nothing. Resolution order:
+*  1. `dist/dimi_bridge.node` next to the package — the dev / workspace
+*     layout (local cargo builds always win).
+*  2. the npm platform subpackage (`@dimi-agent/dimi-native-<platform>-<arch>`)
+*     — npm installs >=0.5.4; the SEA binary's module hook redirects the same
+*     specifier into the embedded native-asset cache.
+* Throws with a pointer to the build command when neither exists.
 */
 function loadNative() {
 	if (binding) return binding;
 	try {
-		binding = require$1("../dist/dimi_bridge.node");
-	} catch (error) {
-		throw new Error("dimi-native: native binding not found; run `pnpm --filter @dimi-agent/dimi-native run build:native`", { cause: error });
+		binding = nodeRequire$4("../dist/dimi_bridge.node");
+		return binding;
+	} catch {}
+	const platformBinding = loadPlatformSubpackage();
+	if (platformBinding !== null) {
+		binding = platformBinding;
+		return binding;
 	}
-	return binding;
+	throw new Error("dimi-native: native binding not found; run `pnpm --filter @dimi-agent/dimi-native run build:native`");
 }
 /** Full cold rebuild: wire records JSON array → snapshot JSON. */
 function coldRebuild(recordsJson) {
@@ -99321,9 +99337,10 @@ function rustHostEnvironmentProbe() {
 function rustTerminalSpawn(options) {
 	return loadNative().RustTerminal.spawn(options);
 }
-var require$1, binding, RustAgentTranscript, RustFileSystem;
+var nodeRequire$4, binding, PLATFORM_SUBPACKAGE, RustAgentTranscript, RustFileSystem;
 var init_src$7 = __esmMin((() => {
-	require$1 = createRequire(import.meta.url);
+	nodeRequire$4 = createRequire(import.meta.url);
+	PLATFORM_SUBPACKAGE = `@dimi-agent/dimi-native-${process.platform}-${process.arch}`;
 	RustAgentTranscript = class {
 		#inner;
 		constructor(agentId) {
@@ -99601,7 +99618,6 @@ function toRustOptions$1(options) {
 }
 var ERRNO_PREFIX, RustHostFileSystem;
 var init_rustHostFileSystemService = __esmMin((() => {
-	init_scope();
 	init_src$7();
 	init_hostFileSystem();
 	init_hostFsErrors();
@@ -119569,22 +119585,6 @@ function wrapSubagentModelError(error, boundModel, callerModelAlias) {
 		}
 	});
 }
-/** Human-readable duration for the subagent timeout message. */
-function formatSubagentTimeoutDescription(ms) {
-	if (ms % (3600 * 1e3) === 0) {
-		const h = ms / (3600 * 1e3);
-		return `${h} hour${h === 1 ? "" : "s"}`;
-	}
-	if (ms % (60 * 1e3) === 0) {
-		const m = ms / (60 * 1e3);
-		return `${m} minute${m === 1 ? "" : "s"}`;
-	}
-	if (ms % 1e3 === 0) {
-		const s = ms / 1e3;
-		return `${s} second${s === 1 ? "" : "s"}`;
-	}
-	return `${ms} ms`;
-}
 var SUBAGENT_SECTION, SubagentConfigSchema, DEFAULT_SUBAGENT_TIMEOUT_MS, SUBAGENT_TIMEOUT_ENV, subagentEnvBindings, stripSubagentEnv;
 var init_configSection$7 = __esmMin((() => {
 	init_zod$1();
@@ -138766,7 +138766,15 @@ var init_subagent = __esmMin((() => {
 async function runAgentTurn(target, request, options) {
 	options.signal.throwIfAborted();
 	const promptService = target.accessor.get(IAgentPromptService);
-	const turn = request.kind === "prompt" ? await (await promptService.enqueue({ message: {
+	const turn = request.kind === "prompt" ? await (await (options.steer === true ? promptService.enqueueOrSteer({ message: {
+		role: "user",
+		content: [{
+			type: "text",
+			text: request.prompt
+		}],
+		toolCalls: [],
+		origin: AGENT_RUN_PROMPT_ORIGIN
+	} }) : promptService.enqueue({ message: {
 		role: "user",
 		content: [{
 			type: "text",
@@ -138774,7 +138782,7 @@ async function runAgentTurn(target, request, options) {
 		}],
 		toolCalls: [],
 		origin: AGENT_RUN_PROMPT_ORIGIN
-	} })).launched : await promptService.retry();
+	} }))).launched : await promptService.retry();
 	if (turn === void 0) throw new Error("Agent turn could not be started");
 	if (options.onReady !== void 0) turn.ready.then(() => options.onReady?.()).catch(() => {});
 	const completion = awaitRun(target, turn, options);
@@ -138948,7 +138956,8 @@ var init_subagentService = __esmMin((() => {
 			return runAgentTurn(handle, request, {
 				summaryPolicy: opts.summaryPolicy ?? this.summaryPolicyFor(handle),
 				signal: opts.signal,
-				onReady: opts.onReady
+				onReady: opts.onReady,
+				steer: opts.steer
 			});
 		}
 		notifyAgentTaskStopped(context) {
@@ -139220,7 +139229,7 @@ var init_mirrorAgentRun = __esmMin((() => {
 	init_eventBus();
 	init_agentLifecycle();
 	init_subagent();
-})), DEFAULT_PROFILE_NAME, SubagentToolInputSchema, BACKGROUND_AGENT_UNAVAILABLE, RESUME_WITH_TYPE_UNAVAILABLE, USER_INTERRUPTED_SUBAGENT_MESSAGE, SUBAGENT_STOPPED_MESSAGE, ISubagentTool;
+})), DEFAULT_PROFILE_NAME, SubagentToolInputSchema, RESUME_WITH_TYPE_UNAVAILABLE, USER_INTERRUPTED_SUBAGENT_MESSAGE, SUBAGENT_STOPPED_MESSAGE, ISubagentTool;
 var init_agent$2 = __esmMin((() => {
 	init_zod$1();
 	init_instantiation();
@@ -139237,8 +139246,7 @@ var init_agent$2 = __esmMin((() => {
 		prompt: string$2().describe("Full task prompt for the subagent"),
 		description: string$2().describe("Short task description (3-5 words) for UI display"),
 		subagent_type: string$2().optional().describe("One of the available agent types (see \"Available agent types\" in this tool description). Defaults to \"coder\" when omitted."),
-		resume: string$2().optional().describe("Optional agent ID to resume instead of creating a new instance. When set, do not also pass subagent_type — the resumed agent keeps its own type, and supplying both is rejected."),
-		run_in_background: boolean$2().optional().describe("If true, return immediately without waiting for completion. Prefer false unless the task can run independently and there is a clear benefit to not waiting."),
+		resume: string$2().optional().describe("Agent ID to message or continue instead of creating a new instance. Messaging an existing subagent works exactly like a human steering the agent: if it is still running, the prompt is injected into its current turn immediately; if it is idle, it starts a normal turn. When set, do not also pass subagent_type — the resumed agent keeps its own type, and supplying both is rejected."),
 		model: _enum(["secondary", "primary"]).optional().describe("Which model to run the subagent on: \"secondary\" = the configured secondary model; \"primary\" = the main model you are running on (for hard, quality-sensitive tasks). This explicit choice overrides the selected agent type's model_preference; without either, secondary is the default when configured. Only effective when a secondary model is configured; otherwise the subagent inherits your model. Ignored when resuming — resumed subagents keep their own model.")
 	}));
 	object({
@@ -139250,7 +139258,6 @@ var init_agent$2 = __esmMin((() => {
 			cache_write: number$2().int().nonnegative().optional()
 		}).describe("Cumulative token usage")
 	});
-	BACKGROUND_AGENT_UNAVAILABLE = "Background agent execution is not available for this agent because TaskList, TaskOutput, and TaskStop are not enabled.";
 	RESUME_WITH_TYPE_UNAVAILABLE = "Cannot set subagent_type when resuming an existing agent. Resume by agent id only.";
 	USER_INTERRUPTED_SUBAGENT_MESSAGE = "The subagent was stopped before it finished by user.";
 	SUBAGENT_STOPPED_MESSAGE = "The subagent was stopped before it finished.";
@@ -139296,22 +139303,10 @@ function firstNonEmpty(...values) {
 }
 var init_subagentMetadata = __esmMin((() => {}));
 //#endregion
-//#region ../../packages/agent-core-v2/src/agent/tools/agent/agent-background-disabled.md?raw
-var agent_background_disabled_default;
-var init_agent_background_disabled = __esmMin((() => {
-	agent_background_disabled_default = "Background agent execution is disabled for this agent. Do not set `run_in_background=true` — any call that sets it is rejected before the subagent launches. Run every subagent in the foreground and wait for its result.";
-}));
-//#endregion
-//#region ../../packages/agent-core-v2/src/agent/tools/agent/agent-background-enabled.md?raw
-var agent_background_enabled_default;
-var init_agent_background_enabled = __esmMin((() => {
-	agent_background_enabled_default = "When `run_in_background=true`, the subagent runs detached from this turn. The completion arrives in a later turn as a synthetic user-role message containing its result — you do not need to poll, sleep, or check on its progress. Continue with other work or respond to the user. Never fabricate or predict what the result will say.\n\nDefault to a foreground subagent (omit `run_in_background`) when your next step needs its result — foreground hands the result straight back. Reach for `run_in_background=true` only when you have other work to do while it runs and do not need its result to proceed. Never launch in the background and then immediately wait on it (by polling `TaskOutput`, sleeping, or otherwise): that just blocks the turn for no benefit — run it in the foreground instead.\n";
-}));
-//#endregion
 //#region ../../packages/agent-core-v2/src/agent/tools/agent/agent.md?raw
 var agent_default;
 var init_agent$1 = __esmMin((() => {
-	agent_default = "Launch a subagent to handle a task. The subagent runs as a same-process loop instance with its own context and wire file. Delegating also keeps the bulk of intermediate file contents out of your own context — you get a conclusion back instead of a pile of dumps.\n\nWriting the prompt:\n- The subagent starts with zero context — it has not seen this conversation. Brief it like a colleague who just walked into the room: state the goal, list what you already know, hand over the specifics.\n- Lookups (read this file, run that test): put the exact path or command in the prompt. The subagent should not have to search for things you already know.\n- Investigations (figure out X, find why Y): give the question, not prescribed steps — fixed steps become dead weight when the premise is wrong.\n- Do not delegate understanding. If the task hinges on a file path or line number, find it yourself first and write it into the prompt.\n\nUsage notes:\n- When the task continues earlier work a subagent already did, prefer resuming that agent (pass its `resume` id) over spawning a fresh instance — the resumed agent keeps its prior context.\n- A subagent's result is only visible to you, not to the user. When the user needs to see what a subagent produced, summarize the relevant parts yourself in your own reply.\n- Subagents use a fixed 2-hour timeout. If one times out, resume the same agent instead of starting over.\n\nWhen NOT to use Agent: skip delegation for trivial work you can do directly — reading a file whose path you already know, searching a small known set of files, or any task that takes only a step or two. Delegation has a context-handoff cost; it pays off only when the task is substantial enough to outweigh it.\n\nOnce a subagent is running, leave that scope to it: do not redo its searches or reads in parallel, and do not abandon it midway and finish the job manually. Both undo the context savings the delegation was meant to buy.\n";
+	agent_default = "Launch a subagent to handle a task. The subagent runs as a same-process loop instance with its own context and wire file. Delegating also keeps the bulk of intermediate file contents out of your own context — you get a conclusion back instead of a pile of dumps.\n\nThe subagent is **fully asynchronous**: this tool returns immediately with the subagent's `agent_id` and a `task_id` — it never blocks your turn. Do the rest of your work while it runs; its result arrives on its own as a completion notification with the final summary. You do not need to poll, sleep, or check on it — and never fabricate or predict what the result will say.\n\nWhen you genuinely have nothing else to do and want to see how it is going:\n\n- Call `AgentOutput(agent_id=\"...\")` to read its recent rendered output (assistant text, thinking, tool calls, progress) — the same view a human sees in the TUI.\n- If it is still working, call `WaitFor` with a reasonable `timeout_seconds` instead of polling `AgentOutput` in a loop; the wait wakes you on the completion notification or the timeout, then check again with `AgentOutput`.\n\nWriting the prompt:\n- The subagent starts with zero context — it has not seen this conversation. Brief it like a colleague who just walked into the room: state the goal, list what you already know, hand over the specifics.\n- Lookups (read this file, run that test): put the exact path or command in the prompt. The subagent should not have to search for things you already know.\n- Investigations (figure out X, find why Y): give the question, not prescribed steps — fixed steps become dead weight when the premise is wrong.\n- Do not delegate understanding. If the task hinges on a file path or line number, find it yourself first and write it into the prompt.\n\nUsage notes:\n- When the task continues earlier work a subagent already did, prefer resuming that agent (pass its `resume` id) over spawning a fresh instance — the resumed agent keeps its prior context. `resume` works exactly like a human steering the agent: while the subagent is still running, your prompt is injected into its current turn immediately; when it is idle, it starts a normal turn. Use it to redirect, follow up, or send it new information.\n- A subagent's result is only visible to you, not to the user. When the user needs to see what a subagent produced, summarize the relevant parts yourself in your own reply.\n- Subagents use a fixed 2-hour timeout. If one times out, resume the same agent instead of starting over.\n\nWhen NOT to use Agent: skip delegation for trivial work you can do directly — reading a file whose path you already know, searching a small known set of files, or any task that takes only a step or two. Delegation has a context-handoff cost; it pays off only when the task is substantial enough to outweigh it.\n\nOnce a subagent is running, leave that scope to it: do not redo its searches or reads in parallel, and do not abandon it midway and finish the job manually. Both undo the context savings the delegation was meant to buy.\n";
 }));
 //#endregion
 //#region ../../packages/agent-core-v2/src/agent/tools/agent/agentTool.ts
@@ -139335,7 +139330,7 @@ function buildProfileDescriptions(profiles, tools, isToolActive$1, showModelPref
 		return `${headerLines}\n  Tools: ${activeTools.join(", ")}`;
 	}).join("\n");
 }
-function formatBackgroundAgentResult(taskId, handle, description, allowBackground) {
+function formatAsyncAgentResult(taskId, handle, description) {
 	return [
 		`task_id: ${taskId}`,
 		"status: running",
@@ -139345,31 +139340,11 @@ function formatBackgroundAgentResult(taskId, handle, description, allowBackgroun
 		"",
 		`description: ${description}`,
 		"",
-		allowBackground ? `next_step: The completion arrives automatically in a later turn — do NOT wait, poll, or call TaskOutput on it; continue with other work or hand back to the user. (If you have nothing to do until it finishes, run such tasks in the foreground next time.)` : "next_step: The completion arrives automatically in a later turn.",
-		`resume_hint: To continue or recover this same subagent later, call Agent(resume="${handle.agentId}", prompt="..."). The parameter is agent_id ("${handle.agentId}"), NOT task_id ("${taskId}") or source_id from a later <notification>. Recovery cases: a later <notification type="task.lost" | "task.failed" | "task.killed"> for this subagent — its conversation history is preserved across session restarts and resume will pick it up.`
-	].join("\n");
-}
-function formatForegroundAgentSuccess(handle, result) {
-	return [
-		`agent_id: ${handle.agentId}`,
-		`actual_subagent_type: ${handle.profileName}`,
-		"status: completed",
-		"",
-		"[summary]",
-		result
+		"next_step: The subagent runs fully asynchronously — continue with other work. Its final result arrives later as a completion notification.",
+		`progress_hint: To check on it, call AgentOutput(agent_id="${handle.agentId}") to read its recent output (assistant text, thinking, tool calls). If you have nothing else to do, call WaitFor with a reasonable timeout_seconds instead of polling, then check again with AgentOutput.`,
+		`resume_hint: To continue, redirect, or send this subagent a message — like a human steering the agent — call Agent(resume="${handle.agentId}", prompt="..."). While it is still running the prompt is injected into its current turn immediately; when idle it starts a normal turn. The parameter is agent_id ("${handle.agentId}"), NOT task_id ("${taskId}") or source_id from a later <notification>. Recovery cases: a later <notification type="task.lost" | "task.failed" | "task.killed"> for this subagent — its conversation history is preserved across session restarts and resume will pick it up.`
 	].join("\n");
 }
-function formatForegroundAgentFailure(handle, message, timedOut) {
-	const lines = [
-		`agent_id: ${handle.agentId}`,
-		`actual_subagent_type: ${handle.profileName}`,
-		"status: failed",
-		"",
-		`subagent error: ${message}`
-	];
-	if (timedOut) lines.push(`resume_hint: Continue with Agent(resume="${handle.agentId}", prompt="continue"). Use agent_id only; do not set subagent_type. The subagent retains its prior context; redo any unfinished tool call if its result was lost.`);
-	return lines.join("\n");
-}
 function launchErrorMessage(error, signal) {
 	if (isUserCancellation(signal.reason)) return USER_INTERRUPTED_SUBAGENT_MESSAGE;
 	if (isAbortError$1(error)) return formatSubagentStoppedMessage(errorMessage$4(signal.reason));
@@ -139397,7 +139372,6 @@ var init_agentTool = __esmMin((() => {
 	init_toolPolicy();
 	init_permissionMode();
 	init_scopeContext();
-	init_loop();
 	init_userTool();
 	init_toolContract();
 	init_toolContribution();
@@ -139421,8 +139395,6 @@ var init_agentTool = __esmMin((() => {
 	init_flag$2();
 	init_agent$2();
 	init_subagent_task();
-	init_agent_background_disabled();
-	init_agent_background_enabled();
 	init_agent$1();
 	init_decorateParam();
 	init_decorate();
@@ -139445,7 +139417,6 @@ var init_agentTool = __esmMin((() => {
 		name = "Agent";
 		parameters = toInputJsonSchema(SubagentToolInputSchema);
 		callerAgentId;
-		canRunInBackground;
 		constructor(lifecycle, subagents, catalog, scopeContext, tasks, profile, toolPolicy, toolRegistry, workspace, processRunner, sessionMetadata, log, permissionMode, config, flags, modelCatalog) {
 			this.lifecycle = lifecycle;
 			this.subagents = subagents;
@@ -139463,10 +139434,9 @@ var init_agentTool = __esmMin((() => {
 			this.flags = flags;
 			this.modelCatalog = modelCatalog;
 			this.callerAgentId = scopeContext.agentId;
-			this.canRunInBackground = () => this.toolPolicy.isToolActive("TaskList") && this.toolPolicy.isToolActive("TaskOutput") && this.toolPolicy.isToolActive("TaskStop");
 		}
 		get description() {
-			let description = `${agent_default}\n\n${this.canRunInBackground() ? agent_background_enabled_default : agent_background_disabled_default}`;
+			let description = agent_default;
 			const allowlist = subagentAllowlistFor(this.catalog, this.profile.data());
 			const typeLines = buildProfileDescriptions(allowlist === void 0 ? this.catalog.list() : this.catalog.list().filter((profile) => allowlist.includes(profile.name)), this.knownToolReferences(), (profile, name, source) => this.toolPolicy.isToolActiveForProfile(profile, name, source), this.flags.enabled(SECONDARY_MODEL_FLAG_ID), this.flags.enabled(BACKGROUND_BASH_STDIN_FLAG_ID));
 			if (typeLines) description += `\n\nAvailable agent types (pass via subagent_type):\n${typeLines}`;
@@ -139492,13 +139462,13 @@ var init_agentTool = __esmMin((() => {
 			};
 			const profileNameForDisplay = resumeAgentId !== void 0 && resumeAgentId.length > 0 ? this.resumeProfileName(resumeAgentId) ?? "subagent" : requestedProfileName ?? "coder";
 			return {
-				description: `${args.run_in_background === true ? "Launching background" : "Launching"} ${profileNameForDisplay} agent: ${args.description}`,
+				description: `Launching ${profileNameForDisplay} agent: ${args.description}`,
 				accesses: ToolAccesses.none(),
 				display: {
 					kind: "agent_call",
 					agent_name: profileNameForDisplay,
 					prompt: args.prompt,
-					background: args.run_in_background
+					background: false
 				},
 				approvalRule: this.name,
 				matchesRule: (ruleArgs) => matchesGlobRuleSubject(ruleArgs, profileNameForDisplay),
@@ -139521,7 +139491,7 @@ var init_agentTool = __esmMin((() => {
 			if (isResume) {
 				const target = this.lifecycle.get(resumeAgentId);
 				if (target === void 0) throw new Error(`Agent instance "${resumeAgentId}" does not exist`);
-				await this.ensureOwnedIdleSubagent(resumeAgentId, target);
+				await this.ensureOwnedSubagent(resumeAgentId);
 				agentId = target.id;
 				profileName = target.accessor.get(IAgentProfileService).data().profileName ?? "subagent";
 			} else {
@@ -139562,17 +139532,19 @@ var init_agentTool = __esmMin((() => {
 					log: this.log
 				});
 			}
-			const runInBackground = args.run_in_background === true;
 			emitAgentRunSpawned(requester, agentId, {
 				profileName,
 				parentToolCallId: toolCallId,
 				description: args.description,
-				runInBackground
+				runInBackground: false
 			});
 			const mirrored = mirrorAgentRun(requester, await this.subagents.run(agentId, {
 				kind: "prompt",
 				prompt: promptText
-			}, { signal: controller.signal }), {
+			}, {
+				signal: controller.signal,
+				steer: isResume
+			}), {
 				profileName,
 				prompt: promptText,
 				signal: controller.signal,
@@ -139589,16 +139561,14 @@ var init_agentTool = __esmMin((() => {
 				}))
 			};
 		}
-		async ensureOwnedIdleSubagent(agentId, target) {
+		async ensureOwnedSubagent(agentId) {
 			const meta = (await this.sessionMetadata.read()).agents?.[agentId];
 			if (!isSubagentMeta(meta)) throw new Error(`Agent instance "${agentId}" is not a subagent`);
 			if (subagentParentAgentId(meta) !== this.callerAgentId) throw new Error(`Agent instance "${agentId}" does not belong to this parent agent`);
-			if (target.accessor.get(IAgentLoopService).status().state === "running") throw new Error(`Agent instance "${agentId}" is already running and cannot run concurrently`);
 		}
 		async execution(args, { toolCallId, signal }) {
 			try {
 				signal.throwIfAborted();
-				const runInBackground = args.run_in_background === true;
 				const requestedProfileName = args.subagent_type?.length ? args.subagent_type : void 0;
 				const resumeAgentId = args.resume?.trim();
 				const isResume = resumeAgentId !== void 0 && resumeAgentId.length > 0;
@@ -139606,17 +139576,12 @@ var init_agentTool = __esmMin((() => {
 					output: RESUME_WITH_TYPE_UNAVAILABLE,
 					isError: true
 				};
-				const allowBackground = this.canRunInBackground();
-				if (runInBackground && !allowBackground) return {
-					output: BACKGROUND_AGENT_UNAVAILABLE,
-					isError: true
-				};
 				const timeoutMs = resolveSubagentTimeoutMs(this.config);
 				const controller = new AbortController();
 				const abortBeforeRegister = () => {
 					controller.abort(signal.reason);
 				};
-				if (!runInBackground) signal.addEventListener("abort", abortBeforeRegister, { once: true });
+				signal.addEventListener("abort", abortBeforeRegister, { once: true });
 				let handle;
 				try {
 					handle = await this.launch(args, toolCallId, controller);
@@ -139624,7 +139589,6 @@ var init_agentTool = __esmMin((() => {
 					signal.removeEventListener("abort", abortBeforeRegister);
 					this.log.warn("subagent launch failed", {
 						toolCallId,
-						runInBackground,
 						operation: isResume ? "resume" : "spawn",
 						subagentType: requestedProfileName ?? "coder",
 						resumeAgentId: isResume ? resumeAgentId : void 0,
@@ -139635,9 +139599,9 @@ var init_agentTool = __esmMin((() => {
 				let taskId;
 				try {
 					const registerOptions = {
-						detached: runInBackground,
+						detached: true,
 						timeoutMs,
-						signal: runInBackground ? void 0 : signal
+						signal: void 0
 					};
 					taskId = this.tasks.registerTask(new SubagentTask(handle, args.description, controller), registerOptions);
 					signal.removeEventListener("abort", abortBeforeRegister);
@@ -139645,7 +139609,7 @@ var init_agentTool = __esmMin((() => {
 					controller.abort();
 					handle.completion.catch(() => {});
 					signal.removeEventListener("abort", abortBeforeRegister);
-					this.log?.warn("background agent task registration failed", {
+					this.log?.warn("subagent task registration failed", {
 						toolCallId,
 						agentId: handle.agentId,
 						subagentType: handle.profileName,
@@ -139657,9 +139621,7 @@ var init_agentTool = __esmMin((() => {
 						isError: true
 					};
 				}
-				if (runInBackground) return { output: formatBackgroundAgentResult(taskId, handle, args.description, allowBackground) };
-				if (await this.tasks.waitForForegroundRelease(taskId) === "detached") return { output: formatBackgroundAgentResult(taskId, handle, args.description, allowBackground) };
-				return await this.formatForegroundResult(taskId, handle, timeoutMs);
+				return { output: formatAsyncAgentResult(taskId, handle, args.description) };
 			} catch (error) {
 				return {
 					output: `subagent error: ${launchErrorMessage(error, signal)}`,
@@ -139667,15 +139629,6 @@ var init_agentTool = __esmMin((() => {
 				};
 			}
 		}
-		async formatForegroundResult(taskId, handle, timeoutMs) {
-			const info = this.tasks.getTask(taskId);
-			if (info?.status === "completed") return { output: formatForegroundAgentSuccess(handle, await this.tasks.readOutput(taskId)) };
-			const timedOut = info?.status === "timed_out";
-			return {
-				output: formatForegroundAgentFailure(handle, timedOut ? `Agent timed out after ${formatSubagentTimeoutDescription(timeoutMs)}.` : formatSubagentStoppedMessage(info?.stopReason), timedOut),
-				isError: true
-			};
-		}
 	};
 	SubagentTool = __decorate$1([
 		__decorateParam(0, IAgentLifecycleService),
@@ -214606,7 +214559,6 @@ var init_sessionSwarmService = __esmMin((() => {
 	init_abort();
 	init_profile();
 	init_permissionMode();
-	init_loop();
 	init_userTool();
 	init_eventBus();
 	init_sessionAgentProfileCatalog();
@@ -214735,7 +214687,6 @@ var init_sessionSwarmService = __esmMin((() => {
 			await this.requireOwnedSubagent(callerAgentId, agentId);
 			const caller = this.requireHandle(callerAgentId, "Caller agent");
 			const child = this.requireHandle(agentId, "Agent instance");
-			this.requireIdleSubagent(agentId, child);
 			const profileName = child.accessor.get(IAgentProfileService).data().profileName ?? RESUMED_PROFILE_FALLBACK;
 			if (!retryTurn) emitAgentRunSpawned(caller, agentId, {
 				profileName,
@@ -214749,15 +214700,16 @@ var init_sessionSwarmService = __esmMin((() => {
 				kind: "prompt",
 				prompt: options.prompt
 			};
-			return this.observe(caller, child.id, profileName, request, options);
+			return this.observe(caller, child.id, profileName, request, options, !retryTurn);
 		}
-		async observe(caller, agentId, profileName, request, options) {
+		async observe(caller, agentId, profileName, request, options, steer = false) {
 			return {
 				agentId,
 				profileName,
 				completion: mirrorAgentRun(caller, await this.subagents.run(agentId, request, {
 					signal: options.signal,
-					onReady: options.onReady
+					onReady: options.onReady,
+					steer
 				}), {
 					profileName,
 					prompt: request.kind === "prompt" ? request.prompt : void 0,
@@ -214774,9 +214726,6 @@ var init_sessionSwarmService = __esmMin((() => {
 			if (handle === void 0) throw new Error(`${label} "${agentId}" does not exist`);
 			return handle;
 		}
-		requireIdleSubagent(agentId, child) {
-			if (child.accessor.get(IAgentLoopService).status().state === "running") throw new Error(`Agent instance "${agentId}" is already running and cannot run concurrently`);
-		}
 		async requireOwnedSubagent(callerAgentId, agentId) {
 			const meta = await this.agentMeta(agentId);
 			if (!isSubagentMeta(meta)) throw new Error(`Agent instance "${agentId}" is not a subagent`);
@@ -393981,6 +393930,20 @@ var init_upgrade = __esmMin((() => {
 }));
 //#endregion
 //#region src/native/module-hook.ts
+/**
+* The cached dimi_bridge.node for the requested binding subpackage, or null
+* when the package resolves normally (dev / npm installs — the real package
+* wins) or the native-asset tree has no such package.
+*/
+function dimiNativeBindingPath(request) {
+	try {
+		nodeRequire.resolve(request);
+		return null;
+	} catch {}
+	const pkgRoot = getNativePackageRoot(request);
+	if (pkgRoot === null) return null;
+	return join(pkgRoot, "dimi_bridge.node");
+}
 function installNativeModuleHook() {
 	if (installed) return;
 	installed = true;
@@ -393988,28 +393951,38 @@ function installNativeModuleHook() {
 	const originalLoad = moduleBuiltin._load;
 	if (originalLoad === void 0) return;
 	moduleBuiltin._load = function loadWithNativeAssets(request, parent, isMain) {
-		if (typeof request === "string" && PI_TUI_NATIVE_PATTERN.test(request) && !existsSync(request)) {
-			const pkgRoot = getNativePackageRoot("@dimi-agent/pi-tui");
-			if (pkgRoot !== null) {
-				const match = request.match(PI_TUI_NATIVE_PATTERN);
-				if (match !== null) {
-					const redirected = join(pkgRoot, match[0]);
-					return originalLoad.call(this, redirected, parent, isMain);
+		if (typeof request === "string") {
+			if (PI_TUI_NATIVE_PATTERN.test(request) && !existsSync(request)) {
+				const pkgRoot = getNativePackageRoot("@dimi-agent/pi-tui");
+				if (pkgRoot !== null) {
+					const match = request.match(PI_TUI_NATIVE_PATTERN);
+					if (match !== null) {
+						const redirected = join(pkgRoot, match[0]);
+						return originalLoad.call(this, redirected, parent, isMain);
+					}
 				}
+			} else if (DIMI_NATIVE_SUBPACKAGE.test(request)) {
+				const redirected = dimiNativeBindingPath(request);
+				if (redirected !== null) return originalLoad.call(this, redirected, parent, isMain);
 			}
 		}
 		return originalLoad.call(this, request, parent, isMain);
 	};
 }
-var nodeRequire, installed, PI_TUI_NATIVE_PATTERN;
+var nodeRequire, installed, PI_TUI_NATIVE_PATTERN, DIMI_NATIVE_SUBPACKAGE;
 var init_module_hook = __esmMin((() => {
 	init_native_assets();
 	nodeRequire = createRequire(import.meta.url);
 	installed = false;
 	PI_TUI_NATIVE_PATTERN = /native[\\/](?:win32|darwin)[\\/]prebuilds[\\/].+\.node$/;
+	DIMI_NATIVE_SUBPACKAGE = /^@dimi-agent\/dimi-native-(?:darwin|linux|win32)-(?:arm64|x64)$/;
 }));
 //#endregion
 //#region src/native/smoke.ts
+function smokeDimiNativeLoad() {
+	const info = createRequire(import.meta.url)(dimiNativePackage)?.RustHostEnvironment?.probe?.();
+	if (typeof info !== "object" || info === null || typeof info.osKind !== "string") throw new Error("dimi-native binding loaded but probe() returned an unexpected shape");
+}
 function smokePiTuiNativeLoad() {
 	const platform = process.platform;
 	const arch = process.arch;
@@ -394027,6 +394000,7 @@ function runNativeAssetSmokeIfRequested() {
 		if (manifest === null) throw new Error("Native asset manifest is not available.");
 		for (const packageName of smokePackages) if (getNativePackageRoot(packageName, { manifest }) === null) throw new Error(`Native package is not available: ${packageName}`);
 		smokePiTuiNativeLoad();
+		smokeDimiNativeLoad();
 		process.stdout.write(`Native asset smoke passed: ${manifest.target}\n`);
 		process.exit(0);
 	} catch (error) {
@@ -394035,10 +394009,15 @@ function runNativeAssetSmokeIfRequested() {
 		process.exit(1);
 	}
 }
-var smokePackages;
+var dimiNativePackage, smokePackages;
 var init_smoke = __esmMin((() => {
 	init_native_assets();
-	smokePackages = ["@mariozechner/clipboard", "@dimi-agent/pi-tui"];
+	dimiNativePackage = `@dimi-agent/dimi-native-${process.platform}-${process.arch}`;
+	smokePackages = [
+		"@mariozechner/clipboard",
+		"@dimi-agent/pi-tui",
+		dimiNativePackage
+	];
 }));
 //#endregion
 //#region src/main-app.ts
@@ -394186,16 +394165,26 @@ if (process.env["DIMI_LEGACY"] !== "1" && !nativeBindingAvailable()) {
 	process.env["DIMI_LEGACY"] = "1";
 	process.stderr.write("dimi: native runtime unavailable (dimi_bridge.node not found); falling back to the legacy TypeScript backend. Reinstall or run \"dimi upgrade\" to get the Rust runtime.\n");
 }
-await Promise.resolve().then(() => (init_main_app(), main_app_exports));
+Promise.resolve().then(() => (init_main_app(), main_app_exports)).catch((error) => {
+	process.stderr.write(`dimi: failed to start: ${error instanceof Error ? error.message : String(error)}\n`);
+	process.exit(1);
+});
 /** Locate the napi binding without loading it. */
 function nativeBindingAvailable() {
-	const require = createRequire(import.meta.url);
-	const candidates = [resolve(dirname(fileURLToPath(import.meta.url)), "../dist/dimi_bridge.node")];
+	const nodeRequire = createRequire(import.meta.url);
+	try {
+		const sea = nodeRequire("node:sea");
+		if (typeof sea?.isSea === "function" && sea.isSea()) return true;
+	} catch {}
+	if (existsSync(resolve(dirname(fileURLToPath(import.meta.url)), "../dist/dimi_bridge.node"))) return true;
 	try {
-		const pkgPath = require.resolve("@dimi-agent/dimi-native/package.json");
-		candidates.push(resolve(dirname(pkgPath), "dist/dimi_bridge.node"));
+		nodeRequire.resolve(`@dimi-agent/dimi-native-${process.platform}-${process.arch}`);
+		return true;
+	} catch {}
+	try {
+		if (existsSync(resolve(dirname(nodeRequire.resolve("@dimi-agent/dimi-native/package.json")), "dist/dimi_bridge.node"))) return true;
 	} catch {}
-	return candidates.some((candidate) => existsSync(candidate));
+	return false;
 }
 //#endregion
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dimi-agent/cli",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "The Starting Point for Next-Gen Agents",
   "keywords": [
     "agent",
@@ -27,6 +27,7 @@
   },
   "files": [
     "dist",
+    "!dist/dimi_bridge.node",
     "dist-web",
     "native",
     "README.md"
@@ -59,10 +60,10 @@
     "tsx": "^4.21.0",
     "yazl": "^3.3.1",
     "zod": "^4.3.6",
-    "@dimi-agent/agent-core-v2": "^0.1.0",
-    "@dimi-agent/dimi-sdk": "^0.2.0",
     "@dimi-agent/dimi-oauth": "^0.1.0",
+    "@dimi-agent/dimi-sdk": "^0.2.0",
     "@dimi-agent/dimi-telemetry": "^0.1.0",
+    "@dimi-agent/agent-core-v2": "^0.1.0",
     "@dimi-agent/dimi-web": "^0.1.0",
     "@dimi-agent/pi-tui": "^0.1.0",
     "@dimi-agent/remote": "^0.1.0",
@@ -70,7 +71,13 @@
   },
   "optionalDependencies": {
     "@mariozechner/clipboard": "^0.3.9",
-    "node-pty": "^1.1.0"
+    "node-pty": "^1.1.0",
+    "@dimi-agent/dimi-native-darwin-arm64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-darwin-x64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-linux-x64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-linux-arm64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-win32-x64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-win32-arm64": ">=0.5.3 <1"
   },
   "engines": {
     "node": ">=22.19.0"