@dexto/tui 1.7.1 → 1.8.0

package/dist/interactive-commands/prompt-commands.js

@@ -110,7 +110,7 @@ function createPromptCommand(promptInfo) {
     description: promptInfo.description || `Execute ${baseName} prompt`,
     usage: `/${commandName} [context]`,
     category: "Dynamic Prompts",
-    handler: async (args, agent, ctx) => {
+    handler: async (args, agent, _ctx) => {
       try {
         const { argMap, context: contextString } = splitPromptArguments(args);
         const resolveOptions = {};
@@ -121,58 +121,6 @@ function createPromptCommand(promptInfo) {
           resolveOptions.context = contextString;
         }
         const result = await agent.resolvePrompt(internalName, resolveOptions);
-        if (ctx.sessionId) {
-          if (result.model) {
-            try {
-              await agent.switchLLM({ model: result.model }, ctx.sessionId);
-            } catch (modelError) {
-              agent.logger.warn("Failed to switch model for prompt override", {
-                model: result.model,
-                error: modelError instanceof Error ? modelError.message : String(modelError)
-              });
-            }
-          }
-          if (result.allowedTools && result.allowedTools.length > 0) {
-            try {
-              agent.toolManager.addSessionAutoApproveTools(
-                ctx.sessionId,
-                result.allowedTools
-              );
-            } catch (toolError) {
-              agent.logger.warn("Failed to set auto-approve tools for prompt", {
-                tools: result.allowedTools,
-                error: toolError instanceof Error ? toolError.message : String(toolError)
-              });
-            }
-          }
-        }
-        if (result.context !== "fork" && result.toolkits && result.toolkits.length > 0) {
-          if (!agent.loadToolkits) {
-            return formatForInkCli(
-              `\u274C Skill '${commandName}' requires toolkits (${result.toolkits.join(", ")}), but this agent does not support dynamic tool loading.`
-            );
-          }
-          try {
-            await agent.loadToolkits(result.toolkits);
-          } catch (error) {
-            return formatForInkCli(
-              `\u274C Failed to load toolkits for skill '${commandName}': ${error instanceof Error ? error.message : String(error)}`
-            );
-          }
-        }
-        if (result.context === "fork") {
-          const skillName = internalName;
-          const taskContext = contextString || "";
-          const instructionText = `<skill-invocation>
-Execute the fork skill: ${commandName}
-${taskContext ? `Task context: ${taskContext}` : ""}
-
-Call the invoke_skill tool immediately with:
-- skill: "${skillName}"
-${taskContext ? `- taskContext: "${taskContext}"` : ""}
-</skill-invocation>`;
-          return createSendMessageMarker(instructionText);
-        }
         let finalText = result.text;
         if (result.resources.length > 0) {
           const resourceRefs = result.resources.map((uri) => `@<${uri}>`).join(" ");
@@ -181,20 +129,10 @@ ${taskContext ? `- taskContext: "${taskContext}"` : ""}
 ${resourceRefs}` : resourceRefs;
         }
         if (finalText.trim()) {
-          const taskContext = contextString || "";
-          const wrappedText = `<skill-invocation>
-Execute the inline skill: ${commandName}
-${taskContext ? `Task context: ${taskContext}` : ""}
-
-skill: "${internalName}"
-</skill-invocation>
-
-${finalText.trim()}`;
-          return createSendMessageMarker(wrappedText);
-        } else {
-          const warningMsg = `\u26A0\uFE0F  Prompt '${commandName}' returned no content`;
-          return formatForInkCli(warningMsg);
+          return createSendMessageMarker(finalText.trim());
         }
+        const warningMsg = `\u26A0\uFE0F  Prompt '${commandName}' returned no content`;
+        return formatForInkCli(warningMsg);
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
         agent.logger.error(

package/dist/interactive-commands/skill-commands.cjs

@@ -0,0 +1,73 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var skill_commands_exports = {};
+__export(skill_commands_exports, {
+  skillCommands: () => skillCommands
+});
+module.exports = __toCommonJS(skill_commands_exports);
+var import_format_output = require("./utils/format-output.js");
+const skillCommands = [
+  {
+    name: "skills",
+    description: "List available skills, or read one skill by id",
+    usage: "/skills [skill-id]",
+    category: "Skill Management",
+    handler: async (args, agent, _ctx) => {
+      const skillManager = agent.skillManager;
+      if (!skillManager) {
+        return (0, import_format_output.formatForInkCli)("\u26A0\uFE0F  Skills are not available for this chat target.");
+      }
+      const skillId = args[0];
+      try {
+        if (skillId) {
+          const skill = await skillManager.get(skillId);
+          if (!skill) {
+            return (0, import_format_output.formatForInkCli)(`\u26A0\uFE0F  Skill '${skillId}' not found`);
+          }
+          const outputLines2 = [`
+\u{1F9E9} ${skill.displayName}`, `ID: ${skill.id}`];
+          if (skill.description) {
+            outputLines2.push(`Description: ${skill.description}`);
+          }
+          outputLines2.push("", skill.instructions);
+          return (0, import_format_output.formatForInkCli)(outputLines2.join("\n"));
+        }
+        const skills = await skillManager.list();
+        if (skills.length === 0) {
+          return (0, import_format_output.formatForInkCli)("\n\u26A0\uFE0F  No skills available");
+        }
+        const outputLines = ["\n\u{1F9E9} Available Skills:\n"];
+        for (const skill of skills) {
+          const desc = skill.description ? ` - ${skill.description}` : "";
+          outputLines.push(`  ${skill.displayName} (${skill.id})${desc}`);
+        }
+        outputLines.push("", `Total: ${skills.length} skills`);
+        return (0, import_format_output.formatForInkCli)(outputLines.join("\n"));
+      } catch (error) {
+        const errorMsg = `Error loading skills: ${error instanceof Error ? error.message : String(error)}`;
+        agent.logger.error(errorMsg);
+        return (0, import_format_output.formatForInkCli)(`\u274C ${errorMsg}`);
+      }
+    }
+  }
+];
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  skillCommands
+});

package/dist/interactive-commands/skill-commands.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Skill Commands Module
+ *
+ * Skills are first-class agent capabilities backed by SkillManager. They are
+ * listed/read separately from slash prompt commands.
+ */
+import type { CommandDefinition } from './command-parser.js';
+export declare const skillCommands: CommandDefinition[];
+//# sourceMappingURL=skill-commands.d.ts.map

package/dist/interactive-commands/skill-commands.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-commands.d.ts","sourceRoot":"","sources":["../../src/interactive-commands/skill-commands.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAkB,iBAAiB,EAAwB,MAAM,qBAAqB,CAAC;AAInG,eAAO,MAAM,aAAa,EAAE,iBAAiB,EAoD5C,CAAC"}

package/dist/interactive-commands/skill-commands.js

@@ -0,0 +1,49 @@
+import { formatForInkCli } from "./utils/format-output.js";
+const skillCommands = [
+  {
+    name: "skills",
+    description: "List available skills, or read one skill by id",
+    usage: "/skills [skill-id]",
+    category: "Skill Management",
+    handler: async (args, agent, _ctx) => {
+      const skillManager = agent.skillManager;
+      if (!skillManager) {
+        return formatForInkCli("\u26A0\uFE0F  Skills are not available for this chat target.");
+      }
+      const skillId = args[0];
+      try {
+        if (skillId) {
+          const skill = await skillManager.get(skillId);
+          if (!skill) {
+            return formatForInkCli(`\u26A0\uFE0F  Skill '${skillId}' not found`);
+          }
+          const outputLines2 = [`
+\u{1F9E9} ${skill.displayName}`, `ID: ${skill.id}`];
+          if (skill.description) {
+            outputLines2.push(`Description: ${skill.description}`);
+          }
+          outputLines2.push("", skill.instructions);
+          return formatForInkCli(outputLines2.join("\n"));
+        }
+        const skills = await skillManager.list();
+        if (skills.length === 0) {
+          return formatForInkCli("\n\u26A0\uFE0F  No skills available");
+        }
+        const outputLines = ["\n\u{1F9E9} Available Skills:\n"];
+        for (const skill of skills) {
+          const desc = skill.description ? ` - ${skill.description}` : "";
+          outputLines.push(`  ${skill.displayName} (${skill.id})${desc}`);
+        }
+        outputLines.push("", `Total: ${skills.length} skills`);
+        return formatForInkCli(outputLines.join("\n"));
+      } catch (error) {
+        const errorMsg = `Error loading skills: ${error instanceof Error ? error.message : String(error)}`;
+        agent.logger.error(errorMsg);
+        return formatForInkCli(`\u274C ${errorMsg}`);
+      }
+    }
+  }
+];
+export {
+  skillCommands
+};

package/dist/services/processStream.cjs

@@ -102,6 +102,7 @@ async function processStream(iterator, setters, options) {
     setDequeuedBuffer,
     setUi,
     setSession: _setSession,
+    setSteerMessages,
     setQueuedMessages,
     setApproval,
     setApprovalQueue
@@ -139,6 +140,24 @@ async function processStream(iterator, setters, options) {
       return `${prefix}: ${content}`;
     }).join("\n\n");
   };
+  const removeDequeuedMessagesFromState = (event) => {
+    const dequeuedIds = new Set(
+      event.ids ?? event.messages?.map((message) => message.id) ?? []
+    );
+    if (dequeuedIds.size === 0) {
+      if (event.queue === "steer") {
+        setSteerMessages([]);
+      } else {
+        setQueuedMessages([]);
+      }
+      return;
+    }
+    if (event.queue === "steer") {
+      setSteerMessages((prev) => prev.filter((message) => !dequeuedIds.has(message.id)));
+    } else {
+      setQueuedMessages((prev) => prev.filter((message) => !dequeuedIds.has(message.id)));
+    }
+  };
   const finalizeMessage = (messageId, updates = {}) => {
     const msg = localPending.find((m) => m.id === messageId);
     if (msg) {
@@ -707,7 +726,7 @@ ${import_chalk.default.dim(callDescription)}`;
                 }
               ]);
             }
-            setQueuedMessages([]);
+            removeDequeuedMessagesFromState(event);
             setUi((prev) => ({ ...prev, isProcessing: true }));
             break;
           }
