@bike4mind/cli 3.3.0 → 4.0.0

package/dist/index.mjs

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
-import { $ as CustomCommandStore, A as createAgentDelegateTool, B as DEFAULT_THOROUGHNESS, C as createTodoStore, D as createCoordinateTaskTool, E as parseAgentConfig, G as setWebSocketToolExecutor, H as buildSkillsPromptSection, I as ALWAYS_DENIED_FOR_AGENTS, L as DEFAULT_AGENT_MODEL, M as substituteArguments, N as PermissionManager, O as createResumeAgentTool, P as buildCliToolList, Q as RemoteSkillSource, R as DEFAULT_MAX_ITERATIONS, S as createFindDefinitionTool, T as createSkillTool, V as buildSystemPrompt, W as getProcessHooks, X as createToolSearchTool, Z as findIterationBoundary, _ as createDecisionLogTool, at as mergeCommands, b as createGetFileStructureTool, ct as searchFiles, d as createReviewGateStore, dt as COMPACTION_SUMMARY_MARKER, et as processFileReferences, f as createReviewGateTool, g as formatBlockersOutput, h as createBlockerTools, it as searchCommands, j as FallbackLlmBackend, k as createBackgroundAgentTools, lt as warmFileCache, m as createBlockerStore, nt as CheckpointStore, ot as rewireReservedNames, p as formatReviewGatesOutput, pt as MAX_PASTE_SIZE, q as getPlanModeFilePath, rt as SessionStore, s as buildSandbox, st as formatFileSize, tt as hasFileReferences, u as isConnectionDrop, v as createDecisionStore, w as createWriteTodosTool, x as createWorkItemTools, y as formatDecisionsOutput, z as DEFAULT_RETRY_CONFIG } from "./AgentHistoryStore-CLidbOHG.mjs";
-import { a as selectLiveSubagentTokens, i as selectLiveSubagentCredits, n as selectActiveBackgroundShells, o as useCliStore, r as selectCompletedBackgroundShells, t as selectActiveBackgroundAgents } from "./store-BxmPEI3v.mjs";
-import { Bt as DELEGATION_PAYLOAD_SCHEMA_NAME, Gt as selfClaimedActorKindSchema, Ht as actorKindMarker, L as CREDIT_DEDUCT_TRANSACTION_TYPES, Pt as tokenEstimateMultiplier, R as ChatModels, S as isValidSessionId, Ut as actorKindSchema, Vt as actorColorIndex, Wt as delegationPayloadSchema, _ as LOCAL_DEV_URL, b as logger, bt as isEarlyStop, d as getCreditsUrl, f as getEnvironmentName, i as ToolCatalog, it as SUBQUEST_STATUS_VALUES, m as resolveApiEndpoint, n as extractCompactInstructions, p as requireApiUrl, t as ConfigStore, tt as REVIEW_GATE_STATUS_VALUES, u as ApiEndpointUnconfiguredError, x as SESSION_ID_PATTERN, y as parseApiUrl, zt as ACTOR_COLOR_SLOTS } from "./ConfigStore-DUATzLxB.mjs";
+import { $ as processFileReferences, A as createAgentDelegateTool, B as DEFAULT_THOROUGHNESS, C as createTodoStore, D as createCoordinateTaskTool, E as parseAgentConfig, H as buildSkillsPromptSection, I as ALWAYS_DENIED_FOR_AGENTS, J as getProcessHooks, K as findIterationBoundary, L as DEFAULT_AGENT_MODEL, M as substituteArguments, N as PermissionManager, O as createResumeAgentTool, P as buildCliToolList, Q as CustomCommandStore, R as DEFAULT_MAX_ITERATIONS, S as createFindDefinitionTool, T as createSkillTool, V as buildSystemPrompt, Y as setWebSocketToolExecutor, Z as getPlanModeFilePath, _ as createDecisionLogTool, at as searchFiles, b as createGetFileStructureTool, ct as COMPACTION_SUMMARY_MARKER, d as createReviewGateStore, et as hasFileReferences, f as createReviewGateTool, g as formatBlockersOutput, h as createBlockerTools, it as formatFileSize, j as FallbackLlmBackend, k as createBackgroundAgentTools, m as createBlockerStore, nt as SessionStore, ot as warmFileCache, p as formatReviewGatesOutput, rt as searchCommands, s as buildSandbox, tt as CheckpointStore, u as isConnectionDrop, ut as MAX_PASTE_SIZE, v as createDecisionStore, w as createWriteTodosTool, x as createWorkItemTools, y as formatDecisionsOutput, z as DEFAULT_RETRY_CONFIG } from "./AgentHistoryStore-DgqmcVLN.mjs";
+import { a as selectLiveSubagentTokens, i as selectLiveSubagentCredits, n as selectActiveBackgroundShells, o as useCliStore, r as selectCompletedBackgroundShells, t as selectActiveBackgroundAgents } from "./store-BbvSi3KK.mjs";
+import { $t as selfClaimedActorKindSchema, B as ChatModels, Dt as isEarlyStop, Jt as DELEGATION_PAYLOAD_SCHEMA_NAME, Qt as delegationPayloadSchema, S as isValidSessionId, Vt as tokenEstimateMultiplier, Xt as actorKindMarker, Yt as actorColorIndex, Zt as actorKindSchema, _ as LOCAL_DEV_URL, at as REVIEW_GATE_STATUS_VALUES, b as logger, ct as SUBQUEST_STATUS_VALUES, d as getCreditsUrl, f as getEnvironmentName, i as ToolCatalog, m as resolveApiEndpoint, n as extractCompactInstructions, p as requireApiUrl, qt as ACTOR_COLOR_SLOTS, t as ConfigStore, u as ApiEndpointUnconfiguredError, x as SESSION_ID_PATTERN, y as parseApiUrl, z as CREDIT_DEDUCT_TRANSACTION_TYPES } from "./ConfigStore-BwqsQ0U9.mjs";
+import { a as rewireReservedNames, i as mergeCommands, t as RemoteSkillSource } from "./RemoteSkillSource-qTvRkaNA.mjs";
 import { r as isFeatureEnabled, t as PluginStore } from "./PluginStore-DwvOJ-G3.mjs";
