@vybestack/llxprt-code 0.5.0 → 0.6.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vybestack/llxprt-code",
-    "version": "0.5.0",
+    "version": "0.6.1",
     "description": "LLxprt Code",
     "repository": {
         "type": "git",
@@ -22,7 +22,7 @@
         "test:integration": "vitest run -c vitest.integration.config.ts",
         "test:ci:covered": "vitest run -c vitest.ci.covered.config.ts",
         "test:ci:fast": "vitest run -c vitest.ci.fast.config.ts",
-        "test:ci": "npm run test:ci:covered && npm run test:ci:fast",
+        "test:ci": "vitest run",
         "test:legacy": "OPENAI_RESPONSES_DISABLE=true vitest run -t \"legacy|gpt-3.5-turbo\"",
         "typecheck": "tsc --noEmit",
         "prerelease:version": "node ../../scripts/bind_package_version.js",
@@ -33,7 +33,7 @@
         "dist"
     ],
     "config": {
-        "sandboxImageUri": "ghcr.io/vybestack/llxprt-code/sandbox:0.5.0"
+        "sandboxImageUri": "ghcr.io/vybestack/llxprt-code/sandbox:0.6.1"
     },
     "dependencies": {
         "@anthropic-ai/sdk": "^0.55.1",
@@ -42,33 +42,39 @@
         "@iarna/toml": "^2.2.5",
         "@modelcontextprotocol/sdk": "^1.15.1",
         "@types/update-notifier": "^6.0.8",
-        "@vybestack/llxprt-code-core": "0.5.0",
+        "@vybestack/llxprt-code-core": "0.6.1",
+        "ansi-regex": "^6.2.2",
         "chalk": "^5.3.0",
         "cli-spinners": "2.9.2",
         "command-exists": "^1.2.9",
         "diff": "^7.0.0",
         "dotenv": "^17.1.0",
+        "extract-zip": "^2.0.1",
         "fzf": "^0.5.2",
-        "glob": "^10.4.1",
+        "glob": "^12.0.0",
         "gradient-string": "2.0.2",
         "highlight.js": "^11.11.1",
-        "ink": "^6.3.1",
+        "ink": "^6.5.1",
         "ink-gradient": "^3.0.0",
         "ink-select-input": "^6.2.0",
         "ink-spinner": "^5.0.0",
         "ink-testing-library": "^4.0.0",
         "lowlight": "^3.3.0",
         "mime-types": "^3.0.1",
+        "mnemonist": "^0.40.3",
         "open": "^10.1.2",
         "openai": "^5.10.1",
         "react": "^19.2.0",
         "read-package-up": "^11.0.0",
         "shell-quote": "^1.8.3",
+        "simple-git": "^3.28.0",
         "string-width": "^7.1.0",
         "strip-ansi": "^7.1.0",
         "strip-json-comments": "^3.1.1",
+        "tar": "^7.5.1",
         "undici": "^7.10.0",
         "update-notifier": "^7.3.1",
+        "wrap-ansi": "9.0.2",
         "yargs": "^17.7.2",
         "zod": "^3.23.8"
     },
@@ -77,6 +83,7 @@
         "@fast-check/vitest": "^0.2.2",
         "@testing-library/dom": "^10.4.0",
         "@testing-library/react": "^16.3.0",
+        "@types/archiver": "^6.0.3",
         "@types/command-exists": "^1.2.3",
         "@types/diff": "^7.0.2",
         "@types/dotenv": "^6.1.1",
@@ -85,8 +92,10 @@
         "@types/react-dom": "^19.1.6",
         "@types/semver": "^7.7.0",
         "@types/shell-quote": "^1.7.5",
+        "@types/tar": "^6.1.13",
         "@types/yargs": "^17.0.33",
         "@vybestack/llxprt-code-test-utils": "file:../test-utils",
+        "archiver": "^7.0.1",
         "dom-accessibility-api": "^0.5.16",
         "jsdom": "^26.1.0",
         "lz-string": "^1.5.0",

