@codex-infinity/pi-infinity 0.61.3 → 0.62.2

package/dist/core/agent-session.js

@@ -27,7 +27,7 @@ import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
 import { ExtensionRunner, wrapRegisteredTools, } from "./extensions/index.js";
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { CURRENT_SESSION_VERSION, getLatestCompactionEntry } from "./session-manager.js";
-import { BUILTIN_SLASH_COMMANDS } from "./slash-commands.js";
+import { createSyntheticSourceInfo } from "./source-info.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { createAllToolDefinitions } from "./tools/index.js";
 import { createToolDefinitionFromAgentTool, wrapToolDefinition } from "./tools/tool-definition-wrapper.js";
@@ -483,17 +483,18 @@ export class AgentSession {
         return this.agent.state.tools.map((t) => t.name);
     }
     /**
-     * Get all configured tools with name, description, and parameter schema.
+     * Get all configured tools with name, description, parameter schema, and source metadata.
      */
     getAllTools() {
-        return Array.from(this._toolDefinitions.values()).map((t) => ({
-            name: t.name,
-            description: t.description,
-            parameters: t.parameters,
+        return Array.from(this._toolDefinitions.values()).map(({ definition, sourceInfo }) => ({
+            name: definition.name,
+            description: definition.description,
+            parameters: definition.parameters,
+            sourceInfo,
         }));
     }
     getToolDefinition(name) {
-        return this._toolDefinitions.get(name);
+        return this._toolDefinitions.get(name)?.definition;
     }
     /**
      * Set active tools by name.
@@ -1649,36 +1650,24 @@ export class AgentSession {
         this.agent.setModel(refreshedModel);
     }
     _bindExtensionCore(runner) {
-        const normalizeLocation = (source) => {
-            if (source === "user" || source === "project" || source === "path") {
-                return source;
-            }
-            return undefined;
-        };
-        const reservedBuiltins = new Set(BUILTIN_SLASH_COMMANDS.map((command) => command.name));
         const getCommands = () => {
-            const extensionCommands = runner
-                .getRegisteredCommandsWithPaths()
-                .filter(({ command }) => !reservedBuiltins.has(command.name))
-                .map(({ command, extensionPath }) => ({
-                name: command.name,
+            const extensionCommands = runner.getRegisteredCommands().map((command) => ({
+                name: command.invocationName,
                 description: command.description,
                 source: "extension",
-                path: extensionPath,
+                sourceInfo: command.sourceInfo,
             }));
             const templates = this.promptTemplates.map((template) => ({
                 name: template.name,
                 description: template.description,
                 source: "prompt",
-                location: normalizeLocation(template.source),
-                path: template.filePath,
+                sourceInfo: template.sourceInfo,
             }));
             const skills = this._resourceLoader.getSkills().skills.map((skill) => ({
                 name: `skill:${skill.name}`,
                 description: skill.description,
                 source: "skill",
-                location: normalizeLocation(skill.source),
-                path: skill.filePath,
+                sourceInfo: skill.sourceInfo,
             }));
             return [...extensionCommands, ...templates, ...skills];
         };
@@ -1766,21 +1755,33 @@ export class AgentSession {
         const registeredTools = this._extensionRunner?.getAllRegisteredTools() ?? [];
         const allCustomTools = [
             ...registeredTools,
-            ...this._customTools.map((def) => ({ definition: def, extensionPath: "<sdk>" })),
+            ...this._customTools.map((definition) => ({
+                definition,
+                sourceInfo: createSyntheticSourceInfo(`<sdk:${definition.name}>`, { source: "sdk" }),
+            })),
         ];
-        const definitionRegistry = new Map(this._baseToolDefinitions);
-        for (const { definition } of allCustomTools) {
-            definitionRegistry.set(definition.name, definition);
+        const definitionRegistry = new Map(Array.from(this._baseToolDefinitions.entries()).map(([name, definition]) => [
+            name,
+            {
+                definition,
+                sourceInfo: createSyntheticSourceInfo(`<builtin:${name}>`, { source: "builtin" }),
+            },
+        ]));
+        for (const tool of allCustomTools) {
+            definitionRegistry.set(tool.definition.name, {
+                definition: tool.definition,
+                sourceInfo: tool.sourceInfo,
+            });
         }
         this._toolDefinitions = definitionRegistry;
         this._toolPromptSnippets = new Map(Array.from(definitionRegistry.values())
-            .map((definition) => {
+            .map(({ definition }) => {
             const snippet = this._normalizePromptSnippet(definition.promptSnippet);
             return snippet ? [definition.name, snippet] : undefined;
         })
             .filter((entry) => entry !== undefined));
         this._toolPromptGuidelines = new Map(Array.from(definitionRegistry.values())
-            .map((definition) => {
+            .map(({ definition }) => {
             const guidelines = this._normalizePromptGuidelines(definition.promptGuidelines);
             return guidelines.length > 0 ? [definition.name, guidelines] : undefined;
         })
@@ -2491,6 +2492,7 @@ export class AgentSession {
                 total: totalInput + totalOutput + totalCacheRead + totalCacheWrite,
             },
             cost: totalCost,
+            contextUsage: this.getContextUsage(),
         };
     }
     getContextUsage() {