@bike4mind/cli 0.2.8-fix-cli-type-error.17148 → 0.2.10-fix-b4m-cli-flicker.17230

package/dist/index.js

@@ -4,9 +4,9 @@ import {
   getEffectiveApiKey,
   getOpenWeatherKey,
   getSerperKey
-} from "./chunk-3CCBDIFR.js";
-import "./chunk-LIRY24M5.js";
-import "./chunk-YXHQN7SK.js";
+} from "./chunk-GO75FMLY.js";
+import "./chunk-VZU4Z7WI.js";
+import "./chunk-AQBZVAYO.js";
 import {
   BFLImageService,
   BaseStorage,
@@ -15,7 +15,7 @@ import {
   OpenAIBackend,
   OpenAIImageService,
   XAIImageService
-} from "./chunk-DNSBC3LO.js";
+} from "./chunk-GCVIRGIN.js";
 import {
   Logger
 } from "./chunk-AMDXHL6S.js";
@@ -73,19 +73,19 @@ import {
   XAI_IMAGE_MODELS,
   b4mLLMTools,
   getMcpProviderMetadata
-} from "./chunk-H6SHASMZ.js";
+} from "./chunk-DJPXSSP4.js";
 import {
   __require
 } from "./chunk-PDX44BCA.js";
 
 // src/index.tsx
-import React15, { useState as useState6, useEffect as useEffect3, useCallback, useRef } from "react";
-import { render, Box as Box14, Text as Text14, useApp, useInput as useInput5 } from "ink";
+import React17, { useState as useState7, useEffect as useEffect3, useCallback, useRef } from "react";
+import { render, Box as Box16, Text as Text16, useApp, useInput as useInput6 } from "ink";
 import { v4 as uuidv49 } from "uuid";
 
 // src/components/App.tsx
-import React10 from "react";
-import { Box as Box9, Text as Text9, Static } from "ink";
+import React11 from "react";
+import { Box as Box10, Text as Text10, Static } from "ink";
 
 // src/components/StatusBar.tsx
 import React from "react";
@@ -742,6 +742,7 @@ function InputPrompt({
   const [selectedIndex, setSelectedIndex] = useState2(0);
   const [historyIndex, setHistoryIndex] = useState2(-1);
   const [tempInput, setTempInput] = useState2("");
+  const [inputKey, setInputKey] = useState2(0);
   useEffect(() => {
     if (prefillInput) {
       setValue(prefillInput);
@@ -889,10 +890,11 @@ function InputPrompt({
   return /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column" }, /* @__PURE__ */ React5.createElement(Box4, null, /* @__PURE__ */ React5.createElement(Text5, { bold: true, color: "cyan" }, "> "), /* @__PURE__ */ React5.createElement(
     CustomTextInput,
     {
+      key: inputKey,
       value,
       onChange: handleChange,
       onSubmit: handleSubmit,
-      placeholder: disabled ? "Thinking..." : "Type your message, /help for commands, or @file to reference",
+      placeholder: disabled ? "" : "Type your message, /help for commands, or @file to reference",
       showCursor: !disabled
     }
   )), shouldShowCommandAutocomplete && /* @__PURE__ */ React5.createElement(CommandAutocomplete, { commands: filteredCommands, selectedIndex }), fileAutocomplete?.active && /* @__PURE__ */ React5.createElement(FileAutocomplete, { files: filteredFiles, selectedIndex: fileSelectedIndex, query: fileAutocomplete.query }));
@@ -916,6 +918,29 @@ var useCliStore = create((set) => ({
   // Session state
   session: null,
   setSession: (session) => set({ session }),
+  // Pending messages
+  pendingMessages: [],
+  addPendingMessage: (message) => set((state) => ({ pendingMessages: [...state.pendingMessages, message] })),
+  updatePendingMessage: (index, message) => set((state) => {
+    const updated = [...state.pendingMessages];
+    updated[index] = message;
+    return { pendingMessages: updated };
+  }),
+  clearPendingMessages: () => set({ pendingMessages: [] }),
+  completePendingMessage: (index, finalMessage) => set((state) => {
+    const pending = [...state.pendingMessages];
+    pending.splice(index, 1);
+    const session = state.session;
+    if (!session) return { pendingMessages: pending };
+    return {
+      pendingMessages: pending,
+      session: {
+        ...session,
+        messages: [...session.messages, finalMessage],
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      }
+    };
+  }),
   // UI state
   isThinking: false,
   setIsThinking: (thinking) => set({ isThinking: thinking }),
@@ -923,6 +948,7 @@ var useCliStore = create((set) => ({
   addAgentStep: (step) => set((state) => ({
     agentSteps: [...state.agentSteps, step]
   })),
+  setAgentSteps: (steps) => set({ agentSteps: steps }),
   clearAgentSteps: () => set({ agentSteps: [] }),
   // Permission prompt
   permissionPrompt: null,
@@ -942,7 +968,7 @@ var AgentThinking = React7.memo(function AgentThinking2() {
   if (!isThinking) {
     return null;
   }
-  return /* @__PURE__ */ React7.createElement(Box6, { borderStyle: "single", borderColor: "yellow", paddingX: 1, marginY: 1 }, /* @__PURE__ */ React7.createElement(ThoughtStream, { steps: agentSteps }));
+  return /* @__PURE__ */ React7.createElement(Box6, { paddingX: 1, marginBottom: 1 }, /* @__PURE__ */ React7.createElement(ThoughtStream, { steps: agentSteps }));
 });
 
 // src/components/PermissionPrompt.tsx
@@ -1214,6 +1240,26 @@ function ConfigEditor({ config, availableModels, onSave, onClose }) {
   })), /* @__PURE__ */ React9.createElement(Box8, { borderStyle: "single", borderColor: "gray", paddingX: 1 }, /* @__PURE__ */ React9.createElement(Text8, { dimColor: true }, "\u2191/\u2193: Navigate | Space/\u2190/\u2192: Change | q/Esc: Save & Exit")));
 }
 
+// src/components/MessageItem.tsx
+import React10 from "react";
+import { Box as Box9, Text as Text9 } from "ink";
+function MessageItem({ message }) {
+  const isUser = message.role === "user";
+  return /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ React10.createElement(Box9, null, /* @__PURE__ */ React10.createElement(Text9, { bold: true, color: isUser ? "cyan" : "green" }, isUser ? "\u{1F464} You" : "\u{1F916} Assistant"), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2022 ", new Date(message.timestamp).toLocaleTimeString())), isUser && message.content && /* @__PURE__ */ React10.createElement(Box9, { paddingLeft: 2 }, /* @__PURE__ */ React10.createElement(Text9, { backgroundColor: "whiteBright", color: "black" }, " ", message.content, " ")), !isUser && message.metadata?.steps && message.metadata.steps.length > 0 && /* @__PURE__ */ React10.createElement(Box9, { paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true, bold: true }, "\u{1F527} Agent Reasoning Trace (", message.metadata.steps.filter((s) => s.type === "action").length, " ", "tools used, ", message.metadata.steps.length, " total steps)", message.metadata.tokenUsage && ` \u2022 ${message.metadata.tokenUsage.total} tokens`), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, "Step types: ", message.metadata.steps.map((s) => s.type).join(", ")), message.metadata.steps.map((step, idx) => {
+    if (step.type === "thought") {
+      return /* @__PURE__ */ React10.createElement(Box9, { key: idx, paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React10.createElement(Text9, { color: "blue" }, "\u{1F4AD} Thought:"), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, `   ${step.content.slice(0, 200)}${step.content.length > 200 ? "..." : ""}`));
+    }
+    if (step.type === "action") {
+      const toolName = step.metadata?.toolName || "unknown";
+      const toolInput = step.metadata?.toolInput;
+      const observationStep = message.metadata.steps[idx + 1];
+      const result = observationStep?.type === "observation" ? observationStep.content : null;
+      return /* @__PURE__ */ React10.createElement(Box9, { key: idx, paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React10.createElement(Text9, { color: "yellow" }, "\u{1F527} Action: ", toolName), toolInput && /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, `   Input: ${typeof toolInput === "string" ? toolInput : JSON.stringify(toolInput).slice(0, 100)}`), result && /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, `   Result: ${typeof result === "string" ? result.slice(0, 200) : JSON.stringify(result).slice(0, 200)}${(typeof result === "string" ? result.length : JSON.stringify(result).length) > 200 ? "..." : ""}`));
+    }
+    return null;
+  }).filter(Boolean)), !isUser && message.content !== "..." && /* @__PURE__ */ React10.createElement(Box9, { paddingLeft: 2, marginTop: message.metadata?.steps?.length ? 1 : 0 }, message.metadata?.permissionDenied ? /* @__PURE__ */ React10.createElement(Text9, { color: "yellow" }, "\u26A0\uFE0F ", message.content) : /* @__PURE__ */ React10.createElement(Text9, null, message.content)), message.metadata?.tokenUsage && (!message.metadata.steps || message.metadata.steps.length === 0) && /* @__PURE__ */ React10.createElement(Box9, { paddingLeft: 2 }, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, `${message.metadata.tokenUsage.total} tokens`)));
+}
+
 // src/utils/processFileReferences.ts
 import * as fs2 from "fs";
 import * as path2 from "path";
@@ -1342,6 +1388,7 @@ function App({
   onPrefillConsumed
 }) {
   const messages = useCliStore((state) => state.session?.messages || []);
+  const pendingMessages = useCliStore((state) => state.pendingMessages);
   const sessionName = useCliStore((state) => state.session?.name || "New Session");
   const currentModel = useCliStore((state) => state.session?.model || "claude-sonnet-4-5-20250929");
   const totalTokens = useCliStore((state) => state.session?.metadata.totalTokens || 0);
@@ -1351,7 +1398,7 @@ function App({
   const setShowConfigEditor = useCliStore((state) => state.setShowConfigEditor);
   const exitRequested = useCliStore((state) => state.exitRequested);
   const setIsThinking = useCliStore((state) => state.setIsThinking);
-  const handleSubmit = React10.useCallback(
+  const handleSubmit = React11.useCallback(
     async (input) => {
       const trimmed = input.trim();
       if (!trimmed) return;
@@ -1380,7 +1427,7 @@ ${errorBlock}`;
     },
     [onMessage, onCommand, setIsThinking]
   );
-  return /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column" }, /* @__PURE__ */ React10.createElement(StatusBar, { sessionName, model: currentModel, tokenUsage: totalTokens }), showConfigEditor && config && onSaveConfig ? /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React10.createElement(
+  return /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column" }, showConfigEditor && config && onSaveConfig ? /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(
     ConfigEditor,
     {
       config,
@@ -1388,7 +1435,7 @@ ${errorBlock}`;
       onSave: onSaveConfig,
       onClose: () => setShowConfigEditor(false)
     }
-  )) : permissionPrompt ? /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React10.createElement(
+  )) : permissionPrompt ? /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(
     PermissionPrompt,
     {
       toolName: permissionPrompt.toolName,
@@ -1397,7 +1444,7 @@ ${errorBlock}`;
       canBeTrusted: permissionPrompt.canBeTrusted,
       onResponse: onPermissionResponse
     }
-  )) : /* @__PURE__ */ React10.createElement(React10.Fragment, null, /* @__PURE__ */ React10.createElement(Static, { items: messages }, (message, index) => /* @__PURE__ */ React10.createElement(Box9, { key: index, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React10.createElement(MessageItem, { message }))), /* @__PURE__ */ React10.createElement(AgentThinking, null), exitRequested && /* @__PURE__ */ React10.createElement(Box9, { paddingX: 1, marginBottom: 1 }, /* @__PURE__ */ React10.createElement(Text9, { color: "yellow", bold: true }, "Press Ctrl+C again to exit")), /* @__PURE__ */ React10.createElement(Box9, { borderStyle: "single", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React10.createElement(
+  )) : /* @__PURE__ */ React11.createElement(React11.Fragment, null, /* @__PURE__ */ React11.createElement(Static, { items: messages }, (message, index) => /* @__PURE__ */ React11.createElement(Box10, { key: `${message.timestamp}-${message.role}-${index}`, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(MessageItem, { message }))), /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column" }, pendingMessages.map((message, index) => /* @__PURE__ */ React11.createElement(Box10, { key: `pending-${message.timestamp}-${index}`, flexDirection: "column", paddingX: 1 }, /* @__PURE__ */ React11.createElement(MessageItem, { message })))), /* @__PURE__ */ React11.createElement(AgentThinking, null), exitRequested && /* @__PURE__ */ React11.createElement(Box10, { paddingX: 1, marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Text10, { color: "yellow", bold: true }, "Press Ctrl+C again to exit")), /* @__PURE__ */ React11.createElement(StatusBar, { sessionName, model: currentModel, tokenUsage: totalTokens }), /* @__PURE__ */ React11.createElement(Box10, { borderStyle: "single", borderColor: "cyan", paddingX: 1 }, /* @__PURE__ */ React11.createElement(
     InputPrompt,
     {
       onSubmit: handleSubmit,
@@ -1409,37 +1456,22 @@ ${errorBlock}`;
     }
   ))));
 }
