@bike4mind/cli 0.6.1 → 0.8.0

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

@@ -862,9 +862,27 @@ const GenericCreditDeductTransaction = BaseCreditTransaction.extend({
 	*/
 	userId: z.string().optional(),
 	/**
-	* Optional reason/source for the transaction (e.g., 'admin_adjustment', 'legacy_usage', 'manual_deduction')
+	* Reason/source for the transaction. Use GenericDeductReasons for new callers.
 	*/
-	reason: z.string().optional()
+	reason: z.enum([
+		"dispute_clawback",
+		"refund_clawback",
+		"payment_failed_clawback",
+		"notebook_curation",
+		"manual",
+		"admin_adjustment",
+		"refund_adjustment"
+	]).optional(),
+	/**
+	* Stripe dispute ID — set for dispute clawback transactions.
+	* Used for idempotency (unique sparse index prevents duplicate clawbacks).
+	*/
+	stripeDisputeId: z.string().optional(),
+	/**
+	* Stripe refund ID — set for refund clawback transactions.
+	* Used for idempotency (unique sparse index prevents duplicate clawbacks).
+	*/
+	stripeRefundId: z.string().optional()
 });
 const TextGenerationUsageTransaction = BaseCreditTransaction.extend({
 	type: z.literal("text_generation_usage"),
@@ -8829,7 +8847,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 +8887,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 +8938,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-Bbkc_8IL.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 { C as WebSocketToolExecutor, D as ServerLlmBackend, E as WebSocketLlmBackend, F as PermissionManager, I as generateCliTools, M as loadContextFiles, N as getApiUrl, O as McpManager, Q as CheckpointStore, S as ApiClient, T as FallbackLlmBackend, W as setWebSocketToolExecutor, X as ReActAgent, Y as isReadOnlyTool, Z as CustomCommandStore, _ as createAgentDelegateTool, b as createSkillTool, d as createFindDefinitionTool, et as SessionStore, f as createTodoStore, g as BackgroundAgentManager, h as createBackgroundAgentTools, m as createCoordinateTaskTool, p as createWriteTodosTool, q as buildSystemPrompt, u as createGetFileStructureTool, v as AgentStore, w as WebSocketConnectionManager, y as SubagentOrchestrator } from "../tools-Dg1HL5PO.mjs";
+import { n as logger, t as ConfigStore } from "../ConfigStore-Bj1IOvWn.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-Bj1IOvWn.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-Bbkc_8IL.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-B0ImnWR4.mjs";
+import { $ as CommandHistoryStore, 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 buildSkillsPromptSection, K as getPlanModeFilePath, L as ALWAYS_DENIED_FOR_AGENTS, M as loadContextFiles, N as getApiUrl, O as McpManager, P as getEnvironmentName, Q as CheckpointStore, R as DEFAULT_AGENT_MODEL, S as ApiClient, T as FallbackLlmBackend, U as registerFeatureModuleTools, V as DEFAULT_THOROUGHNESS, W as setWebSocketToolExecutor, X as ReActAgent, Y as isReadOnlyTool, Z as CustomCommandStore, _ as createAgentDelegateTool, a as createBlockerTools, at as mergeCommands, b as createSkillTool, c as createDecisionStore, ct as warmFileCache, d as createFindDefinitionTool, et as SessionStore, f as createTodoStore, g as BackgroundAgentManager, h as createBackgroundAgentTools, i as createBlockerStore, it as searchCommands, j as extractCompactInstructions, k as substituteArguments, l as formatDecisionsOutput, m as createCoordinateTaskTool, n as createReviewGateTool, nt as hasFileReferences, o as formatBlockersOutput, ot as formatFileSize, p as createWriteTodosTool, q as buildSystemPrompt, r as formatReviewGatesOutput, rt as processFileReferences, s as createDecisionLogTool, st as searchFiles, t as createReviewGateStore, tt as OAuthClient, u as createGetFileStructureTool, v as AgentStore, w as WebSocketConnectionManager, x as parseAgentConfig, y as SubagentOrchestrator, z as DEFAULT_MAX_ITERATIONS } from "./tools-Dg1HL5PO.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-Bj1IOvWn.mjs";
+import { a as version, t as checkForUpdate } from "./updateChecker-Bbkc_8IL.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";
@@ -25,16 +25,19 @@ import { get_encoding } from "tiktoken";
 import WsWebSocket from "ws";
 //#region src/components/StatusBar.tsx
 const StatusBar = React.memo(function StatusBar({ sessionName, model, tokenUsage, creditsUsage }) {
-	const autoAcceptEdits = useCliStore((state) => state.autoAcceptEdits);
+	const interactionMode = useCliStore((state) => state.interactionMode);
 	return /* @__PURE__ */ React.createElement(Box, {
 		flexDirection: "row",
 		justifyContent: "space-between",
 		width: "100%",
 		paddingX: 1
-	}, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, sessionName), /* @__PURE__ */ React.createElement(Box, { gap: 2 }, autoAcceptEdits && /* @__PURE__ */ React.createElement(Text, {
+	}, /* @__PURE__ */ React.createElement(Text, { dimColor: true }, sessionName), /* @__PURE__ */ React.createElement(Box, { gap: 2 }, interactionMode === "auto-accept" && /* @__PURE__ */ React.createElement(Text, {
 		color: "green",
 		bold: true
-	}, "AUTO ACCEPT: Edits"), tokenUsage > 0 && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, tokenUsage.toLocaleString(), " tokens"), creditsUsage !== void 0 && creditsUsage > 0 && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, creditsUsage.toLocaleString(), " ", creditsUsage === 1 ? "credit" : "credits"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, model)));
+	}, "AUTO ACCEPT: Edits"), interactionMode === "plan" && /* @__PURE__ */ React.createElement(Text, {
+		color: "yellow",
+		bold: true
+	}, "PLAN MODE"), tokenUsage > 0 && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, tokenUsage.toLocaleString(), " tokens"), creditsUsage !== void 0 && creditsUsage > 0 && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, creditsUsage.toLocaleString(), " ", creditsUsage === 1 ? "credit" : "credits"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, model)));
 });
 /**
 * Maximum paste size in characters (~500KB) to prevent memory issues
@@ -1274,6 +1277,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 ? note.trim().length === 0 ? "Note required — type a note + Enter to submit, ↑↓ to switch action" : "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 +2021,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 +2031,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);
@@ -1915,9 +2051,9 @@ function App({ onMessage, onBackgroundCompletion, onCommand, onBashCommand, onPe
 		setPendingBackgroundTrigger,
 		onBackgroundCompletion
 	]);
-	const toggleAutoAcceptEdits = useCliStore((state) => state.toggleAutoAcceptEdits);
+	const cycleInteractionMode = useCliStore((state) => state.cycleInteractionMode);
 	useInput((_input, key) => {
-		if (key.tab && key.shift) toggleAutoAcceptEdits();
+		if (key.tab && key.shift) cycleInteractionMode();
 	});
 	const [isBashMode, setIsBashMode] = useState(false);
 	const handleSubmit = React.useCallback(async (input) => {
@@ -1988,7 +2124,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 +2147,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 +2614,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 +5380,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 +5776,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 +5845,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 +5874,7 @@ function CliApp() {
 				writeTodosTool,
 				decisionLogTool,
 				...blockerTools,
+				reviewGateTool,
 				findDefinitionTool,
 				getFileStructureTool
 			];
@@ -5741,15 +5909,18 @@ 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 promptVariant = config.preferences.promptVariant ?? "current";
+			const buildPromptForMode = (mode) => buildSystemPrompt(promptVariant, {
 				contextContent: contextResult.mergedContent,
 				agentStore,
 				customCommands: state.customCommandStore.getAllCommands(),
 				enableSkillTool,
 				enableDynamicAgentCreation: config.preferences.enableDynamicAgentCreation === true,
 				additionalDirectories,
-				featureModulePrompts: featureModulePrompts || void 0
+				featureModulePrompts: featureModulePrompts || void 0,
+				planModeFilePath: mode === "plan" ? getPlanModeFilePath(newSession.id) : void 0
 			});
+			const cliSystemPrompt = buildPromptForMode(useCliStore.getState().interactionMode);
 			const maxIterations = config.preferences.maxIterations === null ? 999999 : config.preferences.maxIterations;
 			const agent = new ReActAgent({
 				userId: config.userId,
@@ -5763,6 +5934,14 @@ function CliApp() {
 				systemPrompt: cliSystemPrompt
 			});
 			agentContext.currentAgent = agent;
+			const agentInternalContext = agent.context;
+			let lastInteractionMode = useCliStore.getState().interactionMode;
+			useCliStore.subscribe((s) => {
+				if (s.interactionMode === lastInteractionMode) return;
+				lastInteractionMode = s.interactionMode;
+				if (agentContext.currentAgent !== agent) return;
+				agentInternalContext.systemPrompt = buildPromptForMode(s.interactionMode);
+			});
 			agent.observationQueue = agentContext.observationQueue;
 			const stepHandler = (step) => {
 				const { pendingMessages, updatePendingMessage } = useCliStore.getState();
@@ -5980,6 +6159,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 +6324,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 +6442,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 +6840,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 +6985,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);
@@ -7084,6 +7271,17 @@ Multi-line Input:
 				}));
 				setStoreSession(newSession);
 				useCliStore.getState().clearPendingMessages();
+				const staleGate = useCliStore.getState().reviewGatePrompt;
+				if (staleGate) {
+					dequeueReviewGatePrompt();
+					staleGate.resolve({
+						decision: "rejected",
+						note: "Session cleared."
+					});
+				}
+				queueMicrotask(() => {
+					reviewGateStoreRef.current.reviewGates = [];
+				});
 				usageCache = null;
 				console.log("New session started.");
 				console.log(`\n📝 Session: ${newSession.name}  |  🤖 Model: ${newSession.model}  |  📊 Tokens: 0\n`);
@@ -7309,7 +7507,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 +7517,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 +7977,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,14 +8095,16 @@ Multi-line Input:
 			const newFeatureTools = newFeatureRegistry.getAllTools();
 			agentContext.tools = [...baseTools, ...newFeatureTools];
 			const newFeaturePrompts = newFeatureRegistry.getSystemPromptSections();
-			agentContext.systemPrompt = buildCoreSystemPrompt({
+			const planFilePathForRebuild = useCliStore.getState().interactionMode === "plan" && state.session ? getPlanModeFilePath(state.session.id) : void 0;
+			agentContext.systemPrompt = buildSystemPrompt(updatedConfig.preferences.promptVariant ?? "current", {
 				contextContent: state.contextContent,
 				agentStore: state.agentStore || void 0,
 				customCommands: state.customCommandStore.getAllCommands(),
 				enableSkillTool: updatedConfig.preferences.enableSkillTool !== false,
 				enableDynamicAgentCreation: updatedConfig.preferences.enableDynamicAgentCreation === true,
 				additionalDirectories: state.additionalDirectories,
-				featureModulePrompts: newFeaturePrompts || void 0
+				featureModulePrompts: newFeaturePrompts || void 0,
+				planModeFilePath: planFilePathForRebuild
 			});
 			const moduleNames = newFeatureRegistry.getModuleNames();
 			if (moduleNames.length > 0) console.error(`\n\x1b[36m🏰 Feature modules hot-reloaded: ${moduleNames.join(", ")}\x1b[0m`);
@@ -8037,8 +8243,15 @@ Multi-line Input:
 		onUserQuestionResponse: (response, promptId) => {
 			const currentPrompt = useCliStore.getState().userQuestionPrompt;
 			if (currentPrompt?.id !== promptId) return;
-			currentPrompt.resolve(response);
 			dequeueUserQuestionPrompt();
+			currentPrompt.resolve(response);
+			emitNextAwaitingStatus();
+		},
+		onReviewGateResponse: (response, promptId) => {
+			const currentPrompt = useCliStore.getState().reviewGatePrompt;
+			if (currentPrompt?.id !== promptId) return;
+			dequeueReviewGatePrompt();
+			currentPrompt.resolve(response);
 			emitNextAwaitingStatus();
 		}
 	});
@@ -8049,6 +8262,9 @@ try {
 } catch {}
 if (import.meta.url.includes("/src/") || process.env.NODE_ENV === "development") logger.debug("🔧 Running in development mode (using TypeScript source)\n");
 warmFileCache();
-render(/* @__PURE__ */ React.createElement(CliApp, null), { exitOnCtrlC: false });
+render(/* @__PURE__ */ React.createElement(CliApp, null), {
+	exitOnCtrlC: false,
+	alternateScreen: true
+});
 //#endregion
 export {};