-import { i as getTokenCounter, n as ConversationContext, r as reconstructTurnBlocks, t as WorkItemsClient } from "./WorkItemsClient-BSoOblGp.mjs";
-import { a as NotifyingLlmBackend, i as deferredToolRegistry, n as buildSupportingStores, r as buildLlmBackend, t as buildAgent } from "./buildAgent-DyZWK0LW.mjs";
+import { i as getTokenCounter, n as ConversationContext, r as reconstructTurnBlocks, t as WorkItemsClient } from "./WorkItemsClient-CERTDrhT.mjs";
+import { a as deferredToolRegistry, i as buildLlmBackend, n as buildAgent, o as NotifyingLlmBackend, r as buildSupportingStores, t as buildToolSearch } from "./buildToolSearch-D9GEK91u.mjs";
 import { t as getShellSessionManager } from "./ShellSessionManager-6o8KZzl1-vrbPAUTq.mjs";
-import { a as ApiClient, s as OAuthClient } from "./dist-DPP7UmK9.mjs";
-import { t as version } from "./package-DYPVrada.mjs";
+import { r as OAuthClient, t as ApiClient } from "./ApiClient-_JrM_xWw.mjs";
+import { t as version } from "./package-CQaam4Dq.mjs";
 import { s as getStartupUpdateStatus } from "./updateChecker-CCLVVdH0.mjs";
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useReducer, useRef, useState, useSyncExternalStore } from "react";
 import { Box, Static, Text, measureElement, render, useApp, useInput, usePaste, useStdout } from "ink";