-function MessageItem({ message }) {
-  return /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ React10.createElement(Box9, null, /* @__PURE__ */ React10.createElement(Text9, { bold: true, color: message.role === "user" ? "cyan" : "green" }, message.role === "user" ? "\u{1F464} You" : "\u{1F916} Assistant"), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, " \u2022 ", new Date(message.timestamp).toLocaleTimeString())), /* @__PURE__ */ React10.createElement(Box9, { paddingLeft: 2 }, message.metadata?.permissionDenied ? /* @__PURE__ */ React10.createElement(Text9, { color: "yellow" }, "\u26A0\uFE0F ", message.content) : /* @__PURE__ */ React10.createElement(Text9, null, message.content)), message.metadata?.steps && message.metadata.steps.length > 0 && /* @__PURE__ */ React10.createElement(Box9, { paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true, bold: true }, "\u{1F527} Agent Reasoning Trace (", message.metadata.steps.filter((s) => s.type === "action").length, " ", "tools used, ", message.metadata.steps.length, " total steps)", message.metadata.tokenUsage && ` \u2022 ${message.metadata.tokenUsage.total} tokens`), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, "Step types: ", message.metadata.steps.map((s) => s.type).join(", ")), message.metadata.steps.map((step, idx) => {
-    if (step.type === "thought") {
-      return /* @__PURE__ */ React10.createElement(Box9, { key: idx, paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React10.createElement(Text9, { color: "blue" }, "\u{1F4AD} Thought:"), /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, `   ${step.content.slice(0, 200)}${step.content.length > 200 ? "..." : ""}`));
-    }
-    if (step.type === "action") {
-      const toolName = step.metadata?.toolName || "unknown";
-      const toolInput = step.metadata?.toolInput;
-      const observationStep = message.metadata.steps[idx + 1];
-      const result = observationStep?.type === "observation" ? observationStep.content : null;
-      return /* @__PURE__ */ React10.createElement(Box9, { key: idx, paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React10.createElement(Text9, { color: "yellow" }, "\u{1F527} Action: ", toolName), toolInput && /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, `   Input: ${typeof toolInput === "string" ? toolInput : JSON.stringify(toolInput).slice(0, 100)}`), result && /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, `   Result: ${typeof result === "string" ? result.slice(0, 200) : JSON.stringify(result).slice(0, 200)}${(typeof result === "string" ? result.length : JSON.stringify(result).length) > 200 ? "..." : ""}`));
-    }
-    return null;
-  }).filter(Boolean)), message.metadata?.tokenUsage && (!message.metadata.steps || message.metadata.steps.length === 0) && /* @__PURE__ */ React10.createElement(Box9, { paddingLeft: 2 }, /* @__PURE__ */ React10.createElement(Text9, { dimColor: true }, `${message.metadata.tokenUsage.total} tokens`)));
-}
 
 // src/components/MessageList.tsx
-import React11 from "react";
-import { Box as Box10, Text as Text10 } from "ink";
+import React12 from "react";
+import { Box as Box11, Text as Text11 } from "ink";
 function stripThinkingTags(content) {
   return content.replace(/<think>[\s\S]*?<\/think>/g, "").trim();
 }
