@mariozechner/pi-coding-agent 0.34.2 → 0.35.0

package/dist/modes/interactive/interactive-mode.js

@@ -24,12 +24,12 @@ import { BorderedLoader } from "./components/bordered-loader.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
 import { CustomEditor } from "./components/custom-editor.js";
+import { CustomMessageComponent } from "./components/custom-message.js";
 import { DynamicBorder } from "./components/dynamic-border.js";
+import { ExtensionEditorComponent } from "./components/extension-editor.js";
+import { ExtensionInputComponent } from "./components/extension-input.js";
+import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FooterComponent } from "./components/footer.js";
-import { HookEditorComponent } from "./components/hook-editor.js";
-import { HookInputComponent } from "./components/hook-input.js";
-import { HookMessageComponent } from "./components/hook-message.js";
-import { HookSelectorComponent } from "./components/hook-selector.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
@@ -43,7 +43,7 @@ function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
 export class InteractiveMode {
-    setToolUIContext;
+    setExtensionUIContext;
     session;
     ui;
     chatContainer;
@@ -86,15 +86,13 @@ export class InteractiveMode {
     // Auto-retry state
     retryLoader = undefined;
     retryEscapeHandler;
-    // Hook UI state
-    hookSelector = undefined;
-    hookInput = undefined;
-    hookEditor = undefined;
-    // Hook widgets (components rendered above the editor)
-    hookWidgets = new Map();
+    // Extension UI state
+    extensionSelector = undefined;
+    extensionInput = undefined;
+    extensionEditor = undefined;
+    // Extension widgets (components rendered above the editor)
+    extensionWidgets = new Map();
     widgetContainer;
-    // Custom tools for custom rendering
-    customTools;
     // Convenience accessors
     get agent() {
         return this.session.agent;
@@ -105,12 +103,11 @@ export class InteractiveMode {
     get settingsManager() {
         return this.session.settingsManager;
     }
-    constructor(session, version, changelogMarkdown = undefined, customTools = [], setToolUIContext = () => { }, fdPath = undefined) {
-        this.setToolUIContext = setToolUIContext;
+    constructor(session, version, changelogMarkdown = undefined, _extensions = [], setExtensionUIContext = () => { }, fdPath = undefined) {
+        this.setExtensionUIContext = setExtensionUIContext;
         this.session = session;
         this.version = version;
         this.changelogMarkdown = changelogMarkdown;
-        this.customTools = new Map(customTools.map((ct) => [ct.tool.name, ct]));
         this.ui = new TUI(new ProcessTerminal());
         this.chatContainer = new Container();
         this.pendingMessagesContainer = new Container();
@@ -122,7 +119,7 @@ export class InteractiveMode {
         this.editorContainer.addChild(this.editor);
         this.footer = new FooterComponent(session);
         this.footer.setAutoCompactEnabled(session.autoCompactionEnabled);
-        // Define slash commands for autocomplete
+        // Define commands for autocomplete
         const slashCommands = [
             { name: "settings", description: "Open settings menu" },
             { name: "model", description: "Select model (opens selector UI)" },
@@ -142,18 +139,18 @@ export class InteractiveMode {
         ];
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
-        // Convert file commands to SlashCommand format
-        const fileSlashCommands = this.session.fileCommands.map((cmd) => ({
+        // Convert prompt templates to SlashCommand format for autocomplete
+        const templateCommands = this.session.promptTemplates.map((cmd) => ({
             name: cmd.name,
             description: cmd.description,
         }));
-        // Convert hook commands to SlashCommand format
-        const hookCommands = (this.session.hookRunner?.getRegisteredCommands() ?? []).map((cmd) => ({
+        // Convert extension commands to SlashCommand format
+        const extensionCommands = (this.session.extensionRunner?.getRegisteredCommands() ?? []).map((cmd) => ({
             name: cmd.name,
-            description: cmd.description ?? "(hook command)",
+            description: cmd.description ?? "(extension command)",
         }));
         // Setup autocomplete
-        const autocompleteProvider = new CombinedAutocompleteProvider([...slashCommands, ...fileSlashCommands, ...hookCommands], process.cwd(), fdPath);
+        const autocompleteProvider = new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands], process.cwd(), fdPath);
         this.editor.setAutocompleteProvider(autocompleteProvider);
     }
     async init() {
@@ -268,8 +265,8 @@ export class InteractiveMode {
         // Set terminal title
         const cwdBasename = path.basename(process.cwd());
         this.ui.terminal.setTitle(`pi - ${cwdBasename}`);
-        // Initialize hooks with TUI-based UI context
-        await this.initHooksAndCustomTools();
+        // Initialize extensions with TUI-based UI context
+        await this.initExtensions();
         // Subscribe to agent events
         this.subscribeToAgent();
         // Set up theme file watcher
@@ -284,12 +281,12 @@ export class InteractiveMode {
         });
     }
     // =========================================================================
-    // Hook System
+    // Extension System
     // =========================================================================
     /**
-     * Initialize the hook system with TUI-based UI context.
+     * Initialize the extension system with TUI-based UI context.
      */
-    async initHooksAndCustomTools() {
+    async initExtensions() {
         // Show loaded project context files
         const contextFiles = loadProjectContextFiles();
         if (contextFiles.length > 0) {
@@ -315,32 +312,19 @@ export class InteractiveMode {
                 this.chatContainer.addChild(new Spacer(1));
             }
         }
-        // Show loaded custom tools
-        if (this.customTools.size > 0) {
-            const toolList = Array.from(this.customTools.values())
-                .map((ct) => theme.fg("dim", `  ${ct.tool.name} (${ct.path})`))
-                .join("\n");
-            this.chatContainer.addChild(new Text(theme.fg("muted", "Loaded custom tools:\n") + toolList, 0, 0));
-            this.chatContainer.addChild(new Spacer(1));
+        // Create and set extension UI context
+        const uiContext = this.createExtensionUIContext();
+        this.setExtensionUIContext(uiContext, true);
+        const extensionRunner = this.session.extensionRunner;
+        if (!extensionRunner) {
+            return; // No extensions loaded
         }
-        // Create and set hook & tool UI context
-        const uiContext = this.createHookUIContext();
-        this.setToolUIContext(uiContext, true);
-        // Notify custom tools of session start
-        await this.emitCustomToolSessionEvent({
-            reason: "start",
-            previousSessionFile: undefined,
-        });
-        const hookRunner = this.session.hookRunner;
-        if (!hookRunner) {
-            return; // No hooks loaded
-        }
-        hookRunner.initialize({
+        extensionRunner.initialize({
             getModel: () => this.session.model,
             sendMessageHandler: (message, options) => {
                 const wasStreaming = this.session.isStreaming;
                 this.session
-                    .sendHookMessage(message, options)
+                    .sendCustomMessage(message, options)
                     .then(() => {
                     // For non-streaming cases with display=true, update UI
                     // (streaming cases update via message_end event)
@@ -349,7 +333,7 @@ export class InteractiveMode {
                     }
                 })
                     .catch((err) => {
-                    this.showError(`Hook sendMessage failed: ${err instanceof Error ? err.message : String(err)}`);
+                    this.showError(`Extension sendMessage failed: ${err instanceof Error ? err.message : String(err)}`);
                 });
             },
             appendEntryHandler: (customType, data) => {
@@ -420,66 +404,42 @@ export class InteractiveMode {
             uiContext,
             hasUI: true,
         });
-        // Subscribe to hook errors
-        hookRunner.onError((error) => {
-            this.showHookError(error.hookPath, error.error, error.stack);
+        // Subscribe to extension errors
+        extensionRunner.onError((error) => {
+            this.showExtensionError(error.extensionPath, error.error, error.stack);
         });
-        // Set up hook-registered shortcuts
-        this.setupHookShortcuts(hookRunner);
-        // Show loaded hooks
-        const hookPaths = hookRunner.getHookPaths();
-        if (hookPaths.length > 0) {
-            const hookList = hookPaths.map((p) => theme.fg("dim", `  ${p}`)).join("\n");
-            this.chatContainer.addChild(new Text(theme.fg("muted", "Loaded hooks:\n") + hookList, 0, 0));
+        // Set up extension-registered shortcuts
+        this.setupExtensionShortcuts(extensionRunner);
+        // Show loaded extensions
+        const extensionPaths = extensionRunner.getExtensionPaths();
+        if (extensionPaths.length > 0) {
+            const extList = extensionPaths.map((p) => theme.fg("dim", `  ${p}`)).join("\n");
+            this.chatContainer.addChild(new Text(theme.fg("muted", "Loaded extensions:\n") + extList, 0, 0));
             this.chatContainer.addChild(new Spacer(1));
         }
         // Emit session_start event
-        await hookRunner.emit({
+        await extensionRunner.emit({
             type: "session_start",
         });
     }
     /**
-     * Emit session event to all custom tools.
+     * Get a registered tool definition by name (for custom rendering).
      */
-    async emitCustomToolSessionEvent(event) {
-        for (const { tool } of this.customTools.values()) {
-            if (tool.onSession) {
-                try {
-                    await tool.onSession(event, {
-                        sessionManager: this.session.sessionManager,
-                        modelRegistry: this.session.modelRegistry,
-                        model: this.session.model,
-                        isIdle: () => !this.session.isStreaming,
-                        hasPendingMessages: () => this.session.pendingMessageCount > 0,
-                        abort: () => {
-                            this.session.abort();
-                        },
-                    });
-                }
-                catch (err) {
-                    this.showToolError(tool.name, err instanceof Error ? err.message : String(err));
-                }
-            }
-        }
-    }
-    /**
-     * Show a tool error in the chat.
-     */
-    showToolError(toolName, error) {
-        const errorText = new Text(theme.fg("error", `Tool "${toolName}" error: ${error}`), 1, 0);
-        this.chatContainer.addChild(errorText);
-        this.ui.requestRender();
+    getRegisteredToolDefinition(toolName) {
+        const tools = this.session.extensionRunner?.getAllRegisteredTools() ?? [];
+        const registeredTool = tools.find((t) => t.definition.name === toolName);
+        return registeredTool?.definition;
     }
     /**
-     * Set up keyboard shortcuts registered by hooks.
+     * Set up keyboard shortcuts registered by extensions.
      */
-    setupHookShortcuts(hookRunner) {
-        const shortcuts = hookRunner.getShortcuts();
+    setupExtensionShortcuts(extensionRunner) {
+        const shortcuts = extensionRunner.getShortcuts();
         if (shortcuts.size === 0)
             return;
         // Create a context for shortcut handlers
         const createContext = () => ({
-            ui: this.createHookUIContext(),
+            ui: this.createExtensionUIContext(),
             hasUI: true,
             cwd: process.cwd(),
             sessionManager: this.sessionManager,
@@ -489,10 +449,10 @@ export class InteractiveMode {
             abort: () => this.session.abort(),
             hasPendingMessages: () => this.session.pendingMessageCount > 0,
         });
-        // Set up the hook shortcut handler on the editor
-        this.editor.onHookShortcut = (data) => {
+        // Set up the extension shortcut handler on the editor
+        this.editor.onExtensionShortcut = (data) => {
             for (const [shortcutStr, shortcut] of shortcuts) {
-                // Cast to KeyId - hook shortcuts use the same format
+                // Cast to KeyId - extension shortcuts use the same format
                 if (matchesKey(data, shortcutStr)) {
                     // Run handler async, don't block input
                     Promise.resolve(shortcut.handler(createContext())).catch((err) => {
@@ -505,22 +465,22 @@ export class InteractiveMode {
         };
     }
     /**
-     * Set hook status text in the footer.
+     * Set extension status text in the footer.
      */
-    setHookStatus(key, text) {
-        this.footer.setHookStatus(key, text);
+    setExtensionStatus(key, text) {
+        this.footer.setExtensionStatus(key, text);
         this.ui.requestRender();
     }
     /**
-     * Set a hook widget (string array or custom component).
+     * Set an extension widget (string array or custom component).
      */
-    setHookWidget(key, content) {
+    setExtensionWidget(key, content) {
         // Dispose and remove existing widget
-        const existing = this.hookWidgets.get(key);
+        const existing = this.extensionWidgets.get(key);
         if (existing?.dispose)
             existing.dispose();
         if (content === undefined) {
-            this.hookWidgets.delete(key);
+            this.extensionWidgets.delete(key);
         }
         else if (Array.isArray(content)) {
             // Wrap string array in a Container with Text components
@@ -531,149 +491,149 @@ export class InteractiveMode {
             if (content.length > InteractiveMode.MAX_WIDGET_LINES) {
                 container.addChild(new Text(theme.fg("muted", "... (widget truncated)"), 1, 0));
             }
-            this.hookWidgets.set(key, container);
+            this.extensionWidgets.set(key, container);
         }
         else {
             // Factory function - create component
             const component = content(this.ui, theme);
-            this.hookWidgets.set(key, component);
+            this.extensionWidgets.set(key, component);
         }
         this.renderWidgets();
     }
     // Maximum total widget lines to prevent viewport overflow
     static MAX_WIDGET_LINES = 10;
     /**
-     * Render all hook widgets to the widget container.
+     * Render all extension widgets to the widget container.
      */
     renderWidgets() {
         if (!this.widgetContainer)
             return;
         this.widgetContainer.clear();
-        if (this.hookWidgets.size === 0) {
+        if (this.extensionWidgets.size === 0) {
             this.ui.requestRender();
             return;
         }
-        for (const [_key, component] of this.hookWidgets) {
+        for (const [_key, component] of this.extensionWidgets) {
             this.widgetContainer.addChild(component);
         }
         this.ui.requestRender();
     }
     /**
-     * Create the HookUIContext for hooks and tools.
+     * Create the ExtensionUIContext for extensions.
      */
-    createHookUIContext() {
+    createExtensionUIContext() {
         return {
-            select: (title, options) => this.showHookSelector(title, options),
-            confirm: (title, message) => this.showHookConfirm(title, message),
-            input: (title, placeholder) => this.showHookInput(title, placeholder),
-            notify: (message, type) => this.showHookNotify(message, type),
-            setStatus: (key, text) => this.setHookStatus(key, text),
-            setWidget: (key, content) => this.setHookWidget(key, content),
+            select: (title, options) => this.showExtensionSelector(title, options),
+            confirm: (title, message) => this.showExtensionConfirm(title, message),
+            input: (title, placeholder) => this.showExtensionInput(title, placeholder),
+            notify: (message, type) => this.showExtensionNotify(message, type),
+            setStatus: (key, text) => this.setExtensionStatus(key, text),
+            setWidget: (key, content) => this.setExtensionWidget(key, content),
             setTitle: (title) => this.ui.terminal.setTitle(title),
-            custom: (factory) => this.showHookCustom(factory),
+            custom: (factory) => this.showExtensionCustom(factory),
             setEditorText: (text) => this.editor.setText(text),
             getEditorText: () => this.editor.getText(),
-            editor: (title, prefill) => this.showHookEditor(title, prefill),
+            editor: (title, prefill) => this.showExtensionEditor(title, prefill),
             get theme() {
                 return theme;
             },
         };
     }
     /**
-     * Show a selector for hooks.
+     * Show a selector for extensions.
      */
-    showHookSelector(title, options) {
+    showExtensionSelector(title, options) {
         return new Promise((resolve) => {
-            this.hookSelector = new HookSelectorComponent(title, options, (option) => {
-                this.hideHookSelector();
+            this.extensionSelector = new ExtensionSelectorComponent(title, options, (option) => {
+                this.hideExtensionSelector();
                 resolve(option);
             }, () => {
-                this.hideHookSelector();
+                this.hideExtensionSelector();
                 resolve(undefined);
             });
             this.editorContainer.clear();
-            this.editorContainer.addChild(this.hookSelector);
-            this.ui.setFocus(this.hookSelector);
+            this.editorContainer.addChild(this.extensionSelector);
+            this.ui.setFocus(this.extensionSelector);
             this.ui.requestRender();
         });
     }
     /**
-     * Hide the hook selector.
+     * Hide the extension selector.
      */
-    hideHookSelector() {
+    hideExtensionSelector() {
         this.editorContainer.clear();
         this.editorContainer.addChild(this.editor);
-        this.hookSelector = undefined;
+        this.extensionSelector = undefined;
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
     /**
-     * Show a confirmation dialog for hooks.
+     * Show a confirmation dialog for extensions.
      */
-    async showHookConfirm(title, message) {
-        const result = await this.showHookSelector(`${title}\n${message}`, ["Yes", "No"]);
+    async showExtensionConfirm(title, message) {
+        const result = await this.showExtensionSelector(`${title}\n${message}`, ["Yes", "No"]);
         return result === "Yes";
     }
     /**
-     * Show a text input for hooks.
+     * Show a text input for extensions.
      */
-    showHookInput(title, placeholder) {
+    showExtensionInput(title, placeholder) {
         return new Promise((resolve) => {
-            this.hookInput = new HookInputComponent(title, placeholder, (value) => {
-                this.hideHookInput();
+            this.extensionInput = new ExtensionInputComponent(title, placeholder, (value) => {
+                this.hideExtensionInput();
                 resolve(value);
             }, () => {
-                this.hideHookInput();
+                this.hideExtensionInput();
                 resolve(undefined);
             });
             this.editorContainer.clear();
-            this.editorContainer.addChild(this.hookInput);
-            this.ui.setFocus(this.hookInput);
+            this.editorContainer.addChild(this.extensionInput);
+            this.ui.setFocus(this.extensionInput);
             this.ui.requestRender();
         });
     }
     /**
-     * Hide the hook input.
+     * Hide the extension input.
      */
-    hideHookInput() {
+    hideExtensionInput() {
         this.editorContainer.clear();
         this.editorContainer.addChild(this.editor);
-        this.hookInput = undefined;
+        this.extensionInput = undefined;
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
     /**
-     * Show a multi-line editor for hooks (with Ctrl+G support).
+     * Show a multi-line editor for extensions (with Ctrl+G support).
      */
-    showHookEditor(title, prefill) {
+    showExtensionEditor(title, prefill) {
         return new Promise((resolve) => {
-            this.hookEditor = new HookEditorComponent(this.ui, title, prefill, (value) => {
-                this.hideHookEditor();
+            this.extensionEditor = new ExtensionEditorComponent(this.ui, title, prefill, (value) => {
+                this.hideExtensionEditor();
                 resolve(value);
             }, () => {
-                this.hideHookEditor();
+                this.hideExtensionEditor();
                 resolve(undefined);
             });
             this.editorContainer.clear();
-            this.editorContainer.addChild(this.hookEditor);
-            this.ui.setFocus(this.hookEditor);
+            this.editorContainer.addChild(this.extensionEditor);
+            this.ui.setFocus(this.extensionEditor);
             this.ui.requestRender();
         });
     }
     /**
-     * Hide the hook editor.
+     * Hide the extension editor.
      */
-    hideHookEditor() {
+    hideExtensionEditor() {
         this.editorContainer.clear();
         this.editorContainer.addChild(this.editor);
-        this.hookEditor = undefined;
+        this.extensionEditor = undefined;
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
     /**
-     * Show a notification for hooks.
+     * Show a notification for extensions.
      */
-    showHookNotify(message, type) {
+    showExtensionNotify(message, type) {
         if (type === "error") {
             this.showError(message);
         }
@@ -687,7 +647,7 @@ export class InteractiveMode {
     /**
      * Show a custom component with keyboard focus.
      */
-    async showHookCustom(factory) {
+    async showExtensionCustom(factory) {
         const savedText = this.editor.getText();
         return new Promise((resolve) => {
             let component;
@@ -710,10 +670,10 @@ export class InteractiveMode {
         });
     }
     /**
-     * Show a hook error in the UI.
+     * Show an extension error in the UI.
      */
-    showHookError(hookPath, error, stack) {
-        const errorMsg = `Hook "${hookPath}" error: ${error}`;
+    showExtensionError(extensionPath, error, stack) {
+        const errorMsg = `Extension "${extensionPath}" error: ${error}`;
         const errorText = new Text(theme.fg("error", errorMsg), 1, 0);
         this.chatContainer.addChild(errorText);
         if (stack) {
@@ -729,10 +689,6 @@ export class InteractiveMode {
         }
         this.ui.requestRender();
     }
-    /**
-     * Handle pi.send() from hooks.
-     * If streaming, queue the message. Otherwise, start a new agent loop.
-     */
     // =========================================================================
     // Key Handlers
     // =========================================================================
@@ -827,7 +783,7 @@ export class InteractiveMode {
             text = text.trim();
             if (!text)
                 return;
-            // Handle slash commands
+            // Handle commands
             if (text === "/settings") {
                 this.showSettingsSelector();
                 this.editor.setText("");
@@ -947,7 +903,7 @@ export class InteractiveMode {
                 return;
             }
             // If streaming, use prompt() with steer behavior
-            // This handles hook commands (execute immediately), slash command expansion, and queueing
+            // This handles extension commands (execute immediately), prompt template expansion, and queueing
             if (this.session.isStreaming) {
                 this.editor.addToHistory(text);
                 this.editor.setText("");
@@ -986,7 +942,7 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "message_start":
-                if (event.message.role === "hookMessage") {
+                if (event.message.role === "custom") {
                     this.addMessageToChat(event.message);
                     this.ui.requestRender();
                 }
@@ -1014,7 +970,7 @@ export class InteractiveMode {
                                 this.chatContainer.addChild(new Text("", 0, 0));
                                 const component = new ToolExecutionComponent(content.name, content.arguments, {
                                     showImages: this.settingsManager.getShowImages(),
-                                }, this.customTools.get(content.name)?.tool, this.ui);
+                                }, this.getRegisteredToolDefinition(content.name), this.ui);
                                 component.setExpanded(this.toolOutputExpanded);
                                 this.chatContainer.addChild(component);
                                 this.pendingTools.set(content.id, component);
@@ -1064,7 +1020,7 @@ export class InteractiveMode {
                 if (!this.pendingTools.has(event.toolCallId)) {
                     const component = new ToolExecutionComponent(event.toolName, event.args, {
                         showImages: this.settingsManager.getShowImages(),
-                    }, this.customTools.get(event.toolName)?.tool, this.ui);
+                    }, this.getRegisteredToolDefinition(event.toolName), this.ui);
                     component.setExpanded(this.toolOutputExpanded);
                     this.chatContainer.addChild(component);
                     this.pendingTools.set(event.toolCallId, component);
@@ -1231,10 +1187,10 @@ export class InteractiveMode {
                 this.chatContainer.addChild(component);
                 break;
             }
-            case "hookMessage": {
+            case "custom": {
                 if (message.display) {
-                    const renderer = this.session.hookRunner?.getMessageRenderer(message.customType);
-                    this.chatContainer.addChild(new HookMessageComponent(message, renderer));
+                    const renderer = this.session.extensionRunner?.getMessageRenderer(message.customType);
+                    this.chatContainer.addChild(new CustomMessageComponent(message, renderer));
                 }
                 break;
             }
@@ -1296,7 +1252,7 @@ export class InteractiveMode {
                 // Render tool call components
                 for (const content of message.content) {
                     if (content.type === "toolCall") {
-                        const component = new ToolExecutionComponent(content.name, content.arguments, { showImages: this.settingsManager.getShowImages() }, this.customTools.get(content.name)?.tool, this.ui);
+                        const component = new ToolExecutionComponent(content.name, content.arguments, { showImages: this.settingsManager.getShowImages() }, this.getRegisteredToolDefinition(content.name), this.ui);
                         component.setExpanded(this.toolOutputExpanded);
                         this.chatContainer.addChild(component);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
@@ -1372,18 +1328,16 @@ export class InteractiveMode {
     }
     /**
      * Gracefully shutdown the agent.
-     * Emits shutdown event to hooks and tools, then exits.
+     * Emits shutdown event to extensions, then exits.
      */
     async shutdown() {
-        // Emit shutdown event to hooks
-        const hookRunner = this.session.hookRunner;
-        if (hookRunner?.hasHandlers("session_shutdown")) {
-            await hookRunner.emit({
+        // Emit shutdown event to extensions
+        const extensionRunner = this.session.extensionRunner;
+        if (extensionRunner?.hasHandlers("session_shutdown")) {
+            await extensionRunner.emit({
                 type: "session_shutdown",
             });
         }
-        // Emit shutdown event to custom tools
-        await this.session.emitCustomToolSessionEvent("shutdown");
         this.stop();
         process.exit(0);
     }
@@ -1403,7 +1357,7 @@ export class InteractiveMode {
         if (!text)
             return;
         // Alt+Enter queues a follow-up message (waits until agent finishes)
-        // This handles hook commands (execute immediately), slash command expansion, and queueing
+        // This handles extension commands (execute immediately), prompt template expansion, and queueing
         if (this.session.isStreaming) {
             this.editor.addToHistory(text);
             this.editor.setText("");
@@ -1701,7 +1655,7 @@ export class InteractiveMode {
             const selector = new UserMessageSelectorComponent(userMessages.map((m) => ({ id: m.entryId, text: m.text })), async (entryId) => {
                 const result = await this.session.branch(entryId);
                 if (result.cancelled) {
-                    // Hook cancelled the branch
+                    // Extension cancelled the branch
                     done();
                     this.ui.requestRender();
                     return;
@@ -1745,7 +1699,7 @@ export class InteractiveMode {
                 }
                 // Ask about summarization
                 done(); // Close selector first
-                const wantsSummary = await this.showHookConfirm("Summarize branch?", "Create a summary of the branch you're leaving?");
+                const wantsSummary = await this.showExtensionConfirm("Summarize branch?", "Create a summary of the branch you're leaving?");
                 // Set up escape handler and loader if summarizing
                 let summaryLoader;
                 const originalOnEscape = this.editor.onEscape;
@@ -1825,7 +1779,7 @@ export class InteractiveMode {
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
         this.pendingTools.clear();
-        // Switch session via AgentSession (emits hook and tool session events)
+        // Switch session via AgentSession (emits extension session events)
         await this.session.switchSession(sessionPath);
         // Clear and re-render the chat
         this.chatContainer.clear();
@@ -2176,18 +2130,18 @@ export class InteractiveMode {
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 `;
-        // Add hook-registered shortcuts
-        const hookRunner = this.session.hookRunner;
-        if (hookRunner) {
-            const shortcuts = hookRunner.getShortcuts();
+        // Add extension-registered shortcuts
+        const extensionRunner = this.session.extensionRunner;
+        if (extensionRunner) {
+            const shortcuts = extensionRunner.getShortcuts();
             if (shortcuts.size > 0) {
                 hotkeys += `
-**Hooks**
+**Extensions**
 | Key | Action |
 |-----|--------|
 `;
                 for (const [key, shortcut] of shortcuts) {
-                    const description = shortcut.description ?? shortcut.hookPath;
+                    const description = shortcut.description ?? shortcut.extensionPath;
                     hotkeys += `| \`${key}\` | ${description} |\n`;
                 }
             }
@@ -2207,7 +2161,7 @@ export class InteractiveMode {
             this.loadingAnimation = undefined;
         }
         this.statusContainer.clear();
-        // New session via session (emits hook and tool session events)
+        // New session via session (emits extension session events)
         await this.session.newSession();
         // Clear UI state
         this.chatContainer.clear();