package/dist/store-44C_Fvdb.mjs

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

package/dist/{store-B7-LLvvx.mjs → store-B0ImnWR4.mjs}

@@ -3,6 +3,14 @@ import { create } from "zustand";
 //#region src/store/index.ts
 /** Active job statuses (jobs still in progress) */
 const ACTIVE_STATUSES = new Set(["running", "queued"]);
+const INTERACTION_MODE_CYCLE = [
+	"normal",
+	"auto-accept",
+	"plan"
+];
+function nextInteractionMode(current) {
+	return INTERACTION_MODE_CYCLE[(INTERACTION_MODE_CYCLE.indexOf(current) + 1) % INTERACTION_MODE_CYCLE.length];
+}
 /** Check if a job status is active (running or queued) */
 function isActiveStatus(status) {
 	return ACTIVE_STATUSES.has(status);
@@ -105,12 +113,26 @@ 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,
 	setShowMcpViewer: (show) => set({ showMcpViewer: show }),
-	autoAcceptEdits: false,
-	toggleAutoAcceptEdits: () => set((state) => ({ autoAcceptEdits: !state.autoAcceptEdits })),
+	interactionMode: "normal",
+	cycleInteractionMode: () => set((state) => ({ interactionMode: nextInteractionMode(state.interactionMode) })),
+	setInteractionMode: (mode) => set({ interactionMode: mode }),
 	exitRequested: false,
 	setExitRequested: (requested) => set({ exitRequested: requested }),
 	backgroundAgents: [],