@nomad-e/bluma-cli 0.1.48 → 0.1.49

package/README.md

@@ -36,8 +36,8 @@ BluMa operates as a **conversational agent** in the terminal, combining:
 
 - **Rich UI Layer**: React/Ink 5 components for interactive prompts, live overlays, and real-time feedback
 - **Agent Layer**: LLM orchestration via FactorRouter with tool invocation and context management
-- **Runtime Layer**: Task tracking, plugin system, hooks, diagnostics, and session management
-- **Tool Layer**: 18 native tools + MCP SDK integration for external tools
+- **Runtime Layer**: Task tracking, plugin system, hooks, diagnostics, session management, and coordinator mode
+- **Tool Layer**: 40+ native tools + MCP SDK integration for external tools
 
 The agent maintains persistent conversation history, workspace snapshots, and coding memory across sessions.
 
@@ -223,15 +223,26 @@ npm start
 │  │Sandbox   │ │ToolExec  │ │Diagnostics│ │SessionView  │   │
 │  │Policy    │ │Policy    │ │           │ │             │   │
 │  └──────────┘ └──────────┘ └──────────┘ └──────────────┘   │
+│  ┌──────────┐ ┌──────────┐ ┌──────────┐ ┌──────────────┐   │
+│  │Feature   │ │Plan Mode │ │Tool Auto │ │Tool Permission│  │
+│  │Flags     │ │Session   │ │Approve   │ │Classifier    │   │
+│  └──────────┘ └──────────┘ └──────────┘ └──────────────┘   │
 └─────────────────────────────────────────────────────────────┘
                          │
 ┌────────────────────────┼────────────────────────────────────┐
 │                    Tools Layer                              │
 │  ┌──────────────────────────────────────────────────────┐  │
-│  │              Native Tools (25+)                      │  │
+│  │              Native Tools (40+)                      │  │
 │  │  edit_tool, file_write, shell_command, grep_search,  │  │
-│  │  spawn_agent, todo, task_boundary, coding_memory,    │  │
-│  │  search_web, web_fetch, load_skill, ...              │  │
+│  │  spawn_agent, wait_agent, list_agents,               │  │
+│  │  todo, task_boundary, task_create, task_list,        │  │
+│  │  task_get, task_update, task_stop,                   │  │
+│  │  coding_memory, search_web, web_fetch, load_skill,   │  │
+│  │  message, ask_user_question,                         │  │
+│  │  list_mcp_resources, read_mcp_resource,              │  │
+│  │  cron_create, cron_list, cron_delete,                │  │
+│  │  lsp_query, notebook_edit,                           │  │
+│  │  enter_plan_mode, exit_plan_mode, ...                │  │
 │  └──────────────────────────────────────────────────────┘  │
 │  ┌──────────────────────────────────────────────────────┐  │
 │  │              MCP SDK Integration                     │  │
@@ -244,26 +255,27 @@ npm start
 
 ## Native Tools
 
-BluMa includes 25+ built-in tools organized by category:
+BluMa includes **40+ built-in tools** organized by category:
 
 ### File Operations
 | Tool | Description |
 |------|-------------|
-| `edit_tool` | Replace text in files (precise, multi-line) |
+| `edit_tool` | Replace text in files (precise, multi-line, batch edits) |
 | `file_write` | Create/overwrite entire files |
-| `read_file_lines` | Read specific line ranges |
+| `read_file_lines` | Read specific line ranges (up to 2000 lines) |
 | `count_file_lines` | Get file line count |
-| `ls_tool` | List directories with filtering |
+| `ls_tool` | List directories with filtering and pagination |
 | `find_by_name` | Glob-based file search |
 | `grep_search` | Text/regex search across files |
-| `view_file_outline` | Show code structure (classes, functions) |
+| `view_file_outline` | Show code structure (classes, functions, interfaces) |
+| `notebook_edit` | Edit Jupyter `.ipynb` files (cells operations) |
 
 ### Shell & Commands
 | Tool | Description |
 |------|-------------|
 | `shell_command` | Execute background commands |
 | `command_status` | Check command progress/output |
-| `send_command_input` | Send input to running commands |
+| `send_command_input` | Send input to running commands' stdin |
 | `kill_command` | Terminate running commands |
 
 ### Agent Coordination
