@bike4mind/cli 0.2.8-feat-cli-session-resume.17148 → 0.2.10-cli-fix-model-change.17240

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,20 @@ import {
   XAI_IMAGE_MODELS,
   b4mLLMTools,
   getMcpProviderMetadata
-} from "./chunk-H6SHASMZ.js";
+} from "./chunk-DJPXSSP4.js";
 import {
   __require
 } from "./chunk-PDX44BCA.js";
 
 // src/index.tsx
-import React16, { useState as useState7, useEffect as useEffect3, useCallback, useRef } from "react";
+import React16, { useState as useState8, useEffect as useEffect3, useCallback, useRef } from "react";
 import { render, Box as Box15, Text as Text15, useApp, useInput as useInput6 } from "ink";
+import { execSync } from "child_process";
 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 React10, { useState as useState4 } from "react";
+import { Box as Box9, Text as Text9 } from "ink";
 
 // src/components/StatusBar.tsx
 import React from "react";
@@ -732,16 +733,19 @@ function findAtTrigger(value) {
 }
 function InputPrompt({
   onSubmit,
+  onBashCommand,
   onImageDetected,
   disabled = false,
   history = [],
   prefillInput,
-  onPrefillConsumed
+  onPrefillConsumed,
+  onBashModeChange
 }) {
   const [value, setValue] = useState2("");
   const [selectedIndex, setSelectedIndex] = useState2(0);
   const [historyIndex, setHistoryIndex] = useState2(-1);
   const [tempInput, setTempInput] = useState2("");
+  const [inputKey, setInputKey] = useState2(0);
   useEffect(() => {
     if (prefillInput) {
       setValue(prefillInput);
@@ -750,6 +754,10 @@ function InputPrompt({
   }, [prefillInput, onPrefillConsumed]);
   const [fileAutocomplete, setFileAutocomplete] = useState2(null);
   const [fileSelectedIndex, setFileSelectedIndex] = useState2(0);
+  const isBashMode = value.startsWith("!");
+  useEffect(() => {
+    onBashModeChange?.(isBashMode);
+  }, [isBashMode, onBashModeChange]);
   const shouldShowCommandAutocomplete = value.startsWith("/") && !disabled && !fileAutocomplete?.active;
   const commandQuery = shouldShowCommandAutocomplete ? value.slice(1) : "";
   const filteredCommands = useMemo(() => {
@@ -856,6 +864,16 @@ function InputPrompt({
       onSubmit(commandText);
       return;
     }
+    if (isBashMode && onBashCommand) {
+      const command = input.slice(1).trim();
+      if (command) {
+        onBashCommand(command);
+        setValue("");
+        setHistoryIndex(-1);
+        setFileAutocomplete(null);
+      }
+      return;
+    }
     onSubmit(input);
     setValue("");
     setHistoryIndex(-1);
@@ -886,13 +904,19 @@ function InputPrompt({
       setFileAutocomplete(null);
     }
   };
-  return /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column" }, /* @__PURE__ */ React5.createElement(Box4, null, /* @__PURE__ */ React5.createElement(Text5, { bold: true, color: "cyan" }, "> "), /* @__PURE__ */ React5.createElement(
+  const getPlaceholder = () => {
+    if (disabled) return "Thinking...";
+    if (isBashMode) return "Enter shell command to execute...";
+    return "Type your message, /help for commands, @file to reference, or ! for bash";
+  };
+  return /* @__PURE__ */ React5.createElement(Box4, { flexDirection: "column" }, /* @__PURE__ */ React5.createElement(Box4, null, /* @__PURE__ */ React5.createElement(Text5, { bold: true, color: isBashMode ? "yellow" : "cyan" }, isBashMode ? "$ " : "> "), /* @__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: getPlaceholder(),
       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 +940,16 @@ var useCliStore = create((set) => ({
   // Session state
   session: null,
   setSession: (session) => set({ session }),
+  addMessage: (message) => set((state) => {
+    if (!state.session) return state;
+    return {
+      session: {
+        ...state.session,
+        messages: [...state.session.messages, message],
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      }
+    };
+  }),
   // UI state
   isThinking: false,
   setIsThinking: (thinking) => set({ isThinking: thinking }),
@@ -923,6 +957,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 +977,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
@@ -1332,6 +1367,7 @@ function hasFileReferences(message) {
 function App({
   onMessage,
   onCommand,
+  onBashCommand,
   onPermissionResponse,
   onImageDetected,
   commandHistory = [],
@@ -1351,6 +1387,7 @@ function App({
   const setShowConfigEditor = useCliStore((state) => state.setShowConfigEditor);
   const exitRequested = useCliStore((state) => state.exitRequested);
   const setIsThinking = useCliStore((state) => state.setIsThinking);
+  const [isBashMode, setIsBashMode] = useState4(false);
   const handleSubmit = React10.useCallback(
     async (input) => {
       const trimmed = input.trim();
@@ -1397,20 +1434,23 @@ ${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__ */ React10.createElement(React10.Fragment, null, /* @__PURE__ */ React10.createElement(Box9, { flexDirection: "column" }, messages.map((message, index) => /* @__PURE__ */ React10.createElement(Box9, { key: `${message.timestamp}-${message.role}-${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: isBashMode ? "yellow" : "cyan", paddingX: 1 }, /* @__PURE__ */ React10.createElement(
     InputPrompt,
     {
       onSubmit: handleSubmit,
+      onBashCommand,
       onImageDetected,
       disabled: isThinking,
       history: commandHistory,
       prefillInput,
-      onPrefillConsumed
+      onPrefillConsumed,
+      onBashModeChange: setIsBashMode
     }
   ))));
 }
 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) => {
+  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 ? "..." : ""}`));
     }
@@ -1422,7 +1462,7 @@ function MessageItem({ message }) {
       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`)));
+  }).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/components/MessageList.tsx
@@ -1498,12 +1538,12 @@ function TrustLocationSelector({ inProject, onSelect, onCancel }) {
 }
 
 // src/components/RewindSelector.tsx
-import React13, { useState as useState4 } from "react";
+import React13, { useState as useState5 } from "react";
 import { Box as Box12, Text as Text12, useInput as useInput4 } from "ink";
 import SelectInput3 from "ink-select-input";
 function RewindSelector({ messages, onSelect, onCancel }) {
-  const [step, setStep] = useState4("selection");
-  const [selectedMessageIndex, setSelectedMessageIndex] = useState4(null);
+  const [step, setStep] = useState5("selection");
+  const [selectedMessageIndex, setSelectedMessageIndex] = useState5(null);
   useInput4((input, key) => {
     if (key.escape) {
       if (step === "confirmation") {
@@ -1567,12 +1607,12 @@ function RewindSelector({ messages, onSelect, onCancel }) {
 }
 
 // src/components/SessionSelector.tsx
-import React14, { useState as useState5 } from "react";
+import React14, { useState as useState6 } from "react";
 import { Box as Box13, Text as Text13, 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);
+  const [step, setStep] = useState6("selection");
+  const [selectedSession, setSelectedSession] = useState6(null);
   useInput5((input, key) => {
     if (key.escape) {
       if (step === "confirmation") {
@@ -1630,7 +1670,7 @@ function SessionSelector({ sessions, currentSession, onSelect, onCancel }) {
 }
 
 // src/components/LoginFlow.tsx
-import React15, { useState as useState6, useEffect as useEffect2 } from "react";
+import React15, { useState as useState7, useEffect as useEffect2 } from "react";
 import { Box as Box14, Text as Text14 } from "ink";
 import Spinner2 from "ink-spinner";
 import jwt from "jsonwebtoken";
@@ -1747,10 +1787,10 @@ var OAuthClient = class {
 
 // src/components/LoginFlow.tsx
 function LoginFlow({ apiUrl = "http://localhost:3000", configStore, onSuccess, onError }) {
-  const [status, setStatus] = useState6("initiating");
-  const [deviceFlow, setDeviceFlow] = useState6(null);
-  const [statusMessage, setStatusMessage] = useState6("Initiating device authorization...");
-  const [error, setError] = useState6(null);
+  const [status, setStatus] = useState7("initiating");
+  const [deviceFlow, setDeviceFlow] = useState7(null);
+  const [statusMessage, setStatusMessage] = useState7("Initiating device authorization...");
+  const [error, setError] = useState7(null);
   useEffect2(() => {
     const runLoginFlow = async () => {
       const oauth = new OAuthClient(apiUrl);
@@ -2688,10 +2728,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;
@@ -5084,8 +5123,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) {
@@ -6297,8 +6336,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);
@@ -8710,6 +8749,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,
@@ -8737,7 +9151,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 = {
@@ -9012,7 +9428,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}
@@ -9025,7 +9441,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() {
@@ -9048,9 +9464,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 ===");
   }
   /**
@@ -9260,12 +9676,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);
@@ -9330,7 +9746,8 @@ var LOCAL_TOOLS = [
   "edit_file",
   "dice_roll",
   "math_evaluate",
-  "current_datetime"
+  "current_datetime",
+  "bash_execute"
 ];
 function isServerTool(toolName) {
   return SERVER_TOOLS.includes(toolName);
@@ -9360,21 +9777,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" };
   }
 };
@@ -9432,6 +9849,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") {
@@ -9502,6 +9923,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: {},
@@ -9567,6 +9990,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) =====
@@ -9728,10 +10152,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
@@ -9772,16 +10308,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) {
@@ -10585,7 +11121,7 @@ import { isAxiosError as isAxiosError2 } from "axios";
 // package.json
 var package_default = {
   name: "@bike4mind/cli",
-  version: "0.2.8-feat-cli-session-resume.17148+30840381b",
+  version: "0.2.10-cli-fix-model-change.17240+efd37dd24",
   type: "module",
   description: "Interactive CLI tool for Bike4Mind with ReAct agents",
   license: "UNLICENSED",
@@ -10640,7 +11176,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",
@@ -10688,11 +11224,11 @@ var package_default = {
   },
   devDependencies: {
     "@bike4mind/agents": "0.1.0",
-    "@bike4mind/common": "2.38.2-feat-cli-session-resume.17148+30840381b",
-    "@bike4mind/mcp": "1.20.2-feat-cli-session-resume.17148+30840381b",
-    "@bike4mind/services": "2.33.2-feat-cli-session-resume.17148+30840381b",
-    "@bike4mind/utils": "2.1.3-feat-cli-session-resume.17148+30840381b",
-    "@types/better-sqlite3": "^7.6.12",
+    "@bike4mind/common": "2.39.1-cli-fix-model-change.17240+efd37dd24",
+    "@bike4mind/mcp": "1.20.4-cli-fix-model-change.17240+efd37dd24",
+    "@bike4mind/services": "2.34.2-cli-fix-model-change.17240+efd37dd24",
+    "@bike4mind/utils": "2.1.4-cli-fix-model-change.17240+efd37dd24",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/diff": "^5.0.9",
     "@types/jsonwebtoken": "^9.0.4",
     "@types/node": "^22.9.0",
@@ -10704,7 +11240,7 @@ var package_default = {
     typescript: "^5.9.3",
     vitest: "^3.2.4"
   },
-  gitHead: "30840381b429950872f0bb0c7eb7ea4408179cff"
+  gitHead: "efd37dd24812e8e34852cf32fa190f2b1c7663d9"
 };
 
 // src/config/constants.ts
@@ -10726,7 +11262,7 @@ var usageCache = null;
 function CliApp() {
   const { exit } = useApp();
   const imageRenderer = new ImageRenderer();
-  const [state, setState] = useState7({
+  const [state, setState] = useState8({
     session: null,
     sessionStore: new SessionStore(),
     configStore: new ConfigStore(),
@@ -10743,9 +11279,9 @@ function CliApp() {
     rewindSelector: null,
     sessionSelector: null
   });
-  const [isInitialized, setIsInitialized] = useState7(false);
-  const [initError, setInitError] = useState7(null);
-  const [commandHistory, setCommandHistory] = useState7([]);
+  const [isInitialized, setIsInitialized] = useState8(false);
+  const [initError, setInitError] = useState8(null);
+  const [commandHistory, setCommandHistory] = useState8([]);
   const imageStoreInitPromise = useRef(null);
   const setStoreSession = useCliStore((state2) => state2.setSession);
   const setPermissionPrompt = useCliStore((state2) => state2.setPermissionPrompt);
@@ -10956,6 +11492,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:
@@ -10985,7 +11539,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,
@@ -11040,6 +11594,29 @@ 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 currentSession = useCliStore.getState().session;
+      if (currentSession) {
+        const messages = [...currentSession.messages];
+        const lastMessage = messages[messages.length - 1];
+        if (lastMessage && lastMessage.role === "assistant") {
+          messages[messages.length - 1] = {
+            ...lastMessage,
+            metadata: {
+              ...lastMessage.metadata,
+              steps: [...currentSteps]
+            }
+          };
+          setStoreSession({
+            ...currentSession,
+            messages
+          });
+        }
+      }
+    };
+    state.agent.on("action", stepHandler);
     try {
       let messageContent = message;
       let userMessageContent = message;
@@ -11053,6 +11630,21 @@ 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 sessionWithMessages = {
+        ...state.session,
+        messages: [...state.session.messages, userMessage, pendingAssistantMessage],
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      setState((prev) => ({ ...prev, session: sessionWithMessages }));
+      setStoreSession(sessionWithMessages);
       const recentMessages = state.session.messages.slice(-20);
       const previousMessages = recentMessages.filter((msg) => msg.role === "user" || msg.role === "assistant").map((msg) => ({
         role: msg.role,
@@ -11066,26 +11658,28 @@ 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 currentSession = useCliStore.getState().session;
+      if (!currentSession) return;
+      const finalMessages = [...currentSession.messages];
+      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
         }
       };
+      finalMessages[finalMessages.length - 1] = finalAssistantMessage;
       const updatedSession = {
-        ...state.session,
-        messages: [...state.session.messages, userMessage, assistantMessage],
+        ...currentSession,
+        messages: finalMessages,
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
         metadata: {
           ...state.session.metadata,
@@ -11105,8 +11699,50 @@ Remember: Use context from previous messages to understand follow-up questions.`
         }
       }
       console.error("Error processing message:", error);
+    } finally {
+      state.agent.off("action", stepHandler);
     }
   };
+  const handleBashCommand = useCallback(
+    (command) => {
+      if (!state.session) return;
+      let output;
+      let isError = false;
+      try {
+        output = execSync(command, {
+          encoding: "utf-8",
+          stdio: ["pipe", "pipe", "pipe"],
+          cwd: process.cwd(),
+          maxBuffer: 10 * 1024 * 1024
+          // 10MB buffer
+        });
+      } catch (error) {
+        const execError = error;
+        output = execError.stderr || execError.message || "Command failed";
+        isError = true;
+      }
+      const userMessage = {
+        role: "user",
+        content: `$ ${command}`,
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      const assistantMessage = {
+        role: "assistant",
+        content: isError ? `\u274C Error:
+${output}` : output.trim() || "(no output)",
+        timestamp: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      const updatedSession = {
+        ...state.session,
+        messages: [...state.session.messages, userMessage, assistantMessage],
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      setState((prev) => ({ ...prev, session: updatedSession }));
+      setStoreSession(updatedSession);
+      state.sessionStore.save(updatedSession);
+    },
+    [state.session, state.sessionStore]
+  );
   const handleImageDetected = async (imageData) => {
     try {
       let imageStore = state.imageStore;
@@ -11682,7 +12318,28 @@ No usage data available for the last ${USAGE_DAYS} days.`);
   };
   const handleSaveConfig = async (updatedConfig) => {
     await state.configStore.save(updatedConfig);
-    setState((prev) => ({ ...prev, config: updatedConfig }));
+    const modelChanged = state.config?.defaultModel !== updatedConfig.defaultModel;
+    setState((prev) => {
+      if (modelChanged && prev.session) {
+        const updatedSession = {
+          ...prev.session,
+          model: updatedConfig.defaultModel,
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        setStoreSession(updatedSession);
+        if (prev.agent) {
+          prev.agent.context.model = updatedConfig.defaultModel;
+        }
+        return { ...prev, config: updatedConfig, session: updatedSession };
+      }
+      return { ...prev, config: updatedConfig };
+    });
+    if (modelChanged && state.agent) {
+      const llm = state.agent.context.llm;
+      if (llm) {
+        llm.currentModel = updatedConfig.defaultModel;
+      }
+    }
   };
   if (initError) {
     return /* @__PURE__ */ React16.createElement(Box15, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React16.createElement(Text15, { color: "red", bold: true }, "\u274C Initialization Error"), /* @__PURE__ */ React16.createElement(Text15, null, initError), /* @__PURE__ */ React16.createElement(Text15, { dimColor: true }, "\n", "Tip: Run /config to set up your API keys"));
@@ -11776,6 +12433,7 @@ No usage data available for the last ${USAGE_DAYS} days.`);
     {
       onMessage: handleMessage,
       onCommand: handleCommand,
+      onBashCommand: handleBashCommand,
       onImageDetected: handleImageDetected,
       commandHistory,
       config: state.config,