@mariozechner/pi-coding-agent 0.61.1 → 0.63.0

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

@@ -20,6 +20,7 @@ import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { copyToClipboard } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
+import { parseGitUrl } from "../../utils/git.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
@@ -168,6 +169,48 @@ export class InteractiveMode {
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
         initTheme(this.settingsManager.getTheme(), true);
     }
+    getAutocompleteSourceTag(sourceInfo) {
+        if (!sourceInfo) {
+            return undefined;
+        }
+        const scopePrefix = sourceInfo.scope === "user" ? "u" : sourceInfo.scope === "project" ? "p" : "t";
+        const source = sourceInfo.source.trim();
+        if (source === "auto" || source === "local" || source === "cli") {
+            return scopePrefix;
+        }
+        if (source.startsWith("npm:")) {
+            return `${scopePrefix}:${source}`;
+        }
+        const gitSource = parseGitUrl(source);
+        if (gitSource) {
+            const ref = gitSource.ref ? `@${gitSource.ref}` : "";
+            return `${scopePrefix}:git:${gitSource.host}/${gitSource.path}${ref}`;
+        }
+        return scopePrefix;
+    }
+    prefixAutocompleteDescription(description, sourceInfo) {
+        const sourceTag = this.getAutocompleteSourceTag(sourceInfo);
+        if (!sourceTag) {
+            return description;
+        }
+        return description ? `[${sourceTag}] ${description}` : `[${sourceTag}]`;
+    }
+    getBuiltInCommandConflictDiagnostics(extensionRunner) {
+        if (!extensionRunner) {
+            return [];
+        }
+        const builtinNames = new Set(BUILTIN_SLASH_COMMANDS.map((command) => command.name));
+        return extensionRunner
+            .getRegisteredCommands()
+            .filter((command) => builtinNames.has(command.name))
+            .map((command) => ({
+            type: "warning",
+            message: command.invocationName === command.name
+                ? `Extension command '/${command.name}' conflicts with built-in interactive command. Skipping in autocomplete.`
+                : `Extension command '/${command.name}' conflicts with built-in interactive command. Available as '/${command.invocationName}'.`,
+            path: command.sourceInfo.path,
+        }));
+    }
     setupAutocomplete(fdPath) {
         // Define commands for autocomplete
         const slashCommands = BUILTIN_SLASH_COMMANDS.map((command) => ({
@@ -203,13 +246,13 @@ export class InteractiveMode {
         // Convert prompt templates to SlashCommand format for autocomplete
         const templateCommands = this.session.promptTemplates.map((cmd) => ({
             name: cmd.name,
-            description: cmd.description,
+            description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
         }));
         // Convert extension commands to SlashCommand format
         const builtinCommandNames = new Set(slashCommands.map((c) => c.name));
-        const extensionCommands = (this.session.extensionRunner?.getRegisteredCommands(builtinCommandNames) ?? []).map((cmd) => ({
-            name: cmd.name,
-            description: cmd.description ?? "(extension command)",
+        const extensionCommands = (this.session.extensionRunner?.getRegisteredCommands().filter((cmd) => !builtinCommandNames.has(cmd.name)) ?? []).map((cmd) => ({
+            name: cmd.invocationName,
+            description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
             getArgumentCompletions: cmd.getArgumentCompletions,
         }));
         // Build skill commands from session.skills (if enabled)
@@ -219,7 +262,10 @@ export class InteractiveMode {
             for (const skill of this.session.resourceLoader.getSkills().skills) {
                 const commandName = `skill:${skill.name}`;
                 this.skillCommands.set(commandName, skill.filePath);
-                skillCommandList.push({ name: commandName, description: skill.description });
+                skillCommandList.push({
+                    name: commandName,
+                    description: this.prefixAutocompleteDescription(skill.description, skill.sourceInfo),
+                });
             }
         }
         // Setup autocomplete
@@ -266,7 +312,8 @@ export class InteractiveMode {
                 hint("app.clipboard.pasteImage", "to paste image"),
                 rawKeyHint("drop files", "to attach"),
             ].join("\n");
-            this.builtInHeader = new Text(`${logo}\n${instructions}`, 1, 0);
+            const onboarding = theme.fg("dim", `Pi can explain its own features and look up its docs. Ask it how to use or extend Pi.`);
+            this.builtInHeader = new Text(`${logo}\n${instructions}\n\n${onboarding}`, 1, 0);
             // Setup UI layout
             this.headerContainer.addChild(new Spacer(1));
             this.headerContainer.addChild(this.builtInHeader);
@@ -547,21 +594,21 @@ export class InteractiveMode {
     /**
      * Get a short path relative to the package root for display.
      */
-    getShortPath(fullPath, source) {
-        // For npm packages, show path relative to node_modules/pkg/
+    getShortPath(fullPath, sourceInfo) {
+        const source = sourceInfo?.source ?? "";
         const npmMatch = fullPath.match(/node_modules\/(@?[^/]+(?:\/[^/]+)?)\/(.*)/);
         if (npmMatch && source.startsWith("npm:")) {
             return npmMatch[2];
         }
-        // For git packages, show path relative to repo root
         const gitMatch = fullPath.match(/git\/[^/]+\/[^/]+\/(.*)/);
         if (gitMatch && source.startsWith("git:")) {
             return gitMatch[1];
         }
-        // For local/auto, just use formatDisplayPath
         return this.formatDisplayPath(fullPath);
     }
-    getDisplaySourceInfo(source, scope) {
+    getDisplaySourceInfo(sourceInfo) {
+        const source = sourceInfo?.source ?? "local";
+        const scope = sourceInfo?.scope ?? "project";
         if (source === "local") {
             if (scope === "user") {
                 return { label: "user", color: "muted" };
@@ -580,7 +627,9 @@ export class InteractiveMode {
         const scopeLabel = scope === "user" ? "user" : scope === "project" ? "project" : scope === "temporary" ? "temp" : undefined;
         return { label: source, scopeLabel, color: "accent" };
     }
-    getScopeGroup(source, scope) {
+    getScopeGroup(sourceInfo) {
+        const source = sourceInfo?.source ?? "local";
+        const scope = sourceInfo?.scope ?? "project";
         if (source === "cli" || scope === "temporary")
             return "path";
         if (scope === "user")
@@ -589,28 +638,27 @@ export class InteractiveMode {
             return "project";
         return "path";
     }
-    isPackageSource(source) {
+    isPackageSource(sourceInfo) {
+        const source = sourceInfo?.source ?? "";
         return source.startsWith("npm:") || source.startsWith("git:");
     }
-    buildScopeGroups(paths, metadata) {
+    buildScopeGroups(items) {
         const groups = {
             user: { scope: "user", paths: [], packages: new Map() },
             project: { scope: "project", paths: [], packages: new Map() },
             path: { scope: "path", paths: [], packages: new Map() },
         };
-        for (const p of paths) {
-            const meta = this.findMetadata(p, metadata);
-            const source = meta?.source ?? "local";
-            const scope = meta?.scope ?? "project";
-            const groupKey = this.getScopeGroup(source, scope);
+        for (const item of items) {
+            const groupKey = this.getScopeGroup(item.sourceInfo);
             const group = groups[groupKey];
-            if (this.isPackageSource(source)) {
+            const source = item.sourceInfo?.source ?? "local";
+            if (this.isPackageSource(item.sourceInfo)) {
                 const list = group.packages.get(source) ?? [];
-                list.push(p);
+                list.push(item);
                 group.packages.set(source, list);
             }
             else {
-                group.paths.push(p);
+                group.paths.push(item);
             }
         }
         return [groups.project, groups.user, groups.path].filter((group) => group.paths.length > 0 || group.packages.size > 0);
@@ -619,57 +667,44 @@ export class InteractiveMode {
         const lines = [];
         for (const group of groups) {
             lines.push(`  ${theme.fg("accent", group.scope)}`);
-            const sortedPaths = [...group.paths].sort((a, b) => a.localeCompare(b));
-            for (const p of sortedPaths) {
-                lines.push(theme.fg("dim", `    ${options.formatPath(p)}`));
+            const sortedPaths = [...group.paths].sort((a, b) => a.path.localeCompare(b.path));
+            for (const item of sortedPaths) {
+                lines.push(theme.fg("dim", `    ${options.formatPath(item)}`));
             }
             const sortedPackages = Array.from(group.packages.entries()).sort(([a], [b]) => a.localeCompare(b));
-            for (const [source, paths] of sortedPackages) {
+            for (const [source, items] of sortedPackages) {
                 lines.push(`    ${theme.fg("mdLink", source)}`);
-                const sortedPackagePaths = [...paths].sort((a, b) => a.localeCompare(b));
-                for (const p of sortedPackagePaths) {
-                    lines.push(theme.fg("dim", `      ${options.formatPackagePath(p, source)}`));
+                const sortedPackagePaths = [...items].sort((a, b) => a.path.localeCompare(b.path));
+                for (const item of sortedPackagePaths) {
+                    lines.push(theme.fg("dim", `      ${options.formatPackagePath(item, source)}`));
                 }
             }
         }
         return lines.join("\n");
     }
-    /**
-     * Find metadata for a path, checking parent directories if exact match fails.
-     * Package manager stores metadata for directories, but we display file paths.
-     */
-    findMetadata(p, metadata) {
-        // Try exact match first
-        const exact = metadata.get(p);
+    findSourceInfoForPath(p, sourceInfos) {
+        const exact = sourceInfos.get(p);
         if (exact)
             return exact;
-        // Try parent directories (package manager stores directory paths)
         let current = p;
         while (current.includes("/")) {
             current = current.substring(0, current.lastIndexOf("/"));
-            const parent = metadata.get(current);
+            const parent = sourceInfos.get(current);
             if (parent)
                 return parent;
         }
         return undefined;
     }
-    /**
-     * Format a path with its source/scope info from metadata.
-     */
-    formatPathWithSource(p, metadata) {
-        const meta = this.findMetadata(p, metadata);
-        if (meta) {
-            const shortPath = this.getShortPath(p, meta.source);
-            const { label, scopeLabel } = this.getDisplaySourceInfo(meta.source, meta.scope);
+    formatPathWithSource(p, sourceInfo) {
+        if (sourceInfo) {
+            const shortPath = this.getShortPath(p, sourceInfo);
+            const { label, scopeLabel } = this.getDisplaySourceInfo(sourceInfo);
             const labelText = scopeLabel ? `${label} (${scopeLabel})` : label;
             return `${labelText} ${shortPath}`;
         }
         return this.formatDisplayPath(p);
     }
-    /**
-     * Format resource diagnostics with nice collision display using metadata.
-     */
-    formatDiagnostics(diagnostics, metadata) {
+    formatDiagnostics(diagnostics, sourceInfos) {
         const lines = [];
         // Group collision diagnostics by name
         const collisions = new Map();
@@ -690,21 +725,17 @@ export class InteractiveMode {
             if (!first)
                 continue;
             lines.push(theme.fg("warning", `  "${name}" collision:`));
-            // Show winner
-            lines.push(theme.fg("dim", `    ${theme.fg("success", "✓")} ${this.formatPathWithSource(first.winnerPath, metadata)}`));
-            // Show all losers
+            lines.push(theme.fg("dim", `    ${theme.fg("success", "✓")} ${this.formatPathWithSource(first.winnerPath, this.findSourceInfoForPath(first.winnerPath, sourceInfos))}`));
             for (const d of collisionList) {
                 if (d.collision) {
-                    lines.push(theme.fg("dim", `    ${theme.fg("warning", "✗")} ${this.formatPathWithSource(d.collision.loserPath, metadata)} (skipped)`));
+                    lines.push(theme.fg("dim", `    ${theme.fg("warning", "✗")} ${this.formatPathWithSource(d.collision.loserPath, this.findSourceInfoForPath(d.collision.loserPath, sourceInfos))} (skipped)`));
                 }
             }
         }
-        // Format other diagnostics (skill name collisions, parse errors, etc.)
         for (const d of otherDiagnostics) {
             if (d.path) {
-                // Use metadata-aware formatting for paths
-                const sourceInfo = this.formatPathWithSource(d.path, metadata);
-                lines.push(theme.fg(d.type === "error" ? "error" : "warning", `  ${sourceInfo}`));
+                const formattedPath = this.formatPathWithSource(d.path, this.findSourceInfoForPath(d.path, sourceInfos));
+                lines.push(theme.fg(d.type === "error" ? "error" : "warning", `  ${formattedPath}`));
                 lines.push(theme.fg(d.type === "error" ? "error" : "warning", `    ${d.message}`));
             }
             else {
@@ -719,11 +750,36 @@ export class InteractiveMode {
         if (!showListing && !showDiagnostics) {
             return;
         }
-        const metadata = this.session.resourceLoader.getPathMetadata();
         const sectionHeader = (name, color = "mdHeading") => theme.fg(color, `[${name}]`);
         const skillsResult = this.session.resourceLoader.getSkills();
         const promptsResult = this.session.resourceLoader.getPrompts();
         const themesResult = this.session.resourceLoader.getThemes();
+        const extensions = options?.extensions ??
+            this.session.resourceLoader.getExtensions().extensions.map((extension) => ({
+                path: extension.path,
+                sourceInfo: extension.sourceInfo,
+            }));
+        const sourceInfos = new Map();
+        for (const extension of extensions) {
+            if (extension.sourceInfo) {
+                sourceInfos.set(extension.path, extension.sourceInfo);
+            }
+        }
+        for (const skill of skillsResult.skills) {
+            if (skill.sourceInfo) {
+                sourceInfos.set(skill.filePath, skill.sourceInfo);
+            }
+        }
+        for (const prompt of promptsResult.prompts) {
+            if (prompt.sourceInfo) {
+                sourceInfos.set(prompt.filePath, prompt.sourceInfo);
+            }
+        }
+        for (const loadedTheme of themesResult.themes) {
+            if (loadedTheme.sourcePath && loadedTheme.sourceInfo) {
+                sourceInfos.set(loadedTheme.sourcePath, loadedTheme.sourceInfo);
+            }
+        }
         if (showListing) {
             const contextFiles = this.session.resourceLoader.getAgentsFiles().agentsFiles;
             if (contextFiles.length > 0) {
@@ -736,39 +792,36 @@ export class InteractiveMode {
             }
             const skills = skillsResult.skills;
             if (skills.length > 0) {
-                const skillPaths = skills.map((s) => s.filePath);
-                const groups = this.buildScopeGroups(skillPaths, metadata);
+                const groups = this.buildScopeGroups(skills.map((skill) => ({ path: skill.filePath, sourceInfo: skill.sourceInfo })));
                 const skillList = this.formatScopeGroups(groups, {
-                    formatPath: (p) => this.formatDisplayPath(p),
-                    formatPackagePath: (p, source) => this.getShortPath(p, source),
+                    formatPath: (item) => this.formatDisplayPath(item.path),
+                    formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
                 });
                 this.chatContainer.addChild(new Text(`${sectionHeader("Skills")}\n${skillList}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
             const templates = this.session.promptTemplates;
             if (templates.length > 0) {
-                const templatePaths = templates.map((t) => t.filePath);
-                const groups = this.buildScopeGroups(templatePaths, metadata);
+                const groups = this.buildScopeGroups(templates.map((template) => ({ path: template.filePath, sourceInfo: template.sourceInfo })));
                 const templateByPath = new Map(templates.map((t) => [t.filePath, t]));
                 const templateList = this.formatScopeGroups(groups, {
-                    formatPath: (p) => {
-                        const template = templateByPath.get(p);
-                        return template ? `/${template.name}` : this.formatDisplayPath(p);
+                    formatPath: (item) => {
+                        const template = templateByPath.get(item.path);
+                        return template ? `/${template.name}` : this.formatDisplayPath(item.path);
                     },
-                    formatPackagePath: (p) => {
-                        const template = templateByPath.get(p);
-                        return template ? `/${template.name}` : this.formatDisplayPath(p);
+                    formatPackagePath: (item) => {
+                        const template = templateByPath.get(item.path);
+                        return template ? `/${template.name}` : this.formatDisplayPath(item.path);
                     },
                 });
                 this.chatContainer.addChild(new Text(`${sectionHeader("Prompts")}\n${templateList}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
-            const extensionPaths = options?.extensionPaths ?? [];
-            if (extensionPaths.length > 0) {
-                const groups = this.buildScopeGroups(extensionPaths, metadata);
+            if (extensions.length > 0) {
+                const groups = this.buildScopeGroups(extensions);
                 const extList = this.formatScopeGroups(groups, {
-                    formatPath: (p) => this.formatDisplayPath(p),
-                    formatPackagePath: (p, source) => this.getShortPath(p, source),
+                    formatPath: (item) => this.formatDisplayPath(item.path),
+                    formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
                 });
                 this.chatContainer.addChild(new Text(`${sectionHeader("Extensions", "mdHeading")}\n${extList}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
@@ -777,11 +830,13 @@ export class InteractiveMode {
             const loadedThemes = themesResult.themes;
             const customThemes = loadedThemes.filter((t) => t.sourcePath);
             if (customThemes.length > 0) {
-                const themePaths = customThemes.map((t) => t.sourcePath);
-                const groups = this.buildScopeGroups(themePaths, metadata);
+                const groups = this.buildScopeGroups(customThemes.map((loadedTheme) => ({
+                    path: loadedTheme.sourcePath,
+                    sourceInfo: loadedTheme.sourceInfo,
+                })));
                 const themeList = this.formatScopeGroups(groups, {
-                    formatPath: (p) => this.formatDisplayPath(p),
-                    formatPackagePath: (p, source) => this.getShortPath(p, source),
+                    formatPath: (item) => this.formatDisplayPath(item.path),
+                    formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
                 });
                 this.chatContainer.addChild(new Text(`${sectionHeader("Themes")}\n${themeList}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
@@ -790,13 +845,13 @@ export class InteractiveMode {
         if (showDiagnostics) {
             const skillDiagnostics = skillsResult.diagnostics;
             if (skillDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(skillDiagnostics, metadata);
+                const warningLines = this.formatDiagnostics(skillDiagnostics, sourceInfos);
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
             const promptDiagnostics = promptsResult.diagnostics;
             if (promptDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(promptDiagnostics, metadata);
+                const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
@@ -809,16 +864,17 @@ export class InteractiveMode {
             }
             const commandDiagnostics = this.session.extensionRunner?.getCommandDiagnostics() ?? [];
             extensionDiagnostics.push(...commandDiagnostics);
+            extensionDiagnostics.push(...this.getBuiltInCommandConflictDiagnostics(this.session.extensionRunner));
             const shortcutDiagnostics = this.session.extensionRunner?.getShortcutDiagnostics() ?? [];
             extensionDiagnostics.push(...shortcutDiagnostics);
             if (extensionDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(extensionDiagnostics, metadata);
+                const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
             const themeDiagnostics = themesResult.diagnostics;
             if (themeDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(themeDiagnostics, metadata);
+                const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
                 this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
                 this.chatContainer.addChild(new Spacer(1));
             }
@@ -907,19 +963,17 @@ export class InteractiveMode {
         this.setupAutocomplete(this.fdPath);
         const extensionRunner = this.session.extensionRunner;
         if (!extensionRunner) {
-            this.showLoadedResources({ extensionPaths: [], force: false });
+            this.showLoadedResources({ extensions: [], force: false });
             return;
         }
         this.setupExtensionShortcuts(extensionRunner);
-        this.showLoadedResources({ extensionPaths: extensionRunner.getExtensionPaths(), force: false });
+        this.showLoadedResources({ force: false });
     }
     /**
      * Get a registered tool definition by name (for custom rendering).
      */
     getRegisteredToolDefinition(toolName) {
-        const tools = this.session.extensionRunner?.getAllRegisteredTools() ?? [];
-        const registeredTool = tools.find((t) => t.definition.name === toolName);
-        return registeredTool?.definition;
+        return this.session.getToolDefinition(toolName);
     }
     /**
      * Set up keyboard shortcuts registered by extensions.
@@ -1809,7 +1863,7 @@ export class InteractiveMode {
                     for (const content of this.streamingMessage.content) {
                         if (content.type === "toolCall") {
                             if (!this.pendingTools.has(content.id)) {
-                                const component = new ToolExecutionComponent(content.name, content.arguments, {
+                                const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
                                     showImages: this.settingsManager.getShowImages(),
                                 }, this.getRegisteredToolDefinition(content.name), this.ui);
                                 component.setExpanded(this.toolOutputExpanded);
@@ -1869,7 +1923,7 @@ export class InteractiveMode {
             case "tool_execution_start": {
                 let component = this.pendingTools.get(event.toolCallId);
                 if (!component) {
-                    component = new ToolExecutionComponent(event.toolName, event.args, {
+                    component = new ToolExecutionComponent(event.toolName, event.toolCallId, event.args, {
                         showImages: this.settingsManager.getShowImages(),
                     }, this.getRegisteredToolDefinition(event.toolName), this.ui);
                     component.setExpanded(this.toolOutputExpanded);
@@ -2125,7 +2179,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.getRegisteredToolDefinition(content.name), this.ui);
+                        const component = new ToolExecutionComponent(content.name, content.id, 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") {
@@ -3286,7 +3340,6 @@ export class InteractiveMode {
             this.rebuildChatFromMessages();
             dismissLoader(this.editor);
             this.showLoadedResources({
-                extensionPaths: runner?.getExtensionPaths() ?? [],
                 force: false,
                 showDiagnosticsWhenQuiet: true,
             });