@@ -627,6 +628,7 @@ function InputPrompt({ onSubmit, onBashCommand, onImageDetected, disabled = fals
 	const pastedLineCount = useCliStore((state) => state.pastedLineCount);
 	const setPastedContent = useCliStore((state) => state.setPastedContent);
 	const clearPaste = useCliStore((state) => state.clearPaste);
+	const turnBusy = useCliStore((state) => state.isThinking || state.turnInFlight);
 	const [selectedIndex, setSelectedIndex] = useState(0);
 	const [historyIndex, setHistoryIndex] = useState(-1);
 	const [tempInput, setTempInput] = useState("");
@@ -705,6 +707,15 @@ function InputPrompt({ onSubmit, onBashCommand, onImageDetected, disabled = fals
 				return;
 			}
 		}
+		if (key.tab && !key.shift && turnBusy && !isBashMode && !shouldShowCommandAutocomplete && !fileAutocomplete?.active) {
+			const content = pastedContent ?? value;
+			if (!content.trim()) return;
+			if (pastedContent) clearPaste();
+			onSubmit(content, { followUp: true });
+			setValue("");
+			setHistoryIndex(-1);
+			return;
+		}
 		if (!shouldShowCommandAutocomplete && !fileAutocomplete?.active && history.length > 0) {
 			if (key.upArrow) {
 				if (historyIndex === -1) {
@@ -2706,6 +2717,8 @@ const MessageItem = React.memo(function MessageItem({ message, showThoughts = tr
 * agent/shell status blocks render nothing when idle.
 */
 const LIVE_CHROME_ROWS = 10;
+/** Shown under the queued-message rows; mirrors the routing in handleSubmit and the ESC handler in index.tsx. */
+const QUEUE_HINT = "Enter steers this turn · Tab queues for next turn · Esc cancels and restores to input";
 function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPermissionResponse, onUserQuestionResponse, onReviewGateResponse, onImageDetected, commandHistory = [], commands = [], config, availableModels = [], pluginDescriptors = [], onSaveConfig, prefillInput, onPrefillConsumed, mcpManager }) {
 	const messages = useCliStore(useShallow((state) => state.session?.messages || []));
 	const pendingMessages = useCliStore((state) => state.pendingMessages);
@@ -2729,15 +2742,17 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 	const exitRequested = useCliStore((state) => state.exitRequested);
 	const setIsThinking = useCliStore((state) => state.setIsThinking);
 	const pendingBackgroundTrigger = useCliStore((state) => state.pendingBackgroundTrigger);
+	const turnInFlight = useCliStore((state) => state.turnInFlight);
 	const setPendingBackgroundTrigger = useCliStore((state) => state.setPendingBackgroundTrigger);
 	useEffect(() => {
-		if (pendingBackgroundTrigger && !isThinking && onBackgroundCompletion) {
+		if (pendingBackgroundTrigger && !isThinking && !turnInFlight && onBackgroundCompletion) {
 			setPendingBackgroundTrigger(false);
 			onBackgroundCompletion();
 		}
 	}, [
 		pendingBackgroundTrigger,
 		isThinking,
+		turnInFlight,
 		setPendingBackgroundTrigger,
 		onBackgroundCompletion
 	]);
@@ -2767,8 +2782,9 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 	useInput(() => setPromptInputTick((tick) => tick + 1), { isActive: promptKey !== "" });
 	const promptRows = promptKey === "" ? 0 : measuredPrompt?.key === promptKey ? measuredPrompt.rows : Infinity;
 	const [terminalCols, terminalRows] = useStdoutDimensions();
-	const liveRows = Math.max(0, terminalRows - LIVE_CHROME_ROWS - messageQueue.length - promptRows);
-	const handleSubmit = React.useCallback(async (input) => {
+	const queueRows = messageQueue.length > 0 ? messageQueue.length + 1 : 0;
+	const liveRows = Math.max(0, terminalRows - LIVE_CHROME_ROWS - queueRows - promptRows);
+	const handleSubmit = React.useCallback(async (input, options) => {
 		const trimmed = input.trim();
 		if (!trimmed) return;
 		if (trimmed.startsWith("/") && !trimmed.match(/^\/[A-Z]/)) {
@@ -2789,8 +2805,10 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 				messageToSend = `${messageToSend}\n\n${errorBlock}`;
 			}
 		}
-		if (useCliStore.getState().isThinking) {
-			useCliStore.getState().enqueueMessage(messageToSend);
+		const store = useCliStore.getState();
+		if (store.isThinking || store.turnInFlight) {
+			const kind = options?.followUp || !store.turnInFlight ? "followUp" : "steer";
+			store.enqueueMessage(messageToSend, kind, trimmed);
 			return;
 		}
 		setIsThinking(true);
@@ -2888,7 +2906,9 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 		paddingX: 1,
 		marginBottom: 1
 	}, messageQueue.map((queuedMessage, idx) => {
-		const rowText = `❯ ${queuedMessage}`;
+		const label = queuedMessage.kind === "followUp" ? "[next turn] " : "";
+		const [firstLine, ...moreLines] = (queuedMessage.typed ?? queuedMessage.text).split("\n");
+		const rowText = `\u276F ${label}${firstLine}${moreLines.length > 0 ? " ..." : ""}`;
 		const padded = rowText.length >= terminalCols - 2 ? rowText : rowText.padEnd(terminalCols - 2);
 		return /* @__PURE__ */ React.createElement(Text, {
 			key: idx,
@@ -2896,7 +2916,10 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 			color: "white",
 			wrap: "truncate-end"
 		}, padded);
-	})), /* @__PURE__ */ React.createElement(Box, {
+	}), /* @__PURE__ */ React.createElement(Text, {
+		dimColor: true,
+		wrap: "truncate-end"
+	}, QUEUE_HINT)), /* @__PURE__ */ React.createElement(Box, {
 		borderStyle: "single",
 		borderColor: isBashMode ? "yellow" : "cyan",
 		borderTop: true,
@@ -3049,7 +3072,7 @@ function RewindSelector({ messages, onSelect, onCancel }) {
 	const items = messages.map((msg, idx) => ({
 		msg,
 		originalIndex: idx
-	})).filter(({ msg }) => msg.role === "user").map(({ msg, originalIndex }, index) => {
+	})).filter(({ msg }) => msg.role === "user" && !msg.metadata?.steered).map(({ msg, originalIndex }, index) => {
 		const preview = msg.content.length > 50 ? msg.content.substring(0, 50) + "..." : msg.content;
 		const timestamp = new Date(msg.timestamp).toLocaleString();
 		return {
@@ -8207,7 +8230,9 @@ Terminal Setup:
 
 Keyboard Shortcuts:
   Ctrl+C          - Press twice to exit
-  Esc             - Abort current operation
+  Esc             - Abort current operation (queued messages return to the input)
+  Enter (busy)    - Steer the running turn with the message
+  Tab (busy)      - Queue the message to run as the next turn
   Shift+Tab       - Toggle auto-accept edits
   Ctrl+U          - Clear current line
   Ctrl+K          - Clear from cursor to end of line
@@ -8394,6 +8419,57 @@ async function handleSandboxTrustDomainCommand(deps, domains) {
 	return lines.join("\n");
 }
 //#endregion
+//#region src/session/steering.ts
+/**
+* Steering: user input submitted while a turn runs joins that turn at its next
+* model request instead of waiting for the turn to end.
+*
+* Delivery rides the agent's `drainFeedback` hook (see AgentRunOptions), which
+* fires after a tool batch resolves or when the model answers with iterations
+* left, and is never called once the run is aborted. A drain call is therefore
+* the delivery point: the steers leave the queue and enter the session in one
+* synchronous step, so each one is delivered exactly once - to the model and
+* the transcript together - or stays queued for the host to run as a follow-up
+* turn (turnController.ts) or restore to the input on cancel (index.tsx ESC).
+*/
+const STEER_PREAMBLE = "The user sent the following while you were working. Take it into account before you continue, and change course if it asks you to.";
+/** The feedback text the model sees for `steers`, or null when there are none. */
+function formatSteerFeedback(steers) {
+	if (steers.length === 0) return null;
+	return [STEER_PREAMBLE, ...steers].join("\n\n");
+}
+/**
+* Take every queued steer and record each as a user message on the session.
+* Returns the feedback for the agent, or null when nothing is queued or the
+* turn was cancelled (the steers then stay queued).
+*/
+function deliverSteers(signal) {
+	if (signal.aborted) return null;
+	const store = useCliStore.getState();
+	const session = store.session;
+	if (!session) return null;
+	const steers = store.takeSteerMessages();
+	const feedback = formatSteerFeedback(steers);
+	if (!feedback) return null;
+	const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+	const steerMessages = steers.map((text) => ({
+		id: v4(),
+		role: "user",
+		content: text,
+		timestamp,
+		metadata: { steered: true }
+	}));
+	store.setSession({
+		...session,
+		messages: [...session.messages, ...steerMessages],
+		updatedAt: timestamp
+	});
+	return {
+		feedback,
+		steers
+	};
+}
+//#endregion
 //#region src/session/turnController.ts
 /**
 * Turn lifecycle (issue #228, phase 2).
@@ -8407,16 +8483,53 @@ async function handleSandboxTrustDomainCommand(deps, domains) {
 * keeps only a thin wrapper that builds the context from its render state.
 */
 /**
-* Run one user turn to completion. Never throws: transport, auth, and abort
-* errors are handled and surfaced to the console; the queue-drain in `finally`
-* recurses with the same context for messages submitted mid-turn.
+* Run one user turn to completion, then each follow-up queued behind it. Never
+* throws: transport, auth, and abort errors are handled and surfaced to the
+* console.
+*
+* Only one runTurn turn is in flight at a time. A call that arrives while one
+* is (a tavern prompt, a bash-command drain, a submit during an ESC unwind) is
+* queued as a follow-up rather than run as a second agent loop over the same
+* agent. Other agent runs (custom commands, background results) gate on
+* `turnInFlight` themselves. After
+* each turn settles - completed, failed, or cancelled - everything still queued
+* runs as one combined next turn: follow-ups, steers that never reached a
+* request boundary, and input submitted after a cancel (ESC moves what was
+* queued before it back to the input, see index.tsx).
 */
 async function runTurn(message, ctx) {
-	const releaseSession = useCliStore.getState().holdSession();
+	const store = useCliStore.getState();
+	if (store.turnInFlight) {
+		store.enqueueMessage(message, "followUp");
+		return;
+	}
+	store.setTurnInFlight(true);
 	try {
-		await runHeldTurn(message, ctx);
+		let next = message;
+		while (next !== null) {
+			const releaseSession = useCliStore.getState().holdSession();
+			try {
+				await runHeldTurn(next, ctx);
+			} catch (error) {
+				console.error(`\n\u274C ${error instanceof Error ? error.message : String(error)}\n`);
+				logger.debug(`Turn failed outside its error handling: ${error instanceof Error ? error.stack : String(error)}`);
+			} finally {
+				releaseSession();
+			}
+			const queued = useCliStore.getState().dequeueAllMessages();
+			next = queued.length > 0 ? queued.join("\n\n") : null;
+		}
 	} finally {
-		releaseSession();
+		useCliStore.getState().setTurnInFlight(false);
+	}
+}
+/** Not awaited by the steer drain, so a failed history write is logged rather than left as an unhandled rejection. */
+async function recordSteerHistory(steers, commandHistoryStore, setCommandHistory) {
+	try {
+		for (const text of steers) await commandHistoryStore.add(text);
+		setCommandHistory(await commandHistoryStore.list());
+	} catch (error) {
+		logger.debug(`[STEER] History write failed: ${error instanceof Error ? error.message : String(error)}`);
 	}
 }
 async function runHeldTurn(message, ctx) {
@@ -8540,7 +8653,19 @@ async function runHeldTurn(message, ctx) {
 				parallelExecution: cliConfig.preferences.enableParallelToolExecution === true,
 				isReadOnlyTool: (toolName) => toolCatalog.isReadOnly(toolName),
 				workflowReminder,
-				drainFeedback: diagnostics ? (phase) => diagnostics.drain(DRAIN_BUDGET_MS[phase], abortController.signal) : void 0,
+				drainFeedback: async (phase) => {
+					const diagnosticsFeedback = diagnostics ? await diagnostics.drain(DRAIN_BUDGET_MS[phase], abortController.signal) : null;
+					const steered = deliverSteers(abortController.signal);
+					if (steered) {
+						for (const text of steered.steers) bridgePresence.emitEvent({
+							type: "message",
+							role: "user",
+							text: text.slice(0, 4e3)
+						});
+						recordSteerHistory(steered.steers, commandHistoryStore, setCommandHistory);
+					}
+					return [steered?.feedback, diagnosticsFeedback].filter(Boolean).join("\n\n") || null;
+				},
 				onContextLimit: createReactiveCompactionHandler(agent, activeSession)
 			});
 		} finally {
@@ -8635,15 +8760,6 @@ async function runHeldTurn(message, ctx) {
 			type: "status",
 			status: wasAborted ? "idle" : "awaiting_input"
 		});
-		if (!wasAborted) {
-			const queued = useCliStore.getState().dequeueAllMessages();
-			if (queued.length > 0) {
-				const combined = queued.join("\n\n");
-				setImmediate(() => {
-					runTurn(combined, ctx);
-				});
-			}
-		}
 	}
 }
 //#endregion
@@ -9064,6 +9180,7 @@ function CliApp() {
 				store.clearPaste();
 				return;
 			}
+			store.restoreQueueToInput();
 			if (state.abortController) {
 				logger.debug("[ABORT] ESC pressed - aborting current operation...");
 				state.abortController.abort();
@@ -9071,9 +9188,8 @@ function CliApp() {
 					...prev,
 					abortController: null
 				}));
-				useCliStore.getState().setIsThinking(false);
-				useCliStore.getState().clearMessageQueue();
-			} else useCliStore.getState().clearMessageQueue();
+				store.setIsThinking(false);
+			}
 			return;
 		}
 		if (key.ctrl && input === "c") {
@@ -9350,9 +9466,17 @@ function CliApp() {
 			const dynamicAgentTool = config.preferences.enableDynamicAgentCreation === true ? createDynamicAgentTool(orchestrator, newSession.id, backgroundManager) : null;
 			const backgroundTools = createBackgroundAgentTools(backgroundManager);
 			const resumeAgentTool = createResumeAgentTool(orchestrator, historyStore, backgroundManager);
-			const llmWithFallback = config.fallbackModels && config.fallbackModels.length > 0 ? new FallbackLlmBackend(llm, config.fallbackModels, (fromModel, toModel, error) => {
+			const agentToolsRef = { current: null };
+			const { llm: toolSearchLlm, toolSearchTool } = buildToolSearch({
+				llm,
+				models,
+				registry: deferredToolRegistry,
+				logger,
+				agentToolsRef
+			});
+			const llmWithFallback = config.fallbackModels && config.fallbackModels.length > 0 ? new FallbackLlmBackend(toolSearchLlm, config.fallbackModels, (fromModel, toModel, error) => {
 				logger.warn(`⚠️  Model "${fromModel}" failed (${error.message}) — falling back to "${toModel}"`);
-			}) : llm;
+			}) : toolSearchLlm;
 			const notifyingLlm = new NotifyingLlmBackend(llmWithFallback, backgroundManager);
 			const todoStore = todoStoreRef.current;
 			todoStore.todos = [];
@@ -9390,15 +9514,6 @@ function CliApp() {
 				allowedDirectories: additionalDirectories
 			}) : null;
 			const workItemTools = config.preferences.enableWorkItemTools ? createWorkItemTools(new WorkItemsClient(apiClient)) : [];
-			const agentToolsRef = { current: null };
-			const toolSearchTool = deferredToolRegistry.size() > 0 ? createToolSearchTool({
-				registry: deferredToolRegistry,
-				logger,
-				toolListAccessor: () => {
-					if (!agentToolsRef.current) throw new Error("tool_search invoked before agent context was wired");
-					return agentToolsRef.current;
-				}
-			}) : null;
 			const cliTools = buildCliToolList({
 				toolSearchTool,
 				agentDelegateTool,
@@ -9421,7 +9536,11 @@ function CliApp() {
 				descriptors: pluginDescriptors,
 				config,
 				logger,
-				reservedToolNames: [...loadedB4mTools, ...cliTools].map((t) => t.toolSchema.name).concat("tool_search")
+				reservedToolNames: [
+					...[...loadedB4mTools, ...cliTools].map((t) => t.toolSchema.name),
+					...deferredToolRegistry.getDirectoryNames(),
+					"tool_search"
+				]
 			});
 			rewireReservedNames(state, featureRegistry);
 			if (wsManager && featureRegistry.hasModules) featureRegistry.registerAllWsHandlers(wsManager);
@@ -11351,7 +11470,11 @@ function CliApp() {
 				descriptors: state.pluginDescriptors,
 				config: updatedConfig,
 				logger,
-				reservedToolNames: baseTools.map((t) => t.toolSchema.name)
+				reservedToolNames: [
+					...baseTools.map((t) => t.toolSchema.name),
+					...deferredToolRegistry.getDirectoryNames(),
+					"tool_search"
+				]
 			});
 			const rebuiltRegistry = rebuilt.registry;
 			newFeatureRegistry = rebuiltRegistry;

package/dist/{package-DYPVrada.mjs → package-CQaam4Dq.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 //#region package.json
-var version = "3.3.0";
+var version = "4.0.0";
 //#endregion
 export { version as t };