@@ -278,6 +290,11 @@ BluMa includes 25+ built-in tools organized by category:
 |------|-------------|
 | `todo` | Manage task lists |
 | `task_boundary` | Track task phases (PLANNING/EXECUTION/VERIFICATION) |
+| `task_create` | Create session-scoped tasks |
+| `task_list` | List all session tasks |
+| `task_get` | Get one task by id |
+| `task_update` | Update task fields |
+| `task_stop` | Cancel a task |
 | `create_artifact` | Save documents to `~/.bluma/artifacts/` |
 | `read_artifact` | Retrieve saved artifacts |
 
@@ -287,12 +304,37 @@ BluMa includes 25+ built-in tools organized by category:
 | `search_web` | Search programming solutions (Reddit, GitHub, StackOverflow) |
 | `web_fetch` | Fetch and analyze remote URLs |
 | `load_skill` | Activate domain-specific skills |
-| `coding_memory` | Persist/retrieve project notes |
+| `coding_memory` | CRUD for persistent coding notes |
 
-### Communication
+### Communication & Interaction
 | Tool | Description |
 |------|-------------|
 | `message` | Post user-visible chat (info/result types) |
+| `ask_user_question` | Ask multiple-choice questions in terminal |
+
+### MCP & Resources
+| Tool | Description |
+|------|-------------|
+| `list_mcp_resources` | List resources from MCP servers |
+| `read_mcp_resource` | Read a resource URI from MCP server |
+
+### Scheduling
+| Tool | Description |
+|------|-------------|
+| `cron_create` | Schedule one-shot or repeating reminders |
+| `cron_list` | List scheduled cron jobs |
+| `cron_delete` | Cancel scheduled job |
+
+### Development Tools
+| Tool | Description |
+|------|-------------|
+| `lsp_query` | LSP go-to-definition or references (TS/JS) |
+
+### Plan Mode
+| Tool | Description |
+|------|-------------|
+| `enter_plan_mode` | Enter plan-only mode (edits require confirmation) |
+| `exit_plan_mode` | Leave plan mode |
 
 ---
 
@@ -464,6 +506,8 @@ Built-in terminal commands (type `/` to see all):
 | `/img ./shot.png [question]` | Send local image(s) to the model |
 | `/image` | Alias of /img |
 | `/init` | Run init subagent — BluMa.md codebase documentation |
+| `/agent [default\|coordinator]` | Set prompt profile (coordinator playbook for worker orchestration) |
+| `/agents` | List worker/agent sessions (spawn_agent children) |
 
 ### Inspect
 | Command | Description |
@@ -471,7 +515,7 @@ Built-in terminal commands (type `/` to see all):
 | `/plugins` | List installed plugins and plugin paths |
 | `/plugin <name>` | Inspect one plugin |
 | `/diagnostics` | Show a consolidated health snapshot |
-| `/permissions` | Inspect sandbox and tool execution rules |
+| `/permissions` | Inspect sandbox and tool rules; set mode |
 | `/hooks` | Inspect, enable, disable, or clear lifecycle hooks |
 | `/model [list\|name\|auto]` | Show, list, or set the active model |
 | `/effort [low\|medium\|high]` | Show or set reasoning effort |
@@ -482,6 +526,7 @@ Built-in terminal commands (type `/` to see all):
 | `/skills` | List load_skill modules, dirs, and conflicts |
 | `/tools [grep]` | List native tools (optional filter) |
 | `/mcp [fs]` | List MCP tools (optional filter) |
+| `/features` | Feature flags: `/features` or `/features <key> on\|off` |
 
 ### Help
 | Command | Description |
@@ -491,8 +536,8 @@ Built-in terminal commands (type `/` to see all):
 ### Input (Keyboard Shortcuts)
 | Shortcut | Description |
 |----------|-------------|
-| `Ctrl+V / Cmd+V` | Paste from clipboard: image → file path under ~/.cache/bluma/clipboard; else text |
-| `Ctrl+Shift+I` | Same as Ctrl+V / Cmd+V (paste image or text) |
+| `Ctrl+V / Cmd+V` | Paste from clipboard: image → cache `~/.cache/bluma/clipboard`; text; or file path as image |
+| `Ctrl+Shift+I` | Same as Ctrl+V (paste image, text, or file path) |
 
 ---
 
@@ -520,6 +565,12 @@ src/
 │   ├── agent/
 │   │   ├── agent.ts                    # Main orchestrator
 │   │   ├── bluma/                      # Core agent logic