package/dist/src/auth/gemini-oauth-provider.d.ts

@@ -23,11 +23,25 @@ export declare class GeminiOAuthProvider implements OAuthProvider {
     private retryHandler;
     private logger;
     private addItem?;
+    private authCodeResolver?;
+    private authCodeRejecter?;
     constructor(tokenStore?: TokenStore, addItem?: (itemData: Omit<HistoryItemWithoutId, 'id'>, baseTimestamp: number) => number);
     /**
      * Set the addItem callback for displaying messages in the UI
      */
     setAddItem(addItem: (itemData: Omit<HistoryItemWithoutId, 'id'>, baseTimestamp: number) => number): void;
+    /**
+     * Wait for authorization code from UI dialog
+     */
+    waitForAuthCode(): Promise<string>;
+    /**
+     * Submit authorization code from UI dialog
+     */
+    submitAuthCode(code: string): void;
+    /**
+     * Cancel OAuth flow
+     */
+    cancelAuth(): void;
     /**
      * Lazy initialization with proper state management
      * Ensures initialization only happens once and handles concurrent calls
@@ -54,4 +68,8 @@ export declare class GeminiOAuthProvider implements OAuthProvider {
      * Clears tokens from all legacy locations
      */
     private clearLegacyTokens;
+    /**
+     * Install auth-code hooks so oauth2.ts can ask the UI for the code instead of readline
+     */
+    private installAuthCodeHooks;
 }

package/dist/src/auth/gemini-oauth-provider.js