@@ -723,7 +742,7 @@ ${import_chalk.default.dim(callDescription)}`;
               }
             ]);
           }
-          setQueuedMessages([]);
+          removeDequeuedMessagesFromState(event);
           setUi((prev) => ({ ...prev, isProcessing: true }));
           break;
         }
@@ -738,7 +757,7 @@ ${import_chalk.default.dim(callDescription)}`;
           const bypassPermissions = options.bypassPermissionsRef.current;
           const autoApproveEdits = options.autoApproveEditsRef.current;
           const { eventBus } = options;
-          if (bypassPermissions && (event.type === import_core.ApprovalType.TOOL_APPROVAL || event.type === import_core.ApprovalType.COMMAND_CONFIRMATION || event.type === import_core.ApprovalType.DIRECTORY_ACCESS)) {
+          if (bypassPermissions && (event.type === import_core.ApprovalType.TOOL_APPROVAL || event.type === import_core.ApprovalType.COMMAND_APPROVAL || event.type === import_core.ApprovalType.DIRECTORY_ACCESS)) {
             if (event.type === import_core.ApprovalType.TOOL_APPROVAL) {
               const { toolName } = event.metadata;
               if (toolName === "plan_create" || toolName === "plan_review") {
@@ -777,7 +796,7 @@ ${import_chalk.default.dim(callDescription)}`;
             approvalIdToToolCallId.set(event.approvalId, toolCallId);
             updatePendingStatus(`tool-${toolCallId}`, "pending_approval");
           }
-          if (event.type === import_core.ApprovalType.TOOL_APPROVAL || event.type === import_core.ApprovalType.COMMAND_CONFIRMATION || event.type === import_core.ApprovalType.ELICITATION || event.type === import_core.ApprovalType.DIRECTORY_ACCESS) {
+          if (event.type === import_core.ApprovalType.TOOL_APPROVAL || event.type === import_core.ApprovalType.COMMAND_APPROVAL || event.type === import_core.ApprovalType.ELICITATION || event.type === import_core.ApprovalType.DIRECTORY_ACCESS) {
             const newApproval = {
               approvalId: event.approvalId,
               type: event.type,

package/dist/services/processStream.d.ts

@@ -36,7 +36,9 @@ export interface ProcessStreamSetters {
     setUi: React.Dispatch<React.SetStateAction<UIState>>;
     /** Setter for session state (for session switch on compaction) */
     setSession: React.Dispatch<React.SetStateAction<import('../state/types.js').SessionState>>;
-    /** Setter for queued messages (cleared when dequeued) */
+    /** Setter for active-turn steer messages */
+    setSteerMessages: React.Dispatch<React.SetStateAction<import('@dexto/core').QueuedMessage[]>>;
+    /** Setter for queued follow-up messages */
     setQueuedMessages: React.Dispatch<React.SetStateAction<import('@dexto/core').QueuedMessage[]>>;
     /** Setter for current approval request (for approval UI) */
     setApproval: React.Dispatch<React.SetStateAction<ApprovalRequest | null>>;

package/dist/services/processStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"processStream.d.ts","sourceRoot":"","sources":["../../src/services/processStream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,aAAa,CAAC;AAGvE,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAoEvE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,2DAA2D;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,oFAAoF;IACpF,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,iFAAiF;IACjF,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,kEAAkE;IAClE,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,EAAE,YAAY,CAAC,CAAC,CAAC;IAC3F,yDAAyD;IACzD,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAC/F,4DAA4D;IAC5D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,uDAAuD;IACvD,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;CAC7E;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,2FAA2F;IAC3F,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,2FAA2F;IAC3F,mBAAmB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1C,wFAAwF;IACxF,oBAAoB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAC3C,yDAAyD;IACzD,QAAQ,EAAE,IAAI,CAAC,OAAO,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAC5D,8DAA8D;IAC9D,YAAY,CAAC,EAAE,OAAO,+BAA+B,EAAE,wBAAwB,CAAC;IAChF,kEAAkE;IAClE,QAAQ,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;CAC3F;AAoDD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAC/B,QAAQ,EAAE,qBAAqB,CAAC,cAAc,CAAC,EAC/C,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAksCf"}
+{"version":3,"file":"processStream.d.ts","sourceRoot":"","sources":["../../src/services/processStream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,aAAa,CAAC;AAGvE,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAc,MAAM,mBAAmB,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAoEvE;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,2DAA2D;IAC3D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC7D,oFAAoF;IACpF,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACpE,iFAAiF;IACjF,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACnE,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IACrD,kEAAkE;IAClE,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,EAAE,YAAY,CAAC,CAAC,CAAC;IAC3F,4CAA4C;IAC5C,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAC9F,2CAA2C;IAC3C,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,aAAa,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;IAC/F,4DAA4D;IAC5D,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,uDAAuD;IACvD,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;CAC7E;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,2FAA2F;IAC3F,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,2FAA2F;IAC3F,mBAAmB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAC1C,wFAAwF;IACxF,oBAAoB,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAC3C,yDAAyD;IACzD,QAAQ,EAAE,IAAI,CAAC,OAAO,aAAa,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAC5D,8DAA8D;IAC9D,YAAY,CAAC,EAAE,OAAO,+BAA+B,EAAE,wBAAwB,CAAC;IAChF,kEAAkE;IAClE,QAAQ,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,mBAAmB,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;CAC3F;AAoDD;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAC/B,QAAQ,EAAE,qBAAqB,CAAC,cAAc,CAAC,EAC/C,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,oBAAoB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAwtCf"}

package/dist/services/processStream.js

@@ -69,6 +69,7 @@ async function processStream(iterator, setters, options) {
     setDequeuedBuffer,
     setUi,
     setSession: _setSession,
+    setSteerMessages,
     setQueuedMessages,
     setApproval,
     setApprovalQueue
@@ -106,6 +107,24 @@ async function processStream(iterator, setters, options) {
       return `${prefix}: ${content}`;
     }).join("\n\n");
   };
+  const removeDequeuedMessagesFromState = (event) => {
+    const dequeuedIds = new Set(
+      event.ids ?? event.messages?.map((message) => message.id) ?? []
+    );
+    if (dequeuedIds.size === 0) {
+      if (event.queue === "steer") {
+        setSteerMessages([]);
+      } else {
+        setQueuedMessages([]);
+      }
+      return;
+    }
+    if (event.queue === "steer") {
+      setSteerMessages((prev) => prev.filter((message) => !dequeuedIds.has(message.id)));
+    } else {
+      setQueuedMessages((prev) => prev.filter((message) => !dequeuedIds.has(message.id)));
+    }
+  };
   const finalizeMessage = (messageId, updates = {}) => {
     const msg = localPending.find((m) => m.id === messageId);
     if (msg) {
@@ -674,7 +693,7 @@ ${chalk.dim(callDescription)}`;
                 }
               ]);
             }