+│   │   │   ├── core/
+│   │   │   │   └── bluma.ts            # BluMaAgent class
+│   │   │   └── turn_start_payload.ts   # Backend turn payload
+│   │   ├── config/
+│   │   │   ├── native_tools.json       # Tool definitions (40+)
+│   │   │   └── skills/                 # Bundled skills (git-commit, git-pr, pdf, xlsx, skill-creator)
 │   │   ├── core/                       # LLM, context, prompts
 │   │   │   ├── context-api/            # Context management
 │   │   │   │   ├── context_manager.ts  # Token-aware context
@@ -531,41 +582,80 @@ src/
 │   │   │   └── prompt/                 # Prompt engineering
 │   │   │       ├── prompt_builder.ts   # Dynamic prompts
 │   │   │       └── workspace_snapshot.ts
+│   │   ├── feedback/
+│   │   │   └── feedback_system.ts      # Smart feedback system
 │   │   ├── runtime/                    # Orchestration layer (v0.1.41+)
 │   │   │   ├── diagnostics.ts          # System snapshots
+│   │   │   ├── feature_flags.ts        # Feature gates
 │   │   │   ├── hook_registry.ts        # Event-driven hooks
 │   │   │   ├── native_tool_catalog.ts  # Tool registry
+│   │   │   ├── plan_mode_session.ts    # Plan mode state
 │   │   │   ├── plugin_registry.ts      # Plugin system
+│   │   │   ├── plugin_runtime.ts       # Plugin execution
 │   │   │   ├── runtime_config.ts       # Runtime settings
 │   │   │   ├── sandbox_policy.ts       # Safety policies
 │   │   │   ├── session_registry.ts     # Multi-session mgmt
 │   │   │   ├── session_view.ts         # Session monitoring
 │   │   │   ├── task_store.ts           # Task lifecycle
-│   │   │   └── tool_execution_policy.ts
-│   │   ├── tools/                      # Tool layer
-│   │   │   └── natives/                # 18 native tools
+│   │   │   ├── tool_auto_approve.ts    # Auto-approve rules
+│   │   │   ├── tool_execution_policy.ts
+│   │   │   ├── tool_orchestration.ts   # Parallel read eligibility
+│   │   │   └── tool_permission_classifier.ts
+│   │   ├── session_manager/
+│   │   │   └── session_manager.ts      # Session persistence
+│   │   ├── skills/
+│   │   │   └── skill_loader.ts         # Skill loading
+│   │   ├── subagents/                  # Subagent system
+│   │   │   ├── base_llm_subagent.ts
+│   │   │   ├── init/                   # Init subagent (BluMa.md)
+│   │   │   ├── registry.ts
+│   │   │   ├── subagents_bluma.ts
+│   │   │   └── types.ts
+│   │   ├── tools/
+│   │   │   ├── mcp/
+│   │   │   │   └── mcp_client.ts       # MCP SDK client
+│   │   │   └── natives/                # 27 native tool implementations
 │   │   │       ├── agent_coordination.ts
+│   │   │       ├── ask_user_question.ts
 │   │   │       ├── async_command.ts
 │   │   │       ├── coding_memory.ts
+│   │   │       ├── coding_memory_consolidate.ts
+│   │   │       ├── coordinator_tools.ts
+│   │   │       ├── count_lines.ts
 │   │   │       ├── edit.ts
 │   │   │       ├── file_write.ts
 │   │   │       ├── find_by_name.ts
 │   │   │       ├── grep_search.ts
 │   │   │       ├── load_skill.ts
 │   │   │       ├── ls.ts
+│   │   │       ├── lsp_query.ts
+│   │   │       ├── mcp_resources.ts
 │   │   │       ├── message.ts
+│   │   │       ├── notebook_edit.ts
+│   │   │       ├── plan_mode_tools.ts
 │   │   │       ├── readLines.ts
 │   │   │       ├── search_web.ts
+│   │   │       ├── session_cron.ts
 │   │   │       ├── shell_command.ts
 │   │   │       ├── task_boundary.ts
+│   │   │       ├── task_tools.ts
 │   │   │       ├── todo.ts
 │   │   │       ├── view_file_outline.ts
 │   │   │       └── web_fetch.ts
