@mariozechner/pi-coding-agent 0.32.1 → 0.32.3

package/dist/core/agent-session.js

@@ -317,19 +317,17 @@ export class AgentSession {
     // =========================================================================
     /**
      * Send a prompt to the agent.
-     * - Validates model and API key before sending
-     * - Handles hook commands (registered via pi.registerCommand)
+     * - Handles hook commands (registered via pi.registerCommand) immediately, even during streaming
      * - Expands file-based slash commands by default
-     * @throws Error if no model selected or no API key available
+     * - During streaming, queues via steer() or followUp() based on streamingBehavior option
+     * - Validates model and API key before sending (when not streaming)
+     * @throws Error if streaming and no streamingBehavior specified
+     * @throws Error if no model selected or no API key available (when not streaming)
      */
     async prompt(text, options) {
-        if (this.isStreaming) {
-            throw new Error("Agent is already processing. Use steer() or followUp() to queue messages during streaming.");
-        }
-        // Flush any pending bash messages before the new prompt
-        this._flushPendingBashMessages();
         const expandCommands = options?.expandSlashCommands ?? true;
-        // Handle hook commands first (if enabled and text is a slash command)
+        // Handle hook commands first (execute immediately, even during streaming)
+        // Hook commands manage their own LLM interaction via pi.sendMessage()
         if (expandCommands && text.startsWith("/")) {
             const handled = await this._tryExecuteHookCommand(text);
             if (handled) {
@@ -337,6 +335,23 @@ export class AgentSession {
                 return;
             }
         }
+        // Expand file-based slash commands if requested
+        const expandedText = expandCommands ? expandSlashCommand(text, [...this._fileCommands]) : text;
+        // If streaming, queue via steer() or followUp() based on option
+        if (this.isStreaming) {
+            if (!options?.streamingBehavior) {
+                throw new Error("Agent is already processing. Specify streamingBehavior ('steer' or 'followUp') to queue the message.");
+            }
+            if (options.streamingBehavior === "followUp") {
+                await this._queueFollowUp(expandedText);
+            }
+            else {
+                await this._queueSteer(expandedText);
+            }
+            return;
+        }
+        // Flush any pending bash messages before the new prompt
+        this._flushPendingBashMessages();
         // Validate model
         if (!this.model) {
             throw new Error("No model selected.\n\n" +
@@ -354,8 +369,6 @@ export class AgentSession {
         if (lastAssistant) {
             await this._checkCompaction(lastAssistant, false);
         }
-        // Expand file-based slash commands if requested
-        const expandedText = expandCommands ? expandSlashCommand(text, [...this._fileCommands]) : text;
         // Build messages array (hook message if any, then user message)
         const messages = [];
         // Add user message
@@ -417,8 +430,37 @@ export class AgentSession {
     /**
      * Queue a steering message to interrupt the agent mid-run.
      * Delivered after current tool execution, skips remaining tools.
+     * Expands file-based slash commands. Errors on hook commands.
+     * @throws Error if text is a hook command
      */
     async steer(text) {
+        // Check for hook commands (cannot be queued)
+        if (text.startsWith("/")) {
+            this._throwIfHookCommand(text);
+        }
+        // Expand file-based slash commands
+        const expandedText = expandSlashCommand(text, [...this._fileCommands]);
+        await this._queueSteer(expandedText);
+    }
+    /**
+     * Queue a follow-up message to be processed after the agent finishes.
+     * Delivered only when agent has no more tool calls or steering messages.
+     * Expands file-based slash commands. Errors on hook commands.
+     * @throws Error if text is a hook command
+     */
+    async followUp(text) {
+        // Check for hook commands (cannot be queued)
+        if (text.startsWith("/")) {
+            this._throwIfHookCommand(text);
+        }
+        // Expand file-based slash commands
+        const expandedText = expandSlashCommand(text, [...this._fileCommands]);
+        await this._queueFollowUp(expandedText);
+    }
+    /**
+     * Internal: Queue a steering message (already expanded, no hook command check).
+     */
+    async _queueSteer(text) {
         this._steeringMessages.push(text);
         this.agent.steer({
             role: "user",
@@ -427,10 +469,9 @@ export class AgentSession {
         });
     }
     /**
-     * Queue a follow-up message to be processed after the agent finishes.
-     * Delivered only when agent has no more tool calls or steering messages.
+     * Internal: Queue a follow-up message (already expanded, no hook command check).
      */
-    async followUp(text) {
+    async _queueFollowUp(text) {
         this._followUpMessages.push(text);
         this.agent.followUp({
             role: "user",
@@ -438,6 +479,19 @@ export class AgentSession {
             timestamp: Date.now(),
         });
     }
+    /**
+     * Throw an error if the text is a hook command.
+     */
+    _throwIfHookCommand(text) {
+        if (!this._hookRunner)
+            return;
+        const spaceIndex = text.indexOf(" ");
+        const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+        const command = this._hookRunner.getCommand(commandName);
+        if (command) {
+            throw new Error(`Hook command "/${commandName}" cannot be queued. Use prompt() or execute the command when not streaming.`);
+        }
+    }
     /**
      * Send a hook message to the session. Creates a CustomMessageEntry.
      *