-            setQueuedMessages([]);
+            removeDequeuedMessagesFromState(event);
             setUi((prev) => ({ ...prev, isProcessing: true }));
             break;
           }
@@ -690,7 +709,7 @@ ${chalk.dim(callDescription)}`;
               }
             ]);
           }
-          setQueuedMessages([]);
+          removeDequeuedMessagesFromState(event);
           setUi((prev) => ({ ...prev, isProcessing: true }));
           break;
         }
@@ -705,7 +724,7 @@ ${chalk.dim(callDescription)}`;
           const bypassPermissions = options.bypassPermissionsRef.current;
           const autoApproveEdits = options.autoApproveEditsRef.current;
           const { eventBus } = options;
-          if (bypassPermissions && (event.type === ApprovalTypeEnum.TOOL_APPROVAL || event.type === ApprovalTypeEnum.COMMAND_CONFIRMATION || event.type === ApprovalTypeEnum.DIRECTORY_ACCESS)) {
+          if (bypassPermissions && (event.type === ApprovalTypeEnum.TOOL_APPROVAL || event.type === ApprovalTypeEnum.COMMAND_APPROVAL || event.type === ApprovalTypeEnum.DIRECTORY_ACCESS)) {
             if (event.type === ApprovalTypeEnum.TOOL_APPROVAL) {
               const { toolName } = event.metadata;
               if (toolName === "plan_create" || toolName === "plan_review") {
@@ -744,7 +763,7 @@ ${chalk.dim(callDescription)}`;
             approvalIdToToolCallId.set(event.approvalId, toolCallId);
             updatePendingStatus(`tool-${toolCallId}`, "pending_approval");
           }
-          if (event.type === ApprovalTypeEnum.TOOL_APPROVAL || event.type === ApprovalTypeEnum.COMMAND_CONFIRMATION || event.type === ApprovalTypeEnum.ELICITATION || event.type === ApprovalTypeEnum.DIRECTORY_ACCESS) {
+          if (event.type === ApprovalTypeEnum.TOOL_APPROVAL || event.type === ApprovalTypeEnum.COMMAND_APPROVAL || event.type === ApprovalTypeEnum.ELICITATION || event.type === ApprovalTypeEnum.DIRECTORY_ACCESS) {
             const newApproval = {
               approvalId: event.approvalId,
               type: event.type,

package/dist/services/processStream.test.cjs

@@ -25,10 +25,15 @@ async function* eventStream(events) {
     yield event;
   }
 }
-function createSetters() {
+function createSetters({
+  steerMessages: initialSteerMessages = [],
+  queuedMessages: initialQueuedMessages = []
+} = {}) {
   const messages = createState([]);
   const pendingMessages = createState([]);
   const dequeuedBuffer = createState([]);
+  const steerMessages = createState(initialSteerMessages);
+  const queuedMessages = createState(initialQueuedMessages);
   const ui = createState({
     isProcessing: false,
     isCancelling: false,
@@ -71,6 +76,8 @@ function createSetters() {
   return {
     getMessages: messages.get,
     getPendingMessages: pendingMessages.get,
+    getSteerMessages: steerMessages.get,
+    getQueuedMessages: queuedMessages.get,
     getUi: ui.get,
     setters: {
       setMessages: messages.set,
@@ -78,7 +85,8 @@ function createSetters() {
       setDequeuedBuffer: dequeuedBuffer.set,
       setUi: ui.set,
       setSession: session.set,
-      setQueuedMessages: createNoopDispatch(),
+      setSteerMessages: steerMessages.set,
+      setQueuedMessages: queuedMessages.set,
       setApproval: createNoopDispatch(),
       setApprovalQueue: createNoopDispatch()
     }
@@ -88,6 +96,47 @@ function createSetters() {
   (0, import_vitest.beforeEach)(() => {
     captureAnalyticsMock.mockClear();
   });
+  (0, import_vitest.it)("removes only dequeued queue ids from steer and follow-up state", async () => {
+    const steer = {
+      id: "steer-1",
+      content: [{ type: "text", text: "active steer" }],
+      queuedAt: Date.now(),
+      kind: "default"
+    };
+    const followUp = {
+      id: "follow-up-1",
+      content: [{ type: "text", text: "later" }],
+      queuedAt: Date.now(),
+      kind: "default"
+    };
+    const { getSteerMessages, getQueuedMessages, setters } = createSetters({
+      steerMessages: [steer],
+      queuedMessages: [followUp]
+    });
+    await (0, import_processStream.processStream)(
+      eventStream([
+        {
+          name: "message:dequeued",
+          sessionId: "test-session",
+          count: 1,
+          ids: [steer.id],
+          queue: "steer",
+          coalesced: false,
+          content: steer.content,
+          messages: [steer]
+        }
+      ]),
+      setters,
+      {
+        useStreaming: true,
+        autoApproveEditsRef: { current: false },
+        bypassPermissionsRef: { current: false },
+        eventBus: { emit: import_vitest.vi.fn() }
+      }
+    );
+    (0, import_vitest.expect)(getSteerMessages()).toEqual([]);
+    (0, import_vitest.expect)(getQueuedMessages()).toEqual([followUp]);
+  });
   (0, import_vitest.it)("attaches streamed reasoning chunks to the assistant message", async () => {
     const { getMessages, getPendingMessages, setters } = createSetters();
     const events = [
@@ -234,6 +283,7 @@ function createSetters() {
         name: "llm:tool-call",
         sessionId: "test-session",
         toolName: "test-tool",
+        callId: "call-1",
         args: {}
       },
       {

package/dist/services/processStream.test.js

@@ -24,10 +24,15 @@ async function* eventStream(events) {
     yield event;
   }
 }
-function createSetters() {
+function createSetters({
+  steerMessages: initialSteerMessages = [],
+  queuedMessages: initialQueuedMessages = []
+} = {}) {
   const messages = createState([]);
   const pendingMessages = createState([]);
   const dequeuedBuffer = createState([]);
+  const steerMessages = createState(initialSteerMessages);
+  const queuedMessages = createState(initialQueuedMessages);
   const ui = createState({
     isProcessing: false,
     isCancelling: false,
@@ -70,6 +75,8 @@ function createSetters() {
   return {
     getMessages: messages.get,
     getPendingMessages: pendingMessages.get,
+    getSteerMessages: steerMessages.get,
+    getQueuedMessages: queuedMessages.get,
     getUi: ui.get,
     setters: {
       setMessages: messages.set,
@@ -77,7 +84,8 @@ function createSetters() {
       setDequeuedBuffer: dequeuedBuffer.set,
       setUi: ui.set,
       setSession: session.set,
-      setQueuedMessages: createNoopDispatch(),
+      setSteerMessages: steerMessages.set,
+      setQueuedMessages: queuedMessages.set,
       setApproval: createNoopDispatch(),
       setApprovalQueue: createNoopDispatch()
     }
@@ -87,6 +95,47 @@ describe("processStream (reasoning)", () => {
   beforeEach(() => {
     captureAnalyticsMock.mockClear();
   });
+  it("removes only dequeued queue ids from steer and follow-up state", async () => {
+    const steer = {
+      id: "steer-1",
+      content: [{ type: "text", text: "active steer" }],
+      queuedAt: Date.now(),
+      kind: "default"
+    };
+    const followUp = {
+      id: "follow-up-1",
+      content: [{ type: "text", text: "later" }],
+      queuedAt: Date.now(),
+      kind: "default"
+    };
+    const { getSteerMessages, getQueuedMessages, setters } = createSetters({
+      steerMessages: [steer],
+      queuedMessages: [followUp]
+    });
+    await processStream(
+      eventStream([
+        {
+          name: "message:dequeued",
+          sessionId: "test-session",
+          count: 1,
+          ids: [steer.id],
+          queue: "steer",
+          coalesced: false,
+          content: steer.content,
+          messages: [steer]
+        }
+      ]),
+      setters,
+      {
+        useStreaming: true,
+        autoApproveEditsRef: { current: false },
+        bypassPermissionsRef: { current: false },
+        eventBus: { emit: vi.fn() }
+      }
+    );
+    expect(getSteerMessages()).toEqual([]);
+    expect(getQueuedMessages()).toEqual([followUp]);
+  });
   it("attaches streamed reasoning chunks to the assistant message", async () => {
     const { getMessages, getPendingMessages, setters } = createSetters();
     const events = [
@@ -233,6 +282,7 @@ describe("processStream (reasoning)", () => {
         name: "llm:tool-call",
         sessionId: "test-session",
         toolName: "test-tool",
+        callId: "call-1",
         args: {}
       },
       {

package/dist/state/initialState.cjs

@@ -30,7 +30,8 @@ function createInitialState(initialModelName = "") {
       draftBeforeHistory: "",
       images: [],
       pastedBlocks: [],
-      pasteCounter: 0
+      pasteCounter: 0,
+      editingQueuedFollowUp: false
     },
     ui: {
       isProcessing: false,

package/dist/state/initialState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialState.d.ts","sourceRoot":"","sources":["../../src/state/initialState.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,gBAAgB,GAAE,MAAW,GAAG,QAAQ,CAoD1E"}
+{"version":3,"file":"initialState.d.ts","sourceRoot":"","sources":["../../src/state/initialState.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,gBAAgB,GAAE,MAAW,GAAG,QAAQ,CAqD1E"}

package/dist/state/initialState.js

@@ -7,7 +7,8 @@ function createInitialState(initialModelName = "") {
       draftBeforeHistory: "",
       images: [],
       pastedBlocks: [],
-      pasteCounter: 0
+      pasteCounter: 0,
+      editingQueuedFollowUp: false
     },
     ui: {
       isProcessing: false,

package/dist/state/reducer.cjs

@@ -44,7 +44,8 @@ function cliReducer(state, action) {
         input: {
           ...state.input,
           value: "",
-          historyIndex: -1
+          historyIndex: -1,
+          editingQueuedFollowUp: false
         }
       };
     case "INPUT_HISTORY_NAVIGATE": {
@@ -66,7 +67,8 @@ function cliReducer(state, action) {
             input: {
               ...state.input,
               value: "",
-              historyIndex: -1
+              historyIndex: -1,
+              editingQueuedFollowUp: false
             }
           };
         }
@@ -78,7 +80,8 @@ function cliReducer(state, action) {
         input: {
           ...state.input,
           value: historyItem || "",
-          historyIndex: newIndex
+          historyIndex: newIndex,
+          editingQueuedFollowUp: false
         }
       };
     }
@@ -87,7 +90,8 @@ function cliReducer(state, action) {
         ...state,
         input: {
           ...state.input,
-          historyIndex: -1
+          historyIndex: -1,
+          editingQueuedFollowUp: false
         }
       };
     case "INPUT_HISTORY_ADD": {
@@ -101,7 +105,8 @@ function cliReducer(state, action) {
           ...state.input,
           history: [...history, action.value].slice(-100),
           // Keep last 100
-          historyIndex: -1
+          historyIndex: -1,
+          editingQueuedFollowUp: false
         }
       };
     }

package/dist/state/reducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../src/state/reducer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAkWvE"}
+{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../src/state/reducer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAG,QAAQ,CAuWvE"}