-│   │   └── types/                      # TypeScript definitions
+│   │   ├── types/
+│   │   │   └── index.ts
+│   │   └── utils/
+│   │       ├── coordinator_prompt.ts   # Coordinator mode playbook
+│   │       ├── update_check.ts
+│   │       └── user_message_images.ts
 │   └── ui/
 │       ├── App.tsx                     # Main UI component
-│       ├── components/                 # 21 UI components
+│       ├── Asci/
+│       │   └── AsciiArt.ts
+│       ├── components/                 # 24+ UI components
 │       │   ├── AnimatedBorder.tsx
+│       │   ├── AskUserQuestionPrompt.tsx
+│       │   ├── AssistantMessageDisplay.tsx
 │       │   ├── CollapsibleResult.tsx
 │       │   ├── EditToolDiffPanel.tsx   # Diff preview for edits
 │       │   ├── ErrorMessage.tsx
@@ -576,20 +666,44 @@ src/
 │       │   ├── ReasoningDisplay.tsx    # LLM reasoning
 │       │   ├── SessionStats.tsx
 │       │   ├── SimpleDiff.tsx
-│       │   ├── SlashCommands.tsx       # 20+ commands
+│       │   ├── SlashCommands.tsx       # 30+ commands
 │       │   ├── StatusNotification.tsx
 │       │   ├── StreamingText.tsx       # Live text output
 │       │   ├── TodoPlanDisplay.tsx     # Task visualization
 │       │   ├── ToolCallDisplay.tsx
+│       │   ├── ToolInvocationBlock.tsx
 │       │   ├── ToolResultCard.tsx      # Structured results
 │       │   ├── ToolResultDisplay.tsx
 │       │   ├── TypewriterText.tsx
 │       │   ├── UpdateNotice.tsx
+│       │   ├── streamingTextFlush.ts
 │       │   └── toolCallRenderers.tsx
-│       ├── theme/                      # Terminal theming
-│       └── utils/                      # UI utilities
+│       ├── constants/
+│       │   ├── historyLayout.ts
+│       │   ├── inputPaste.ts
+│       │   └── toolUiPreview.ts
+│       ├── hooks/
+│       │   └── useAtCompletion.ts
+│       ├── theme/
+│       │   ├── blumaTerminal.ts
+│       │   └── m3Layout.tsx
+│       └── utils/
+│           ├── clipboardImage.ts
+│           ├── editToolDiffUtils.ts
+│           ├── expandPreviewHotkey.ts
+│           ├── expandablePreviewStore.ts
+│           ├── formatTurnDurationMs.ts
+│           ├── inlineImageInputLabels.ts
+│           ├── pathDisplay.ts
+│           ├── shellToolNames.ts
+│           ├── slashRegistry.ts
+│           ├── terminalTitle.ts
+│           ├── toolDisplayLabels.ts
+│           ├── toolInvocationPairing.ts
+│           └── useSimpleInputBuffer.ts
 ├── main.ts                             # Entry point
-└── types/                              # Global types
+└── types/
+    └── semver-functions.d.ts
 ```
 
 ---
@@ -682,6 +796,12 @@ BluMa's runtime layer provides enterprise-grade orchestration:
 | `session_view.ts` | Session monitoring | Log streaming, status display |
 | `native_tool_catalog.ts` | Tool registry | Discovery and metadata |
 | `runtime_config.ts` | Settings | Runtime configuration management |
+| `feature_flags.ts` | Feature gates | Opt-in features via env or settings |
+| `plan_mode_session.ts` | Plan mode | Forces confirmation for edits/writes |
+| `tool_auto_approve.ts` | Auto-approve | Effective approve rules |
+| `tool_orchestration.ts` | Parallel reads | Eligibility for parallel execution |
+| `tool_permission_classifier` | Tool classification | Classify tool invocations |
+| `plugin_runtime.ts` | Plugin execution | Plugin runtime context |
 
 ### UI Components
 
@@ -699,6 +819,9 @@ Key UI components that power the rich terminal experience:
 | `AnimatedBorder.tsx` | Visual feedback for active elements |
 | `CollapsibleResult.tsx` | Expandable result sections |
 | `ProgressBar.tsx` | Progress indicators |
+| `AskUserQuestionPrompt.tsx` | Multiple-choice question UI |
+| `ToolInvocationBlock.tsx` | Tool call visualization |
+| `AssistantMessageDisplay.tsx` | Assistant message formatting |
 
 ---
 

package/dist/main.js

@@ -10234,9 +10234,9 @@ var BluMaAgent = class {
     this.mcpClient = mcpClient;
     this.feedbackSystem = feedbackSystem;
     this.skillLoader = new SkillLoader(process.cwd());
-    this.eventBus.on("user_interrupt", () => {
+    this.eventBus.on("user_interrupt", async () => {
       this.isInterrupted = true;
-      void this.notifyFactorTurnEndIfNeeded("user_interrupt");
+      await this.notifyFactorTurnEndIfNeeded("user_interrupt");
       this.eventBus.emit("backend_message", { type: "done", status: "interrupted" });
     });
     this.eventBus.on("user_overlay", async (data) => {
@@ -10781,6 +10781,10 @@ ${editData.error.display}`;
       reason
     });
   }
