@bike4mind/cli 0.6.1 → 0.7.0

package/dist/{ConfigStore-Dt6utdSA.mjs → ConfigStore-Bu_plzvP.mjs}

@@ -8829,7 +8829,14 @@ const CliConfigSchema = z.object({
 		maxIterations: z.number().nullable().prefault(10),
 		enableSkillTool: z.boolean().optional().prefault(true),
 		enableDynamicAgentCreation: z.boolean().optional().prefault(false),
-		enableCoordinatorMode: z.boolean().optional().prefault(false)
+		enableCoordinatorMode: z.boolean().optional().prefault(false),
+		/**
+		* System-prompt variant. 'current' uses the elaborate behavioral-scaffolding
+		* prompt; 'minimal' uses a pi-style short prompt. See apps/cli/src/core/prompts.ts.
+		* Defaults to 'current' for backward compatibility; switch via /config or by
+		* editing the config file directly.
+		*/
+		promptVariant: z.enum(["current", "minimal"]).optional().prefault("current")
 	}),
 	tools: z.object({
 		enabled: z.array(z.string()),
@@ -8862,7 +8869,8 @@ const ProjectConfigSchema = z.object({
 		exportFormat: z.enum(["markdown", "json"]).optional(),
 		enableSkillTool: z.boolean().optional(),
 		enableDynamicAgentCreation: z.boolean().optional(),
-		enableCoordinatorMode: z.boolean().optional()
+		enableCoordinatorMode: z.boolean().optional(),
+		promptVariant: z.enum(["current", "minimal"]).optional()
 	}).optional(),
 	sandbox: PartialSandboxConfigSchema,
 	additionalDirectories: z.array(z.string()).optional()
@@ -8912,7 +8920,8 @@ const DEFAULT_CONFIG = {
 		maxIterations: 10,
 		enableSkillTool: true,
 		enableDynamicAgentCreation: false,
-		enableCoordinatorMode: false
+		enableCoordinatorMode: false,
+		promptVariant: "current"
 	},
 	tools: {
 		enabled: [],

package/dist/commands/doctorCommand.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as version, n as compareSemver, r as fetchLatestVersion } from "../updateChecker-D-xoVcN3.mjs";
+import { a as version, n as compareSemver, r as fetchLatestVersion } from "../updateChecker-Dn-Ri8zw.mjs";
 import { execSync } from "child_process";
 import { constants, existsSync, promises } from "fs";
 import { homedir } from "os";

package/dist/commands/headlessCommand.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { A as getApiUrl, C as WebSocketLlmBackend, G as isReadOnlyTool, J as CheckpointStore, K as ReActAgent, M as PermissionManager, N as generateCliTools, S as FallbackLlmBackend, T as McpManager, U as buildCoreSystemPrompt, V as setWebSocketToolExecutor, X as SessionStore, _ as createSkillTool, b as WebSocketToolExecutor, c as createFindDefinitionTool, d as createCoordinateTaskTool, f as createBackgroundAgentTools, g as SubagentOrchestrator, h as AgentStore, k as loadContextFiles, l as createTodoStore, m as createAgentDelegateTool, p as BackgroundAgentManager, q as CustomCommandStore, s as createGetFileStructureTool, u as createWriteTodosTool, w as ServerLlmBackend, x as WebSocketConnectionManager, y as ApiClient } from "../tools-BUs_OkJc.mjs";
-import { n as logger, t as ConfigStore } from "../ConfigStore-Dt6utdSA.mjs";
+import { $ as SessionStore, C as WebSocketToolExecutor, D as ServerLlmBackend, E as WebSocketLlmBackend, F as PermissionManager, I as generateCliTools, J as isReadOnlyTool, K as buildSystemPrompt, M as loadContextFiles, N as getApiUrl, O as McpManager, S as ApiClient, T as FallbackLlmBackend, W as setWebSocketToolExecutor, X as CustomCommandStore, Y as ReActAgent, Z as CheckpointStore, _ as createAgentDelegateTool, b as createSkillTool, d as createFindDefinitionTool, f as createTodoStore, g as BackgroundAgentManager, h as createBackgroundAgentTools, m as createCoordinateTaskTool, p as createWriteTodosTool, u as createGetFileStructureTool, v as AgentStore, w as WebSocketConnectionManager, y as SubagentOrchestrator } from "../tools-DY-JzNoY.mjs";
+import { n as logger, t as ConfigStore } from "../ConfigStore-Bu_plzvP.mjs";
 import { t as DEFAULT_SANDBOX_CONFIG } from "../types-DBEjF9YS.mjs";
 import { t as createSandboxRuntime } from "../SandboxRuntimeAdapter-C1B4t20N.mjs";
 import { t as SandboxOrchestrator } from "../SandboxOrchestrator-BEW3rqYi.mjs";
@@ -193,7 +193,7 @@ async function handleHeadlessCommand(options) {
 			...mcpTools,
 			...cliTools
 		];
-		const systemPrompt = buildCoreSystemPrompt({
+		const systemPrompt = buildSystemPrompt(config.preferences.promptVariant ?? "current", {
 			contextContent: contextResult.mergedContent,
 			agentStore,
 			customCommands: customCommandStore.getAllCommands(),

package/dist/commands/mcpCommand.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as ConfigStore } from "../ConfigStore-Dt6utdSA.mjs";
+import { t as ConfigStore } from "../ConfigStore-Bu_plzvP.mjs";
 //#region src/commands/mcpCommand.ts
 /**
 * External MCP commands (b4m mcp list, b4m mcp add, etc.)

package/dist/commands/updateCommand.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as version, i as forceCheckForUpdate } from "../updateChecker-D-xoVcN3.mjs";
+import { a as version, i as forceCheckForUpdate } from "../updateChecker-Dn-Ri8zw.mjs";
 import { execSync } from "child_process";
 //#region src/commands/updateCommand.ts
 /**

package/dist/index.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { n as useCliStore, t as selectActiveBackgroundAgents } from "./store-B7-LLvvx.mjs";
-import { $ as processFileReferences, A as getApiUrl, B as registerFeatureModuleTools, C as WebSocketLlmBackend, D as formatStep, E as substituteArguments, F as DEFAULT_AGENT_MODEL, G as isReadOnlyTool, H as OllamaBackend, I as DEFAULT_MAX_ITERATIONS, J as CheckpointStore, K as ReActAgent, L as DEFAULT_RETRY_CONFIG, M as PermissionManager, N as generateCliTools, O as extractCompactInstructions, P as ALWAYS_DENIED_FOR_AGENTS, Q as hasFileReferences, R as DEFAULT_THOROUGHNESS, S as FallbackLlmBackend, T as McpManager, U as buildCoreSystemPrompt, V as setWebSocketToolExecutor, W as buildSkillsPromptSection, X as SessionStore, Y as CommandHistoryStore, Z as OAuthClient, _ as createSkillTool, a as createDecisionStore, b as WebSocketToolExecutor, c as createFindDefinitionTool, d as createCoordinateTaskTool, et as searchCommands, f as createBackgroundAgentTools, g as SubagentOrchestrator, h as AgentStore, i as createDecisionLogTool, it as warmFileCache, j as getEnvironmentName, k as loadContextFiles, l as createTodoStore, m as createAgentDelegateTool, n as createBlockerTools, nt as formatFileSize, o as formatDecisionsOutput, p as BackgroundAgentManager, q as CustomCommandStore, r as formatBlockersOutput, rt as searchFiles, s as createGetFileStructureTool, t as createBlockerStore, tt as mergeCommands, u as createWriteTodosTool, v as parseAgentConfig, w as ServerLlmBackend, x as WebSocketConnectionManager, y as ApiClient, z as clearFeatureModuleTools } from "./tools-BUs_OkJc.mjs";
-import { Mt as validateNotebookPath$1, g as ChatModels, jt as validateJupyterKernelName, m as CREDIT_DEDUCT_TRANSACTION_TYPES, n as logger, t as ConfigStore } from "./ConfigStore-Dt6utdSA.mjs";
-import { a as version, t as checkForUpdate } from "./updateChecker-D-xoVcN3.mjs";
+import { n as useCliStore, t as selectActiveBackgroundAgents } from "./store-FkY4K-0M.mjs";
+import { $ as SessionStore, A as formatStep, B as DEFAULT_RETRY_CONFIG, C as WebSocketToolExecutor, D as ServerLlmBackend, E as WebSocketLlmBackend, F as PermissionManager, G as OllamaBackend, H as clearFeatureModuleTools, I as generateCliTools, J as isReadOnlyTool, K as buildSystemPrompt, L as ALWAYS_DENIED_FOR_AGENTS, M as loadContextFiles, N as getApiUrl, O as McpManager, P as getEnvironmentName, Q as CommandHistoryStore, R as DEFAULT_AGENT_MODEL, S as ApiClient, T as FallbackLlmBackend, U as registerFeatureModuleTools, V as DEFAULT_THOROUGHNESS, W as setWebSocketToolExecutor, X as CustomCommandStore, Y as ReActAgent, Z as CheckpointStore, _ as createAgentDelegateTool, a as createBlockerTools, at as formatFileSize, b as createSkillTool, c as createDecisionStore, d as createFindDefinitionTool, et as OAuthClient, f as createTodoStore, g as BackgroundAgentManager, h as createBackgroundAgentTools, i as createBlockerStore, it as mergeCommands, j as extractCompactInstructions, k as substituteArguments, l as formatDecisionsOutput, m as createCoordinateTaskTool, n as createReviewGateTool, nt as processFileReferences, o as formatBlockersOutput, ot as searchFiles, p as createWriteTodosTool, q as buildSkillsPromptSection, r as formatReviewGatesOutput, rt as searchCommands, s as createDecisionLogTool, st as warmFileCache, t as createReviewGateStore, tt as hasFileReferences, u as createGetFileStructureTool, v as AgentStore, w as WebSocketConnectionManager, x as parseAgentConfig, y as SubagentOrchestrator, z as DEFAULT_MAX_ITERATIONS } from "./tools-DY-JzNoY.mjs";
+import { Mt as validateNotebookPath$1, g as ChatModels, jt as validateJupyterKernelName, m as CREDIT_DEDUCT_TRANSACTION_TYPES, n as logger, t as ConfigStore } from "./ConfigStore-Bu_plzvP.mjs";
+import { a as version, t as checkForUpdate } from "./updateChecker-Dn-Ri8zw.mjs";
 import React, { useCallback, useEffect, useMemo, useReducer, useRef, useState } from "react";
 import { Box, Static, Text, render, useApp, useInput } from "ink";
 import { execSync } from "child_process";
@@ -1274,6 +1274,138 @@ function UserQuestionPrompt({ payload, onResponse }) {
 	})), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, isOnOther ? "Type your answer, Enter to submit, or arrow keys to go back" : isMulti ? "Press 1-" + options.length + ", Space to toggle, Enter to confirm" : "Press 1-" + options.length + ", or arrow keys + Enter")));
 }
 //#endregion
+//#region src/components/ReviewGatePrompt.tsx
+const ITEMS = [
+	{
+		label: "✓ Approve",
+		decision: "approved",
+		withNote: false
+	},
+	{
+		label: "✓ Approve with note...",
+		decision: "approved",
+		withNote: true
+	},
+	{
+		label: "✗ Reject",
+		decision: "rejected",
+		withNote: false
+	},
+	{
+		label: "✗ Reject with note...",
+		decision: "rejected",
+		withNote: true
+	}
+];
+/**
+* Review gate prompt component.
+*
+* Pauses the agent and asks the user to explicitly approve or reject a
+* significant decision. An optional free-text note can be attached to either
+* decision via the dedicated "...with note..." actions.
+*
+* Keyboard:
+* - 1–4: shortcut for each action
+* - y: Approve (no note); n: Reject (no note)
+* - ↑/↓: navigate; Enter: confirm selection
+* - When a "with note..." action is selected, an inline text input appears.
+*   Type the note and press Enter to submit. Use ↑/↓ to switch to a no-note
+*   action without losing the typed note.
+*/
+function ReviewGatePrompt({ description, options, recommendation, onResponse }) {
+	const [selectedIndex, setSelectedIndex] = useState(0);
+	const [note, setNote] = useState("");
+	const [responded, setResponded] = useState(false);
+	const submit = useCallback((item, noteText) => {
+		if (responded) return;
+		setResponded(true);
+		const trimmed = noteText.trim();
+		onResponse({
+			decision: item.decision,
+			note: trimmed.length > 0 ? trimmed : void 0
+		});
+	}, [responded, onResponse]);
+	const selectedItem = ITEMS[selectedIndex];
+	const noteMode = selectedItem.withNote;
+	const handleConfirm = useCallback(() => {
+		if (selectedItem.withNote && note.trim().length === 0) return;
+		submit(selectedItem, note);
+	}, [
+		selectedItem,
+		note,
+		submit
+	]);
+	useInput((input, key) => {
+		if (responded) return;
+		if (key.upArrow) {
+			setSelectedIndex((i) => i > 0 ? i - 1 : ITEMS.length - 1);
+			return;
+		}
+		if (key.downArrow) {
+			setSelectedIndex((i) => i < ITEMS.length - 1 ? i + 1 : 0);
+			return;
+		}
+		if (noteMode) return;
+		const num = parseInt(input, 10);
+		if (num >= 1 && num <= ITEMS.length) {
+			const item = ITEMS[num - 1];
+			setSelectedIndex(num - 1);
+			if (!item.withNote) submit(item, "");
+			return;
+		}
+		if (input.toLowerCase() === "y") {
+			submit(ITEMS[0], "");
+			return;
+		}
+		if (input.toLowerCase() === "n") {
+			submit(ITEMS[2], "");
+			return;
+		}
+		if (key.return) handleConfirm();
+	}, { isActive: !responded });
+	if (responded) return null;
+	return /* @__PURE__ */ React.createElement(Box, {
+		flexDirection: "column",
+		borderStyle: "bold",
+		borderColor: "magenta",
+		padding: 1,
+		marginY: 1
+	}, /* @__PURE__ */ React.createElement(Box, null, /* @__PURE__ */ React.createElement(Text, {
+		bold: true,
+		color: "magenta"
+	}, "🛑 Review Gate")), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, description)), recommendation && /* @__PURE__ */ React.createElement(Box, {
+		marginTop: 1,
+		flexDirection: "column"
+	}, /* @__PURE__ */ React.createElement(Text, { bold: true }, "Recommendation:"), /* @__PURE__ */ React.createElement(Box, { paddingLeft: 2 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, recommendation))), options && options.length > 0 && /* @__PURE__ */ React.createElement(Box, {
+		marginTop: 1,
+		flexDirection: "column"
+	}, /* @__PURE__ */ React.createElement(Text, { bold: true }, "Options:"), /* @__PURE__ */ React.createElement(Box, {
+		paddingLeft: 2,
+		flexDirection: "column"
+	}, options.map((opt, idx) => /* @__PURE__ */ React.createElement(Text, {
+		key: idx,
+		dimColor: true
+	}, "• ", opt)))), /* @__PURE__ */ React.createElement(Box, {
+		marginTop: 1,
+		flexDirection: "column"
+	}, ITEMS.map((item, index) => {
+		const isHighlighted = index === selectedIndex;
+		const color = item.decision === "approved" ? "green" : "red";
+		return /* @__PURE__ */ React.createElement(Box, { key: item.label }, /* @__PURE__ */ React.createElement(Text, { color: "cyan" }, index + 1, "."), /* @__PURE__ */ React.createElement(Text, {
+			color: isHighlighted ? color : void 0,
+			bold: isHighlighted
+		}, isHighlighted ? " ❯ " : "   ", item.label));
+	})), noteMode && /* @__PURE__ */ React.createElement(Box, {
+		marginTop: 1,
+		flexDirection: "column"
+	}, /* @__PURE__ */ React.createElement(Text, { bold: true }, "Note:"), /* @__PURE__ */ React.createElement(Box, { paddingLeft: 2 }, /* @__PURE__ */ React.createElement(TextInput, {
+		value: note,
+		onChange: setNote,
+		onSubmit: handleConfirm,
+		placeholder: "Type a note and press Enter…"
+	}))), /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, noteMode ? "Type note + Enter to submit, ↑↓ to switch action" : "Press 1-4, y/n, or ↑↓ + Enter")));
+}
+//#endregion
 //#region src/components/ConfigEditor.tsx
 /**
 * Max iterations options: 10, 20, 30, 40, 50, Infinite (null)
@@ -1886,7 +2018,7 @@ const MessageItem = React.memo(function MessageItem({ message }) {
 });
 //#endregion
 //#region src/components/App.tsx
-function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPermissionResponse, onUserQuestionResponse, onImageDetected, commandHistory = [], commands = [], config, availableModels = [], onSaveConfig, prefillInput, onPrefillConsumed, mcpManager }) {
+function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPermissionResponse, onUserQuestionResponse, onReviewGateResponse, onImageDetected, commandHistory = [], commands = [], config, availableModels = [], onSaveConfig, prefillInput, onPrefillConsumed, mcpManager }) {
 	const messages = useCliStore((state) => state.session?.messages || []);
 	const pendingMessages = useCliStore((state) => state.pendingMessages);
 	const sessionName = useCliStore((state) => state.session?.name || "New Session");
@@ -1896,6 +2028,7 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 	const isThinking = useCliStore((state) => state.isThinking);
 	const permissionPrompt = useCliStore((state) => state.permissionPrompt);
 	const userQuestionPrompt = useCliStore((state) => state.userQuestionPrompt);
+	const reviewGatePrompt = useCliStore((state) => state.reviewGatePrompt);
 	const showConfigEditor = useCliStore((state) => state.showConfigEditor);
 	const setShowConfigEditor = useCliStore((state) => state.setShowConfigEditor);
 	const showMcpViewer = useCliStore((state) => state.showMcpViewer);
@@ -1988,7 +2121,16 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 	}, /* @__PURE__ */ React.createElement(UserQuestionPrompt, {
 		payload: userQuestionPrompt.payload,
 		onResponse: (response) => onUserQuestionResponse(response, userQuestionPrompt.id)
-	})), !permissionPrompt && !userQuestionPrompt && /* @__PURE__ */ React.createElement(AgentThinking, null), /* @__PURE__ */ React.createElement(BackgroundAgentStatus, null), /* @__PURE__ */ React.createElement(CompletedGroupNotification, null), exitRequested && /* @__PURE__ */ React.createElement(Box, {
+	})), reviewGatePrompt && /* @__PURE__ */ React.createElement(Box, {
+		key: reviewGatePrompt.id,
+		flexDirection: "column",
+		paddingX: 1
+	}, /* @__PURE__ */ React.createElement(ReviewGatePrompt, {
+		description: reviewGatePrompt.description,
+		options: reviewGatePrompt.options,
+		recommendation: reviewGatePrompt.recommendation,
+		onResponse: (response) => onReviewGateResponse(response, reviewGatePrompt.id)
+	})), !permissionPrompt && !userQuestionPrompt && !reviewGatePrompt && /* @__PURE__ */ React.createElement(AgentThinking, null), /* @__PURE__ */ React.createElement(BackgroundAgentStatus, null), /* @__PURE__ */ React.createElement(CompletedGroupNotification, null), exitRequested && /* @__PURE__ */ React.createElement(Box, {
 		paddingX: 1,
 		marginBottom: 1
 	}, /* @__PURE__ */ React.createElement(Text, {
@@ -2002,7 +2144,7 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 		onSubmit: handleSubmit,
 		onBashCommand,
 		onImageDetected,
-		disabled: isThinking || !!permissionPrompt || !!userQuestionPrompt,
+		disabled: isThinking || !!permissionPrompt || !!userQuestionPrompt || !!reviewGatePrompt,
 		history: commandHistory,
 		commands,
 		prefillInput,
@@ -2469,7 +2611,7 @@ function buildCompactionPrompt(messages, options = {}) {
 function createCompactedSession(originalSession, summary, preservedMessages) {
 	const summaryMessage = {
 		id: v4(),
-		role: "system",
+		role: "user",
 		content: `[Previous conversation summary]\n\n${summary}`,
 		timestamp: (/* @__PURE__ */ new Date()).toISOString()
 	};
@@ -5235,10 +5377,13 @@ function CliApp() {
 	const imageStoreInitPromise = useRef(null);
 	const decisionStoreRef = useRef(createDecisionStore());
 	const blockerStoreRef = useRef(createBlockerStore());
+	const reviewGateStoreRef = useRef(createReviewGateStore());
 	const setStoreSession = useCliStore((state) => state.setSession);
 	const enqueuePermissionPrompt = useCliStore((state) => state.enqueuePermissionPrompt);
 	const enqueueUserQuestionPrompt = useCliStore((state) => state.enqueueUserQuestionPrompt);
 	const dequeueUserQuestionPrompt = useCliStore((state) => state.dequeueUserQuestionPrompt);
+	const enqueueReviewGatePrompt = useCliStore((state) => state.enqueueReviewGatePrompt);
+	const dequeueReviewGatePrompt = useCliStore((state) => state.dequeueReviewGatePrompt);
 	const setShowConfigEditor = useCliStore((state) => state.setShowConfigEditor);
 	const setShowMcpViewer = useCliStore((state) => state.setShowMcpViewer);
 	const setExitRequested = useCliStore((state) => state.setExitRequested);
@@ -5628,6 +5773,22 @@ function CliApp() {
 					});
 				});
 			};
+			const reviewGateFn = (params) => {
+				return new Promise((resolve) => {
+					enqueueReviewGatePrompt({
+						id: params.id,
+						description: params.description,
+						options: params.options,
+						recommendation: params.recommendation,
+						resolve
+					});
+					bridgePresence.emitEvent({
+						type: "status",
+						status: "awaiting_input",
+						text: `Review gate: ${params.description}`.slice(0, 240)
+					});
+				});
+			};
 			const agentContext = {
 				currentAgent: null,
 				observationQueue: []
@@ -5681,12 +5842,15 @@ function CliApp() {
 			const writeTodosTool = createWriteTodosTool(createTodoStore());
 			const decisionLogTool = createDecisionLogTool(decisionStoreRef.current);
 			const blockerTools = createBlockerTools(blockerStoreRef.current);
+			const reviewGateTool = createReviewGateTool(reviewGateStoreRef.current, reviewGateFn);
 			if (newSession.metadata.workflow) {
 				decisionStoreRef.current.decisions = [...newSession.metadata.workflow.decisions];
 				blockerStoreRef.current.blockers = [...newSession.metadata.workflow.blockers];
+				reviewGateStoreRef.current.reviewGates = [...newSession.metadata.workflow.reviewGates ?? []];
 			} else {
 				decisionStoreRef.current.decisions = [];
 				blockerStoreRef.current.blockers = [];
+				reviewGateStoreRef.current.reviewGates = [];
 			}
 			const enableSkillTool = config.preferences.enableSkillTool !== false;
 			const skillTool = enableSkillTool ? createSkillTool({
@@ -5707,6 +5871,7 @@ function CliApp() {
 				writeTodosTool,
 				decisionLogTool,
 				...blockerTools,
+				reviewGateTool,
 				findDefinitionTool,
 				getFileStructureTool
 			];
@@ -5741,7 +5906,7 @@ function CliApp() {
 			if (contextResult.projectContext) startupLog.push(`📄 Project context: ${contextResult.projectContext.filename}`);
 			for (const error of contextResult.errors) startupLog.push(`⚠️  Context file error: ${error}`);
 			const featureModulePrompts = featureRegistry.getSystemPromptSections();
-			const cliSystemPrompt = buildCoreSystemPrompt({
+			const cliSystemPrompt = buildSystemPrompt(config.preferences.promptVariant ?? "current", {
 				contextContent: contextResult.mergedContent,
 				agentStore,
 				customCommands: state.customCommandStore.getAllCommands(),
@@ -5980,6 +6145,14 @@ function CliApp() {
 			});
 			return;
 		}
+		if (s.reviewGatePrompt) {
+			bridgePresence.emitEvent({
+				type: "status",
+				status: "awaiting_input",
+				text: `Review gate: ${s.reviewGatePrompt.description}`.slice(0, 240)
+			});
+			return;
+		}
 		const abort = abortControllerRef.current;
 		if (!abort || abort.signal.aborted) return;
 		bridgePresence.emitEvent({
@@ -6137,11 +6310,11 @@ function CliApp() {
 					totalTokens: currentSession.metadata.totalTokens + result.completionInfo.totalTokens,
 					totalCredits: (currentSession.metadata.totalCredits || 0) + (result.completionInfo.totalCredits || 0),
 					toolCallCount: currentSession.metadata.toolCallCount + successfulToolCalls,
-					workflow: decisionStoreRef.current.decisions.length > 0 || blockerStoreRef.current.blockers.length > 0 ? {
+					workflow: decisionStoreRef.current.decisions.length > 0 || blockerStoreRef.current.blockers.length > 0 || reviewGateStoreRef.current.reviewGates.length > 0 ? {
 						decisions: decisionStoreRef.current.decisions,
 						blockers: blockerStoreRef.current.blockers,
 						handoff: currentSession.metadata.workflow?.handoff,
-						reviewGates: currentSession.metadata.workflow?.reviewGates
+						reviewGates: reviewGateStoreRef.current.reviewGates
 					} : currentSession.metadata.workflow
 				}
 			};
@@ -6255,7 +6428,7 @@ function CliApp() {
 		if (config?.preferences.autoCompact !== false && activeSession.messages.length >= 6) {
 			const tokenCounter = getTokenCounter();
 			const threshold = tokenCounter.getContextWindow(activeSession.model, state.availableModels) * .8;
-			const systemPrompt = buildCoreSystemPrompt({
+			const systemPrompt = buildSystemPrompt(config?.preferences.promptVariant ?? "current", {
 				contextContent: state.contextContent,
 				agentStore: state.agentStore || void 0,
 				customCommands: state.customCommandStore.getAllCommands(),
@@ -6653,7 +6826,7 @@ function CliApp() {
 				decisions: decisionStoreRef.current.decisions,
 				blockers: blockerStoreRef.current.blockers,
 				handoff,
-				reviewGates: session.metadata.workflow?.reviewGates
+				reviewGates: reviewGateStoreRef.current.reviewGates
 			};
 			return handoff;
 		} catch (err) {
@@ -6798,11 +6971,11 @@ Multi-line Input:
 				}
 				const sessionName = args.join(" ") || state.session.name;
 				state.session.name = sessionName;
-				if (decisionStoreRef.current.decisions.length > 0 || blockerStoreRef.current.blockers.length > 0) state.session.metadata.workflow = {
+				if (decisionStoreRef.current.decisions.length > 0 || blockerStoreRef.current.blockers.length > 0 || reviewGateStoreRef.current.reviewGates.length > 0) state.session.metadata.workflow = {
 					decisions: decisionStoreRef.current.decisions,
 					blockers: blockerStoreRef.current.blockers,
 					handoff: state.session.metadata.workflow?.handoff,
-					reviewGates: state.session.metadata.workflow?.reviewGates
+					reviewGates: reviewGateStoreRef.current.reviewGates
 				};
 				const handoff = await generateHandoff(state.session);
 				await state.sessionStore.save(state.session);
@@ -7077,6 +7250,7 @@ Multi-line Input:
 				logger.debug("=== New Session Started via /clear ===");
 				decisionStoreRef.current.decisions = [];
 				blockerStoreRef.current.blockers = [];
+				reviewGateStoreRef.current.reviewGates = [];
 				if (state.checkpointStore) state.checkpointStore.setSessionId(newSession.id);
 				setState((prev) => ({
 					...prev,
@@ -7309,7 +7483,8 @@ Multi-line Input:
 				}
 				const tokenCounter = getTokenCounter();
 				const contextWindow = tokenCounter.getContextWindow(state.session.model, state.availableModels);
-				const corePromptTokens = tokenCounter.countTokens(buildCoreSystemPrompt());
+				const variantForCount = state.config?.preferences.promptVariant ?? "current";
+				const corePromptTokens = tokenCounter.countTokens(buildSystemPrompt(variantForCount));
 				const projectContextTokens = state.contextContent ? tokenCounter.countTokens(state.contextContent) : 0;
 				const commands = state.customCommandStore.getAllCommands();
 				const skillsSection = buildSkillsPromptSection(commands);
@@ -7318,7 +7493,7 @@ Multi-line Input:
 				const mcpTools = state.mcpManager?.getTools() || [];
 				const mcpToolsTokens = tokenCounter.countToolSchemaTokens(mcpTools);
 				const mcpToolCount = state.mcpManager?.getToolCount() || [];
-				const systemPrompt = buildCoreSystemPrompt({
+				const systemPrompt = buildSystemPrompt(variantForCount, {
 					contextContent: state.contextContent,
 					agentStore: state.agentStore || void 0,
 					customCommands: commands,
@@ -7778,6 +7953,11 @@ Multi-line Input:
 				console.log(formatBlockersOutput(blockerStoreRef.current.blockers));
 				console.log("");
 				break;
+			case "review-gates":
+				console.log("\n🛑 Review Gates\n");
+				console.log(formatReviewGatesOutput(reviewGateStoreRef.current.reviewGates));
+				console.log("");
+				break;
 			case "handoff": {
 				if (!state.session) {
 					console.log("No active session");
@@ -7891,7 +8071,7 @@ Multi-line Input:
 			const newFeatureTools = newFeatureRegistry.getAllTools();
 			agentContext.tools = [...baseTools, ...newFeatureTools];
 			const newFeaturePrompts = newFeatureRegistry.getSystemPromptSections();
-			agentContext.systemPrompt = buildCoreSystemPrompt({
+			agentContext.systemPrompt = buildSystemPrompt(updatedConfig.preferences.promptVariant ?? "current", {
 				contextContent: state.contextContent,
 				agentStore: state.agentStore || void 0,
 				customCommands: state.customCommandStore.getAllCommands(),
@@ -8040,6 +8220,13 @@ Multi-line Input:
 			currentPrompt.resolve(response);
 			dequeueUserQuestionPrompt();
 			emitNextAwaitingStatus();
+		},
+		onReviewGateResponse: (response, promptId) => {
+			const currentPrompt = useCliStore.getState().reviewGatePrompt;
+			if (currentPrompt?.id !== promptId) return;
+			currentPrompt.resolve(response);
+			dequeueReviewGatePrompt();
+			emitNextAwaitingStatus();
 		}
 	});
 }

package/dist/store-D2zh6DFz.mjs

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import { n as useCliStore } from "./store-FkY4K-0M.mjs";
+export { useCliStore };

package/dist/{store-B7-LLvvx.mjs → store-FkY4K-0M.mjs}

@@ -105,6 +105,19 @@ const useCliStore = create((set) => ({
 			userQuestionQueue: rest
 		};
 	}),
+	reviewGatePrompt: null,
+	reviewGateQueue: [],
+	enqueueReviewGatePrompt: (prompt) => set((state) => {
+		if (!state.reviewGatePrompt) return { reviewGatePrompt: prompt };
+		return { reviewGateQueue: [...state.reviewGateQueue, prompt] };
+	}),
+	dequeueReviewGatePrompt: () => set((state) => {
+		const [next, ...rest] = state.reviewGateQueue;
+		return {
+			reviewGatePrompt: next ?? null,
+			reviewGateQueue: rest
+		};
+	}),
 	showConfigEditor: false,
 	setShowConfigEditor: (show) => set({ showConfigEditor: show }),
 	showMcpViewer: false,

package/dist/{tools-BUs_OkJc.mjs → tools-DY-JzNoY.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as RechartsChartTypeList, A as ImageGenerationUsageTransaction, At as secureParameters, B as NotFoundError, C as FileEvents, Ct as getMcpProviderMetadata, D as GenericCreditAddTransaction, Dt as obfuscateApiKey, E as GenerateImageToolCallSchema, Et as isGPTImageModel, F as KnowledgeType, G as ProfileEvents, H as OpenAIImageGenerationInput, I as LLMEvents, J as PurchaseTransaction, K as ProjectEvents, L as MiscEvents, M as InboxEvents, N as InviteEvents, Nt as CollectionType, O as GenericCreditDeductTransaction, Ot as resolveNavigationIntents, P as InviteType, Q as ReceivedCreditTransaction, R as ModalEvents, S as FeedbackEvents, St as getDataLakeTags, T as GEMINI_IMAGE_MODELS, Tt as isGPTImage2Model, U as Permission, V as OpenAIEmbeddingModel, W as PermissionDeniedError, X as REASONING_SUPPORTED_MODELS, Y as QuestMasterParamsSchema, Z as RealtimeVoiceUsageTransaction, _ as CompletionApiUsageTransaction, _t as VideoModels, a as ApiKeyEvents, at as SessionEvents, b as FIXED_TEMPERATURE_MODELS, bt as b4mLLMTools, c as AppFileEvents, ct as SupportedFabFileMimeTypes, d as BFL_IMAGE_MODELS, dt as TextGenerationUsageTransaction, et as RegInviteEvents, f as BFL_SAFETY_TOLERANCE, ft as ToolUsageTransaction, g as ChatModels, gt as VideoGenerationUsageTransaction, h as ChatCompletionCreateInputSchema, ht as VIDEO_SIZE_CONSTRAINTS, i as AiEvents, it as ResearchTaskType, j as ImageModels, k as ImageEditUsageTransaction, kt as sanitizeTelemetryError, l as ArtifactTypeSchema, lt as TagType, mt as UiNavigationEvents, n as logger, nt as ResearchTaskExecutionType, o as ApiKeyScope, ot as SpeechToTextModels, p as BedrockEmbeddingModel, pt as TransferCreditTransaction, q as PromptMetaZodSchema, r as ALERT_THRESHOLDS, rt as ResearchTaskPeriodicFrequencyType, s as ApiKeyType, st as SubscriptionCreditTransaction, t as ConfigStore, tt as ResearchModeParamsSchema, u as AuthEvents, ut as TaskScheduleHandler, v as DashboardParamsSchema, vt as VoyageAIEmbeddingModel, w as FriendshipEvents, wt as getViewById, x as FavoriteDocumentType, xt as getAccessibleDataLakes, y as ElabsEvents, yt as XAI_IMAGE_MODELS, z as ModelBackend } from "./ConfigStore-Dt6utdSA.mjs";
+import { $ as RechartsChartTypeList, A as ImageGenerationUsageTransaction, At as secureParameters, B as NotFoundError, C as FileEvents, Ct as getMcpProviderMetadata, D as GenericCreditAddTransaction, Dt as obfuscateApiKey, E as GenerateImageToolCallSchema, Et as isGPTImageModel, F as KnowledgeType, G as ProfileEvents, H as OpenAIImageGenerationInput, I as LLMEvents, J as PurchaseTransaction, K as ProjectEvents, L as MiscEvents, M as InboxEvents, N as InviteEvents, Nt as CollectionType, O as GenericCreditDeductTransaction, Ot as resolveNavigationIntents, P as InviteType, Q as ReceivedCreditTransaction, R as ModalEvents, S as FeedbackEvents, St as getDataLakeTags, T as GEMINI_IMAGE_MODELS, Tt as isGPTImage2Model, U as Permission, V as OpenAIEmbeddingModel, W as PermissionDeniedError, X as REASONING_SUPPORTED_MODELS, Y as QuestMasterParamsSchema, Z as RealtimeVoiceUsageTransaction, _ as CompletionApiUsageTransaction, _t as VideoModels, a as ApiKeyEvents, at as SessionEvents, b as FIXED_TEMPERATURE_MODELS, bt as b4mLLMTools, c as AppFileEvents, ct as SupportedFabFileMimeTypes, d as BFL_IMAGE_MODELS, dt as TextGenerationUsageTransaction, et as RegInviteEvents, f as BFL_SAFETY_TOLERANCE, ft as ToolUsageTransaction, g as ChatModels, gt as VideoGenerationUsageTransaction, h as ChatCompletionCreateInputSchema, ht as VIDEO_SIZE_CONSTRAINTS, i as AiEvents, it as ResearchTaskType, j as ImageModels, k as ImageEditUsageTransaction, kt as sanitizeTelemetryError, l as ArtifactTypeSchema, lt as TagType, mt as UiNavigationEvents, n as logger, nt as ResearchTaskExecutionType, o as ApiKeyScope, ot as SpeechToTextModels, p as BedrockEmbeddingModel, pt as TransferCreditTransaction, q as PromptMetaZodSchema, r as ALERT_THRESHOLDS, rt as ResearchTaskPeriodicFrequencyType, s as ApiKeyType, st as SubscriptionCreditTransaction, t as ConfigStore, tt as ResearchModeParamsSchema, u as AuthEvents, ut as TaskScheduleHandler, v as DashboardParamsSchema, vt as VoyageAIEmbeddingModel, w as FriendshipEvents, wt as getViewById, x as FavoriteDocumentType, xt as getAccessibleDataLakes, y as ElabsEvents, yt as XAI_IMAGE_MODELS, z as ModelBackend } from "./ConfigStore-Bu_plzvP.mjs";
 import { n as isPathAllowed, t as assertPathAllowed } from "./pathValidation-CIytuhr3-Dt5dntLx.mjs";
 import { execFile, execFileSync, spawn } from "child_process";
 import { createHash, randomBytes } from "crypto";
@@ -1906,11 +1906,17 @@ var ReActAgent = class extends EventEmitter {
 	iterations = 0;
 	/** Whether runIteration() has been initialized (messages built, state reset) */
 	iterationInitialized = false;
+	/**
+	* Length of the initial messages array (system + previousMessages + user query)
+	* before any ReAct iteration messages are appended. Used by trimConversationHistory
+	* to protect the conversation prefix from being mistaken for iteration nudges.
+	*/
+	initialMessageCount = 0;
 	constructor(context) {
 		super();
 		this.context = {
 			...context,
-			maxIterations: context.maxIterations ?? 5,
+			maxIterations: context.maxIterations ?? 50,
 			maxTokens: context.maxTokens ?? 4096,
 			temperature: context.temperature ?? .7
 		};
@@ -1933,11 +1939,13 @@ var ReActAgent = class extends EventEmitter {
 		this.toolCallCount = 0;
 		this.confidenceLog = [];
 		this.iterationConfidences = [];
-		const maxIterations = options.maxIterations ?? this.context.maxIterations ?? 5;
+		const maxIterations = options.maxIterations ?? this.context.maxIterations ?? 50;
 		const temperature = options.temperature ?? this.context.temperature ?? .7;
 		const maxTokens = options.maxTokens ?? this.context.maxTokens ?? 4096;
+		const maxTotalTokens = options.maxTotalTokens ?? this.context.maxTotalTokens;
 		const maxHistoryIterations = options.maxHistoryIterations ?? 4;
 		let iterations = 0;
+		let reachedMaxTotalTokens = false;
 		try {
 			const messages = [
 				{
@@ -1951,6 +1959,7 @@ var ReActAgent = class extends EventEmitter {
 				}
 			];
 			this.messages = messages;
+			this.initialMessageCount = messages.length;
 			messages.forEach((msg, i) => {
 				const content = typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content);
 				this.context.logger.debug(`  [${i}] ${msg.role}: ${content.substring(0, 150)}...`);
@@ -1987,7 +1996,7 @@ var ReActAgent = class extends EventEmitter {
 				const processedToolIds = /* @__PURE__ */ new Set();
 				let hadToolCalls = false;
 				if (maxHistoryIterations > 0 && iterations > 1) {
-					trimConversationHistory(messages, maxHistoryIterations);
+					trimConversationHistory(messages, maxHistoryIterations, this.initialMessageCount);
 					trimSteps(this.steps, maxHistoryIterations);
 				}
 				const cacheStrategy = options.enableCaching ? {
@@ -2119,6 +2128,18 @@ var ReActAgent = class extends EventEmitter {
 					role: "user",
 					content: `Based on the tool results above, please provide a complete answer. If I asked for multiple things, make sure to address all of them.`
 				});
+				if (maxTotalTokens !== void 0 && this.totalTokens >= maxTotalTokens && !iterationComplete) {
+					reachedMaxTotalTokens = true;
+					finalAnswer = currentText.trim() || `I stopped after reaching the cumulative token ceiling (${this.totalTokens}/${maxTotalTokens}) without arriving at a final answer.`;
+					const finalStep = {
+						type: "final_answer",
+						content: finalAnswer,
+						metadata: { timestamp: Date.now() }
+					};
+					this.steps.push(finalStep);
+					this.emit("final_answer", finalStep);
+					break;
+				}
 				if (iterations >= maxIterations) {
 					reachedMaxIterations = true;
 					finalAnswer = currentText.trim() || `I reached the maximum number of iterations (${iterations}/${maxIterations}) without arriving at a final answer.`;
@@ -2147,6 +2168,7 @@ var ReActAgent = class extends EventEmitter {
 					iterations,
 					toolCalls: this.toolCallCount,
 					reachedMaxIterations,
+					reachedMaxTotalTokens: reachedMaxTotalTokens || void 0,
 					averageConfidence: avgConfidence,
 					minConfidence,
 					confidenceLog: this.confidenceLog.length > 0 ? this.confidenceLog : void 0
@@ -2265,7 +2287,8 @@ Remember: You are an autonomous AGENT. Act independently and solve problems proa
 			totalCredits: this.totalCredits,
 			toolCallCount: this.toolCallCount,
 			confidenceLog: structuredClone(this.confidenceLog),
-			iterationConfidences: [...this.iterationConfidences]
+			iterationConfidences: [...this.iterationConfidences],
+			initialMessageCount: this.initialMessageCount
 		};
 	}
 	/**
@@ -2290,6 +2313,7 @@ Remember: You are an autonomous AGENT. Act independently and solve problems proa
 		this.toolCallCount = checkpoint.toolCallCount;
 		this.confidenceLog = structuredClone(checkpoint.confidenceLog);
 		this.iterationConfidences = [...checkpoint.iterationConfidences];
+		this.initialMessageCount = checkpoint.initialMessageCount ?? this.messages.length;
 		this.observationQueue = [];
 		this.iterationInitialized = true;
 	}
@@ -2325,9 +2349,10 @@ Remember: You are an autonomous AGENT. Act independently and solve problems proa
 	* regressing the battle-tested run() path in this PR.
 	*/
 	async runIteration(query, options = {}) {
-		const maxIterations = options.maxIterations ?? this.context.maxIterations ?? 5;
+		const maxIterations = options.maxIterations ?? this.context.maxIterations ?? 50;
 		const temperature = options.temperature ?? this.context.temperature ?? .7;
 		const maxTokens = options.maxTokens ?? this.context.maxTokens ?? 4096;
+		const maxTotalTokens = options.maxTotalTokens ?? this.context.maxTotalTokens;
 		if (!this.iterationInitialized) {
 			if (!query) throw new Error("query is required on the first call to runIteration(). Pass the user query, or call fromCheckpoint() first to resume.");
 			this.steps = [];
@@ -2352,6 +2377,7 @@ Remember: You are an autonomous AGENT. Act independently and solve problems proa
 					content: query
 				}
 			];
+			this.initialMessageCount = this.messages.length;
 			this.iterationInitialized = true;
 		}
 		if (this.iterations >= maxIterations) {
@@ -2393,7 +2419,7 @@ Remember: You are an autonomous AGENT. Act independently and solve problems proa
 			this.context.logger.debug(`[ReActAgent] Starting iteration ${this.iterations}/${maxIterations}`);
 			const maxHistoryIterations = options.maxHistoryIterations ?? 4;
 			if (maxHistoryIterations > 0 && this.iterations > 1) {
-				trimConversationHistory(this.messages, maxHistoryIterations);
+				trimConversationHistory(this.messages, maxHistoryIterations, this.initialMessageCount);
 				trimSteps(this.steps, maxHistoryIterations);
 			}
 			let iterationComplete = false;
@@ -2540,6 +2566,25 @@ Remember: You are an autonomous AGENT. Act independently and solve problems proa
 				role: "user",
 				content: "Based on the tool results above, please provide a complete answer. If I asked for multiple things, make sure to address all of them."
 			});
+			if (!iterationComplete && maxTotalTokens !== void 0 && this.totalTokens >= maxTotalTokens) {
+				finalAnswer = currentText.trim() || `I stopped after reaching the cumulative token ceiling (${this.totalTokens}/${maxTotalTokens}) without arriving at a final answer.`;
+				const ceilingStep = {
+					type: "final_answer",
+					content: finalAnswer,
+					metadata: { timestamp: Date.now() }
+				};
+				this.steps.push(ceilingStep);
+				iterationSteps.push(ceilingStep);
+				this.emit("final_answer", ceilingStep);
+				return {
+					step: ceilingStep,
+					allSteps: iterationSteps,
+					isComplete: true,
+					reachedMaxIterations: false,
+					reachedMaxTotalTokens: true,
+					checkpoint: this.toCheckpoint()
+				};
+			}
 			if (!iterationComplete && this.iterations >= maxIterations) {
 				finalAnswer = currentText.trim() || `I reached the maximum number of iterations (${this.iterations}/${maxIterations}) without arriving at a final answer.`;
 				const maxStep = {
@@ -2671,10 +2716,19 @@ Remember: You are an autonomous AGENT. Act independently and solve problems proa
 		return .7;
 	}
 	/**
-	* Parse tool arguments, handling both string and object forms
+	* Parse tool arguments, handling both string and object forms.
+	*
+	* Recovers from common malformed-JSON patterns models emit before failing:
+	* - Trailing commas before `]` or `}` (frequent across providers)
+	* - Markdown code fences wrapping the JSON (`` ```json ... ``` ``)
+	*
+	* If recovery succeeds, logs at debug level so provider-specific patterns
+	* can be tracked. If recovery fails, re-throws the original parse error
+	* so the failure mode stays visible.
 	*/
 	parseToolArguments(args) {
-		return typeof args === "string" ? JSON.parse(args) : args;
+		if (typeof args !== "string") return args;
+		return parseToolArgsLenient(args, this.context.logger);
 	}
 	/**
 	* Execute a tool and return the result as a string.
@@ -2715,6 +2769,64 @@ Remember: You are an autonomous AGENT. Act independently and solve problems proa
 	}
 };
 /**
+* Parse JSON tool arguments with recovery for common LLM mistakes.
+*
+* Strategy: try standard parse first (the happy path, no allocation). On
+* failure, attempt targeted fixes one at a time and retry. Each recovery
+* step is conservative — it only handles patterns that have a low risk of
+* silently corrupting valid input.
+*
+* Exported for direct use and unit testing.
+*/
+function parseToolArgsLenient(args, logger) {
+	try {
+		return JSON.parse(args);
+	} catch (originalError) {
+		const recoveries = [
+			{
+				name: "strip-code-fence",
+				transform: stripCodeFence
+			},
+			{
+				name: "strip-trailing-commas",
+				transform: stripTrailingCommas
+			},
+			{
+				name: "strip-code-fence+strip-trailing-commas",
+				transform: (s) => stripTrailingCommas(stripCodeFence(s))
+			}
+		];
+		for (const { name, transform } of recoveries) {
+			const candidate = transform(args);
+			if (candidate === args) continue;
+			try {
+				const result = JSON.parse(candidate);
+				logger?.debug?.(`[ReActAgent] Recovered malformed tool args via ${name}`);
+				return result;
+			} catch {}
+		}
+		throw originalError;
+	}
+}
+/**
+* Remove a wrapping markdown code fence, e.g. `` ```json\n{...}\n``` ``.
+* Preserves input if no recognizable fence is found.
+*/
+function stripCodeFence(input) {
+	const fenceMatch = input.trim().match(/^```(?:json|JSON)?\s*\n?([\s\S]*?)\n?```$/);
+	return fenceMatch ? fenceMatch[1].trim() : input;
+}
+/**
+* Strip commas that immediately precede `}` or `]` (with optional whitespace).
+* Conservative: doesn't touch commas inside strings because the regex only
+* matches commas followed by whitespace and a closing bracket.
+*
+* Preserves input if no trailing-comma pattern is found.
+*/
+function stripTrailingCommas(input) {
+	return input.replace(/,(\s*[}\]])/g, "$1");
+}
+/**
 * Trim the steps array to keep only the last N iterations worth of steps.
 *
 * Each iteration produces 1-5 steps (thought, action(s), observation(s), final_answer).
@@ -2731,27 +2843,27 @@ function trimSteps(steps, maxIterations) {
 	}
 }
 /**
-* Trim conversation history to keep only the initial messages (system + user query)
-* plus the last N iterations of assistant/tool/user messages.
+* Trim conversation history to keep the protected prefix (system + previousMessages
+* + current user query) plus the last N iterations of assistant/tool/user messages.
 *
 * Each ReAct iteration adds ~3-5 messages (assistant with tool calls, tool results,
 * user nudge). Keeping all iterations causes input tokens to grow quadratically.
 * Trimming to the last N iterations keeps the agent grounded in recent context
 * while dramatically reducing token accumulation.
+*
+* @param protectedPrefixCount - Length of the initial messages array before any
+*   ReAct iteration messages were appended. Required when previousMessages is
+*   used, otherwise prior-turn user messages get mistaken for iteration nudges
+*   and trimmed away (including, eventually, the current user query itself).
 */
-function trimConversationHistory(messages, maxIterations) {
-	let dynamicStart = 0;
-	for (let i = 0; i < messages.length; i++) if (messages[i].role === "user") {
-		dynamicStart = i + 1;
-		break;
-	}
+function trimConversationHistory(messages, maxIterations, protectedPrefixCount) {
+	const dynamicStart = protectedPrefixCount;
 	const dynamicMessages = messages.slice(dynamicStart);
 	if (dynamicMessages.length === 0) return;
 	const nudgeIndices = [];
 	for (let i = 0; i < dynamicMessages.length; i++) if (dynamicMessages[i].role === "user" && typeof dynamicMessages[i].content === "string") nudgeIndices.push(i);
 	if (nudgeIndices.length <= maxIterations) return;
-	const cutoffNudgeIndex = nudgeIndices[nudgeIndices.length - maxIterations];
-	const keepFrom = dynamicStart + cutoffNudgeIndex;
+	const keepFrom = dynamicStart + nudgeIndices[nudgeIndices.length - maxIterations];
 	messages.splice(dynamicStart, keepFrom - dynamicStart);
 }
 //#endregion
@@ -3030,7 +3142,7 @@ EXAMPLES:
 Remember: Use context from previous messages to understand follow-up questions.
 
 DURABLE WORKFLOW TRACKING:
-You have tools for tracking decisions and blockers during your work. These create an audit trail that persists across sessions, enabling anyone to understand why things were done and what's still outstanding.
+You have tools for tracking decisions, blockers, and human review gates during your work. These create an audit trail that persists across sessions, enabling anyone to understand why things were done and what's still outstanding.
 
 - log_decision: When you make a significant decision (architecture choice, scope narrowing, interpretation of ambiguous requirements, trade-off between alternatives), log it with rationale. Do NOT log trivial decisions. Log decisions that would matter if someone needed to understand WHY you did something or if they needed to resume this work.
 
@@ -3038,9 +3150,40 @@ You have tools for tracking decisions and blockers during your work. These creat
 
 - resolve_blocker: When a blocker is cleared, record how it was resolved. Use the blocker ID from the track_blocker output.
 
+- request_review_gate: Pause for explicit human approval before crossing a significant decision point — one that affects interpretation, evidence, cost, credentials, platform, or public commitment (e.g., narrowing research scope after synthesis, hard-to-reverse refactors, architectural pivots, dependency swaps). Do NOT use for routine operations or actions already covered by the standard permission system (file edits, bash commands). Treat a rejection as a hard stop — re-plan, do not retry.
+
 These tools are lightweight — use them naturally as part of your work, not as a ceremony.${directoriesSection}${projectContextSection}${skillsSection}${featureModulesSection}`;
 }
 /**
+* Build the minimal-variant system prompt. Reuses the project context,
+* skills, additional-directories, and feature-module sections from
+* `buildCoreSystemPrompt` — those carry user-specific information the
+* model needs and are independent of the behavioral scaffolding.
+*/
+function buildMinimalSystemPrompt(config = {}) {
+	let projectContextSection = "";
+	let skillsSection = "";
+	let directoriesSection = "";
+	let featureModulesSection = "";
+	if (config.contextContent) projectContextSection = `\n\n## Project Context\n\nFollow these project-specific instructions:\n\n${config.contextContent}`;
+	if (config.enableSkillTool !== false && config.customCommands && config.customCommands.length > 0) skillsSection = buildSkillsPromptSection(config.customCommands);
+	if (config.additionalDirectories && config.additionalDirectories.length > 0) directoriesSection = `\n\n## Additional Allowed Directories\n\nIn addition to the working directory (${process.cwd()}), you have read/write access to these directories:\n${config.additionalDirectories.map((d) => `- ${d}`).join("\n")}\n\nPass full paths to file tools' \`dir_path\` parameter to access these directories.`;
+	if (config.featureModulePrompts) featureModulesSection = config.featureModulePrompts;
+	return `You are an expert coding assistant. You help users by reading files, executing commands, editing code, and writing new files using the tools available to you.
+
+Guidelines:
+- Be concise in your responses.
+- Show file paths clearly when working with files.
+- When the task is done, give the user a direct answer — no recap of steps already visible in the tool history.${directoriesSection}${projectContextSection}${skillsSection}${featureModulesSection}`;
+}
+/**
+* Pick a system prompt by variant. The dispatch point for the
+* production CLI's `promptVariant` preference flag.
+*/
+function buildSystemPrompt(variant, config = {}) {
+	return variant === "minimal" ? buildMinimalSystemPrompt(config) : buildCoreSystemPrompt(config);
+}
+/**
 * Build the dynamic agent creation prompt section
 * Injected into the system prompt when enableDynamicAgentCreation is true
 */
@@ -18828,7 +18971,7 @@ function wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, a
 				return result;
 			}
 			if (!permissionManager.needsPermission(toolName, { isSandboxed })) return executeAndRecord();
-			const { useCliStore } = await import("./store-B_ILRSdP.mjs");
+			const { useCliStore } = await import("./store-D2zh6DFz.mjs");
 			if (useCliStore.getState().autoAcceptEdits) return executeAndRecord();
 			const response = await showPermissionPrompt(toolName, effectiveArgs, await generateToolPreview(toolName, args, isSandboxed));
 			if (response.action === "deny") throw new PermissionDeniedError(toolName, args);
@@ -23620,7 +23763,7 @@ function createGetFileStructureTool() {
 * Validate log_decision parameters
 * @throws Error if validation fails
 */
-function validateParams(args) {
+function validateParams$1(args) {
 	const params = args;
 	if (typeof params.summary !== "string" || params.summary.trim() === "") throw new Error("log_decision: summary must be a non-empty string");
 	if (typeof params.rationale !== "string" || params.rationale.trim() === "") throw new Error("log_decision: rationale must be a non-empty string");
@@ -23660,7 +23803,7 @@ function formatDecisionsOutput(decisions) {
 function createDecisionLogTool(store) {
 	return {
 		toolFn: async (args) => {
-			const params = validateParams(args);
+			const params = validateParams$1(args);
 			const decision = {
 				id: v4(),
 				timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -23845,4 +23988,127 @@ function createBlockerStore(onUpdate) {
 	};
 }
 //#endregion
-export { processFileReferences as $, getApiUrl as A, registerFeatureModuleTools as B, WebSocketLlmBackend as C, formatStep as D, substituteArguments as E, DEFAULT_AGENT_MODEL as F, isReadOnlyTool as G, OllamaBackend as H, DEFAULT_MAX_ITERATIONS as I, CheckpointStore as J, ReActAgent as K, DEFAULT_RETRY_CONFIG as L, PermissionManager as M, generateCliTools as N, extractCompactInstructions as O, ALWAYS_DENIED_FOR_AGENTS as P, hasFileReferences as Q, DEFAULT_THOROUGHNESS as R, FallbackLlmBackend as S, McpManager as T, buildCoreSystemPrompt as U, setWebSocketToolExecutor as V, buildSkillsPromptSection as W, SessionStore as X, CommandHistoryStore as Y, OAuthClient as Z, createSkillTool as _, createDecisionStore as a, WebSocketToolExecutor as b, createFindDefinitionTool as c, createCoordinateTaskTool as d, searchCommands as et, createBackgroundAgentTools as f, SubagentOrchestrator as g, AgentStore as h, createDecisionLogTool as i, warmFileCache as it, getEnvironmentName as j, loadContextFiles as k, createTodoStore as l, createAgentDelegateTool as m, createBlockerTools as n, formatFileSize$1 as nt, formatDecisionsOutput as o, BackgroundAgentManager as p, CustomCommandStore as q, formatBlockersOutput as r, searchFiles as rt, createGetFileStructureTool as s, createBlockerStore as t, mergeCommands as tt, createWriteTodosTool as u, parseAgentConfig as v, ServerLlmBackend as w, WebSocketConnectionManager as x, ApiClient as y, clearFeatureModuleTools as z };
+//#region src/tools/reviewGateTool.ts
+/**
+* Validate request_review_gate parameters
+* @throws Error if validation fails
+*/
+function validateParams(args) {
+	const params = args;
+	if (typeof params.description !== "string" || params.description.trim() === "") throw new Error("request_review_gate: description must be a non-empty string");
+	if (params.options !== void 0) {
+		if (!Array.isArray(params.options)) throw new Error("request_review_gate: options must be an array of strings");
+		for (const opt of params.options) if (typeof opt !== "string") throw new Error("request_review_gate: each option must be a string");
+	}
+	if (params.recommendation !== void 0 && typeof params.recommendation !== "string") throw new Error("request_review_gate: recommendation must be a string");
+	const options = params.options?.map((o) => o.trim()).filter((o) => o.length > 0);
+	return {
+		description: params.description.trim(),
+		options: options && options.length > 0 ? options : void 0,
+		recommendation: typeof params.recommendation === "string" ? params.recommendation.trim() : void 0
+	};
+}
+/**
+* Format review gates for display output
+*/
+function formatReviewGatesOutput(gates) {
+	if (gates.length === 0) return "No review gates recorded in this session.";
+	return gates.map((gate, index) => {
+		const lines = [`${index + 1}. **${gate.description}**`, `   Status: ${gate.status}`];
+		if (gate.userNote) lines.push(`   Note: ${gate.userNote}`);
+		const requested = new Date(gate.timestamp).toLocaleTimeString();
+		lines.push(`   Requested at: ${requested}`);
+		if (gate.resolvedAt) {
+			const resolved = new Date(gate.resolvedAt).toLocaleTimeString();
+			lines.push(`   Resolved at: ${resolved}`);
+		}
+		return lines.join("\n");
+	}).join("\n\n");
+}
+/**
+* Create the request_review_gate tool.
+*
+* Pauses agent execution and prompts the user for explicit approval at a
+* significant decision point. The agent halts until the user responds.
+*
+* Decisions are persisted in the session's workflow state (`reviewGates`)
+* for audit trail and cross-session continuity.
+*/
+function createReviewGateTool(store, requestReviewFn) {
+	return {
+		toolFn: async (args) => {
+			const params = validateParams(args);
+			const id = v4();
+			const requestedAt = (/* @__PURE__ */ new Date()).toISOString();
+			const response = await requestReviewFn({
+				id,
+				description: params.description,
+				options: params.options,
+				recommendation: params.recommendation
+			});
+			const trimmedNote = response.note?.trim();
+			const entry = {
+				id,
+				timestamp: requestedAt,
+				description: params.description,
+				status: response.decision,
+				resolvedAt: (/* @__PURE__ */ new Date()).toISOString(),
+				userNote: trimmedNote && trimmedNote.length > 0 ? trimmedNote : void 0
+			};
+			store.reviewGates.push(entry);
+			if (store.onUpdate) store.onUpdate(store.reviewGates);
+			const verdict = response.decision === "approved" ? "APPROVED" : "REJECTED";
+			const noteText = entry.userNote ? `\nUser note: ${entry.userNote}` : "";
+			return `Review gate ${verdict} [${id.slice(0, 8)}]: ${params.description}${noteText}`;
+		},
+		toolSchema: {
+			name: "request_review_gate",
+			description: `Pause execution and request explicit human approval at a significant decision point.
+
+Review gates protect meaning. Stop before crossing decisions that affect interpretation, evidence, cost, credentials, platform, or public commitment.
+
+**When to use:**
+- Synthesizing findings before narrowing research scope
+- Hard-to-reverse decisions (refactors, architectural pivots, dependency swaps)
+- Decisions affecting cost, credentials, or external commitments
+- Major direction changes after exploration
+
+**When NOT to use:**
+- Routine operations (reading files, running tests, listing directories)
+- Operations already covered by the standard permission system (file edits, bash commands)
+- Trivial choices that wouldn't matter to someone resuming this work
+
+The agent will pause until the user explicitly approves or rejects. The user may attach an optional note to their decision (e.g., to redirect or clarify scope). Treat a rejection as a hard stop — re-plan rather than retry.`,
+			parameters: {
+				type: "object",
+				properties: {
+					description: {
+						type: "string",
+						description: "Clear explanation of what the user is being asked to approve, including relevant context"
+					},
+					options: {
+						type: "array",
+						items: { type: "string" },
+						description: "Optional list of alternatives the user can choose between"
+					},
+					recommendation: {
+						type: "string",
+						description: "Optional recommendation from the AI on the preferred path and why"
+					}
+				},
+				required: ["description"]
+			}
+		}
+	};
+}
+/**
+* Create a new empty ReviewGateStore
+*/
+function createReviewGateStore(onUpdate) {
+	return {
+		reviewGates: [],
+		onUpdate
+	};
+}
+//#endregion
+export { SessionStore as $, formatStep as A, DEFAULT_RETRY_CONFIG as B, WebSocketToolExecutor as C, ServerLlmBackend as D, WebSocketLlmBackend as E, PermissionManager as F, OllamaBackend as G, clearFeatureModuleTools as H, generateCliTools as I, isReadOnlyTool as J, buildSystemPrompt as K, ALWAYS_DENIED_FOR_AGENTS as L, loadContextFiles as M, getApiUrl as N, McpManager as O, getEnvironmentName as P, CommandHistoryStore as Q, DEFAULT_AGENT_MODEL as R, ApiClient as S, FallbackLlmBackend as T, registerFeatureModuleTools as U, DEFAULT_THOROUGHNESS as V, setWebSocketToolExecutor as W, CustomCommandStore as X, ReActAgent as Y, CheckpointStore as Z, createAgentDelegateTool as _, createBlockerTools as a, formatFileSize$1 as at, createSkillTool as b, createDecisionStore as c, createFindDefinitionTool as d, OAuthClient as et, createTodoStore as f, BackgroundAgentManager as g, createBackgroundAgentTools as h, createBlockerStore as i, mergeCommands as it, extractCompactInstructions as j, substituteArguments as k, formatDecisionsOutput as l, createCoordinateTaskTool as m, createReviewGateTool as n, processFileReferences as nt, formatBlockersOutput as o, searchFiles as ot, createWriteTodosTool as p, buildSkillsPromptSection as q, formatReviewGatesOutput as r, searchCommands as rt, createDecisionLogTool as s, warmFileCache as st, createReviewGateStore as t, hasFileReferences as tt, createGetFileStructureTool as u, AgentStore as v, WebSocketConnectionManager as w, parseAgentConfig as x, SubagentOrchestrator as y, DEFAULT_MAX_ITERATIONS as z };

package/dist/{updateChecker-D-xoVcN3.mjs → updateChecker-Dn-Ri8zw.mjs}

@@ -4,7 +4,7 @@ import { homedir } from "os";
 import path from "path";
 import axios from "axios";
 //#region package.json
-var version = "0.6.1";
+var version = "0.7.0";
 //#endregion
 //#region src/utils/updateChecker.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bike4mind/cli",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "type": "module",
   "description": "Interactive CLI tool for Bike4Mind with ReAct agents",
   "license": "UNLICENSED",
@@ -118,11 +118,11 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vitest": "^4.1.2",
-    "@bike4mind/agents": "0.6.3",
+    "@bike4mind/agents": "0.7.0",
     "@bike4mind/common": "2.92.1",
-    "@bike4mind/mcp": "1.37.3",
-    "@bike4mind/services": "2.79.3",
-    "@bike4mind/utils": "2.19.3"
+    "@bike4mind/services": "2.79.4",
+    "@bike4mind/utils": "2.19.3",
+    "@bike4mind/mcp": "1.37.3"
   },
   "optionalDependencies": {
     "@vscode/ripgrep": "^1.17.1"
@@ -134,6 +134,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "start": "node dist/index.mjs",
+    "eval:run": "tsx src/evals/cli.ts",
     "postinstall": "node -e \"try { require('better-sqlite3') } catch(e) { if(e.message.includes('bindings')) { console.log('\\n⚠️  Rebuilding better-sqlite3 native bindings...'); require('child_process').execSync('pnpm rebuild better-sqlite3', {stdio:'inherit'}) } }\""
   }
 }

package/dist/store-B_ILRSdP.mjs

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-import { n as useCliStore } from "./store-B7-LLvvx.mjs";
-export { useCliStore };