@@ -26,6 +26,8 @@ export class GeminiOAuthProvider {
     retryHandler;
     logger;
     addItem;
+    authCodeResolver;
+    authCodeRejecter;
     constructor(tokenStore, addItem) {
         this.tokenStore = tokenStore;
         this.retryHandler = new RetryHandler();
@@ -44,6 +46,36 @@ export class GeminiOAuthProvider {
     setAddItem(addItem) {
         this.addItem = addItem;
     }
+    /**
+     * Wait for authorization code from UI dialog
+     */
+    waitForAuthCode() {
+        return new Promise((resolve, reject) => {
+            this.authCodeResolver = resolve;
+            this.authCodeRejecter = reject;
+        });
+    }
+    /**
+     * Submit authorization code from UI dialog
+     */
+    submitAuthCode(code) {
+        if (this.authCodeResolver) {
+            this.authCodeResolver(code);
+            this.authCodeResolver = undefined;
+            this.authCodeRejecter = undefined;
+        }
+    }
+    /**
+     * Cancel OAuth flow
+     */
+    cancelAuth() {
+        if (this.authCodeRejecter) {
+            const error = OAuthErrorFactory.fromUnknown(this.name, new Error('OAuth authentication was cancelled by user'), 'user cancellation');
+            this.authCodeRejecter(error);
+            this.authCodeResolver = undefined;
+            this.authCodeRejecter = undefined;
+        }
+    }
     /**
      * Lazy initialization with proper state management
      * Ensures initialization only happens once and handles concurrent calls
@@ -100,98 +132,104 @@ export class GeminiOAuthProvider {
     async initiateAuth() {
         await this.ensureInitialized();
         return this.errorHandler.wrapMethod(async () => {
-            // Import the existing Google OAuth infrastructure
-            const coreModule = await import('@vybestack/llxprt-code-core');
-            const { getOauthClient, AuthType } = coreModule;
-            // Create a minimal config for OAuth - use type assertion for test environment
-            // Type assertion is needed since we're creating a partial Config for test mode
-            const config = {
-                getProxy: () => undefined,
-                isBrowserLaunchSuppressed: () => !shouldLaunchBrowser(),
-            };
-            // Use the existing Google OAuth infrastructure to get a client
-            let client;
+            const cleanupAuthHooks = this.installAuthCodeHooks();
             try {
-                client = await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, config);
-            }
-            catch (error) {
-                // Handle browser auth cancellation or other auth failures
-                if (error instanceof Error) {
-                    // Show error message to user if addItem is available
-                    const addItem = this.addItem || globalOAuthUI.getAddItem();
-                    if (addItem) {
-                        addItem({
-                            type: 'error',
-                            text: `Browser authentication failed: ${error.message}
-Please try again or use an API key with /keyfile <path-to-your-gemini-key>`,
-                        }, Date.now());
-                    }
-                    // Check for specific cancellation messages
-                    if (error.message.includes('cancelled') ||
-                        error.message.includes('denied') ||
-                        error.message.includes('access_denied') ||
-                        error.message.includes('user_cancelled')) {
-                        // CRITICAL FIX: Trigger fallback flow instead of failing
-                        this.logger.debug(() => `Browser auth cancelled, triggering fallback: ${error.message}`);
-                        // Show fallback instructions to user
-                        const fallbackMessage = `Browser authentication was cancelled or failed.\nFallback options:\n1. Use API key: /keyfile <path-to-your-gemini-key>\n2. Set environment: export GEMINI_API_KEY=<your-key>\n3. Try OAuth again: /auth gemini enable`;
+                // Import the existing Google OAuth infrastructure
+                const coreModule = await import('@vybestack/llxprt-code-core');
+                const { getOauthClient, AuthType } = coreModule;
+                // Create a minimal config for OAuth - use type assertion for test environment
+                // Type assertion is needed since we're creating a partial Config for test mode
+                const config = {
+                    getProxy: () => undefined,
+                    isBrowserLaunchSuppressed: () => !shouldLaunchBrowser(),
+                };
+                // Use the existing Google OAuth infrastructure to get a client
+                let client;
+                try {
+                    client = await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, config);
+                }
+                catch (error) {
+                    // Handle browser auth cancellation or other auth failures
+                    if (error instanceof Error) {
+                        // Show error message to user if addItem is available
                         const addItem = this.addItem || globalOAuthUI.getAddItem();
                         if (addItem) {
                             addItem({
-                                type: 'info',
-                                text: fallbackMessage,
+                                type: 'error',
+                                text: `Browser authentication failed: ${error.message}
+Please try again or use an API key with /keyfile <path-to-your-gemini-key>`,
                             }, Date.now());
                         }
-                        else {
-                            console.log('\\n' + '─'.repeat(60));
-                            console.log('Browser authentication was cancelled or failed.');
-                            console.log('Fallback options:');
-                            console.log('1. Use API key: /keyfile <path-to-your-gemini-key>');
-                            console.log('2. Set environment: export GEMINI_API_KEY=<your-key>');
-                            console.log('3. Try OAuth again: /auth gemini enable');
-                            console.log('─'.repeat(60));
+                        // Check for specific cancellation messages
+                        if (error.message.includes('cancelled') ||
+                            error.message.includes('denied') ||
+                            error.message.includes('access_denied') ||
+                            error.message.includes('user_cancelled')) {
+                            // CRITICAL FIX: Trigger fallback flow instead of failing
+                            this.logger.debug(() => `Browser auth cancelled, triggering fallback: ${error.message}`);
+                            // Show fallback instructions to user
+                            const fallbackMessage = `Browser authentication was cancelled or failed.\nFallback options:\n1. Use API key: /keyfile <path-to-your-gemini-key>\n2. Set environment: export GEMINI_API_KEY=<your-key>\n3. Try OAuth again: /auth gemini enable`;
+                            const addItem = this.addItem || globalOAuthUI.getAddItem();
+                            if (addItem) {
+                                addItem({
+                                    type: 'info',
+                                    text: fallbackMessage,
+                                }, Date.now());
+                            }
+                            else {
+                                console.log('\n' + '─'.repeat(60));
+                                console.log('Browser authentication was cancelled or failed.');
+                                console.log('Fallback options:');
+                                console.log('1. Use API key: /keyfile <path-to-your-gemini-key>');
+                                console.log('2. Set environment: export GEMINI_API_KEY=<your-key>');
+                                console.log('3. Try OAuth again: /auth gemini enable');
+                                console.log('─'.repeat(60));
+                            }
+                            // Throw a user-friendly error that doesn't hang the system
+                            throw OAuthErrorFactory.authenticationRequired(this.name, {
+                                reason: 'Browser authentication was cancelled or failed. Please use one of the fallback options shown above, or check the URL in your history.',
+                            });
                         }
-                        // Throw a user-friendly error that doesn't hang the system
-                        throw OAuthErrorFactory.authenticationRequired(this.name, {
-                            reason: 'Browser authentication was cancelled or failed. Please use one of the fallback options shown above, or check the URL in your history.',
-                        });
                     }
+                    // Re-throw other authentication errors
+                    throw error;
                 }
-                // Re-throw other authentication errors
-                throw error;
-            }
-            // The client should now have valid credentials
-            // Extract and cache the token
-            const credentials = client.credentials;
-            if (credentials && credentials.access_token) {
-                const token = this.credentialsToOAuthToken(credentials);
-                if (token && this.tokenStore) {
-                    try {
-                        await this.tokenStore.saveToken('gemini', token);
-                        this.currentToken = token;
-                        // Display success message
-                        const addItem = this.addItem || globalOAuthUI.getAddItem();
-                        if (addItem) {
-                            addItem({
-                                type: 'info',
-                                text: 'Successfully authenticated with Google Gemini!',
-                            }, Date.now());
+                // The client should now have valid credentials
+                // Extract and cache the token
+                const credentials = client.credentials;
+                if (credentials && credentials.access_token) {
+                    const token = this.credentialsToOAuthToken(credentials);
+                    if (token && this.tokenStore) {
+                        try {
+                            await this.tokenStore.saveToken('gemini', token);
+                            this.currentToken = token;
+                            // Display success message
+                            const addItem = this.addItem || globalOAuthUI.getAddItem();
+                            if (addItem) {
+                                addItem({
+                                    type: 'info',
+                                    text: 'Successfully authenticated with Google Gemini!',
+                                }, Date.now());
+                            }
+                            else {
+                                console.log('Successfully authenticated with Google Gemini!');
+                            }
                         }
-                        else {
-                            console.log('Successfully authenticated with Google Gemini!');
+                        catch (saveError) {
+                            throw OAuthErrorFactory.storageError(this.name, saveError instanceof Error ? saveError : undefined, {
+                                operation: 'saveToken',
+                            });
                         }
                     }
-                    catch (saveError) {
-                        throw OAuthErrorFactory.storageError(this.name, saveError instanceof Error ? saveError : undefined, {
-                            operation: 'saveToken',
-                        });
-                    }
+                }
+                else {
+                    throw OAuthErrorFactory.authenticationRequired(this.name, {
+                        reason: 'No valid credentials received from Google OAuth',
+                    });
                 }
             }
-            else {
-                throw OAuthErrorFactory.authenticationRequired(this.name, {
-                    reason: 'No valid credentials received from Google OAuth',
-                });
+            finally {
+                cleanupAuthHooks();
             }
         }, this.name, 'initiateAuth')();
     }
@@ -361,5 +399,29 @@ Please try again or use an API key with /keyfile <path-to-your-gemini-key>`,
             }
         });
     }
+    /**
+     * Install auth-code hooks so oauth2.ts can ask the UI for the code instead of readline
+     */
+    installAuthCodeHooks() {
+        const globalObj = global;
+        const previousWaitForCode = globalObj.__oauth_wait_for_code;
+        const previousProvider = globalObj.__oauth_provider;
+        globalObj.__oauth_wait_for_code = () => this.waitForAuthCode();
+        globalObj.__oauth_provider = this.name;
+        return () => {
+            if (previousWaitForCode !== undefined) {
+                globalObj.__oauth_wait_for_code = previousWaitForCode;
+            }
+            else {
+                delete globalObj.__oauth_wait_for_code;
+            }
+            if (previousProvider !== undefined) {
+                globalObj.__oauth_provider = previousProvider;
+            }
+            else {
+                delete globalObj.__oauth_provider;
+            }
+        };
+    }
 }
 //# sourceMappingURL=gemini-oauth-provider.js.map

package/dist/src/auth/gemini-oauth-provider.js.map

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

package/dist/src/auth/local-oauth-callback.spec.js

@@ -1,14 +1,40 @@
 import { describe, it, expect, vi, afterEach } from 'vitest';
 import http from 'node:http';
+import net from 'node:net';
 import { startLocalOAuthCallback } from './local-oauth-callback.js';
+const findAvailablePort = async () => await new Promise((resolve, reject) => {
+    const server = net.createServer();
+    server.once('error', (error) => {
+        server.close();
+        reject(error);
+    });
+    server.listen(0, '127.0.0.1', () => {
+        const address = server.address();
+        if (address && typeof address === 'object') {
+            const port = address.port;
+            server.close((closeError) => {
+                if (closeError) {
+                    reject(closeError);
+                    return;
+                }
+                resolve(port);
+            });
+        }
+        else {
+            server.close();
+            reject(new Error('Unable to allocate a port'));
+        }
+    });
+});
 describe('startLocalOAuthCallback', () => {
     afterEach(() => {
         vi.useRealTimers();
     });
     it('captures authorization code from localhost redirect', async () => {
+        const port = await findAvailablePort();
         const server = await startLocalOAuthCallback({
             state: 'state-123',
-            portRange: [8765, 8765],
+            portRange: [port, port],
             timeoutMs: 500,
         });
         const callbackPromise = server.waitForCallback();
@@ -35,9 +61,10 @@ describe('startLocalOAuthCallback', () => {
     });
     it('rejects when callback does not arrive within timeout', async () => {
         vi.useFakeTimers();
+        const port = await findAvailablePort();
         const server = await startLocalOAuthCallback({
             state: 'timeout-state',
-            portRange: [8770, 8770],
+            portRange: [port, port],
             timeoutMs: 100,
         });
         const callbackPromise = server.waitForCallback();

package/dist/src/auth/local-oauth-callback.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-oauth-callback.spec.js","sourceRoot":"","sources":["../../../src/auth/local-oauth-callback.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;YAC3C,KAAK,EAAE,WAAW;YAClB,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;YACvB,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAExC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAC1B;gBACE,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;gBACtB,IAAI,EAAE,GAAG,GAAG,CAAC,QAAQ,qCAAqC;aAC3D,EACD,CAAC,QAAQ,EAAE,EAAE;gBACX,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAClB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9B,CAAC,CACF,CAAC;YACF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;QAErC,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QAExB,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;YAC3C,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;YACvB,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAEjD,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,YAAY,CAC5D,0BAA0B,CAC3B,CAAC;QAEF,MAAM,EAAE,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QAEvC,MAAM,SAAS,CAAC;QAEhB,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"local-oauth-callback.spec.js","sourceRoot":"","sources":["../../../src/auth/local-oauth-callback.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,iBAAiB,GAAG,KAAK,IAAqB,EAAE,CACpD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IACpC,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;IAClC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC7B,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE;QACjC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAC1B,MAAM,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,EAAE;gBAC1B,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,CAAC,UAAU,CAAC,CAAC;oBACnB,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEL,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,IAAI,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;YAC3C,KAAK,EAAE,WAAW;YAClB,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;YACvB,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAExC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAC1B;gBACE,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;gBACtB,IAAI,EAAE,GAAG,GAAG,CAAC,QAAQ,qCAAqC;aAC3D,EACD,CAAC,QAAQ,EAAE,EAAE;gBACX,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAClB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9B,CAAC,CACF,CAAC;YACF,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;QAErC,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QAExB,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,WAAW;SACnB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACpE,EAAE,CAAC,aAAa,EAAE,CAAC;QAEnB,MAAM,IAAI,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;YAC3C,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;YACvB,SAAS,EAAE,GAAG;SACf,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAEjD,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,YAAY,CAC5D,0BAA0B,CAC3B,CAAC;QAEF,MAAM,EAAE,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QAEvC,MAAM,SAAS,CAAC;QAEhB,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/commands/extensions/disable.d.ts

@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type CommandModule } from 'yargs';
-import { SettingScope } from '../../config/settings.js';
 interface DisableArgs {
     name: string;
-    scope?: SettingScope;
+    scope?: string;
 }
 export declare function handleDisable(args: DisableArgs): Promise<void>;
 export declare const disableCommand: CommandModule;

package/dist/src/commands/extensions/disable.js

@@ -8,7 +8,9 @@ import { disableExtension } from '../../config/extension.js';
 import { SettingScope } from '../../config/settings.js';
 export async function handleDisable(args) {
     try {
-        const scope = args.scope || SettingScope.User;
+        const scope = args.scope?.toLowerCase() === 'workspace'
+            ? SettingScope.Workspace
+            : SettingScope.User;
         disableExtension(args.name, scope);
         console.log(`Extension "${args.name}" successfully disabled for scope "${scope}".`);
     }
@@ -27,9 +29,19 @@ export const disableCommand = {
         .option('scope', {
         describe: 'The scope to disable the extension in. Defaults to user scope.',
         type: 'string',
-        choices: [SettingScope.User, SettingScope.Workspace],
+        default: SettingScope.User,
     })
-        .check((_argv) => true),
+        .check((argv) => {
+        if (argv.scope &&
+            !Object.values(SettingScope)
+                .map((s) => s.toLowerCase())
+                .includes(argv.scope.toLowerCase())) {
+            throw new Error(`Invalid scope: ${argv.scope}. Please use one of ${Object.values(SettingScope)
+                .map((s) => s.toLowerCase())
+                .join(', ')}.`);
+        }
+        return true;
+    }),
     handler: async (argv) => {
         await handleDisable({
             name: argv['name'],

package/dist/src/commands/extensions/disable.js.map

@@ -1 +1 @@
-{"version":3,"file":"disable.js","sourceRoot":"","sources":["../../../../src/commands/extensions/disable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAOxD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAiB;IACnD,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC;QAC9C,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnC,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,sCAAsC,KAAK,IAAI,CACvE,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAkB;IAC3C,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE,wBAAwB;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,uCAAuC;QACjD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EACN,gEAAgE;QAClE,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;KACrD,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC;IAC3B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,aAAa,CAAC;YAClB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAiB;SACrC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"disable.js","sourceRoot":"","sources":["../../../../src/commands/extensions/disable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAOxD,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAiB;IACnD,IAAI,CAAC;QACH,MAAM,KAAK,GACT,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,WAAW;YACvC,CAAC,CAAC,YAAY,CAAC,SAAS;YACxB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;QACxB,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACnC,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,sCAAsC,KAAK,IAAI,CACvE,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAkB;IAC3C,OAAO,EAAE,0BAA0B;IACnC,QAAQ,EAAE,wBAAwB;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,uCAAuC;QACjD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EACN,gEAAgE;QAClE,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,YAAY,CAAC,IAAI;KAC3B,CAAC;SACD,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IACE,IAAI,CAAC,KAAK;YACV,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;iBACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC3B,QAAQ,CAAE,IAAI,CAAC,KAAgB,CAAC,WAAW,EAAE,CAAC,EACjD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,CAAC,KAAK,uBAAuB,MAAM,CAAC,MAAM,CAC9D,YAAY,CACb;iBACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,aAAa,CAAC;YAClB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}

package/dist/src/commands/extensions/enable.d.ts

@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type CommandModule } from 'yargs';
-import { SettingScope } from '../../config/settings.js';
 interface EnableArgs {
     name: string;
-    scope?: SettingScope;
+    scope?: string;
 }
 export declare function handleEnable(args: EnableArgs): Promise<void>;
 export declare const enableCommand: CommandModule;

package/dist/src/commands/extensions/enable.js

@@ -8,10 +8,12 @@ import { enableExtension } from '../../config/extension.js';
 import { SettingScope } from '../../config/settings.js';
 export async function handleEnable(args) {
     try {
-        const scopes = args.scope
-            ? [args.scope]
-            : [SettingScope.User, SettingScope.Workspace];
-        enableExtension(args.name, scopes);
+        if (args.scope?.toLowerCase() === 'workspace') {
+            enableExtension(args.name, SettingScope.Workspace);
+        }
+        else {
+            enableExtension(args.name, SettingScope.User);
+        }
         if (args.scope) {
             console.log(`Extension "${args.name}" successfully enabled for scope "${args.scope}".`);
         }
@@ -34,9 +36,18 @@ export const enableCommand = {
         .option('scope', {
         describe: 'The scope to enable the extenison in. If not set, will be enabled in all scopes.',
         type: 'string',
-        choices: [SettingScope.User, SettingScope.Workspace],
     })
-        .check((_argv) => true),
+        .check((argv) => {
+        if (argv.scope &&
+            !Object.values(SettingScope)
+                .map((s) => s.toLowerCase())
+                .includes(argv.scope.toLowerCase())) {
+            throw new Error(`Invalid scope: ${argv.scope}. Please use one of ${Object.values(SettingScope)
+                .map((s) => s.toLowerCase())
+                .join(', ')}.`);
+        }
+        return true;
+    }),
     handler: async (argv) => {
         await handleEnable({
             name: argv['name'],

package/dist/src/commands/extensions/enable.js.map

@@ -1 +1 @@
-{"version":3,"file":"enable.js","sourceRoot":"","sources":["../../../../src/commands/extensions/enable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAOxD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAgB;IACjD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK;YACvB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;YACd,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;QAChD,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,qCAAqC,IAAI,CAAC,KAAK,IAAI,CAC3E,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,uCAAuC,CAC/D,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EAAE,uBAAuB;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,sCAAsC;QAChD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EACN,kFAAkF;QACpF,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC;KACrD,CAAC;SACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC;IAC3B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,YAAY,CAAC;YACjB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAiB;SACrC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"enable.js","sourceRoot":"","sources":["../../../../src/commands/extensions/enable.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAOxD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAgB;IACjD,IAAI,CAAC;QACH,IAAI,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,CAAC;YAC9C,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,qCAAqC,IAAI,CAAC,KAAK,IAAI,CAC3E,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,cAAc,IAAI,CAAC,IAAI,uCAAuC,CAC/D,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,gBAAgB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAkB;IAC1C,OAAO,EAAE,yBAAyB;IAClC,QAAQ,EAAE,uBAAuB;IACjC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK;SACF,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,sCAAsC;QAChD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,OAAO,EAAE;QACf,QAAQ,EACN,kFAAkF;QACpF,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACd,IACE,IAAI,CAAC,KAAK;YACV,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;iBACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC3B,QAAQ,CAAE,IAAI,CAAC,KAAgB,CAAC,WAAW,EAAE,CAAC,EACjD,CAAC;YACD,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,CAAC,KAAK,uBAAuB,MAAM,CAAC,MAAM,CAC9D,YAAY,CACb;iBACE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;iBAC3B,IAAI,CAAC,IAAI,CAAC,GAAG,CACjB,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,MAAM,YAAY,CAAC;YACjB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAW;YAC5B,KAAK,EAAE,IAAI,CAAC,OAAO,CAAW;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}