+  /** Fecho explícito de turno (útil para workers antes de process.exit). */
+  async closeActiveTurn(reason = "worker_exit") {
+    await this.notifyFactorTurnEndIfNeeded(reason);
+  }
   async _continueConversation() {
     try {
       if (this.isInterrupted) {
@@ -10806,7 +10810,7 @@ ${editData.error.display}`;
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "An unknown API error occurred.";
       this.eventBus.emit("backend_message", { type: "error", message: errorMessage });
-      void this.notifyFactorTurnEndIfNeeded("llm_error");
+      await this.notifyFactorTurnEndIfNeeded("llm_error");
       this.eventBus.emit("backend_message", { type: "done", status: "failed" });
     } finally {
       this.persistSession();
@@ -11720,6 +11724,10 @@ var Agent = class {
     }
     await this.routeManager.handleRoute({ content: inputText, userContext: resolvedUserContext });
   }
+  /** Fecha o turno ativo no FactorRouter (idempotente). */
+  async closeActiveTurn(reason = "worker_exit") {
+    await this.core.closeActiveTurn(reason);
+  }
   /**
    * Handler para o comando /coordinator
    * /coordinator enable  - Ativa o Coordinator Mode
@@ -14606,6 +14614,14 @@ var AskUserQuestionPrompt = memo14(AskUserQuestionPromptComponent);
 import { jsx as jsx24, jsxs as jsxs22 } from "react/jsx-runtime";
 var MAX_STATIC_HISTORY_ITEMS = 220;
 var blumaUpdateRegistryCheckStarted = false;
+function nextHistoryId(items) {
+  if (items.length === 0) return HEADER_PANEL_HISTORY_ID + 1;
+  let maxId = HEADER_PANEL_HISTORY_ID;
+  for (const it of items) {
+    if (typeof it.id === "number" && it.id > maxId) maxId = it.id;
+  }
+  return maxId + 1;
+}
 function trimRecentActivity(s, max = 72) {
   const t = String(s ?? "").replace(/\s+/g, " ").trim();
   if (!t) return "";
@@ -14739,13 +14755,16 @@ var AppComponent = ({ eventBus, sessionId, cliVersion }) => {
     turnStartedAtRef.current = null;
     setProcessingStartMs(null);
     setIsProcessing(false);
-    setHistory((prev) => [
-      ...prev,
-      {
-        id: prev.length,
-        component: /* @__PURE__ */ jsx24(ChatMeta, { children: "cancelled (Esc)" })
-      }
-    ]);
+    setHistory((prev) => {
+      const id = nextHistoryId(prev);
+      return [
+        ...prev,
+        {
+          id,
+          component: /* @__PURE__ */ jsx24(ChatMeta, { children: "cancelled (Esc)" })
+        }
+      ];
+    });
   }, [isProcessing, eventBus]);
   const handleSubmit = useCallback3(
     (text) => {
@@ -14753,13 +14772,16 @@ var AppComponent = ({ eventBus, sessionId, cliVersion }) => {
       const trimmedForSlash = text.trim();
       if (isProcessing && !isSlashRoutingLine(trimmedForSlash)) {
         if (trimmedForSlash.startsWith("/")) {
-          setHistory((prev) => [
-            ...prev,
-            {
-              id: prev.length,
-              component: /* @__PURE__ */ jsx24(ChatMeta, { children: "Slash command not recognized or incomplete. Type /help for the list." })
-            }
-          ]);
+          setHistory((prev) => {
+            const id = nextHistoryId(prev);
+            return [
+              ...prev,
+              {
+                id,
+                component: /* @__PURE__ */ jsx24(ChatMeta, { children: "Slash command not recognized or incomplete. Type /help for the list." })
+              }
+            ];
+          });
         }
         return;
       }
@@ -14768,13 +14790,16 @@ var AppComponent = ({ eventBus, sessionId, cliVersion }) => {
       if (/^\/img\s+/i.test(text) || /^\/image\s+/i.test(text)) {
         const payload = text.replace(/^\/img\s+/i, "").replace(/^\/image\s+/i, "").trim();
         if (!payload) {
-          setHistory((prev) => [
-            ...prev,
-            {
-              id: prev.length,
-              component: /* @__PURE__ */ jsx24(ChatMeta, { children: "Usage: /img ./screenshot.png \u2014 optional text after the path is sent too" })
-            }
-          ]);
+          setHistory((prev) => {
+            const id = nextHistoryId(prev);
+            return [
+              ...prev,
+              {
+                id,
+                component: /* @__PURE__ */ jsx24(ChatMeta, { children: "Usage: /img ./screenshot.png \u2014 optional text after the path is sent too" })
+              }
+            ];
+          });
           return;
         }
         setIsProcessing(true);
@@ -14784,13 +14809,16 @@ var AppComponent = ({ eventBus, sessionId, cliVersion }) => {
           sessionId,
           summary: trimRecentActivity(payload, 120)
         });
-        setHistory((prev) => [
-          ...prev,
-          {
-            id: prev.length,
-            component: /* @__PURE__ */ jsx24(UserMessageWithOptionalImages, { raw: payload, variant: "slash-img" })
-          }
-        ]);
+        setHistory((prev) => {
+          const id = nextHistoryId(prev);
+          return [
+            ...prev,
+            {
+              id,
+              component: /* @__PURE__ */ jsx24(UserMessageWithOptionalImages, { raw: payload, variant: "slash-img" })
+            }
+          ];
+        });
         agentInstance.current.processTurn({ content: payload });
         return;
       }
@@ -14813,24 +14841,28 @@ var AppComponent = ({ eventBus, sessionId, cliVersion }) => {
           setIsProcessing(false);
           setIsInitAgentActive(false);
         }
-        setHistory((prev) => [
-          ...prev,
-          {
-            id: prev.length,
-            component: /* @__PURE__ */ jsx24(ChatUserMessage, { children: /* @__PURE__ */ jsx24(Text22, { color: BLUMA_TERMINAL.m3OnSurface, bold: true, wrap: "wrap", children: text }) })
-          },
-          {
-            id: prev.length + 1,
-            component: /* @__PURE__ */ jsx24(
-              SlashCommands_default,
-              {
-                input: text,
-                setHistory,
-                agentRef: agentInstance
-              }
-            )
-          }
-        ]);
+        setHistory((prev) => {
+          const firstId = nextHistoryId(prev);
+          const secondId = firstId + 1;
+          return [
+            ...prev,
+            {
+              id: firstId,
+              component: /* @__PURE__ */ jsx24(ChatUserMessage, { children: /* @__PURE__ */ jsx24(Text22, { color: BLUMA_TERMINAL.m3OnSurface, bold: true, wrap: "wrap", children: text }) })
+            },
+            {
+              id: secondId,
+              component: /* @__PURE__ */ jsx24(
+                SlashCommands_default,
+                {
+                  input: text,
+                  setHistory,
+                  agentRef: agentInstance
+                }
+              )
+            }
+          ];
+        });
         return;
       }
       if (text.startsWith("!")) {
@@ -14846,16 +14878,19 @@ var AppComponent = ({ eventBus, sessionId, cliVersion }) => {
           sessionId,
           summary: trimRecentActivity(command, 120)
         });
-        setHistory((prev) => [
-          ...prev,
-          {
-            id: prev.length,
-            component: /* @__PURE__ */ jsx24(ChatUserMessage, { children: /* @__PURE__ */ jsxs22(Text22, { bold: true, color: "white", children: [
-              "$ !",
-              command
-            ] }) })
-          }
-        ]);
+        setHistory((prev) => {
+          const id = nextHistoryId(prev);
+          return [
+            ...prev,
+            {
+              id,
+              component: /* @__PURE__ */ jsx24(ChatUserMessage, { children: /* @__PURE__ */ jsxs22(Text22, { bold: true, color: "white", children: [
+                "$ !",
+                command
+              ] }) })
+            }
+          ];
+        });
         Promise.resolve().then(() => (init_async_command(), async_command_exports)).then(async ({ runCommandAsync: runCommandAsync2 }) => {
           try {
             const result = await runCommandAsync2({ command, cwd: workdir });
@@ -14869,31 +14904,37 @@ Please use command_status to check the result and report back to the user.`;
             } else {
               turnStartedAtRef.current = null;
               setProcessingStartMs(null);
-              setHistory((prev) => [
-                ...prev,
-                {
-                  id: prev.length,
-                  component: /* @__PURE__ */ jsxs22(Text22, { color: "red", children: [
-                    "Failed to execute: ",
-                    result.error || result.message
-                  ] })
-                }
-              ]);
+              setHistory((prev) => {
+                const id = nextHistoryId(prev);
+                return [
+                  ...prev,
+                  {
+                    id,
+                    component: /* @__PURE__ */ jsxs22(Text22, { color: "red", children: [
+                      "Failed to execute: ",
+                      result.error || result.message
+                    ] })
+                  }
+                ];
+              });
               setIsProcessing(false);
             }
           } catch (err) {
             turnStartedAtRef.current = null;
             setProcessingStartMs(null);
-            setHistory((prev) => [
-              ...prev,
-              {
-                id: prev.length,
-                component: /* @__PURE__ */ jsxs22(Text22, { color: "red", children: [
-                  "Error: ",
-                  err.message
-                ] })
-              }
-            ]);
+            setHistory((prev) => {
+              const id = nextHistoryId(prev);
+              return [
+                ...prev,
+                {
+                  id,
+                  component: /* @__PURE__ */ jsxs22(Text22, { color: "red", children: [
+                    "Error: ",
+                    err.message
+                  ] })
+                }
+              ];
+            });
             setIsProcessing(false);
           }
         });