-var MessageList = React11.memo(
+var MessageList = React12.memo(
   function MessageList2({ messages }) {
     if (messages.length === 0) {
-      return /* @__PURE__ */ React11.createElement(Box10, { paddingY: 1 }, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "No messages yet. Type a message to start!"));
+      return /* @__PURE__ */ React12.createElement(Box11, { paddingY: 1 }, /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, "No messages yet. Type a message to start!"));
     }
-    return /* @__PURE__ */ React11.createElement(Box10, { flexDirection: "column", gap: 1, paddingY: 1 }, messages.map((message, index) => /* @__PURE__ */ React11.createElement(Box10, { key: index, flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ React11.createElement(Box10, null, /* @__PURE__ */ React11.createElement(Text10, { bold: true, color: message.role === "user" ? "cyan" : "green" }, message.role === "user" ? "\u{1F464} You" : "\u{1F916} Assistant"), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, " \u2022 ", new Date(message.timestamp).toLocaleTimeString())), /* @__PURE__ */ React11.createElement(Box10, { paddingLeft: 2 }, message.metadata?.permissionDenied ? /* @__PURE__ */ React11.createElement(Text10, { color: "yellow" }, "\u26A0\uFE0F ", stripThinkingTags(message.content)) : /* @__PURE__ */ React11.createElement(Text10, null, stripThinkingTags(message.content))), message.metadata?.steps && message.metadata.steps.length > 0 && /* @__PURE__ */ React11.createElement(Box10, { paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true, bold: true }, "\u{1F527} Agent Reasoning Trace (", message.metadata.steps.filter((s) => s.type === "action").length, " tools used,", " ", message.metadata.steps.length, " total steps)", message.metadata.tokenUsage && ` \u2022 ${message.metadata.tokenUsage.total} tokens`), /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, "Step types: ", message.metadata.steps.map((s) => s.type).join(", ")), message.metadata.steps.map((step, idx) => {
+    return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column", gap: 1, paddingY: 1 }, messages.map((message, index) => /* @__PURE__ */ React12.createElement(Box11, { key: index, flexDirection: "column", marginBottom: 1 }, /* @__PURE__ */ React12.createElement(Box11, null, /* @__PURE__ */ React12.createElement(Text11, { bold: true, color: message.role === "user" ? "cyan" : "green" }, message.role === "user" ? "\u{1F464} You" : "\u{1F916} Assistant"), /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, " \u2022 ", new Date(message.timestamp).toLocaleTimeString())), /* @__PURE__ */ React12.createElement(Box11, { paddingLeft: 2 }, message.metadata?.permissionDenied ? /* @__PURE__ */ React12.createElement(Text11, { color: "yellow" }, "\u26A0\uFE0F ", stripThinkingTags(message.content)) : /* @__PURE__ */ React12.createElement(Text11, null, stripThinkingTags(message.content))), message.metadata?.steps && message.metadata.steps.length > 0 && /* @__PURE__ */ React12.createElement(Box11, { paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React12.createElement(Text11, { dimColor: true, bold: true }, "\u{1F527} Agent Reasoning Trace (", message.metadata.steps.filter((s) => s.type === "action").length, " tools used,", " ", message.metadata.steps.length, " total steps)", message.metadata.tokenUsage && ` \u2022 ${message.metadata.tokenUsage.total} tokens`), /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, "Step types: ", message.metadata.steps.map((s) => s.type).join(", ")), message.metadata.steps.map((step, idx) => {
       if (step.type === "thought") {
-        return /* @__PURE__ */ React11.createElement(Box10, { key: idx, paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React11.createElement(Text10, { color: "blue" }, "\u{1F4AD} Thought:"), /* @__PURE__ */ React11.createElement(
-          Text10,
+        return /* @__PURE__ */ React12.createElement(Box11, { key: idx, paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React12.createElement(Text11, { color: "blue" }, "\u{1F4AD} Thought:"), /* @__PURE__ */ React12.createElement(
+          Text11,
           {
             dimColor: true
           },
@@ -1451,10 +1483,10 @@ var MessageList = React11.memo(
         const toolInput = step.metadata?.toolInput;
         const observationStep = message.metadata.steps[idx + 1];
         const result = observationStep?.type === "observation" ? observationStep.content : null;
-        return /* @__PURE__ */ React11.createElement(Box10, { key: idx, paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React11.createElement(Text10, { color: "yellow" }, "\u{1F527} Action: ", toolName), toolInput && /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, `   Input: ${typeof toolInput === "string" ? toolInput : JSON.stringify(toolInput).slice(0, 100)}`), result && /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, `   Result: ${typeof result === "string" ? result.slice(0, 200) : JSON.stringify(result).slice(0, 200)}${(typeof result === "string" ? result.length : JSON.stringify(result).length) > 200 ? "..." : ""}`));
+        return /* @__PURE__ */ React12.createElement(Box11, { key: idx, paddingLeft: 2, marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React12.createElement(Text11, { color: "yellow" }, "\u{1F527} Action: ", toolName), toolInput && /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, `   Input: ${typeof toolInput === "string" ? toolInput : JSON.stringify(toolInput).slice(0, 100)}`), result && /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, `   Result: ${typeof result === "string" ? result.slice(0, 200) : JSON.stringify(result).slice(0, 200)}${(typeof result === "string" ? result.length : JSON.stringify(result).length) > 200 ? "..." : ""}`));
       }
       return null;
-    }).filter(Boolean)), message.metadata?.tokenUsage && (!message.metadata.steps || message.metadata.steps.length === 0) && /* @__PURE__ */ React11.createElement(Box10, { paddingLeft: 2 }, /* @__PURE__ */ React11.createElement(Text10, { dimColor: true }, `${message.metadata.tokenUsage.total} tokens`)))));
+    }).filter(Boolean)), message.metadata?.tokenUsage && (!message.metadata.steps || message.metadata.steps.length === 0) && /* @__PURE__ */ React12.createElement(Box11, { paddingLeft: 2 }, /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, `${message.metadata.tokenUsage.total} tokens`)))));
   },
   (prevProps, nextProps) => {
     if (prevProps.messages.length !== nextProps.messages.length) {
@@ -1465,8 +1497,8 @@ var MessageList = React11.memo(
 );
 
 // src/components/TrustLocationSelector.tsx
-import React12 from "react";
-import { Box as Box11, Text as Text11 } from "ink";
+import React13 from "react";
+import { Box as Box12, Text as Text12 } from "ink";
 import SelectInput2 from "ink-select-input";
 function TrustLocationSelector({ inProject, onSelect, onCancel }) {
   const items = [];
@@ -1487,19 +1519,19 @@ function TrustLocationSelector({ inProject, onSelect, onCancel }) {
   const handleSelect = (item) => {
     onSelect(item.value);
   };
-  return /* @__PURE__ */ React12.createElement(Box11, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React12.createElement(Box11, { marginBottom: 1 }, /* @__PURE__ */ React12.createElement(Text11, { bold: true }, "Where should this rule be saved?")), /* @__PURE__ */ React12.createElement(
+  return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React13.createElement(Box12, { marginBottom: 1 }, /* @__PURE__ */ React13.createElement(Text12, { bold: true }, "Where should this rule be saved?")), /* @__PURE__ */ React13.createElement(
     SelectInput2,
     {
       items,
       onSelect: handleSelect,
-      itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React12.createElement(Box11, null, /* @__PURE__ */ React12.createElement(Text11, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
+      itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React13.createElement(Box12, null, /* @__PURE__ */ React13.createElement(Text12, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
     }
-  ), /* @__PURE__ */ React12.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React12.createElement(Text11, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Ctrl+C to cancel")));
+  ), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text12, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Ctrl+C to cancel")));
 }
 
 // src/components/RewindSelector.tsx
-import React13, { useState as useState4 } from "react";
-import { Box as Box12, Text as Text12, useInput as useInput4 } from "ink";
+import React14, { useState as useState4 } from "react";
+import { Box as Box13, Text as Text13, useInput as useInput4 } from "ink";
 import SelectInput3 from "ink-select-input";
 function RewindSelector({ messages, onSelect, onCancel }) {
   const [step, setStep] = useState4("selection");
@@ -1541,14 +1573,14 @@ function RewindSelector({ messages, onSelect, onCancel }) {
     return sum2 + (msg.metadata?.tokenUsage?.total || 0);
   }, 0);
   if (step === "selection") {
-    return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React13.createElement(Box12, { marginBottom: 1 }, /* @__PURE__ */ React13.createElement(Text12, { bold: true }, "Select a point to rewind to:")), /* @__PURE__ */ React13.createElement(
+    return /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1 }, /* @__PURE__ */ React14.createElement(Text13, { bold: true }, "Select a point to rewind to:")), /* @__PURE__ */ React14.createElement(
       SelectInput3,
       {
         items,
         onSelect: handleSelectionSelect,
-        itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React13.createElement(Box12, null, /* @__PURE__ */ React13.createElement(Text12, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
+        itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React14.createElement(Box13, null, /* @__PURE__ */ React14.createElement(Text13, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
       }
-    ), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text12, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Esc to cancel")));
+    ), /* @__PURE__ */ React14.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React14.createElement(Text13, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Esc to cancel")));
   }
   const confirmationItems = [
     { label: "Yes, rewind to this point", value: "confirm" },
@@ -1556,19 +1588,82 @@ function RewindSelector({ messages, onSelect, onCancel }) {
   ];
   const selectedMessage = selectedMessageIndex !== null && selectedMessageIndex >= 0 && selectedMessageIndex < messages.length ? messages[selectedMessageIndex] : null;
   const selectedPreview = selectedMessage ? selectedMessage.content.length > 50 ? selectedMessage.content.substring(0, 50) + "..." : selectedMessage.content : "";
-  return /* @__PURE__ */ React13.createElement(Box12, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React13.createElement(Box12, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React13.createElement(Text12, { bold: true }, "Confirm rewind operation:"), /* @__PURE__ */ React13.createElement(Text12, { dimColor: true }, "Message: ", selectedPreview), /* @__PURE__ */ React13.createElement(Text12, { color: "yellow" }, "This will remove ", messagesToRemove.length, " message(s) (", tokensToRemove.toLocaleString(), " tokens)"), /* @__PURE__ */ React13.createElement(Text12, { color: "cyan" }, "The selected message will be placed in your input for editing.")), /* @__PURE__ */ React13.createElement(
+  return /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React14.createElement(Text13, { bold: true }, "Confirm rewind operation:"), /* @__PURE__ */ React14.createElement(Text13, { dimColor: true }, "Message: ", selectedPreview), /* @__PURE__ */ React14.createElement(Text13, { color: "yellow" }, "This will remove ", messagesToRemove.length, " message(s) (", tokensToRemove.toLocaleString(), " tokens)"), /* @__PURE__ */ React14.createElement(Text13, { color: "cyan" }, "The selected message will be placed in your input for editing.")), /* @__PURE__ */ React14.createElement(
     SelectInput3,
     {
       items: confirmationItems,
       onSelect: handleConfirmationSelect,
-      itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React13.createElement(Box12, null, /* @__PURE__ */ React13.createElement(Text12, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
+      itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React14.createElement(Box13, null, /* @__PURE__ */ React14.createElement(Text13, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
+    }
+  ), /* @__PURE__ */ React14.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React14.createElement(Text13, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Esc to go back")));
+}
+
+// src/components/SessionSelector.tsx
+import React15, { useState as useState5 } from "react";
+import { Box as Box14, Text as Text14, useInput as useInput5 } from "ink";
+import SelectInput4 from "ink-select-input";
+function SessionSelector({ sessions, currentSession, onSelect, onCancel }) {
+  const [step, setStep] = useState5("selection");
+  const [selectedSession, setSelectedSession] = useState5(null);
+  useInput5((input, key) => {
+    if (key.escape) {
+      if (step === "confirmation") {
+        setStep("selection");
+        setSelectedSession(null);
+      } else {
+        onCancel();
+      }
+    }
+  });
+  const hasUnsavedWork = currentSession && currentSession.messages.length > 0;
+  const items = sessions.map((session, index) => {
+    const messageCount = session.messages.length;
+    const lastUpdated = new Date(session.updatedAt).toLocaleString();
+    return {
+      label: `[${index + 1}] ${session.name} (${messageCount} msg, ${session.model})
+      Last updated: ${lastUpdated}`,
+      value: session
+    };
+  });
+  const handleSelectionSelect = (item) => {
+    setSelectedSession(item.value);
+    setStep("confirmation");
+  };
+  const handleConfirmationSelect = (item) => {
+    if (item.value === "confirm" && selectedSession) {
+      onSelect(selectedSession);
+    } else {
+      setStep("selection");
+      setSelectedSession(null);
+    }
+  };
+  if (step === "selection") {
+    return /* @__PURE__ */ React15.createElement(Box14, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React15.createElement(Box14, { marginBottom: 1 }, /* @__PURE__ */ React15.createElement(Text14, { bold: true }, "Select a session to resume:")), /* @__PURE__ */ React15.createElement(
+      SelectInput4,
+      {
+        items,
+        onSelect: handleSelectionSelect,
+        itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React15.createElement(Box14, null, /* @__PURE__ */ React15.createElement(Text14, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
+      }
+    ), /* @__PURE__ */ React15.createElement(Box14, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text14, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Esc to cancel")));
+  }
+  const confirmationItems = [
+    { label: "Yes, resume this session", value: "confirm" },
+    { label: "No, go back to selection", value: "cancel" }
+  ];
+  return /* @__PURE__ */ React15.createElement(Box14, { flexDirection: "column", marginY: 1 }, /* @__PURE__ */ React15.createElement(Box14, { marginBottom: 1, flexDirection: "column" }, /* @__PURE__ */ React15.createElement(Text14, { bold: true }, 'Resume session: "', selectedSession?.name, '"'), /* @__PURE__ */ React15.createElement(Text14, { dimColor: true }, selectedSession?.messages.length, " messages | ", selectedSession?.model, " |", " ", selectedSession?.metadata?.totalTokens?.toLocaleString() ?? 0, " tokens"), hasUnsavedWork && /* @__PURE__ */ React15.createElement(Text14, { color: "yellow" }, "Warning: Your current session has unsaved messages. Use /save first if needed.")), /* @__PURE__ */ React15.createElement(
+    SelectInput4,
+    {
+      items: confirmationItems,
+      onSelect: handleConfirmationSelect,
+      itemComponent: ({ isSelected, label }) => /* @__PURE__ */ React15.createElement(Box14, null, /* @__PURE__ */ React15.createElement(Text14, { color: isSelected ? "cyan" : void 0 }, isSelected ? "\u276F " : "  ", label))
     }
-  ), /* @__PURE__ */ React13.createElement(Box12, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text12, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Esc to go back")));
+  ), /* @__PURE__ */ React15.createElement(Box14, { marginTop: 1 }, /* @__PURE__ */ React15.createElement(Text14, { dimColor: true }, "Use \u2191\u2193 arrows to navigate, Enter to select, Esc to go back")));
 }
 
 // src/components/LoginFlow.tsx
-import React14, { useState as useState5, useEffect as useEffect2 } from "react";
-import { Box as Box13, Text as Text13 } from "ink";
+import React16, { useState as useState6, useEffect as useEffect2 } from "react";
+import { Box as Box15, Text as Text15 } from "ink";
 import Spinner2 from "ink-spinner";
 import jwt from "jsonwebtoken";
 import open from "open";
@@ -1684,10 +1779,10 @@ var OAuthClient = class {
 
 // src/components/LoginFlow.tsx
 function LoginFlow({ apiUrl = "http://localhost:3000", configStore, onSuccess, onError }) {
-  const [status, setStatus] = useState5("initiating");
-  const [deviceFlow, setDeviceFlow] = useState5(null);
-  const [statusMessage, setStatusMessage] = useState5("Initiating device authorization...");
-  const [error, setError] = useState5(null);
+  const [status, setStatus] = useState6("initiating");
+  const [deviceFlow, setDeviceFlow] = useState6(null);
+  const [statusMessage, setStatusMessage] = useState6("Initiating device authorization...");
+  const [error, setError] = useState6(null);
   useEffect2(() => {
     const runLoginFlow = async () => {
       const oauth = new OAuthClient(apiUrl);
@@ -1731,15 +1826,15 @@ function LoginFlow({ apiUrl = "http://localhost:3000", configStore, onSuccess, o
     }
   }, [deviceFlow, status]);
   if (status === "initiating") {
-    return /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React14.createElement(Box13, null, /* @__PURE__ */ React14.createElement(Text13, { color: "cyan" }, /* @__PURE__ */ React14.createElement(Spinner2, { type: "dots" }), " Initiating device authorization...")));
+    return /* @__PURE__ */ React16.createElement(Box15, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React16.createElement(Box15, null, /* @__PURE__ */ React16.createElement(Text15, { color: "cyan" }, /* @__PURE__ */ React16.createElement(Spinner2, { type: "dots" }), " Initiating device authorization...")));
   }
   if (status === "error") {
-    return /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1 }, /* @__PURE__ */ React14.createElement(Text13, { color: "red", bold: true }, "\u2716 Authentication Failed")), /* @__PURE__ */ React14.createElement(Box13, null, /* @__PURE__ */ React14.createElement(Text13, { color: "red" }, error)));
+    return /* @__PURE__ */ React16.createElement(Box15, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React16.createElement(Box15, { marginBottom: 1 }, /* @__PURE__ */ React16.createElement(Text15, { color: "red", bold: true }, "\u2716 Authentication Failed")), /* @__PURE__ */ React16.createElement(Box15, null, /* @__PURE__ */ React16.createElement(Text15, { color: "red" }, error)));
   }
   if (status === "success") {
-    return /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1 }, /* @__PURE__ */ React14.createElement(Text13, { color: "green", bold: true }, "\u2714 Successfully authenticated!")), /* @__PURE__ */ React14.createElement(Box13, null, /* @__PURE__ */ React14.createElement(Text13, { dimColor: true }, "You can now use B4M CLI with your account.")));
+    return /* @__PURE__ */ React16.createElement(Box15, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React16.createElement(Box15, { marginBottom: 1 }, /* @__PURE__ */ React16.createElement(Text15, { color: "green", bold: true }, "\u2714 Successfully authenticated!")), /* @__PURE__ */ React16.createElement(Box15, null, /* @__PURE__ */ React16.createElement(Text15, { dimColor: true }, "You can now use B4M CLI with your account.")));
   }
-  return /* @__PURE__ */ React14.createElement(Box13, { flexDirection: "column", padding: 1, borderStyle: "round", borderColor: "cyan" }, /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1 }, /* @__PURE__ */ React14.createElement(Text13, { color: "cyan", bold: true }, "\u{1F510} Device Authorization")), /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1 }, /* @__PURE__ */ React14.createElement(Text13, null, "Opening browser automatically... If it doesn't open, please visit:")), /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1, paddingLeft: 2 }, /* @__PURE__ */ React14.createElement(Text13, { color: "blue", bold: true }, deviceFlow?.verification_uri)), /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1 }, /* @__PURE__ */ React14.createElement(Text13, null, "And enter this code when prompted:")), /* @__PURE__ */ React14.createElement(Box13, { marginBottom: 1, paddingLeft: 2 }, /* @__PURE__ */ React14.createElement(Text13, { color: "yellow", bold: true }, deviceFlow?.user_code)), /* @__PURE__ */ React14.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React14.createElement(Text13, { color: "cyan" }, /* @__PURE__ */ React14.createElement(Spinner2, { type: "dots" }), " ", statusMessage)), /* @__PURE__ */ React14.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React14.createElement(Text13, { dimColor: true }, "Expires in ", deviceFlow ? Math.floor(deviceFlow.expires_in / 60) : 0, " minutes")));
+  return /* @__PURE__ */ React16.createElement(Box15, { flexDirection: "column", padding: 1, borderStyle: "round", borderColor: "cyan" }, /* @__PURE__ */ React16.createElement(Box15, { marginBottom: 1 }, /* @__PURE__ */ React16.createElement(Text15, { color: "cyan", bold: true }, "\u{1F510} Device Authorization")), /* @__PURE__ */ React16.createElement(Box15, { marginBottom: 1 }, /* @__PURE__ */ React16.createElement(Text15, null, "Opening browser automatically... If it doesn't open, please visit:")), /* @__PURE__ */ React16.createElement(Box15, { marginBottom: 1, paddingLeft: 2 }, /* @__PURE__ */ React16.createElement(Text15, { color: "blue", bold: true }, deviceFlow?.verification_uri)), /* @__PURE__ */ React16.createElement(Box15, { marginBottom: 1 }, /* @__PURE__ */ React16.createElement(Text15, null, "And enter this code when prompted:")), /* @__PURE__ */ React16.createElement(Box15, { marginBottom: 1, paddingLeft: 2 }, /* @__PURE__ */ React16.createElement(Text15, { color: "yellow", bold: true }, deviceFlow?.user_code)), /* @__PURE__ */ React16.createElement(Box15, { marginTop: 1 }, /* @__PURE__ */ React16.createElement(Text15, { color: "cyan" }, /* @__PURE__ */ React16.createElement(Spinner2, { type: "dots" }), " ", statusMessage)), /* @__PURE__ */ React16.createElement(Box15, { marginTop: 1 }, /* @__PURE__ */ React16.createElement(Text15, { dimColor: true }, "Expires in ", deviceFlow ? Math.floor(deviceFlow.expires_in / 60) : 0, " minutes")));
 }
 
 // src/storage/SessionStore.ts
@@ -2625,10 +2720,9 @@ ${options.context}` : this.getSystemPrompt()
           content: query
         }
       ];
-      console.log("[DEBUG ReActAgent] Messages array being sent to LLM:");
       messages.forEach((msg, i) => {
         const content = typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content);
-        console.log(`  [${i}] ${msg.role}: ${content.substring(0, 150)}...`);
+        this.context.logger.debug(`  [${i}] ${msg.role}: ${content.substring(0, 150)}...`);
       });
       let finalAnswer = "";
       let reachedMaxIterations = false;
@@ -5021,8 +5115,8 @@ async function processAndStoreImages(images, context) {
     const buffer = await downloadImage(image);
     const fileType = await fileTypeFromBuffer2(buffer);
     const filename = `${uuidv45()}.${fileType?.ext}`;
-    const path13 = await context.imageGenerateStorage.upload(buffer, filename, {});
-    return path13;
+    const path15 = await context.imageGenerateStorage.upload(buffer, filename, {});
+    return path15;
   }));
 }
 async function updateQuestAndReturnMarkdown(storedImageUrls, context) {
@@ -6234,8 +6328,8 @@ async function processAndStoreImage(imageUrl, context) {
   const buffer = await downloadImage2(imageUrl);
   const fileType = await fileTypeFromBuffer3(buffer);
   const filename = `${uuidv46()}.${fileType?.ext}`;
-  const path13 = await context.imageGenerateStorage.upload(buffer, filename, {});
-  return path13;
+  const path15 = await context.imageGenerateStorage.upload(buffer, filename, {});
+  return path15;
 }
 async function updateQuestAndReturnMarkdown2(storedImagePath, context) {
   await context.onFinish?.("edit_image", storedImagePath);
@@ -8647,6 +8741,381 @@ var deleteFileTool = {
   })
 };
 
+// ../../b4m-core/packages/services/dist/src/llm/tools/implementation/bashExecute/index.js
+import { spawn } from "child_process";
+import path11 from "path";
+var DEFAULT_TIMEOUT_MS = 6e4;
+var MAX_OUTPUT_SIZE = 100 * 1024;
+var DANGEROUS_PATTERNS = [
+  // Destructive file operations
+  {
+    pattern: /\brm\s+(-[a-zA-Z]*r[a-zA-Z]*\s+|.*\s+-[a-zA-Z]*r).*\//i,
+    reason: "Recursive delete with path",
+    block: true
+  },
+  {
+    pattern: /\brm\s+(-[a-zA-Z]*f[a-zA-Z]*\s+|.*\s+-[a-zA-Z]*f).*--no-preserve-root/i,
+    reason: "Force delete without preserve root",
+    block: true
+  },
+  {
+    pattern: /\brm\s+-[a-zA-Z]*r[a-zA-Z]*f[a-zA-Z]*\s+\//i,
+    reason: "Recursive force delete on root paths",
+    block: true
+  },
+  {
+    pattern: /\brm\s+-[a-zA-Z]*f[a-zA-Z]*r[a-zA-Z]*\s+\//i,
+    reason: "Force recursive delete on root paths",
+    block: true
+  },
+  // System-level dangerous commands
+  { pattern: /\bsudo\b/i, reason: "Elevated privileges (sudo)", block: true },
+  { pattern: /\bsu\s+(-|root)/i, reason: "Switch to root user", block: true },
+  { pattern: /\bchmod\s+777\b/i, reason: "Overly permissive chmod", block: false },
+  { pattern: /\bchown\s+-R\s+root/i, reason: "Recursive chown to root", block: true },
+  // Disk/partition operations
+  { pattern: /\bmkfs\b/i, reason: "Filesystem creation", block: true },
+  { pattern: /\bfdisk\b/i, reason: "Disk partitioning", block: true },
+  { pattern: /\bdd\s+.*of=\/dev\//i, reason: "Direct disk write", block: true },
+  // Network attacks
+  { pattern: /\b(nc|netcat)\s+.*-e\s+\/bin\/(ba)?sh/i, reason: "Reverse shell attempt", block: true },
+  { pattern: /\bcurl\s+.*\|\s*(ba)?sh/i, reason: "Piping remote script to shell", block: true },
+  { pattern: /\bwget\s+.*\|\s*(ba)?sh/i, reason: "Piping remote script to shell", block: true },
+  // Fork bombs and resource exhaustion
+  { pattern: /:\(\)\s*\{\s*:\|:&\s*\}\s*;/i, reason: "Fork bomb", block: true },
+  { pattern: /\bwhile\s+true.*do.*done.*&/i, reason: "Infinite loop in background", block: false },
+  // Credential/sensitive data access
+  { pattern: /\/etc\/shadow/i, reason: "Access to shadow file", block: true },
+  { pattern: /\/etc\/passwd.*>/i, reason: "Modifying passwd file", block: true },
+  { pattern: /\baws\s+.*--profile\s+/i, reason: "AWS profile access", block: false },
+  // History/log manipulation
+  { pattern: /\bhistory\s+-c\b/i, reason: "Clearing shell history", block: false },
+  { pattern: />\s*\/var\/log\//i, reason: "Overwriting system logs", block: true },
+  // Dangerous redirects
+  { pattern: />\s*\/dev\/sda/i, reason: "Writing to block device", block: true },
+  { pattern: />\s*\/dev\/null.*2>&1.*</i, reason: "Potentially hiding output", block: false },
+  // Environment manipulation
+  { pattern: /\bexport\s+PATH\s*=\s*[^$]/i, reason: "Overwriting PATH", block: false },
+  { pattern: /\bexport\s+LD_PRELOAD/i, reason: "LD_PRELOAD manipulation", block: true },
+  // Process/system control
+  { pattern: /\bkill\s+-9\s+(-1|1)\b/i, reason: "Killing all processes", block: true },
+  { pattern: /\bkillall\s+-9\b/i, reason: "Force killing processes", block: false },
+  { pattern: /\bshutdown\b/i, reason: "System shutdown", block: true },
+  { pattern: /\breboot\b/i, reason: "System reboot", block: true },
+  { pattern: /\binit\s+[06]\b/i, reason: "System runlevel change", block: true }
+];
+var SAFE_COMMAND_PREFIXES = [
+  "ls",
+  "cat",
+  "head",
+  "tail",
+  "grep",
+  "find",
+  "echo",
+  "pwd",
+  "whoami",
+  "date",
+  "cal",
+  "wc",
+  "sort",
+  "uniq",
+  "cut",
+  "tr",
+  "sed",
+  "awk",
+  "git",
+  "npm",
+  "pnpm",
+  "yarn",
+  "node",
+  "npx",
+  "tsx",
+  "ts-node",
+  "python",
+  "python3",
+  "pip",
+  "pip3",
+  "docker",
+  "docker-compose",
+  "curl",
+  "wget",
+  // These are safe for fetching, blocked when piped to shell
+  "mkdir",
+  "touch",
+  "cp",
+  "mv",
+  // File operations (still require permission)
+  "which",
+  "whereis",
+  "type",
+  "file",
+  "stat",
+  "env",
+  "printenv",
+  "set",
+  "man",
+  "help",
+  "info",
+  "diff",
+  "comm",
+  "cmp",
+  "tar",
+  "zip",
+  "unzip",
+  "gzip",
+  "gunzip",
+  "ssh",
+  "scp",
+  "rsync",
+  // Network tools
+  "make",
+  "cmake",
+  "cargo",
+  "go",
+  "rustc",
+  "gcc",
+  "g++",
+  // Build tools
+  "jest",
+  "vitest",
+  "mocha",
+  "pytest",
+  // Test runners
+  "eslint",
+  "prettier",
+  "tsc"
+  // Linters/formatters
+];
+function checkDangerousPatterns(command) {
+  for (const { pattern, reason, block } of DANGEROUS_PATTERNS) {
+    if (pattern.test(command)) {
+      return { blocked: block, reason };
+    }
+  }
+  return { blocked: false };
+}
+function getBaseCommand(command) {
+  const trimmed = command.trim();
+  const match = trimmed.match(/^(\S+)/);
+  return match ? match[1] : "";
+}
+function isSafeCommandPrefix(command) {
+  const baseCommand = getBaseCommand(command);
+  return SAFE_COMMAND_PREFIXES.some((safe) => baseCommand === safe || baseCommand.endsWith(`/${safe}`));
+}
+async function executeBashCommand(params) {
+  const { command, cwd: relativeCwd, timeout = DEFAULT_TIMEOUT_MS } = params;
+  if (!command || command.trim().length === 0) {
+    return {
+      stdout: "",
+      stderr: "Error: Command cannot be empty",
+      exitCode: 1,
+      timedOut: false,
+      blocked: true,
+      blockedReason: "Empty command"
+    };
+  }
+  const dangerCheck = checkDangerousPatterns(command);
+  if (dangerCheck.blocked) {
+    return {
+      stdout: "",
+      stderr: `Command blocked for safety: ${dangerCheck.reason}`,
+      exitCode: 1,
+      timedOut: false,
+      blocked: true,
+      blockedReason: dangerCheck.reason
+    };
+  }
+  const baseCwd = process.cwd();
+  const targetCwd = relativeCwd ? path11.resolve(baseCwd, relativeCwd) : baseCwd;
+  const effectiveTimeout = Math.min(timeout, 5 * 60 * 1e3);
+  return new Promise((resolve3) => {
+    let stdout = "";
+    let stderr = "";
+    let timedOut = false;
+    const proc = spawn("bash", ["-c", command], {
+      cwd: targetCwd,
+      env: {
+        ...process.env,
+        // Prevent color codes that might be hard to read
+        NO_COLOR: "1",
+        FORCE_COLOR: "0"
+      },
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const timeoutId = setTimeout(() => {
+      timedOut = true;
+      proc.kill("SIGTERM");
+      setTimeout(() => {
+        if (!proc.killed) {
+          proc.kill("SIGKILL");
+        }
+      }, 5e3);
+    }, effectiveTimeout);
+    proc.stdout.on("data", (data) => {
+      if (stdout.length < MAX_OUTPUT_SIZE) {
+        stdout += data.toString();
+        if (stdout.length > MAX_OUTPUT_SIZE) {
+          stdout = stdout.slice(0, MAX_OUTPUT_SIZE) + "\n... [output truncated]";
+        }
+      }
+    });
+    proc.stderr.on("data", (data) => {
+      if (stderr.length < MAX_OUTPUT_SIZE) {
+        stderr += data.toString();
+        if (stderr.length > MAX_OUTPUT_SIZE) {
+          stderr = stderr.slice(0, MAX_OUTPUT_SIZE) + "\n... [output truncated]";
+        }
+      }
+    });
+    proc.on("close", (exitCode) => {
+      clearTimeout(timeoutId);
+      resolve3({
+        stdout: stdout.trim(),
+        stderr: stderr.trim(),
+        exitCode,
+        timedOut,
+        blocked: false
+      });
+    });
+    proc.on("error", (error) => {
+      clearTimeout(timeoutId);
+      resolve3({
+        stdout: "",
+        stderr: `Failed to execute command: ${error.message}`,
+        exitCode: 1,
+        timedOut: false,
+        blocked: false
+      });
+    });
+  });
+}
+function formatResult(result, command) {
+  const parts = [];
+  parts.push(`$ ${command}`);
+  parts.push("");
+  if (result.blocked) {
+    parts.push(`BLOCKED: ${result.blockedReason}`);
+    parts.push("");
+    parts.push("This command was blocked for safety reasons.");
+    parts.push("If you believe this is a false positive, please run the command manually.");
+    return parts.join("\n");
+  }
+  if (result.timedOut) {
+    parts.push("WARNING: Command timed out and was terminated.");
+    parts.push("");
+  }
+  if (result.stdout) {
+    parts.push(result.stdout);
+  }
+  if (result.stderr) {
+    if (result.stdout) {
+      parts.push("");
+    }
+    parts.push("STDERR:");
+    parts.push(result.stderr);
+  }
+  if (result.exitCode !== 0 && result.exitCode !== null) {
+    parts.push("");
+    parts.push(`Exit code: ${result.exitCode}`);
+  }
+  if (!result.stdout && !result.stderr && !result.timedOut) {
+    parts.push("(command completed with no output)");
+  }
+  return parts.join("\n");
+}
+var bashExecuteTool = {
+  name: "bash_execute",
+  implementation: (context) => ({
+    toolFn: async (value) => {
+      const params = value;
+      const isSafe = isSafeCommandPrefix(params.command);
+      context.logger.info("Bash: Executing command", {
+        command: params.command,
+        cwd: params.cwd || ".",
+        timeout: params.timeout || DEFAULT_TIMEOUT_MS,
+        isSafeCommand: isSafe
+      });
+      if (context.onStart) {
+        await context.onStart("bash_execute", {
+          command: params.command,
+          cwd: params.cwd
+        });
+      }
+      try {
+        const result = await executeBashCommand(params);
+        const formattedResult = formatResult(result, params.command);
+        context.logger.info("Bash: Command completed", {
+          exitCode: result.exitCode,
+          timedOut: result.timedOut,
+          blocked: result.blocked
+        });
+        if (context.onFinish) {
+          await context.onFinish("bash_execute", {
+            command: params.command,
+            exitCode: result.exitCode,
+            blocked: result.blocked
+          });
+        }
+        return formattedResult;
+      } catch (error) {
+        context.logger.error("Bash: Command failed", error);
+        if (context.onFinish) {
+          await context.onFinish("bash_execute", {
+            command: params.command,
+            error: error instanceof Error ? error.message : "Unknown error"
+          });
+        }
+        throw error;
+      }
+    },
+    toolSchema: {
+      name: "bash_execute",
+      description: `Execute a bash command in the terminal. Use this for running shell commands, scripts, build tools, git operations, and other CLI tasks.
+
+SAFETY NOTES:
+- Commands are executed in the current working directory (or specified cwd)
+- Dangerous commands (sudo, rm -rf /, etc.) are automatically blocked
+- Commands have a default timeout of 60 seconds (max 5 minutes)
+- Output is limited to prevent overwhelming responses
+- This tool ALWAYS requires user permission before execution
+
+COMMON USE CASES:
+- Running build commands: npm run build, make, cargo build
+- Git operations: git status, git log, git diff
+- Viewing system info: ls, pwd, cat, head, tail
+- Running tests: npm test, pytest, cargo test
+- Package management: npm install, pip install
+- File operations: mkdir, cp, mv (with permission)
+
+BLOCKED OPERATIONS:
+- sudo and privilege escalation
+- Recursive deletes on system paths
+- Direct disk operations
+- Fork bombs and resource exhaustion
+- Piping remote scripts to shell`,
+      parameters: {
+        type: "object",
+        properties: {
+          command: {
+            type: "string",
+            description: "The bash command to execute. Can include pipes, redirects, and chained commands."
+          },
+          cwd: {
+            type: "string",
+            description: "Working directory for the command (optional). Can be relative or absolute path. Defaults to current directory."
+          },
+          timeout: {
+            type: "number",
+            description: "Timeout in milliseconds (optional, default: 60000, max: 300000). Command will be terminated if it exceeds this time."
+          }
+        },
+        required: ["command"]
+      }
+    }
+  })
+};
+
 // ../../b4m-core/packages/services/dist/src/llm/tools/index.js
 var tools = {
   dice_roll: diceRollTool,
@@ -8674,7 +9143,9 @@ var tools = {
   create_file: createFileTool,
   glob_files: globFilesTool,
   grep_search: grepSearchTool,
-  delete_file: deleteFileTool
+  delete_file: deleteFileTool,
+  // Shell execution
+  bash_execute: bashExecuteTool
 };
 var generateTools = (userId, user, logger2, { db }, storage, imageGenerateStorage, statusUpdate, onStart, onFinish, llm, config, model) => {
   const context = {
@@ -8949,7 +9420,7 @@ async function generateFileDeletePreview(args) {
     if (!existsSync7(args.path)) {
       return `[File does not exist: ${args.path}]`;
     }
-    const stats = await import("fs/promises").then((fs11) => fs11.stat(args.path));
+    const stats = await import("fs/promises").then((fs12) => fs12.stat(args.path));
     return `[File will be deleted]
 
 Path: ${args.path}
@@ -8962,7 +9433,7 @@ Last modified: ${stats.mtime.toLocaleString()}`;
 
 // src/utils/Logger.ts
 import fs10 from "fs/promises";
-import path11 from "path";
+import path12 from "path";
 import os from "os";
 var Logger2 = class _Logger {
   constructor() {
@@ -8985,9 +9456,9 @@ var Logger2 = class _Logger {
    */
   async initialize(sessionId) {
     this.sessionId = sessionId;
-    const debugDir = path11.join(os.homedir(), ".bike4mind", "debug");
+    const debugDir = path12.join(os.homedir(), ".bike4mind", "debug");
     await fs10.mkdir(debugDir, { recursive: true });
-    this.logFilePath = path11.join(debugDir, `${sessionId}.txt`);
+    this.logFilePath = path12.join(debugDir, `${sessionId}.txt`);
     await this.writeToFile("INFO", "=== CLI SESSION START ===");
   }
   /**
@@ -9197,12 +9668,12 @@ var Logger2 = class _Logger {
   async cleanupOldLogs() {
     if (!this.fileLoggingEnabled) return;
     try {
-      const debugDir = path11.join(os.homedir(), ".bike4mind", "debug");
+      const debugDir = path12.join(os.homedir(), ".bike4mind", "debug");
       const files = await fs10.readdir(debugDir);
       const now = Date.now();
       const thirtyDaysAgo = now - 30 * 24 * 60 * 60 * 1e3;
       for (const file of files) {
-        const filePath = path11.join(debugDir, file);
+        const filePath = path12.join(debugDir, file);
         const stats = await fs10.stat(filePath);
         if (stats.mtime.getTime() < thirtyDaysAgo) {
           await fs10.unlink(filePath);
@@ -9267,7 +9738,8 @@ var LOCAL_TOOLS = [
   "edit_file",
   "dice_roll",
   "math_evaluate",
-  "current_datetime"
+  "current_datetime",
+  "bash_execute"
 ];
 function isServerTool(toolName) {
   return SERVER_TOOLS.includes(toolName);
@@ -9297,21 +9769,21 @@ var NoOpStorage = class extends BaseStorage {
   async upload(input, destination, options) {
     return `/tmp/${destination}`;
   }
-  async download(path13) {
+  async download(path15) {
     throw new Error("Download not supported in CLI");
   }
-  async delete(path13) {
+  async delete(path15) {
   }
-  async getSignedUrl(path13) {
-    return `/tmp/${path13}`;
+  async getSignedUrl(path15) {
+    return `/tmp/${path15}`;
   }
-  getPublicUrl(path13) {
-    return `/tmp/${path13}`;
+  getPublicUrl(path15) {
+    return `/tmp/${path15}`;
   }
-  async getPreview(path13) {
-    return `/tmp/${path13}`;
+  async getPreview(path15) {
+    return `/tmp/${path15}`;
   }
-  async getMetadata(path13) {
+  async getMetadata(path15) {
     return { size: 0, contentType: "application/octet-stream" };
   }
 };
@@ -9369,6 +9841,10 @@ function wrapToolWithPermission(tool, permissionManager, showPermissionPrompt, a
         } catch (error) {
           preview = `[Could not generate preview: ${error instanceof Error ? error.message : "Unknown error"}]`;
         }
+      } else if (toolName === "bash_execute" && args?.command) {
+        const cwd = args.cwd ? ` (in ${args.cwd})` : "";
+        const timeout = args.timeout ? ` [timeout: ${args.timeout}ms]` : "";
+        preview = `$ ${args.command}${cwd}${timeout}`;
       }
       const response = await showPermissionPrompt(toolName, args, preview);
       if (response.action === "deny") {
@@ -9439,6 +9915,8 @@ function generateCliTools(userId, llm, model, permissionManager, showPermissionP
     glob_files: {},
     grep_search: {},
     delete_file: {},
+    // Shell execution (always requires permission)
+    bash_execute: {},
     // Server-side tools (executed via /api/ai/v1/tools Lambda)
     // Routed by ToolRouter to use B4M company API keys
     weather_info: {},
@@ -9504,6 +9982,7 @@ var DEFAULT_TOOL_CATEGORIES = {
   create_file: "prompt_always",
   delete_file: "prompt_always",
   shell_execute: "prompt_always",
+  bash_execute: "prompt_always",
   git_commit: "prompt_always",
   git_push: "prompt_always",
   // ===== PROMPT DEFAULT (Repository read tools) =====
@@ -9665,10 +10144,122 @@ function getEnvironmentName(configApiConfig) {
   return "Bike4Mind";
 }
 
+// src/utils/contextLoader.ts
+import * as fs11 from "fs";
+import * as path13 from "path";
+import { homedir as homedir4 } from "os";
+var CONTEXT_FILE_SIZE_LIMIT = 100 * 1024;
+var PROJECT_CONTEXT_FILES = [
+  "CLAUDE.local.md",
+  // gitignored, highest priority
+  "CLAUDE.md",
+  "AGENTS.md",
+  // cross-tool standard
+  "AI.local.md",
+  // gitignored
+  "AI.md",
+  "INSTRUCTIONS.md"
+];
+var GLOBAL_CONTEXT_FILES = ["AI.local.md", "AI.md"];
+function formatFileSize2(bytes) {
+  if (bytes < 1024) return `${bytes}B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+}
+function tryReadContextFile(dir, filename, source) {
+  const filePath = path13.join(dir, filename);
+  try {
+    const stats = fs11.lstatSync(filePath);
+    if (stats.isDirectory()) {
+      return null;
+    }
+    if (stats.isSymbolicLink()) {
+      return {
+        error: `${source === "global" ? "Global" : "Project"} ${filename} is a symlink (not allowed for security)`
+      };
+    }
+    if (stats.size > CONTEXT_FILE_SIZE_LIMIT) {
+      return {
+        error: `${source === "global" ? "Global" : "Project"} ${filename} exceeds 100KB limit (${formatFileSize2(stats.size)})`
+      };
+    }
+    const content = fs11.readFileSync(filePath, "utf-8");
+    return {
+      filename,
+      content,
+      source,
+      path: filePath
+    };
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      return null;
+    }
+    if (err.code === "EACCES") {
+      return {
+        error: `Cannot read ${source} ${filename}: permission denied`
+      };
+    }
+    return {
+      error: `Cannot read ${source} ${filename}: ${err instanceof Error ? err.message : "Unknown error"}`
+    };
+  }
+}
+function findContextFile(dir, candidates, source) {
+  for (const filename of candidates) {
+    const result = tryReadContextFile(dir, filename, source);
+    if (result === null) {
+      continue;
+    }
+    if ("error" in result) {
+      return { result: null, error: result.error };
+    }
+    return { result, error: null };
+  }
+  return { result: null, error: null };
+}
+function mergeContextContent(global, project) {
+  if (global && project) {
+    return `${global.content}
+
+---
+
+${project.content}`;
+  }
+  if (global) {
+    return global.content;
+  }
+  if (project) {
+    return project.content;
+  }
+  return "";
+}
+async function loadContextFiles(projectDir) {
+  const errors = [];
+  const globalDir = path13.join(homedir4(), ".bike4mind");
+  const projectDirectory = projectDir || process.cwd();
+  const [globalResult, projectResult] = await Promise.all([
+    Promise.resolve(findContextFile(globalDir, GLOBAL_CONTEXT_FILES, "global")),
+    Promise.resolve(findContextFile(projectDirectory, PROJECT_CONTEXT_FILES, "project"))
+  ]);
+  if (globalResult.error) {
+    errors.push(globalResult.error);
+  }
+  if (projectResult.error) {
+    errors.push(projectResult.error);
+  }
+  const mergedContent = mergeContextContent(globalResult.result, projectResult.result);
+  return {
+    globalContext: globalResult.result,
+    projectContext: projectResult.result,
+    mergedContent,
+    errors
+  };
+}
+
 // ../../b4m-core/packages/mcp/dist/src/client.js
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { Client as Client2 } from "@modelcontextprotocol/sdk/client/index.js";
-import path12 from "path";
+import path14 from "path";
 import { existsSync as existsSync8, readdirSync as readdirSync3 } from "fs";
 var MCPClient = class {
   // Note: This class handles MCP server communication with repository filtering
@@ -9709,16 +10300,16 @@ var MCPClient = class {
         const root = process.env.INIT_CWD || process.cwd();
         const candidatePaths = [
           // When running from SST Lambda with node_modules structure (copyFiles)
-          path12.join(root, `node_modules/@bike4mind/mcp/dist/src/${this.serverName}/index.js`),
+          path14.join(root, `node_modules/@bike4mind/mcp/dist/src/${this.serverName}/index.js`),
           // When running from SST Lambda deployed environment (/var/task)
-          path12.join(root, `b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          path14.join(root, `b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
           // When running from SST Lambda (.sst/artifacts/mcpHandler-dev), navigate to monorepo root (3 levels up)
-          path12.join(root, `../../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          path14.join(root, `../../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
           // When running from packages/client (Next.js app), navigate to monorepo root (2 levels up)
-          path12.join(root, `../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          path14.join(root, `../../b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
           // Original paths (backward compatibility)
-          path12.join(root, `/b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
-          path12.join(root, "core", "mcp", "servers", this.serverName, "dist", "index.js")
+          path14.join(root, `/b4m-core/packages/mcp/dist/src/${this.serverName}/index.js`),
+          path14.join(root, "core", "mcp", "servers", this.serverName, "dist", "index.js")
         ];
         const serverScriptPath = candidatePaths.find((p) => existsSync8(p));
         if (!serverScriptPath) {
@@ -10522,7 +11113,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.8-fix-cli-type-error.17148+5ef98d7d2",
+  version: "0.2.10-fix-b4m-cli-flicker.17230+316343590",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -10577,7 +11168,7 @@ var package_default = {
     "@google/generative-ai": "^0.21.0",
     "@joplin/turndown-plugin-gfm": "^1.0.62",
     "@mendable/firecrawl-js": "^1.29.3",
-    "@modelcontextprotocol/sdk": "^1.7.0",
+    "@modelcontextprotocol/sdk": "1.20.1",
     "@octokit/rest": "^22.0.0",
     "@opensearch-project/opensearch": "2.11.0",
     "async-mutex": "^0.5.0",
@@ -10625,11 +11216,11 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.38.2-fix-cli-type-error.17148+5ef98d7d2",
-    "@bike4mind/mcp": "1.20.2-fix-cli-type-error.17148+5ef98d7d2",
-    "@bike4mind/services": "2.33.2-fix-cli-type-error.17148+5ef98d7d2",
-    "@bike4mind/utils": "2.1.3-fix-cli-type-error.17148+5ef98d7d2",
-    "@types/better-sqlite3": "^7.6.12",
+    "@bike4mind/common": "2.39.1-fix-b4m-cli-flicker.17230+316343590",
+    "@bike4mind/mcp": "1.20.4-fix-b4m-cli-flicker.17230+316343590",
+    "@bike4mind/services": "2.34.2-fix-b4m-cli-flicker.17230+316343590",
+    "@bike4mind/utils": "2.1.4-fix-b4m-cli-flicker.17230+316343590",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
     "@types/node": "^22.9.0",
@@ -10641,7 +11232,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "5ef98d7d29cde0f6125959fe3a2acc3c5d7f40e6"
+  gitHead: "316343590be145ba6cfa891271ed491b27f9c7d0"
 };
 
 // src/config/constants.ts
@@ -10663,7 +11254,7 @@ var usageCache = null;
 function CliApp() {
   const { exit } = useApp();
   const imageRenderer = new ImageRenderer();
-  const [state, setState] = useState6({
+  const [state, setState] = useState7({
     session: null,
     sessionStore: new SessionStore(),
     configStore: new ConfigStore(),
@@ -10677,11 +11268,12 @@ function CliApp() {
     permissionManager: null,
     permissionPrompt: null,
     trustLocationSelector: null,
-    rewindSelector: null
+    rewindSelector: null,
+    sessionSelector: null
   });
-  const [isInitialized, setIsInitialized] = useState6(false);
-  const [initError, setInitError] = useState6(null);
-  const [commandHistory, setCommandHistory] = useState6([]);
+  const [isInitialized, setIsInitialized] = useState7(false);
+  const [initError, setInitError] = useState7(null);
+  const [commandHistory, setCommandHistory] = useState7([]);
   const imageStoreInitPromise = useRef(null);
   const setStoreSession = useCliStore((state2) => state2.setSession);
   const setPermissionPrompt = useCliStore((state2) => state2.setPermissionPrompt);
@@ -10722,7 +11314,7 @@ function CliApp() {
       process.exit(0);
     }, 100);
   }, [state.session, state.sessionStore, state.mcpManager, state.agent, state.imageStore]);
-  useInput5((input, key) => {
+  useInput6((input, key) => {
     if (key.ctrl && input === "c") {
       const now = Date.now();
       if (exitTimestamp && now - exitTimestamp < EXIT_TIMEOUT_MS) {
@@ -10892,6 +11484,24 @@ function CliApp() {
       }
       const allTools = [...b4mTools, ...mcpTools];
       console.log(`\u2705 Total: ${allTools.length} tool(s) available`);
+      const projectDir = state.configStore.getProjectConfigDir();
+      const contextResult = await loadContextFiles(projectDir);
+      if (contextResult.globalContext) {
+        console.log(`\u{1F4C4} Global context: ${contextResult.globalContext.filename}`);
+      }
+      if (contextResult.projectContext) {
+        console.log(`\u{1F4C4} Project context: ${contextResult.projectContext.filename}`);
+      }
+      for (const error of contextResult.errors) {
+        console.log(`\u26A0\uFE0F  Context file error: ${error}`);
+      }
+      const contextSection = contextResult.mergedContent ? `
+
+## Project Context
+
+Follow these project-specific instructions:
+
+${contextResult.mergedContent}` : "";
       const cliSystemPrompt = `You are an autonomous AI assistant with access to tools. Your job is to help users by taking action and solving problems proactively.
 
 CORE BEHAVIOR:
@@ -10921,7 +11531,7 @@ EXAMPLES:
 - "enhance README" \u2192 file_read \u2192 generate \u2192 create_file
 - "what packages installed?" \u2192 glob_files "**/package.json" \u2192 file_read
 
-Remember: Use context from previous messages to understand follow-up questions.`;
+Remember: Use context from previous messages to understand follow-up questions.${contextSection}`;
       const maxIterations = config.preferences.maxIterations === null ? 999999 : config.preferences.maxIterations;
       const agent = new ReActAgent({
         userId: config.userId,
@@ -10976,6 +11586,22 @@ Remember: Use context from previous messages to understand follow-up questions.`
       console.log("\u{1F4A1} Run /login to authenticate with your B4M account.\n");
       return;
     }
+    const currentSteps = [];
+    const stepHandler = (step) => {
+      currentSteps.push(step);
+      const { pendingMessages, updatePendingMessage } = useCliStore.getState();
+      const lastIdx = pendingMessages.length - 1;
+      if (lastIdx >= 0 && pendingMessages[lastIdx].role === "assistant") {
+        updatePendingMessage(lastIdx, {
+          ...pendingMessages[lastIdx],
+          metadata: {
+            ...pendingMessages[lastIdx].metadata,
+            steps: [...currentSteps]
+          }
+        });
+      }
+    };
+    state.agent.on("action", stepHandler);
     try {
       let messageContent = message;
       let userMessageContent = message;
@@ -10989,6 +11615,22 @@ Remember: Use context from previous messages to understand follow-up questions.`
         content: userMessageContent,
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       };
+      const pendingAssistantMessage = {
+        role: "assistant",
+        content: "...",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        metadata: {
+          steps: []
+        }
+      };
+      const sessionWithUserMessage = {
+        ...state.session,
+        messages: [...state.session.messages, userMessage],
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      setState((prev) => ({ ...prev, session: sessionWithUserMessage }));
+      setStoreSession(sessionWithUserMessage);
+      useCliStore.getState().addPendingMessage(pendingAssistantMessage);
       const recentMessages = state.session.messages.slice(-20);
       const previousMessages = recentMessages.filter((msg) => msg.role === "user" || msg.role === "assistant").map((msg) => ({
         role: msg.role,
@@ -11002,37 +11644,37 @@ Remember: Use context from previous messages to understand follow-up questions.`
         console.log("\n\u26A0\uFE0F  Action denied by user\n");
       }
       const successfulToolCalls = result.steps.filter((s) => s.type === "observation").length;
-      const assistantMessage = {
+      const finalAssistantMessage = {
         role: "assistant",
         content: result.finalAnswer,
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        timestamp: pendingAssistantMessage.timestamp,
         metadata: {
           tokenUsage: {
             prompt: 0,
-            // TODO: Extract from result
             completion: 0,
             total: result.completionInfo.totalTokens
           },
           steps: result.steps,
           // Complete history: thoughts, actions, observations
           permissionDenied
-          // Mark if this ended due to permission denial
         }
       };
+      useCliStore.getState().completePendingMessage(0, finalAssistantMessage);
+      const currentSession = useCliStore.getState().session;
+      if (!currentSession) return;
       const updatedSession = {
-        ...state.session,
-        messages: [...state.session.messages, userMessage, assistantMessage],
-        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        ...currentSession,
         metadata: {
-          ...state.session.metadata,
-          totalTokens: state.session.metadata.totalTokens + result.completionInfo.totalTokens,
-          toolCallCount: state.session.metadata.toolCallCount + successfulToolCalls
+          ...currentSession.metadata,
+          totalTokens: currentSession.metadata.totalTokens + result.completionInfo.totalTokens,
+          toolCallCount: currentSession.metadata.toolCallCount + successfulToolCalls
         }
       };
       setState((prev) => ({ ...prev, session: updatedSession }));
       setStoreSession(updatedSession);
       await state.sessionStore.save(updatedSession);
     } catch (error) {
+      useCliStore.getState().clearPendingMessages();
       if (error instanceof Error) {
         if (error.message.includes("Authentication failed") || error.message.includes("Authentication expired")) {
           console.log("\n\u274C Authentication failed");
@@ -11041,6 +11683,8 @@ Remember: Use context from previous messages to understand follow-up questions.`
         }
       }
       console.error("Error processing message:", error);
+    } finally {
+      state.agent.off("action", stepHandler);
     }
   };
   const handleImageDetected = async (imageData) => {
@@ -11143,15 +11787,45 @@ Project Configuration:
         await state.sessionStore.save(state.session);
         console.log(`\u2705 Session saved as "${sessionName}"`);
         break;
-      case "sessions":
+      case "sessions": {
         const sessions = await state.sessionStore.list();
-        console.log("\n\u{1F4DA} Saved Sessions:\n");
-        sessions.forEach((s, i) => {
-          console.log(`${i + 1}. ${s.name} (${s.messages.length} messages)`);
-          console.log(`   Last updated: ${new Date(s.updatedAt).toLocaleString()}`);
-        });
-        console.log("");
+        if (sessions.length === 0) {
+          console.log("\n\u{1F4DA} No saved sessions found.");
+          console.log("\u{1F4A1} Use /save <name> to save your current session.\n");
+          break;
+        }
+        const handleSessionSelect = async (selectedSession) => {
+          setState((prev) => ({ ...prev, sessionSelector: null }));
+          if (!selectedSession) {
+            console.log("\u274C Session selection cancelled");
+            return;
+          }
+          const loadedSession = await state.sessionStore.load(selectedSession.id);
+          if (!loadedSession) {
+            console.log(`\u274C Failed to load session: ${selectedSession.name}`);
+            console.log("   The session file may be corrupted or deleted.");
+            return;
+          }
+          await logger.initialize(loadedSession.id);
+          logger.debug("=== Session Resumed ===");
+          setState((prev) => ({ ...prev, session: loadedSession }));
+          setStoreSession(loadedSession);
+          useCliStore.getState().clearAgentSteps();
+          useCliStore.getState().clearPendingMessages();
+          usageCache = null;
+          console.log(`
+\u2705 Session resumed: "${loadedSession.name}"`);
+          console.log(
+            `\u{1F4DD} ${loadedSession.messages.length} messages | \u{1F916} ${loadedSession.model} | \u{1F4CA} ${loadedSession.metadata.totalTokens.toLocaleString()} tokens
+`
+          );
+        };
+        setState((prev) => ({
+          ...prev,
+          sessionSelector: { sessions, resolve: handleSessionSelect }
+        }));
         break;
+      }
       case "config": {
         setShowConfigEditor(true);
         break;
@@ -11373,6 +12047,7 @@ Project Configuration:
         setState((prev) => ({ ...prev, session: newSession }));
         setStoreSession(newSession);
         useCliStore.getState().clearAgentSteps();
+        useCliStore.getState().clearPendingMessages();
         usageCache = null;
         console.log("New session started.");
         console.log(`
@@ -11425,6 +12100,7 @@ Project Configuration:
             prefillInput: prefillContent
           }));
           setStoreSession(rewindedSession);
+          useCliStore.getState().clearPendingMessages();
           await state.sessionStore.save(rewindedSession);
           console.log("\u2705 Conversation rewound successfully");
           console.log(`\u{1F4CA} Current state: ${rewindedMessages.length} messages, ${newMetadata.totalTokens} tokens`);
@@ -11592,12 +12268,12 @@ No usage data available for the last ${USAGE_DAYS} days.`);
     setState((prev) => ({ ...prev, config: updatedConfig }));
   };
   if (initError) {
-    return /* @__PURE__ */ React15.createElement(Box14, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React15.createElement(Text14, { color: "red", bold: true }, "\u274C Initialization Error"), /* @__PURE__ */ React15.createElement(Text14, null, initError), /* @__PURE__ */ React15.createElement(Text14, { dimColor: true }, "\n", "Tip: Run /config to set up your API keys"));
+    return /* @__PURE__ */ React17.createElement(Box16, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React17.createElement(Text16, { color: "red", bold: true }, "\u274C Initialization Error"), /* @__PURE__ */ React17.createElement(Text16, null, initError), /* @__PURE__ */ React17.createElement(Text16, { dimColor: true }, "\n", "Tip: Run /config to set up your API keys"));
   }
   if (state.trustLocationSelector) {
     const projectDir = state.configStore.getProjectConfigDir();
     const inProject = projectDir !== null;
-    return /* @__PURE__ */ React15.createElement(
+    return /* @__PURE__ */ React17.createElement(
       TrustLocationSelector,
       {
         inProject,
@@ -11615,7 +12291,7 @@ No usage data available for the last ${USAGE_DAYS} days.`);
     );
   }
   if (state.rewindSelector && state.session) {
-    return /* @__PURE__ */ React15.createElement(
+    return /* @__PURE__ */ React17.createElement(
       RewindSelector,
       {
         messages: state.session.messages,
@@ -11632,9 +12308,28 @@ No usage data available for the last ${USAGE_DAYS} days.`);
       }
     );
   }
+  if (state.sessionSelector) {
+    return /* @__PURE__ */ React17.createElement(
+      SessionSelector,
+      {
+        sessions: state.sessionSelector.sessions,
+        currentSession: state.session,
+        onSelect: (session) => {
+          if (state.sessionSelector) {
+            state.sessionSelector.resolve(session);
+          }
+        },
+        onCancel: () => {
+          if (state.sessionSelector) {
+            state.sessionSelector.resolve(null);
+          }
+        }
+      }
+    );
+  }
   if (state.showLoginFlow) {
     const loginApiUrl = getApiUrl(state.config?.apiConfig);
-    return /* @__PURE__ */ React15.createElement(
+    return /* @__PURE__ */ React17.createElement(
       LoginFlow,
       {
         apiUrl: loginApiUrl,
@@ -11657,9 +12352,9 @@ No usage data available for the last ${USAGE_DAYS} days.`);
     );
   }
   if (!isInitialized) {
-    return /* @__PURE__ */ React15.createElement(Box14, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React15.createElement(Text14, null, "\u{1F680} Initializing..."));
+    return /* @__PURE__ */ React17.createElement(Box16, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React17.createElement(Text16, null, "\u{1F680} Initializing..."));
   }
-  return /* @__PURE__ */ React15.createElement(
+  return /* @__PURE__ */ React17.createElement(
     App,
     {
       onMessage: handleMessage,
@@ -11698,6 +12393,6 @@ var isDevMode = import.meta.url.includes("/src/") || process.env.NODE_ENV === "d
 if (isDevMode) {
   console.log("\u{1F527} Running in development mode (using TypeScript source)\n");
 }
-render(/* @__PURE__ */ React15.createElement(CliApp, null), {
+render(/* @__PURE__ */ React17.createElement(CliApp, null), {
   exitOnCtrlC: false
 });