@vybestack/llxprt-code 0.1.14 → 0.1.16

package/dist/src/providers/providerConfigUtils.d.ts

@@ -15,10 +15,6 @@ export interface ProviderConfigResult {
  * Sets or removes the API key for the active provider
  */
 export declare function setProviderApiKey(providerManager: ProviderManager, settings: LoadedSettings, apiKey: string | undefined, config?: Config): Promise<ProviderConfigResult>;
-/**
- * Sets the API key from a file for the active provider
- */
-export declare function setProviderApiKeyFromFile(providerManager: ProviderManager, settings: LoadedSettings, filePath: string, config?: Config): Promise<ProviderConfigResult>;
 /**
  * Sets or clears the base URL for the active provider
  */

package/dist/src/providers/providerConfigUtils.js

@@ -3,10 +3,20 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { readFile } from 'node:fs/promises';
-import { homedir } from 'node:os';
-import { AuthType } from '@vybestack/llxprt-code-core';
-import { SettingScope } from '../config/settings.js';
+import { AuthType, sanitizeForByteString, needsSanitization, } from '@vybestack/llxprt-code-core';
+/**
+ * Sanitizes API keys to remove problematic characters that cause ByteString errors.
+ * This handles cases where API key files have encoding issues or contain
+ * Unicode replacement characters (U+FFFD).
+ */
+function sanitizeApiKey(key) {
+    const sanitized = sanitizeForByteString(key);
+    if (needsSanitization(key)) {
+        console.warn('[ProviderConfig] API key contained non-ASCII or control characters that were removed. ' +
+            'Please check your API key file encoding (should be UTF-8 without BOM).');
+    }
+    return sanitized;
+}
 /**
  * Sets or removes the API key for the active provider
  */
@@ -21,10 +31,7 @@ export async function setProviderApiKey(providerManager, settings, apiKey, confi
             // Clear the API key
             if (activeProvider.setApiKey) {
                 activeProvider.setApiKey('');
-                // Remove from settings
-                const currentKeys = settings.merged.providerApiKeys || {};
-                delete currentKeys[providerName];
-                settings.setValue(SettingScope.User, 'providerApiKeys', currentKeys);
+                // Don't need to remove from settings as we no longer save API keys there
                 // If this is the Gemini provider, we might need to switch auth mode
                 const requiresAuthRefresh = providerName === 'gemini' && !!config;
                 if (requiresAuthRefresh && config) {
@@ -49,13 +56,11 @@ export async function setProviderApiKey(providerManager, settings, apiKey, confi
                 };
             }
         }
-        // Update the provider's API key
+        // Update the provider's API key (sanitized)
         if (activeProvider.setApiKey) {
-            activeProvider.setApiKey(apiKey);
-            // Save to settings
-            const currentKeys = settings.merged.providerApiKeys || {};
-            currentKeys[providerName] = apiKey;
-            settings.setValue(SettingScope.User, 'providerApiKeys', currentKeys);
+            const sanitizedKey = sanitizeApiKey(apiKey);
+            activeProvider.setApiKey(sanitizedKey);
+            // Don't save API keys to settings - they should only be in profiles or ephemeral
             // If this is the Gemini provider, we need to refresh auth to use API key mode
             const requiresAuthRefresh = providerName === 'gemini' && !!config;
             if (requiresAuthRefresh && config) {
@@ -87,36 +92,6 @@ export async function setProviderApiKey(providerManager, settings, apiKey, confi
         };
     }
 }
-/**
- * Sets the API key from a file for the active provider
- */
-export async function setProviderApiKeyFromFile(providerManager, settings, filePath, config) {
-    try {
-        // Resolve ~ to home directory
-        const resolvedPath = filePath.replace(/^~/, homedir());
-        // Read the API key from file
-        const apiKey = (await readFile(resolvedPath, 'utf-8')).trim();
-        if (!apiKey) {
-            return {
-                success: false,
-                message: 'The specified file is empty',
-            };
-        }
-        // Use the setProviderApiKey function to handle the actual key setting
-        const result = await setProviderApiKey(providerManager, settings, apiKey, config);
-        // Modify the message to indicate it was loaded from a file
-        if (result.success && result.message.includes('API key updated')) {
-            result.message = result.message.replace('API key updated', `API key loaded from ${resolvedPath}`);
-        }
-        return result;
-    }
-    catch (error) {
-        return {
-            success: false,
-            message: `Failed to process keyfile: ${error instanceof Error ? error.message : String(error)}`,
-        };
-    }
-}
 /**
  * Sets or clears the base URL for the active provider
  */
@@ -128,10 +103,7 @@ export async function setProviderBaseUrl(providerManager, settings, baseUrl) {
             // Clear base URL to provider default
             if (activeProvider.setBaseUrl) {
                 activeProvider.setBaseUrl(undefined);
-                // Remove from settings
-                const currentUrls = settings.merged.providerBaseUrls || {};
-                delete currentUrls[providerName];
-                settings.setValue(SettingScope.User, 'providerBaseUrls', currentUrls);
+                // Don't need to remove from settings as we no longer save base URLs there
                 return {
                     success: true,
                     message: `Base URL cleared, provider '${providerName}' now uses default URL`,
@@ -147,10 +119,7 @@ export async function setProviderBaseUrl(providerManager, settings, baseUrl) {
         // Update the provider's base URL
         if (activeProvider.setBaseUrl) {
             activeProvider.setBaseUrl(baseUrl);
-            // Save to settings
-            const currentUrls = settings.merged.providerBaseUrls || {};
-            currentUrls[providerName] = baseUrl;
-            settings.setValue(SettingScope.User, 'providerBaseUrls', currentUrls);
+            // Don't save base URLs to settings - they should only be in profiles or ephemeral
             return {
                 success: true,
                 message: `Base URL updated to '${baseUrl}' for provider '${providerName}'`,

package/dist/src/providers/providerConfigUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"providerConfigUtils.js","sourceRoot":"","sources":["../../../src/providers/providerConfigUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"providerConfigUtils.js","sourceRoot":"","sources":["../../../src/providers/providerConfigUtils.ts"],"names":[],"mappings":"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"}

package/dist/src/providers/providerManagerInstance.d.ts

@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Config, ProviderManager } from '@vybestack/llxprt-code-core';
-export declare function getProviderManager(config?: Config): ProviderManager;
+import { IFileSystem } from './IFileSystem.js';
+/**
+ * Set a custom file system implementation (mainly for testing).
+ */
+export declare function setFileSystem(fs: IFileSystem): void;
+export declare function getProviderManager(config?: Config, allowBrowserEnvironment?: boolean): ProviderManager;
 export declare function resetProviderManager(): void;
 export { getProviderManager as providerManager };

package/dist/src/providers/providerManagerInstance.js

@@ -3,109 +3,144 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ProviderManager, OpenAIProvider, AnthropicProvider, GeminiProvider, } from '@vybestack/llxprt-code-core';
-import { readFileSync, existsSync } from 'fs';
+import { ProviderManager, OpenAIProvider, AnthropicProvider, GeminiProvider, sanitizeForByteString, needsSanitization, } from '@vybestack/llxprt-code-core';
+import { NodeFileSystem } from './IFileSystem.js';
 import { homedir } from 'os';
 import { join } from 'path';
 import { USER_SETTINGS_PATH } from '../config/settings.js';
 import stripJsonComments from 'strip-json-comments';
+/**
+ * Sanitizes API keys to remove problematic characters that cause ByteString errors.
+ * This handles cases where API key files have encoding issues or contain
+ * Unicode replacement characters (U+FFFD).
+ */
+function sanitizeApiKey(key) {
+    const sanitized = sanitizeForByteString(key);
+    if (needsSanitization(key)) {
+        console.warn('[ProviderManager] API key contained non-ASCII or control characters that were removed. ' +
+            'Please check your API key file encoding (should be UTF-8 without BOM).');
+    }
+    return sanitized;
+}
 let providerManagerInstance = null;
-export function getProviderManager(config) {
+let fileSystemInstance = null;
+/**
+ * Set a custom file system implementation (mainly for testing).
+ */
+export function setFileSystem(fs) {
+    fileSystemInstance = fs;
+}
+/**
+ * Get the file system implementation to use.
+ */
+function getFileSystem() {
+    if (!fileSystemInstance) {
+        fileSystemInstance = new NodeFileSystem();
+    }
+    return fileSystemInstance;
+}
+export function getProviderManager(config, allowBrowserEnvironment = false) {
     if (!providerManagerInstance) {
         providerManagerInstance = new ProviderManager();
-        // Only auto-initialize providers when not in test environment
-        if (process.env.NODE_ENV !== 'test') {
-            // Load user settings to check for saved API keys
-            let savedApiKeys = {};
-            let userSettings;
-            try {
-                if (existsSync(USER_SETTINGS_PATH)) {
-                    const userContent = readFileSync(USER_SETTINGS_PATH, 'utf-8');
-                    userSettings = JSON.parse(stripJsonComments(userContent));
-                    savedApiKeys = userSettings.providerApiKeys || {};
-                }
-            }
-            catch (_error) {
-                // Failed to load user settings, that's OK
+        const fs = getFileSystem();
+        // Load user settings
+        let userSettings;
+        try {
+            if (fs.existsSync(USER_SETTINGS_PATH)) {
+                const userContent = fs.readFileSync(USER_SETTINGS_PATH, 'utf-8');
+                userSettings = JSON.parse(stripJsonComments(userContent));
             }
-            // Register GeminiProvider
-            const geminiProvider = new GeminiProvider();
-            // Set initial model from settings if available
-            if (userSettings?.defaultModel) {
-                geminiProvider.setModel(userSettings.defaultModel);
-            }
-            if (config) {
-                geminiProvider.setConfig(config);
-            }
-            providerManagerInstance.registerProvider(geminiProvider);
-            // Configure Gemini auth with priority: keyfile > key > oauth
-            // First check for saved API key
-            if (savedApiKeys.gemini) {
-                geminiProvider.setApiKey(savedApiKeys.gemini);
-            }
-            // Then check for keyfile
-            else {
-                try {
-                    const keyfilePath = join(homedir(), '.google_key');
-                    const geminiApiKey = readFileSync(keyfilePath, 'utf-8').trim();
-                    if (geminiApiKey) {
-                        geminiProvider.setApiKey(geminiApiKey);
-                    }
-                }
-                catch (_error) {
-                    // No Google keyfile available, that's OK - will use OAuth if available
+        }
+        catch (_error) {
+            // Failed to load user settings, that's OK
+        }
+        // Always register GeminiProvider
+        const geminiProvider = new GeminiProvider(undefined, undefined, config);
+        if (config) {
+            geminiProvider.setConfig(config);
+        }
+        providerManagerInstance.registerProvider(geminiProvider);
+        // Configure Gemini auth - check for keyfile only
+        try {
+            const keyfilePath = join(homedir(), '.google_key');
+            if (fs.existsSync(keyfilePath)) {
+                const geminiApiKey = fs.readFileSync(keyfilePath, 'utf-8').trim();
+                if (geminiApiKey) {
+                    geminiProvider.setApiKey(sanitizeApiKey(geminiApiKey));
                 }
             }
-            // Initialize with OpenAI provider if API key is available
-            // Priority: CLI /key (in settings) > Environment variable > keyfile
-            let openaiApiKey = savedApiKeys.openai;
-            if (!openaiApiKey) {
-                openaiApiKey = process.env.OPENAI_API_KEY;
-            }
-            if (!openaiApiKey) {
-                try {
-                    const apiKeyPath = join(homedir(), '.openai_key');
-                    openaiApiKey = readFileSync(apiKeyPath, 'utf-8').trim();
-                }
-                catch (_error) {
-                    // No OpenAI keyfile available, that's OK
+        }
+        catch (_error) {
+            // No Google keyfile available, that's OK - will use OAuth if available
+        }
+        // Always register OpenAI provider
+        // Priority: Environment variable > keyfile (skip keyfile in test)
+        let openaiApiKey;
+        if (process.env.OPENAI_API_KEY) {
+            openaiApiKey = sanitizeApiKey(process.env.OPENAI_API_KEY);
+        }
+        if (!openaiApiKey) {
+            try {
+                const apiKeyPath = join(homedir(), '.openai_key');
+                if (fs.existsSync(apiKeyPath)) {
+                    const rawKey = fs.readFileSync(apiKeyPath, 'utf-8').trim();
+                    openaiApiKey = sanitizeApiKey(rawKey);
                 }
             }
-            const openaiBaseUrl = process.env.OPENAI_BASE_URL;
-            if (process.env.DEBUG || process.env.VERBOSE) {
-                console.log('[ProviderManager] Initializing OpenAI provider with:', {
-                    hasApiKey: !!openaiApiKey,
-                    baseUrl: openaiBaseUrl || 'default',
-                });
-            }
-            const openaiProvider = new OpenAIProvider(openaiApiKey || '', openaiBaseUrl, userSettings);
-            providerManagerInstance.registerProvider(openaiProvider);
-            // OpenAI provider registered
-            // Initialize with Anthropic provider if API key is available
-            // Priority: CLI /key (in settings) > Environment variable > keyfile
-            let anthropicApiKey = savedApiKeys.anthropic;
-            if (!anthropicApiKey) {
-                anthropicApiKey = process.env.ANTHROPIC_API_KEY;
+            catch (_error) {
+                // No OpenAI keyfile available, that's OK
             }
-            if (!anthropicApiKey) {
-                try {
-                    const apiKeyPath = join(homedir(), '.anthropic_key');
-                    anthropicApiKey = readFileSync(apiKeyPath, 'utf-8').trim();
-                }
-                catch (_error) {
-                    // No Anthropic keyfile available, that's OK
+        }
+        const openaiBaseUrl = process.env.OPENAI_BASE_URL;
+        if (process.env.DEBUG || process.env.VERBOSE) {
+            console.log('[ProviderManager] Initializing OpenAI provider with:', {
+                hasApiKey: !!openaiApiKey,
+                baseUrl: openaiBaseUrl || 'default',
+            });
+        }
+        // Create provider config from user settings
+        const openaiProviderConfig = {
+            enableTextToolCallParsing: userSettings?.enableTextToolCallParsing,
+            textToolCallModels: userSettings?.textToolCallModels,
+            providerToolFormatOverrides: userSettings?.providerToolFormatOverrides,
+            openaiResponsesEnabled: userSettings?.openaiResponsesEnabled,
+            allowBrowserEnvironment,
+        };
+        const openaiProvider = new OpenAIProvider(openaiApiKey || '', openaiBaseUrl, openaiProviderConfig);
+        providerManagerInstance.registerProvider(openaiProvider);
+        // Always register Anthropic provider
+        // Priority: Environment variable > keyfile (skip keyfile in test)
+        let anthropicApiKey;
+        if (process.env.ANTHROPIC_API_KEY) {
+            anthropicApiKey = sanitizeApiKey(process.env.ANTHROPIC_API_KEY);
+        }
+        if (!anthropicApiKey) {
+            try {
+                const apiKeyPath = join(homedir(), '.anthropic_key');
+                if (fs.existsSync(apiKeyPath)) {
+                    const rawKey = fs.readFileSync(apiKeyPath, 'utf-8').trim();
+                    anthropicApiKey = sanitizeApiKey(rawKey);
                 }
             }
-            const anthropicBaseUrl = process.env.ANTHROPIC_BASE_URL;
-            const anthropicProvider = new AnthropicProvider(anthropicApiKey || '', anthropicBaseUrl);
-            providerManagerInstance.registerProvider(anthropicProvider);
-            // Anthropic provider registered
+            catch (_error) {
+                // No Anthropic keyfile available, that's OK
+            }
         }
+        const anthropicBaseUrl = process.env.ANTHROPIC_BASE_URL;
+        // Create provider config from user settings
+        const anthropicProviderConfig = {
+            allowBrowserEnvironment,
+        };
+        const anthropicProvider = new AnthropicProvider(anthropicApiKey || '', anthropicBaseUrl, anthropicProviderConfig);
+        providerManagerInstance.registerProvider(anthropicProvider);
+        // Set default provider to gemini
+        providerManagerInstance.setActiveProvider('gemini');
     }
     return providerManagerInstance;
 }
 export function resetProviderManager() {
     providerManagerInstance = null;
+    fileSystemInstance = null;
 }
 export { getProviderManager as providerManager };
 //# sourceMappingURL=providerManagerInstance.js.map

package/dist/src/providers/providerManagerInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"providerManagerInstance.js","sourceRoot":"","sources":["../../../src/providers/providerManagerInstance.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAEL,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,cAAc,GACf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAY,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,IAAI,uBAAuB,GAA2B,IAAI,CAAC;AAE3D,MAAM,UAAU,kBAAkB,CAAC,MAAe;IAChD,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,uBAAuB,GAAG,IAAI,eAAe,EAAE,CAAC;QAEhD,8DAA8D;QAC9D,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;YACpC,iDAAiD;YACjD,IAAI,YAAY,GAA2B,EAAE,CAAC;YAC9C,IAAI,YAAkC,CAAC;YACvC,IAAI,CAAC;gBACH,IAAI,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBACnC,MAAM,WAAW,GAAG,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;oBAC9D,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAa,CAAC;oBACtE,YAAY,GAAG,YAAY,CAAC,eAAe,IAAI,EAAE,CAAC;gBACpD,CAAC;YACH,CAAC;YAAC,OAAO,MAAM,EAAE,CAAC;gBAChB,0CAA0C;YAC5C,CAAC;YAED,0BAA0B;YAC1B,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;YAE5C,+CAA+C;YAC/C,IAAI,YAAY,EAAE,YAAY,EAAE,CAAC;gBAC/B,cAAc,CAAC,QAAQ,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;YACrD,CAAC;YAED,IAAI,MAAM,EAAE,CAAC;gBACX,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC;YACD,uBAAuB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YAEzD,6DAA6D;YAC7D,gCAAgC;YAChC,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBACxB,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;YACD,yBAAyB;iBACpB,CAAC;gBACJ,IAAI,CAAC;oBACH,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC;oBACnD,MAAM,YAAY,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC/D,IAAI,YAAY,EAAE,CAAC;wBACjB,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;oBACzC,CAAC;gBACH,CAAC;gBAAC,OAAO,MAAM,EAAE,CAAC;oBAChB,uEAAuE;gBACzE,CAAC;YACH,CAAC;YAED,0DAA0D;YAC1D,oEAAoE;YACpE,IAAI,YAAY,GAAuB,YAAY,CAAC,MAAM,CAAC;YAE3D,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;YAC5C,CAAC;YAED,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC;oBAClD,YAAY,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC1D,CAAC;gBAAC,OAAO,MAAM,EAAE,CAAC;oBAChB,yCAAyC;gBAC3C,CAAC;YACH,CAAC;YAED,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YAClD,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBAC7C,OAAO,CAAC,GAAG,CAAC,sDAAsD,EAAE;oBAClE,SAAS,EAAE,CAAC,CAAC,YAAY;oBACzB,OAAO,EAAE,aAAa,IAAI,SAAS;iBACpC,CAAC,CAAC;YACL,CAAC;YACD,MAAM,cAAc,GAAG,IAAI,cAAc,CACvC,YAAY,IAAI,EAAE,EAClB,aAAa,EACb,YAAY,CACb,CAAC;YACF,uBAAuB,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACzD,6BAA6B;YAE7B,6DAA6D;YAC7D,oEAAoE;YACpE,IAAI,eAAe,GAAuB,YAAY,CAAC,SAAS,CAAC;YAEjE,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YAClD,CAAC;YAED,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAC;oBACrD,eAAe,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC7D,CAAC;gBAAC,OAAO,MAAM,EAAE,CAAC;oBAChB,4CAA4C;gBAC9C,CAAC;YACH,CAAC;YAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;YACxD,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,CAC7C,eAAe,IAAI,EAAE,EACrB,gBAAgB,CACjB,CAAC;YACF,uBAAuB,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;YAC5D,gCAAgC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,uBAAuB,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,uBAAuB,GAAG,IAAI,CAAC;AACjC,CAAC;AAED,OAAO,EAAE,kBAAkB,IAAI,eAAe,EAAE,CAAC"}
+{"version":3,"file":"providerManagerInstance.js","sourceRoot":"","sources":["../../../src/providers/providerManagerInstance.ts"],"names":[],"mappings":"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"}

package/dist/src/services/BuiltinCommandLoader.js

@@ -11,10 +11,12 @@ import { clearCommand } from '../ui/commands/clearCommand.js';
 import { compressCommand } from '../ui/commands/compressCommand.js';
 import { copyCommand } from '../ui/commands/copyCommand.js';
 import { docsCommand } from '../ui/commands/docsCommand.js';
+import { directoryCommand } from '../ui/commands/directoryCommand.js';
 import { editorCommand } from '../ui/commands/editorCommand.js';
 import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
 import { helpCommand } from '../ui/commands/helpCommand.js';
 import { ideCommand } from '../ui/commands/ideCommand.js';
+import { initCommand } from '../ui/commands/initCommand.js';
 import { mcpCommand } from '../ui/commands/mcpCommand.js';
 import { memoryCommand } from '../ui/commands/memoryCommand.js';
 import { privacyCommand } from '../ui/commands/privacyCommand.js';
@@ -30,6 +32,11 @@ import { keyCommand } from '../ui/commands/keyCommand.js';
 import { keyfileCommand } from '../ui/commands/keyfileCommand.js';
 import { baseurlCommand } from '../ui/commands/baseurlCommand.js';
 import { toolformatCommand } from '../ui/commands/toolformatCommand.js';
+import { setupGithubCommand } from '../ui/commands/setupGithubCommand.js';
+import { setCommand } from '../ui/commands/setCommand.js';
+import { profileCommand } from '../ui/commands/profileCommand.js';
+import { diagnosticsCommand } from '../ui/commands/diagnosticsCommand.js';
+import { isGitHubRepository } from '../utils/gitUtils.js';
 /**
  * Loads the core, hard-coded slash commands that are an integral part
  * of the Gemini CLI application.
@@ -56,10 +63,12 @@ export class BuiltinCommandLoader {
             compressCommand,
             copyCommand,
             docsCommand,
+            directoryCommand,
             editorCommand,
             extensionsCommand,
             helpCommand,
             ideCommand(this.config),
+            initCommand,
             mcpCommand,
             memoryCommand,
             privacyCommand,
@@ -75,6 +84,10 @@ export class BuiltinCommandLoader {
             keyfileCommand,
             baseurlCommand,
             toolformatCommand,
+            setCommand,
+            profileCommand,
+            diagnosticsCommand,
+            ...(isGitHubRepository() ? [setupGithubCommand] : []),
         ];
         return allDefinitions.filter((cmd) => cmd !== null);
     }

package/dist/src/services/BuiltinCommandLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"BuiltinCommandLoader.js","sourceRoot":"","sources":["../../../src/services/BuiltinCommandLoader.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE;;;GAGG;AACH,MAAM,OAAO,oBAAoB;IACX;IAApB,YAAoB,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;IAAG,CAAC;IAE7C;;;;;;OAMG;IACH,KAAK,CAAC,YAAY,CAAC,OAAoB;QACrC,MAAM,cAAc,GAA+B;YACjD,YAAY;YACZ,WAAW;YACX,UAAU;YACV,WAAW;YACX,YAAY;YACZ,eAAe;YACf,WAAW;YACX,WAAW;YACX,aAAa;YACb,iBAAiB;YACjB,WAAW;YACX,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;YACvB,UAAU;YACV,aAAa;YACb,cAAc;YACd,WAAW;YACX,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;YAC3B,YAAY;YACZ,YAAY;YACZ,YAAY;YACZ,UAAU;YACV,eAAe;YACf,YAAY;YACZ,UAAU;YACV,cAAc;YACd,cAAc;YACd,iBAAiB;SAClB,CAAC;QAEF,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAuB,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IAC3E,CAAC;CACF"}
+{"version":3,"file":"BuiltinCommandLoader.js","sourceRoot":"","sources":["../../../src/services/BuiltinCommandLoader.ts"],"names":[],"mappings":"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"}

package/dist/src/services/CommandService.d.ts

@@ -28,13 +28,17 @@ export declare class CommandService {
      *
      * This factory method orchestrates the entire command loading process. It
      * runs all provided loaders in parallel, aggregates their results, handles
-     * name conflicts by letting the last-loaded command win, and then returns a
+     * name conflicts for extension commands by renaming them, and then returns a
      * fully constructed `CommandService` instance.
      *
+     * Conflict resolution:
+     * - Extension commands that conflict with existing commands are renamed to
+     *   `extensionName.commandName`
+     * - Non-extension commands (built-in, user, project) override earlier commands
+     *   with the same name based on loader order
+     *
      * @param loaders An array of objects that conform to the `ICommandLoader`
-     *   interface. The order of loaders is significant: if multiple loaders
-     *   provide a command with the same name, the command from the loader that
-     *   appears later in the array will take precedence.
+     *   interface. Built-in commands should come first, followed by FileCommandLoader.
      * @param signal An AbortSignal to cancel the loading process.
      * @returns A promise that resolves to a new, fully initialized `CommandService` instance.
      */

package/dist/src/services/CommandService.js

@@ -28,13 +28,17 @@ export class CommandService {
      *
      * This factory method orchestrates the entire command loading process. It
      * runs all provided loaders in parallel, aggregates their results, handles
-     * name conflicts by letting the last-loaded command win, and then returns a
+     * name conflicts for extension commands by renaming them, and then returns a
      * fully constructed `CommandService` instance.
      *
+     * Conflict resolution:
+     * - Extension commands that conflict with existing commands are renamed to
+     *   `extensionName.commandName`
+     * - Non-extension commands (built-in, user, project) override earlier commands
+     *   with the same name based on loader order
+     *
      * @param loaders An array of objects that conform to the `ICommandLoader`
-     *   interface. The order of loaders is significant: if multiple loaders
-     *   provide a command with the same name, the command from the loader that
-     *   appears later in the array will take precedence.
+     *   interface. Built-in commands should come first, followed by FileCommandLoader.
      * @param signal An AbortSignal to cancel the loading process.
      * @returns A promise that resolves to a new, fully initialized `CommandService` instance.
      */
@@ -49,12 +53,24 @@ export class CommandService {
                 console.debug('A command loader failed:', result.reason);
             }
         }
-        // De-duplicate commands using a Map. The last one found with a given name wins.
-        // This creates a natural override system based on the order of the loaders
-        // passed to the constructor.
         const commandMap = new Map();
         for (const cmd of allCommands) {
-            commandMap.set(cmd.name, cmd);
+            let finalName = cmd.name;
+            // Extension commands get renamed if they conflict with existing commands
+            if (cmd.extensionName && commandMap.has(cmd.name)) {
+                let renamedName = `${cmd.extensionName}.${cmd.name}`;
+                let suffix = 1;
+                // Keep trying until we find a name that doesn't conflict
+                while (commandMap.has(renamedName)) {
+                    renamedName = `${cmd.extensionName}.${cmd.name}${suffix}`;
+                    suffix++;
+                }
+                finalName = renamedName;
+            }
+            commandMap.set(finalName, {
+                ...cmd,
+                name: finalName,
+            });
         }
         const finalCommands = Object.freeze(Array.from(commandMap.values()));
         return new CommandService(finalCommands);

package/dist/src/services/CommandService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CommandService.js","sourceRoot":"","sources":["../../../src/services/CommandService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH;;;;;;;;;;GAUG;AACH,MAAM,OAAO,cAAc;IAKY;IAJrC;;;OAGG;IACH,YAAqC,QAAiC;QAAjC,aAAQ,GAAR,QAAQ,CAAyB;IAAG,CAAC;IAE1E;;;;;;;;;;;;;;OAcG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,OAAyB,EACzB,MAAmB;QAEnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CACrD,CAAC;QAEF,MAAM,WAAW,GAAmB,EAAE,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAClC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,gFAAgF;QAChF,2EAA2E;QAC3E,6BAA6B;QAC7B,MAAM,UAAU,GAAG,IAAI,GAAG,EAAwB,CAAC;QACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrE,OAAO,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}
+{"version":3,"file":"CommandService.js","sourceRoot":"","sources":["../../../src/services/CommandService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH;;;;;;;;;;GAUG;AACH,MAAM,OAAO,cAAc;IAKY;IAJrC;;;OAGG;IACH,YAAqC,QAAiC;QAAjC,aAAQ,GAAR,QAAQ,CAAyB;IAAG,CAAC;IAE1E;;;;;;;;;;;;;;;;;;OAkBG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,OAAyB,EACzB,MAAmB;QAEnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CACrD,CAAC;QAEF,MAAM,WAAW,GAAmB,EAAE,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAClC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,0BAA0B,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAwB,CAAC;QACnD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,IAAI,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC;YAEzB,yEAAyE;YACzE,IAAI,GAAG,CAAC,aAAa,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClD,IAAI,WAAW,GAAG,GAAG,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;gBACrD,IAAI,MAAM,GAAG,CAAC,CAAC;gBAEf,yDAAyD;gBACzD,OAAO,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;oBACnC,WAAW,GAAG,GAAG,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC;oBAC1D,MAAM,EAAE,CAAC;gBACX,CAAC;gBAED,SAAS,GAAG,WAAW,CAAC;YAC1B,CAAC;YAED,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE;gBACxB,GAAG,GAAG;gBACN,IAAI,EAAE,SAAS;aAChB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrE,OAAO,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF"}

package/dist/src/services/FileCommandLoader.d.ts

@@ -21,16 +21,28 @@ export declare class FileCommandLoader implements ICommandLoader {
     private readonly projectRoot;
     constructor(config: Config | null);
     /**
-     * Loads all commands, applying the precedence rule where project-level
-     * commands override user-level commands with the same name.
+     * Loads all commands from user, project, and extension directories.
+     * Returns commands in order: user → project → extensions (alphabetically).
+     *
+     * Order is important for conflict resolution in CommandService:
+     * - User/project commands (without extensionName) use "last wins" strategy
+     * - Extension commands (with extensionName) get renamed if conflicts exist
+     *
      * @param signal An AbortSignal to cancel the loading process.
-     * @returns A promise that resolves to an array of loaded SlashCommands.
+     * @returns A promise that resolves to an array of all loaded SlashCommands.
      */
     loadCommands(signal: AbortSignal): Promise<SlashCommand[]>;
+    /**
+     * Get all command directories in order for loading.
+     * User commands → Project commands → Extension commands
+     * This order ensures extension commands can detect all conflicts.
+     */
+    private getCommandDirectories;
     /**
      * Parses a single .toml file and transforms it into a SlashCommand object.
      * @param filePath The absolute path to the .toml file.
      * @param baseDir The root command directory for name calculation.
+     * @param extensionName Optional extension name to prefix commands with.
      * @returns A promise resolving to a SlashCommand, or null if the file is invalid.
      */
     private parseAndAdaptFile;