@@ -14901,13 +14942,16 @@ Please use command_status to check the result and report back to the user.`;
       }
       setIsProcessing(true);
       markTurnStarted();
-      setHistory((prev) => [
-        ...prev,
-        {
-          id: prev.length,
-          component: /* @__PURE__ */ jsx24(UserMessageWithOptionalImages, { raw: text, variant: "plain" })
-        }
-      ]);
+      setHistory((prev) => {
+        const id = nextHistoryId(prev);
+        return [
+          ...prev,
+          {
+            id,
+            component: /* @__PURE__ */ jsx24(UserMessageWithOptionalImages, { raw: text, variant: "plain" })
+          }
+        ];
+      });
       agentInstance.current.processTurn({ content: text });
     },
     [isProcessing, markTurnStarted]
@@ -14939,26 +14983,32 @@ Please use command_status to check the result and report back to the user.`;
     const key = reasoningDedupeKey(r);
     if (!r || key === lastReasoningTextRef.current) return;
     lastReasoningTextRef.current = key;
-    setHistory((prev) => [
-      ...prev,
-      {
-        id: prev.length,
-        component: /* @__PURE__ */ jsx24(ReasoningDisplay, { reasoning })
-      }
-    ]);
+    setHistory((prev) => {
+      const id = nextHistoryId(prev);
+      return [
+        ...prev,
+        {
+          id,
+          component: /* @__PURE__ */ jsx24(ReasoningDisplay, { reasoning })
+        }
+      ];
+    });
   }, []);
   const appendStreamedAssistant = useCallback3((content) => {
     const t = String(content ?? "").trim();
     if (!t) return;
     const key = reasoningDedupeKey(t);
     lastStreamAssistantKeyRef.current = key;
-    setHistory((prev) => [
-      ...prev,
-      {
-        id: prev.length,
-        component: /* @__PURE__ */ jsx24(AssistantMessageDisplay, { content })
-      }
-    ]);
+    setHistory((prev) => {
+      const id = nextHistoryId(prev);
+      return [
+        ...prev,
+        {
+          id,
+          component: /* @__PURE__ */ jsx24(AssistantMessageDisplay, { content })
+        }
+      ];
+    });
   }, []);
   const cappedHistory = useMemo2(() => {
     if (history.length <= MAX_STATIC_HISTORY_ITEMS) return history;
@@ -14998,13 +15048,16 @@ Please use command_status to check the result and report back to the user.`;
           turnStartedAtRef.current = null;
           setProcessingStartMs(null);
           const ms = Date.now() - t;
-          setHistory((prev) => [
-            ...prev,
-            {
-              id: prev.length,
-              component: /* @__PURE__ */ jsx24(ChatTurnDuration, { durationMs: ms })
-            }
-          ]);
+          setHistory((prev) => {
+            const id = nextHistoryId(prev);
+            return [
+              ...prev,
+              {
+                id,
+                component: /* @__PURE__ */ jsx24(ChatTurnDuration, { durationMs: ms })
+              }
+            ];
+          });
         };
         if (parsed.type === "done" || parsed.type === "error") {
           setIsInitAgentActive(false);
@@ -15178,9 +15231,10 @@ Please use command_status to check the result and report back to the user.`;
         }
         if (newComponent) {
           setHistory((prev) => {
+            const id = nextHistoryId(prev);
             const next = [
               ...prev,
-              { id: prev.length, component: newComponent }
+              { id, component: newComponent }
             ];
             if (parsed.type === "error") {
               const t = turnStartedAtRef.current;
@@ -15189,7 +15243,7 @@ Please use command_status to check the result and report back to the user.`;
                 setProcessingStartMs(null);
                 const ms = Date.now() - t;
                 next.push({
-                  id: next.length,
+                  id: nextHistoryId(next),
                   component: /* @__PURE__ */ jsx24(ChatTurnDuration, { durationMs: ms })
                 });
               }
@@ -15206,10 +15260,10 @@ Please use command_status to check the result and report back to the user.`;
     const handleInputNotice = (data) => {
       const msg = String(data.message || "").trim();
       if (!msg) return;
-      setHistory((prev) => [
-        ...prev,
-        { id: prev.length, component: /* @__PURE__ */ jsx24(ChatMeta, { children: msg }) }
-      ]);
+      setHistory((prev) => {
+        const id = nextHistoryId(prev);
+        return [...prev, { id, component: /* @__PURE__ */ jsx24(ChatMeta, { children: msg }) }];
+      });
     };
     uiEventBus.on("user_overlay", handleUiOverlay);
     uiEventBus.on("input_notice", handleInputNotice);
@@ -15491,7 +15545,8 @@ async function runAgentMode() {
   let reasoningBuffer = null;
   let lastAttachments = null;
   let resultEmitted = false;
-  eventBus.on("backend_message", (payload) => {
+  let agentRef = null;
+  eventBus.on("backend_message", async (payload) => {
     const timestamp = (/* @__PURE__ */ new Date()).toISOString();
     writeAgentEvent(sessionId, {
       event_type: "backend_message",
@@ -15524,6 +15579,9 @@ async function runAgentMode() {
     }
     if (!resultEmitted && payload?.type === "done") {
       resultEmitted = true;
+      if (agentRef) {
+        await agentRef.closeActiveTurn("worker_done_exit");
+      }
       finalizeSession(sessionId, "completed", { finishedBy: "done-event" });
       writeAgentEvent(sessionId, {
         event_type: "result",
@@ -15564,6 +15622,7 @@ async function runAgentMode() {
   });
   try {
     const agent = new Agent(sessionId, eventBus);
+    agentRef = agent;
     await agent.initialize();
     const userContent = JSON.stringify({
       message_id: envelope.message_id || sessionId,
@@ -15575,6 +15634,7 @@ async function runAgentMode() {
     await agent.processTurn({ content: userContent }, userContextInput);
     if (!resultEmitted) {
       resultEmitted = true;
+      await agent.closeActiveTurn("worker_post_turn_fallback");
       finalizeSession(sessionId, "completed", { finishedBy: "post-turn-fallback" });
       writeAgentEvent(sessionId, {
         event_type: "result",
@@ -15592,6 +15652,9 @@ async function runAgentMode() {
     }
   } catch (err) {
     if (!resultEmitted) {
+      if (agentRef) {
+        await agentRef.closeActiveTurn("worker_exception");
+      }
       finalizeSession(sessionId, "error", { finishedBy: "exception" });
       writeAgentEvent(sessionId, {
         event_type: "result",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nomad-e/bluma-cli",
-	"version": "0.1.48",
+	"version": "0.1.49",
 	"description": "BluMa independent agent for automation and advanced software engineering.",
 	"author": "Alex Fonseca",
 	"license": "Apache-2.0",