@mariozechner/pi-coding-agent 0.34.2 → 0.35.0

package/dist/core/agent-session.js

@@ -17,7 +17,7 @@ import { getAuthPath } from "../config.js";
 import { executeBash as executeBashCommand } from "./bash-executor.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, compact, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { exportSessionToHtml } from "./export-html/index.js";
-import { expandSlashCommand } from "./slash-commands.js";
+import { expandPromptTemplate } from "./prompt-templates.js";
 // ============================================================================
 // Constants
 // ============================================================================
@@ -33,7 +33,7 @@ export class AgentSession {
     sessionManager;
     settingsManager;
     _scopedModels;
-    _fileCommands;
+    _promptTemplates;
     // Event subscription state
     _unsubscribeAgent;
     _eventListeners = [];
@@ -41,6 +41,8 @@ export class AgentSession {
     _steeringMessages = [];
     /** Tracks pending follow-up messages for UI display. Removed when delivered. */
     _followUpMessages = [];
+    /** Messages queued to be included with the next user prompt as context ("asides"). */
+    _pendingNextTurnMessages = [];
     // Compaction state
     _compactionAbortController = undefined;
     _autoCompactionAbortController = undefined;
@@ -54,35 +56,32 @@ export class AgentSession {
     // Bash execution state
     _bashAbortController = undefined;
     _pendingBashMessages = [];
-    // Hook system
-    _hookRunner = undefined;
+    // Extension system
+    _extensionRunner = undefined;
     _turnIndex = 0;
-    // Custom tools for session lifecycle
-    _customTools = [];
     _skillsSettings;
     // Model registry for API key resolution
     _modelRegistry;
-    // Tool registry for hook getTools/setTools
+    // Tool registry for extension getTools/setTools
     _toolRegistry;
     // Function to rebuild system prompt when tools change
     _rebuildSystemPrompt;
-    // Base system prompt (without hook appends) - used to apply fresh appends each turn
+    // Base system prompt (without extension appends) - used to apply fresh appends each turn
     _baseSystemPrompt;
     constructor(config) {
         this.agent = config.agent;
         this.sessionManager = config.sessionManager;
         this.settingsManager = config.settingsManager;
         this._scopedModels = config.scopedModels ?? [];
-        this._fileCommands = config.fileCommands ?? [];
-        this._hookRunner = config.hookRunner;
-        this._customTools = config.customTools ?? [];
+        this._promptTemplates = config.promptTemplates ?? [];
+        this._extensionRunner = config.extensionRunner;
         this._skillsSettings = config.skillsSettings;
         this._modelRegistry = config.modelRegistry;
         this._toolRegistry = config.toolRegistry ?? new Map();
         this._rebuildSystemPrompt = config.rebuildSystemPrompt;
         this._baseSystemPrompt = config.agent.state.systemPrompt;
         // Always subscribe to agent events for internal handling
-        // (session persistence, hooks, auto-compaction, retry logic)
+        // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
     }
     /** Model registry for API key resolution and model discovery */
@@ -121,14 +120,14 @@ export class AgentSession {
                 }
             }
         }
-        // Emit to hooks first
-        await this._emitHookEvent(event);
+        // Emit to extensions first
+        await this._emitExtensionEvent(event);
         // Notify all listeners
         this._emit(event);
         // Handle session persistence
         if (event.type === "message_end") {
-            // Check if this is a hook message
-            if (event.message.role === "hookMessage") {
+            // Check if this is a custom message from extensions
+            if (event.message.role === "custom") {
                 // Persist as CustomMessageEntry
                 this.sessionManager.appendCustomMessageEntry(event.message.customType, event.message.content, event.message.display, event.message.details);
             }
@@ -197,33 +196,33 @@ export class AgentSession {
         }
         return undefined;
     }
-    /** Emit hook events based on agent events */
-    async _emitHookEvent(event) {
-        if (!this._hookRunner)
+    /** Emit extension events based on agent events */
+    async _emitExtensionEvent(event) {
+        if (!this._extensionRunner)
             return;
         if (event.type === "agent_start") {
             this._turnIndex = 0;
-            await this._hookRunner.emit({ type: "agent_start" });
+            await this._extensionRunner.emit({ type: "agent_start" });
         }
         else if (event.type === "agent_end") {
-            await this._hookRunner.emit({ type: "agent_end", messages: event.messages });
+            await this._extensionRunner.emit({ type: "agent_end", messages: event.messages });
         }
         else if (event.type === "turn_start") {
-            const hookEvent = {
+            const extensionEvent = {
                 type: "turn_start",
                 turnIndex: this._turnIndex,
                 timestamp: Date.now(),
             };
-            await this._hookRunner.emit(hookEvent);
+            await this._extensionRunner.emit(extensionEvent);
         }
         else if (event.type === "turn_end") {
-            const hookEvent = {
+            const extensionEvent = {
                 type: "turn_end",
                 turnIndex: this._turnIndex,
                 message: event.message,
                 toolResults: event.toolResults,
             };
-            await this._hookRunner.emit(hookEvent);
+            await this._extensionRunner.emit(extensionEvent);
             this._turnIndex++;
         }
     }
@@ -353,35 +352,35 @@ export class AgentSession {
     get scopedModels() {
         return this._scopedModels;
     }
-    /** File-based slash commands */
-    get fileCommands() {
-        return this._fileCommands;
+    /** File-based prompt templates */
+    get promptTemplates() {
+        return this._promptTemplates;
     }
     // =========================================================================
     // Prompting
     // =========================================================================
     /**
      * Send a prompt to the agent.
-     * - Handles hook commands (registered via pi.registerCommand) immediately, even during streaming
-     * - Expands file-based slash commands by default
+     * - Handles extension commands (registered via pi.registerCommand) immediately, even during streaming
+     * - Expands file-based prompt templates by default
      * - 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) {
-        const expandCommands = options?.expandSlashCommands ?? true;
-        // 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);
+        const expandPromptTemplates = options?.expandPromptTemplates ?? true;
+        // Handle extension commands first (execute immediately, even during streaming)
+        // Extension commands manage their own LLM interaction via pi.sendMessage()
+        if (expandPromptTemplates && text.startsWith("/")) {
+            const handled = await this._tryExecuteExtensionCommand(text);
             if (handled) {
-                // Hook command executed, no prompt to send
+                // Extension command executed, no prompt to send
                 return;
             }
         }
-        // Expand file-based slash commands if requested
-        const expandedText = expandCommands ? expandSlashCommand(text, [...this._fileCommands]) : text;
+        // Expand file-based prompt templates if requested
+        const expandedText = expandPromptTemplates ? expandPromptTemplate(text, [...this._promptTemplates]) : text;
         // If streaming, queue via steer() or followUp() based on option
         if (this.isStreaming) {
             if (!options?.streamingBehavior) {
@@ -414,7 +413,7 @@ export class AgentSession {
         if (lastAssistant) {
             await this._checkCompaction(lastAssistant, false);
         }
-        // Build messages array (hook message if any, then user message)
+        // Build messages array (custom message if any, then user message)
         const messages = [];
         // Add user message
         const userContent = [{ type: "text", text: expandedText }];
@@ -426,14 +425,19 @@ export class AgentSession {
             content: userContent,
             timestamp: Date.now(),
         });
-        // Emit before_agent_start hook event
-        if (this._hookRunner) {
-            const result = await this._hookRunner.emitBeforeAgentStart(expandedText, options?.images);
-            // Add all hook messages
+        // Inject any pending "nextTurn" messages as context alongside the user message
+        for (const msg of this._pendingNextTurnMessages) {
+            messages.push(msg);
+        }
+        this._pendingNextTurnMessages = [];
+        // Emit before_agent_start extension event
+        if (this._extensionRunner) {
+            const result = await this._extensionRunner.emitBeforeAgentStart(expandedText, options?.images);
+            // Add all custom messages from extensions
             if (result?.messages) {
                 for (const msg of result.messages) {
                     messages.push({
-                        role: "hookMessage",
+                        role: "custom",
                         customType: msg.customType,
                         content: msg.content,
                         display: msg.display,
@@ -442,7 +446,7 @@ export class AgentSession {
                     });
                 }
             }
-            // Apply hook systemPromptAppend on top of base prompt
+            // Apply extension systemPromptAppend on top of base prompt
             if (result?.systemPromptAppend) {
                 this.agent.setSystemPrompt(`${this._baseSystemPrompt}\n\n${result.systemPromptAppend}`);
             }
@@ -455,28 +459,28 @@ export class AgentSession {
         await this.waitForRetry();
     }
     /**
-     * Try to execute a hook command. Returns true if command was found and executed.
+     * Try to execute an extension command. Returns true if command was found and executed.
      */
-    async _tryExecuteHookCommand(text) {
-        if (!this._hookRunner)
+    async _tryExecuteExtensionCommand(text) {
+        if (!this._extensionRunner)
             return false;
         // Parse command name and args
         const spaceIndex = text.indexOf(" ");
         const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
         const args = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1);
-        const command = this._hookRunner.getCommand(commandName);
+        const command = this._extensionRunner.getCommand(commandName);
         if (!command)
             return false;
-        // Get command context from hook runner (includes session control methods)
-        const ctx = this._hookRunner.createCommandContext();
+        // Get command context from extension runner (includes session control methods)
+        const ctx = this._extensionRunner.createCommandContext();
         try {
             await command.handler(args, ctx);
             return true;
         }
         catch (err) {
-            // Emit error via hook runner
-            this._hookRunner.emitError({
-                hookPath: `command:${commandName}`,
+            // Emit error via extension runner
+            this._extensionRunner.emitError({
+                extensionPath: `command:${commandName}`,
                 event: "command",
                 error: err instanceof Error ? err.message : String(err),
             });
@@ -486,35 +490,35 @@ 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
+     * Expands file-based prompt templates. Errors on extension commands.
+     * @throws Error if text is an extension command
      */
     async steer(text) {
-        // Check for hook commands (cannot be queued)
+        // Check for extension commands (cannot be queued)
         if (text.startsWith("/")) {
-            this._throwIfHookCommand(text);
+            this._throwIfExtensionCommand(text);
         }
-        // Expand file-based slash commands
-        const expandedText = expandSlashCommand(text, [...this._fileCommands]);
+        // Expand file-based prompt templates
+        const expandedText = expandPromptTemplate(text, [...this._promptTemplates]);
         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
+     * Expands file-based prompt templates. Errors on extension commands.
+     * @throws Error if text is an extension command
      */
     async followUp(text) {
-        // Check for hook commands (cannot be queued)
+        // Check for extension commands (cannot be queued)
         if (text.startsWith("/")) {
-            this._throwIfHookCommand(text);
+            this._throwIfExtensionCommand(text);
         }
-        // Expand file-based slash commands
-        const expandedText = expandSlashCommand(text, [...this._fileCommands]);
+        // Expand file-based prompt templates
+        const expandedText = expandPromptTemplate(text, [...this._promptTemplates]);
         await this._queueFollowUp(expandedText);
     }
     /**
-     * Internal: Queue a steering message (already expanded, no hook command check).
+     * Internal: Queue a steering message (already expanded, no extension command check).
      */
     async _queueSteer(text) {
         this._steeringMessages.push(text);
@@ -525,7 +529,7 @@ export class AgentSession {
         });
     }
     /**
-     * Internal: Queue a follow-up message (already expanded, no hook command check).
+     * Internal: Queue a follow-up message (already expanded, no extension command check).
      */
     async _queueFollowUp(text) {
         this._followUpMessages.push(text);
@@ -536,41 +540,43 @@ export class AgentSession {
         });
     }
     /**
-     * Throw an error if the text is a hook command.
+     * Throw an error if the text is an extension command.
      */
-    _throwIfHookCommand(text) {
-        if (!this._hookRunner)
+    _throwIfExtensionCommand(text) {
+        if (!this._extensionRunner)
             return;
         const spaceIndex = text.indexOf(" ");
         const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
-        const command = this._hookRunner.getCommand(commandName);
+        const command = this._extensionRunner.getCommand(commandName);
         if (command) {
-            throw new Error(`Hook command "/${commandName}" cannot be queued. Use prompt() or execute the command when not streaming.`);
+            throw new Error(`Extension command "/${commandName}" cannot be queued. Use prompt() or execute the command when not streaming.`);
         }
     }
     /**
-     * Send a hook message to the session. Creates a CustomMessageEntry.
+     * Send a custom message to the session. Creates a CustomMessageEntry.
      *
      * Handles three cases:
      * - Streaming: queues message, processed when loop pulls from queue
      * - Not streaming + triggerTurn: appends to state/session, starts new turn
      * - Not streaming + no trigger: appends to state/session, no turn
      *
-     * @param message Hook message with customType, content, display, details
+     * @param message Custom message with customType, content, display, details
      * @param options.triggerTurn If true and not streaming, triggers a new LLM turn
-     * @param options.deliverAs When streaming, use "steer" (default) for immediate or "followUp" to wait
+     * @param options.deliverAs Delivery mode: "steer", "followUp", or "nextTurn"
      */
-    async sendHookMessage(message, options) {
+    async sendCustomMessage(message, options) {
         const appMessage = {
-            role: "hookMessage",
+            role: "custom",
             customType: message.customType,
             content: message.content,
             display: message.display,
             details: message.details,
             timestamp: Date.now(),
         };
-        if (this.isStreaming) {
-            // Queue for processing by agent loop
+        if (options?.deliverAs === "nextTurn") {
+            this._pendingNextTurnMessages.push(appMessage);
+        }
+        else if (this.isStreaming) {
             if (options?.deliverAs === "followUp") {
                 this.agent.followUp(appMessage);
             }
@@ -579,11 +585,9 @@ export class AgentSession {
             }
         }
         else if (options?.triggerTurn) {
-            // Send as prompt - agent loop will emit message events
             await this.agent.prompt(appMessage);
         }
         else {
-            // Just append to agent state and session, no turn
             this.agent.appendMessage(appMessage);
             this.sessionManager.appendCustomMessageEntry(message.customType, message.content, message.display, message.details);
         }
@@ -629,13 +633,13 @@ export class AgentSession {
      * Clears all messages and starts a new session.
      * Listeners are preserved and will continue receiving events.
      * @param options - Optional initial messages and parent session path
-     * @returns true if completed, false if cancelled by hook
+     * @returns true if completed, false if cancelled by extension
      */
     async newSession(options) {
         const previousSessionFile = this.sessionFile;
         // Emit session_before_switch event with reason "new" (can be cancelled)
-        if (this._hookRunner?.hasHandlers("session_before_switch")) {
-            const result = (await this._hookRunner.emit({
+        if (this._extensionRunner?.hasHandlers("session_before_switch")) {
+            const result = (await this._extensionRunner.emit({
                 type: "session_before_switch",
                 reason: "new",
             }));
@@ -649,17 +653,17 @@ export class AgentSession {
         this.sessionManager.newSession(options);
         this._steeringMessages = [];
         this._followUpMessages = [];
+        this._pendingNextTurnMessages = [];
         this._reconnectToAgent();
-        // Emit session_switch event with reason "new" to hooks
-        if (this._hookRunner) {
-            await this._hookRunner.emit({
+        // Emit session_switch event with reason "new" to extensions
+        if (this._extensionRunner) {
+            await this._extensionRunner.emit({
                 type: "session_switch",
                 reason: "new",
                 previousSessionFile,
             });
         }
         // Emit session event to custom tools
-        await this.emitCustomToolSessionEvent("switch", previousSessionFile);
         return true;
     }
     // =========================================================================
@@ -846,10 +850,10 @@ export class AgentSession {
                 }
                 throw new Error("Nothing to compact (session too small)");
             }
-            let hookCompaction;
-            let fromHook = false;
-            if (this._hookRunner?.hasHandlers("session_before_compact")) {
-                const result = (await this._hookRunner.emit({
+            let extensionCompaction;
+            let fromExtension = false;
+            if (this._extensionRunner?.hasHandlers("session_before_compact")) {
+                const result = (await this._extensionRunner.emit({
                     type: "session_before_compact",
                     preparation,
                     branchEntries: pathEntries,
@@ -860,20 +864,20 @@ export class AgentSession {
                     throw new Error("Compaction cancelled");
                 }
                 if (result?.compaction) {
-                    hookCompaction = result.compaction;
-                    fromHook = true;
+                    extensionCompaction = result.compaction;
+                    fromExtension = true;
                 }
             }
             let summary;
             let firstKeptEntryId;
             let tokensBefore;
             let details;
-            if (hookCompaction) {
-                // Hook provided compaction content
-                summary = hookCompaction.summary;
-                firstKeptEntryId = hookCompaction.firstKeptEntryId;
-                tokensBefore = hookCompaction.tokensBefore;
-                details = hookCompaction.details;
+            if (extensionCompaction) {
+                // Extension provided compaction content
+                summary = extensionCompaction.summary;
+                firstKeptEntryId = extensionCompaction.firstKeptEntryId;
+                tokensBefore = extensionCompaction.tokensBefore;
+                details = extensionCompaction.details;
             }
             else {
                 // Generate compaction result
@@ -886,17 +890,17 @@ export class AgentSession {
             if (this._compactionAbortController.signal.aborted) {
                 throw new Error("Compaction cancelled");
             }
-            this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromHook);
+            this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension);
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
             this.agent.replaceMessages(sessionContext.messages);
-            // Get the saved compaction entry for the hook
+            // Get the saved compaction entry for the extension event
             const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary);
-            if (this._hookRunner && savedCompactionEntry) {
-                await this._hookRunner.emit({
+            if (this._extensionRunner && savedCompactionEntry) {
+                await this._extensionRunner.emit({
                     type: "session_compact",
                     compactionEntry: savedCompactionEntry,
-                    fromHook,
+                    fromExtension,
                 });
             }
             return {
@@ -986,35 +990,35 @@ export class AgentSession {
                 this._emit({ type: "auto_compaction_end", result: undefined, aborted: false, willRetry: false });
                 return;
             }
-            let hookCompaction;
-            let fromHook = false;
-            if (this._hookRunner?.hasHandlers("session_before_compact")) {
-                const hookResult = (await this._hookRunner.emit({
+            let extensionCompaction;
+            let fromExtension = false;
+            if (this._extensionRunner?.hasHandlers("session_before_compact")) {
+                const extensionResult = (await this._extensionRunner.emit({
                     type: "session_before_compact",
                     preparation,
                     branchEntries: pathEntries,
                     customInstructions: undefined,
                     signal: this._autoCompactionAbortController.signal,
                 }));
-                if (hookResult?.cancel) {
+                if (extensionResult?.cancel) {
                     this._emit({ type: "auto_compaction_end", result: undefined, aborted: true, willRetry: false });
                     return;
                 }
-                if (hookResult?.compaction) {
-                    hookCompaction = hookResult.compaction;
-                    fromHook = true;
+                if (extensionResult?.compaction) {
+                    extensionCompaction = extensionResult.compaction;
+                    fromExtension = true;
                 }
             }
             let summary;
             let firstKeptEntryId;
             let tokensBefore;
             let details;
-            if (hookCompaction) {
-                // Hook provided compaction content
-                summary = hookCompaction.summary;
-                firstKeptEntryId = hookCompaction.firstKeptEntryId;
-                tokensBefore = hookCompaction.tokensBefore;
-                details = hookCompaction.details;
+            if (extensionCompaction) {
+                // Extension provided compaction content
+                summary = extensionCompaction.summary;
+                firstKeptEntryId = extensionCompaction.firstKeptEntryId;
+                tokensBefore = extensionCompaction.tokensBefore;
+                details = extensionCompaction.details;
             }
             else {
                 // Generate compaction result
@@ -1028,17 +1032,17 @@ export class AgentSession {
                 this._emit({ type: "auto_compaction_end", result: undefined, aborted: true, willRetry: false });
                 return;
             }
-            this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromHook);
+            this.sessionManager.appendCompaction(summary, firstKeptEntryId, tokensBefore, details, fromExtension);
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
             this.agent.replaceMessages(sessionContext.messages);
-            // Get the saved compaction entry for the hook
+            // Get the saved compaction entry for the extension event
             const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary);
-            if (this._hookRunner && savedCompactionEntry) {
-                await this._hookRunner.emit({
+            if (this._extensionRunner && savedCompactionEntry) {
+                await this._extensionRunner.emit({
                     type: "session_compact",
                     compactionEntry: savedCompactionEntry,
-                    fromHook,
+                    fromExtension,
                 });
             }
             const result = {
@@ -1294,13 +1298,13 @@ export class AgentSession {
      * Switch to a different session file.
      * Aborts current operation, loads messages, restores model/thinking.
      * Listeners are preserved and will continue receiving events.
-     * @returns true if switch completed, false if cancelled by hook
+     * @returns true if switch completed, false if cancelled by extension
      */
     async switchSession(sessionPath) {
         const previousSessionFile = this.sessionManager.getSessionFile();
         // Emit session_before_switch event (can be cancelled)
-        if (this._hookRunner?.hasHandlers("session_before_switch")) {
-            const result = (await this._hookRunner.emit({
+        if (this._extensionRunner?.hasHandlers("session_before_switch")) {
+            const result = (await this._extensionRunner.emit({
                 type: "session_before_switch",
                 reason: "resume",
                 targetSessionFile: sessionPath,
@@ -1313,20 +1317,20 @@ export class AgentSession {
         await this.abort();
         this._steeringMessages = [];
         this._followUpMessages = [];
+        this._pendingNextTurnMessages = [];
         // Set new session
         this.sessionManager.setSessionFile(sessionPath);
         // Reload messages
         const sessionContext = this.sessionManager.buildSessionContext();
-        // Emit session_switch event to hooks
-        if (this._hookRunner) {
-            await this._hookRunner.emit({
+        // Emit session_switch event to extensions
+        if (this._extensionRunner) {
+            await this._extensionRunner.emit({
                 type: "session_switch",
                 reason: "resume",
                 previousSessionFile,
             });
         }
         // Emit session event to custom tools
-        await this.emitCustomToolSessionEvent("switch", previousSessionFile);
         this.agent.replaceMessages(sessionContext.messages);
         // Restore model if saved
         if (sessionContext.model) {
@@ -1345,12 +1349,12 @@ export class AgentSession {
     }
     /**
      * Create a branch from a specific entry.
-     * Emits before_branch/branch session events to hooks.
+     * Emits before_branch/branch session events to extensions.
      *
      * @param entryId ID of the entry to branch from
      * @returns Object with:
      *   - selectedText: The text of the selected user message (for editor pre-fill)
-     *   - cancelled: True if a hook cancelled the branch
+     *   - cancelled: True if an extension cancelled the branch
      */
     async branch(entryId) {
         const previousSessionFile = this.sessionFile;
@@ -1361,8 +1365,8 @@ export class AgentSession {
         const selectedText = this._extractUserMessageText(selectedEntry.message.content);
         let skipConversationRestore = false;
         // Emit session_before_branch event (can be cancelled)
-        if (this._hookRunner?.hasHandlers("session_before_branch")) {
-            const result = (await this._hookRunner.emit({
+        if (this._extensionRunner?.hasHandlers("session_before_branch")) {
+            const result = (await this._extensionRunner.emit({
                 type: "session_before_branch",
                 entryId,
             }));
@@ -1371,6 +1375,8 @@ export class AgentSession {
             }
             skipConversationRestore = result?.skipConversationRestore ?? false;
         }
+        // Clear pending messages (bound to old session state)
+        this._pendingNextTurnMessages = [];
         if (!selectedEntry.parentId) {
             this.sessionManager.newSession();
         }
@@ -1379,15 +1385,14 @@ export class AgentSession {
         }
         // Reload messages from entries (works for both file and in-memory mode)
         const sessionContext = this.sessionManager.buildSessionContext();
-        // Emit session_branch event to hooks (after branch completes)
-        if (this._hookRunner) {
-            await this._hookRunner.emit({
+        // Emit session_branch event to extensions (after branch completes)
+        if (this._extensionRunner) {
+            await this._extensionRunner.emit({
                 type: "session_branch",
                 previousSessionFile,
             });
         }
         // Emit session event to custom tools (with reason "branch")
-        await this.emitCustomToolSessionEvent("branch", previousSessionFile);
         if (!skipConversationRestore) {
             this.agent.replaceMessages(sessionContext.messages);
         }
@@ -1431,11 +1436,11 @@ export class AgentSession {
         };
         // Set up abort controller for summarization
         this._branchSummaryAbortController = new AbortController();
-        let hookSummary;
-        let fromHook = false;
+        let extensionSummary;
+        let fromExtension = false;
         // Emit session_before_tree event
-        if (this._hookRunner?.hasHandlers("session_before_tree")) {
-            const result = (await this._hookRunner.emit({
+        if (this._extensionRunner?.hasHandlers("session_before_tree")) {
+            const result = (await this._extensionRunner.emit({
                 type: "session_before_tree",
                 preparation,
                 signal: this._branchSummaryAbortController.signal,
@@ -1444,14 +1449,14 @@ export class AgentSession {
                 return { cancelled: true };
             }
             if (result?.summary && options.summarize) {
-                hookSummary = result.summary;
-                fromHook = true;
+                extensionSummary = result.summary;
+                fromExtension = true;
             }
         }
         // Run default summarizer if needed
         let summaryText;
         let summaryDetails;
-        if (options.summarize && entriesToSummarize.length > 0 && !hookSummary) {
+        if (options.summarize && entriesToSummarize.length > 0 && !extensionSummary) {
             const model = this.model;
             const apiKey = await this._modelRegistry.getApiKey(model);
             if (!apiKey) {
@@ -1478,9 +1483,9 @@ export class AgentSession {
                 modifiedFiles: result.modifiedFiles || [],
             };
         }
-        else if (hookSummary) {
-            summaryText = hookSummary.summary;
-            summaryDetails = hookSummary.details;
+        else if (extensionSummary) {
+            summaryText = extensionSummary.summary;
+            summaryDetails = extensionSummary.details;
         }
         // Determine the new leaf position based on target type
         let newLeafId;
@@ -1510,7 +1515,7 @@ export class AgentSession {
         let summaryEntry;
         if (summaryText) {
             // Create summary at target position (can be null for root)
-            const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromHook);
+            const summaryId = this.sessionManager.branchWithSummary(newLeafId, summaryText, summaryDetails, fromExtension);
             summaryEntry = this.sessionManager.getEntry(summaryId);
         }
         else if (newLeafId === null) {
@@ -1525,17 +1530,16 @@ export class AgentSession {
         const sessionContext = this.sessionManager.buildSessionContext();
         this.agent.replaceMessages(sessionContext.messages);
         // Emit session_tree event
-        if (this._hookRunner) {
-            await this._hookRunner.emit({
+        if (this._extensionRunner) {
+            await this._extensionRunner.emit({
                 type: "session_tree",
                 newLeafId: this.sessionManager.getLeafId(),
                 oldLeafId,
                 summaryEntry,
-                fromHook: summaryText ? fromHook : undefined,
+                fromExtension: summaryText ? fromExtension : undefined,
             });
         }
         // Emit to custom tools
-        await this.emitCustomToolSessionEvent("tree", this.sessionFile);
         this._branchSummaryAbortController = undefined;
         return { editorText, cancelled: false, summaryEntry };
     }
@@ -1652,54 +1656,19 @@ export class AgentSession {
         return text.trim() || undefined;
     }
     // =========================================================================
-    // Hook System
+    // Extension System
     // =========================================================================
     /**
-     * Check if hooks have handlers for a specific event type.
-     */
-    hasHookHandlers(eventType) {
-        return this._hookRunner?.hasHandlers(eventType) ?? false;
-    }
-    /**
-     * Get the hook runner (for setting UI context and error handlers).
-     */
-    get hookRunner() {
-        return this._hookRunner;
-    }
-    /**
-     * Get custom tools (for setting UI context in modes).
+     * Check if extensions have handlers for a specific event type.
      */
-    get customTools() {
-        return this._customTools;
+    hasExtensionHandlers(eventType) {
+        return this._extensionRunner?.hasHandlers(eventType) ?? false;
     }
     /**
-     * Emit session event to all custom tools.
-     * Called on session switch, branch, tree navigation, and shutdown.
+     * Get the extension runner (for setting UI context and error handlers).
      */
-    async emitCustomToolSessionEvent(reason, previousSessionFile) {
-        if (!this._customTools)
-            return;
-        const event = { reason, previousSessionFile };
-        const ctx = {
-            sessionManager: this.sessionManager,
-            modelRegistry: this._modelRegistry,
-            model: this.agent.state.model,
-            isIdle: () => !this.isStreaming,
-            hasPendingMessages: () => this.pendingMessageCount > 0,
-            abort: () => {
-                this.abort();
-            },
-        };
-        for (const { tool } of this._customTools) {
-            if (tool.onSession) {
-                try {
-                    await tool.onSession(event, ctx);
-                }
-                catch (_err) {
-                    // Silently ignore tool errors during session events
-                }
-            }
-        }
+    get extensionRunner() {
+        return this._extensionRunner;
     }
 }
 //# sourceMappingURL=agent-session.js.map