@codex-infinity/pi-infinity 0.61.2 → 0.61.3

package/dist/core/agent-session.js

@@ -29,7 +29,8 @@ import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "./slash-commands.js";
 import { buildSystemPrompt } from "./system-prompt.js";
-import { createAllTools } from "./tools/index.js";
+import { createAllToolDefinitions } from "./tools/index.js";
+import { createToolDefinitionFromAgentTool, wrapToolDefinition } from "./tools/tool-definition-wrapper.js";
 /**
  * Parse a skill block from message text.
  * Returns null if the text doesn't contain a skill block.
@@ -85,9 +86,10 @@ export class AgentSession {
         // Extension system
         this._extensionRunner = undefined;
         this._turnIndex = 0;
-        this._baseToolRegistry = new Map();
+        this._baseToolDefinitions = new Map();
         // Tool registry for extension getTools/setTools
         this._toolRegistry = new Map();
+        this._toolDefinitions = new Map();
         this._toolPromptSnippets = new Map();
         this._toolPromptGuidelines = new Map();
         // Base system prompt (without extension appends) - used to apply fresh appends each turn
@@ -484,12 +486,15 @@ export class AgentSession {
      * Get all configured tools with name, description, and parameter schema.
      */
     getAllTools() {
-        return Array.from(this._toolRegistry.values()).map((t) => ({
+        return Array.from(this._toolDefinitions.values()).map((t) => ({
             name: t.name,
             description: t.description,
             parameters: t.parameters,
         }));
     }
+    getToolDefinition(name) {
+        return this._toolDefinitions.get(name);
+    }
     /**
      * Set active tools by name.
      * Only tools in the registry can be enabled. Unknown tool names are ignored.
@@ -1763,22 +1768,30 @@ export class AgentSession {
             ...registeredTools,
             ...this._customTools.map((def) => ({ definition: def, extensionPath: "<sdk>" })),
         ];
-        this._toolPromptSnippets = new Map(allCustomTools
-            .map((registeredTool) => {
-            const snippet = this._normalizePromptSnippet(registeredTool.definition.promptSnippet);
-            return snippet ? [registeredTool.definition.name, snippet] : undefined;
+        const definitionRegistry = new Map(this._baseToolDefinitions);
+        for (const { definition } of allCustomTools) {
+            definitionRegistry.set(definition.name, definition);
+        }
+        this._toolDefinitions = definitionRegistry;
+        this._toolPromptSnippets = new Map(Array.from(definitionRegistry.values())
+            .map((definition) => {
+            const snippet = this._normalizePromptSnippet(definition.promptSnippet);
+            return snippet ? [definition.name, snippet] : undefined;
         })
             .filter((entry) => entry !== undefined));
-        this._toolPromptGuidelines = new Map(allCustomTools
-            .map((registeredTool) => {
-            const guidelines = this._normalizePromptGuidelines(registeredTool.definition.promptGuidelines);
-            return guidelines.length > 0 ? [registeredTool.definition.name, guidelines] : undefined;
+        this._toolPromptGuidelines = new Map(Array.from(definitionRegistry.values())
+            .map((definition) => {
+            const guidelines = this._normalizePromptGuidelines(definition.promptGuidelines);
+            return guidelines.length > 0 ? [definition.name, guidelines] : undefined;
         })
             .filter((entry) => entry !== undefined));
         const wrappedExtensionTools = this._extensionRunner
             ? wrapRegisteredTools(allCustomTools, this._extensionRunner)
             : [];
-        const toolRegistry = new Map(this._baseToolRegistry);
+        const toolRegistry = new Map(Array.from(this._baseToolDefinitions.values()).map((definition) => [
+            definition.name,
+            wrapToolDefinition(definition),
+        ]));
         for (const tool of wrappedExtensionTools) {
             toolRegistry.set(tool.name, tool);
         }
@@ -1803,13 +1816,16 @@ export class AgentSession {
     _buildRuntime(options) {
         const autoResizeImages = this.settingsManager.getImageAutoResize();
         const shellCommandPrefix = this.settingsManager.getShellCommandPrefix();
-        const baseTools = this._baseToolsOverride
-            ? this._baseToolsOverride
-            : createAllTools(this._cwd, {
+        const baseToolDefinitions = this._baseToolsOverride
+            ? Object.fromEntries(Object.entries(this._baseToolsOverride).map(([name, tool]) => [
+                name,
+                createToolDefinitionFromAgentTool(tool),
+            ]))
+            : createAllToolDefinitions(this._cwd, {
                 read: { autoResizeImages },
                 bash: { commandPrefix: shellCommandPrefix },
             });
-        this._baseToolRegistry = new Map(Object.entries(baseTools).map(([name, tool]) => [name, tool]));
+        this._baseToolDefinitions = new Map(Object.entries(baseToolDefinitions).map(([name, tool]) => [name, tool]));
         const extensionsResult = this._resourceLoader.getExtensions();
         if (options.flagValues) {
             for (const [name, value] of options.flagValues) {
@@ -2526,13 +2542,10 @@ export class AgentSession {
     async exportToHtml(outputPath) {
         const themeName = this.settingsManager.getTheme();
         // Create tool renderer if we have an extension runner (for custom tool HTML rendering)
-        let toolRenderer;
-        if (this._extensionRunner) {
-            toolRenderer = createToolHtmlRenderer({
-                getToolDefinition: (name) => this._extensionRunner.getToolDefinition(name),
-                theme,
-            });
-        }
+        const toolRenderer = createToolHtmlRenderer({
+            getToolDefinition: (name) => this.getToolDefinition(name),
+            theme,
+        });
         return await exportSessionToHtml(this.sessionManager, this.state, {
             outputPath,
             themeName,