@openeryc/pi-coding-agent 0.75.28 → 0.75.30

package/dist/core/agent-session.js

@@ -26,6 +26,7 @@ import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { emitSessionShutdownEvent } from "./extensions/runner.js";
+import { HookRunner } from "./hook-runner.js";
 import { MCPManager } from "./mcp/index.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry, SessionManager as SessionManagerCtor, } from "./session-manager.js";
@@ -103,6 +104,8 @@ export class AgentSession {
     _extensionErrorUnsubscriber;
     // MCP client management
     _mcpManager = null;
+    // Hooks system
+    _hookRunner = null;
     // Model registry for API key resolution
     _modelRegistry;
     // Tool registry for extension getTools/setTools
@@ -130,6 +133,7 @@ export class AgentSession {
         // Always subscribe to agent events for internal handling
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
+        this._hookRunner = new HookRunner(this.settingsManager);
         this._installAgentToolHooks();
         this._buildRuntime({
             activeToolNames: this._initialActiveToolNames,
@@ -175,7 +179,14 @@ export class AgentSession {
      * happens here instead of in wrappers.
      */
     _installAgentToolHooks() {
+        const hookRunner = this._hookRunner;
         this.agent.beforeToolCall = async ({ toolCall, args }) => {
+            if (hookRunner) {
+                const hookResult = await hookRunner.runPreToolHooks(toolCall.name, args);
+                if (hookResult?.behavior === "deny") {
+                    throw new Error(hookResult.message ?? `Blocked by hook: ${toolCall.name}`);
+                }
+            }
             const runner = this._extensionRunner;
             if (!runner.hasHandlers("tool_call")) {
                 return undefined;
@@ -196,6 +207,15 @@ export class AgentSession {
             }
         };
         this.agent.afterToolCall = async ({ toolCall, args, result, isError }) => {
+            if (this._hookRunner) {
+                const postHookResult = await this._hookRunner.runPostToolHooks(toolCall.name, result.content.map((c) => c.text ?? "").join("\n"));
+                if (postHookResult?.additionalContext) {
+                    result = {
+                        ...result,
+                        content: [...result.content, { type: "text", text: postHookResult.additionalContext }],
+                    };
+                }
+            }
             const runner = this._extensionRunner;
             if (!runner.hasHandlers("tool_result")) {
                 return undefined;
@@ -472,11 +492,14 @@ export class AgentSession {
         this._extensionRunner.invalidate("This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().");
         this._disconnectFromAgent();
         this._eventListeners = [];
+        this._cleanupMcp();
+        cleanupSessionResources(this.sessionId);
+    }
+    _cleanupMcp() {
         if (this._mcpManager) {
             void this._mcpManager.stop().catch(() => { });
             this._mcpManager = null;
         }
-        cleanupSessionResources(this.sessionId);
     }
     // =========================================================================
     // Read-only State Access
@@ -1637,18 +1660,23 @@ export class AgentSession {
         this._applyExtensionBindings(this._extensionRunner);
         await this._extensionRunner.emit(this._sessionStartEvent);
         await this.extendResourcesFromExtensions(this._sessionStartEvent.reason === "reload" ? "reload" : "startup");
+        await this._initMcp();
+    }
+    async _initMcp() {
         const mcpServers = this.settingsManager.getMcpServers();
-        if (mcpServers && Object.keys(mcpServers).length > 0) {
-            if (this._mcpManager) {
-                await this._mcpManager.stop();
-            }
-            this._mcpManager = new MCPManager();
-            await this._mcpManager.start(mcpServers);
-            const mcpTools = this._mcpManager.getToolDefinitions();
-            if (mcpTools.length > 0) {
-                this._customTools.push(...mcpTools);
-                this._refreshToolRegistry();
-            }
+        if (!mcpServers || Object.keys(mcpServers).length === 0) {
+            return;
+        }
+        if (this._mcpManager) {
+            await this._mcpManager.stop();
+            this._mcpManager = null;
+        }
+        this._mcpManager = new MCPManager();
+        await this._mcpManager.start(mcpServers);
+        const mcpTools = this._mcpManager.getToolDefinitions();
+        if (mcpTools.length > 0) {
+            this._customTools.push(...mcpTools);
+            this._refreshToolRegistry();
         }
     }
     async extendResourcesFromExtensions(reason) {