@vybestack/llxprt-code 0.4.8 → 0.5.0-nightly.251102.6bb3db7a

package/dist/src/ui/commands/toolformatCommand.js

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { CommandKind } from './types.js';
-import { getProviderManager } from '../../providers/providerManagerInstance.js';
-import { SettingScope } from '../../config/settings.js';
+import { getRuntimeApi } from '../contexts/RuntimeContext.js';
 const STRUCTURED_FORMATS = ['openai', 'anthropic', 'deepseek', 'qwen', 'gemma'];
 const TEXT_FORMATS = ['hermes', 'xml', 'llama'];
 const ALL_FORMATS = [...STRUCTURED_FORMATS, ...TEXT_FORMATS];
@@ -13,88 +12,36 @@ export const toolformatCommand = {
     name: 'toolformat',
     description: 'override the auto-detected tool calling/format parser for tools',
     kind: CommandKind.BUILT_IN,
-    action: async (context, args) => {
+    action: async (_context, args) => {
         const formatName = args?.trim();
-        const providerManager = getProviderManager();
-        if (!providerManager.hasActiveProvider()) {
+        let state;
+        try {
+            const runtime = getRuntimeApi();
+            state = await runtime.getActiveToolFormatState();
+        }
+        catch (error) {
             return {
                 type: 'message',
                 messageType: 'error',
-                content: 'No active provider. Please select a provider before setting tool format.',
+                content: `Failed to read tool format: ${error instanceof Error ? error.message : String(error)}`,
             };
         }
-        const activeProvider = providerManager.getActiveProvider();
-        const providerName = activeProvider.name;
-        const settings = context.services.settings;
-        const config = context.services.config;
-        const settingsService = config?.getSettingsService();
         // Show current format
         if (!formatName) {
-            const currentFormat = activeProvider.getToolFormat
-                ? activeProvider.getToolFormat()
-                : 'unknown';
-            let isAutoDetected = true;
-            if (settingsService) {
-                try {
-                    const providerSettings = await settingsService.getSettings(providerName);
-                    isAutoDetected =
-                        !providerSettings.toolFormat ||
-                            providerSettings.toolFormat === 'auto';
-                }
-                catch {
-                    // Provider settings don't exist yet, use legacy check
-                    isAutoDetected = !(settings.merged.providerToolFormatOverrides &&
-                        settings.merged.providerToolFormatOverrides[providerName]);
-                }
-            }
-            else {
-                // Fallback to legacy settings
-                isAutoDetected = !(settings.merged.providerToolFormatOverrides &&
-                    settings.merged.providerToolFormatOverrides[providerName]);
-            }
             return {
                 type: 'message',
                 messageType: 'info',
-                content: `Current tool format: ${currentFormat} (${isAutoDetected ? 'auto-detected' : 'manual override'})\nTo override: /toolformat <format>\nTo return to auto: /toolformat auto\nSupported formats:\n  Structured: ${STRUCTURED_FORMATS.join(', ')}\n  Text-based: ${TEXT_FORMATS.join(', ')}`,
+                content: `Current tool format: ${state.currentFormat ?? 'unknown'} (${state.isAutoDetected ? 'auto-detected' : 'manual override'})\nTo override: /toolformat <format>\nTo return to auto: /toolformat auto\nSupported formats:\n  Structured: ${STRUCTURED_FORMATS.join(', ')}\n  Text-based: ${TEXT_FORMATS.join(', ')}`,
             };
         }
         if (formatName === 'auto') {
-            if (activeProvider.setToolFormatOverride) {
-                activeProvider.setToolFormatOverride(null);
-            }
-            // Use SettingsService if available
-            if (settingsService) {
-                try {
-                    await settingsService.updateSettings(providerName, {
-                        toolFormat: 'auto',
-                    });
-                    return {
-                        type: 'message',
-                        messageType: 'info',
-                        content: `Tool format override cleared for provider '${providerName}'. Using auto-detection.`,
-                    };
-                }
-                catch (error) {
-                    return {
-                        type: 'message',
-                        messageType: 'error',
-                        content: `Failed to clear tool format override: ${error instanceof Error ? error.message : String(error)}`,
-                    };
-                }
-            }
-            else {
-                // Fallback to legacy settings
-                const currentOverrides = {
-                    ...(settings.merged.providerToolFormatOverrides || {}),
-                };
-                delete currentOverrides[providerName];
-                settings.setValue(SettingScope.User, 'providerToolFormatOverrides', currentOverrides);
-                return {
-                    type: 'message',
-                    messageType: 'info',
-                    content: `Tool format override cleared for provider '${providerName}'. Using auto-detection.`,
-                };
-            }
+            const runtime = getRuntimeApi();
+            const updated = await runtime.setActiveToolFormatOverride(null);
+            return {
+                type: 'message',
+                messageType: 'info',
+                content: `Tool format override cleared for provider '${updated.providerName}'. Using auto-detection.`,
+            };
         }
         if (!ALL_FORMATS.includes(formatName)) {
             return {
@@ -103,35 +50,15 @@ export const toolformatCommand = {
                 content: `Invalid tool format '${formatName}'.\nSupported formats:\n  Structured: ${STRUCTURED_FORMATS.join(', ')}\n  Text-based: ${TEXT_FORMATS.join(', ')}`,
             };
         }
-        // Set override
         try {
-            if (activeProvider.setToolFormatOverride) {
-                activeProvider.setToolFormatOverride(formatName);
-            }
-            // Use SettingsService if available
-            if (settingsService) {
-                await settingsService.updateSettings(providerName, {
-                    toolFormat: formatName,
-                });
-                return {
-                    type: 'message',
-                    messageType: 'info',
-                    content: `Tool format override set to '${formatName}' for provider '${providerName}'.`,
-                };
-            }
-            else {
-                // Fallback to legacy settings
-                const currentOverrides = {
-                    ...(settings.merged.providerToolFormatOverrides || {}),
-                };
-                currentOverrides[providerName] = formatName;
-                settings.setValue(SettingScope.User, 'providerToolFormatOverrides', currentOverrides);
-                return {
-                    type: 'message',
-                    messageType: 'info',
-                    content: `Tool format override set to '${formatName}' for provider '${providerName}'.`,
-                };
-            }
+            const normalized = formatName;
+            const runtime = getRuntimeApi();
+            const updated = await runtime.setActiveToolFormatOverride(normalized);
+            return {
+                type: 'message',
+                messageType: 'info',
+                content: `Tool format override set to '${formatName}' for provider '${updated.providerName}'.`,
+            };
         }
         catch (error) {
             return {

package/dist/src/ui/commands/toolformatCommand.js.map

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

package/dist/src/ui/commands/toolformatCommand.test.js

@@ -3,143 +3,97 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { toolformatCommand } from './toolformatCommand.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { getProviderManager } from '../../providers/providerManagerInstance.js';
-vi.mock('../../providers/providerManagerInstance.js');
-function mockProvider(extra = {}) {
-    return {
-        name: 'openai',
-        getToolFormat: vi.fn().mockReturnValue('openai'),
-        setToolFormatOverride: vi.fn(),
-        getModels: vi.fn().mockResolvedValue([]),
-        generateChatCompletion: vi.fn(),
-        getServerTools: vi.fn().mockReturnValue([]),
-        invokeServerTool: vi.fn().mockResolvedValue({}),
-        ...extra,
-    };
-}
+const mockRuntime = {
+    getActiveToolFormatState: vi.fn(),
+    setActiveToolFormatOverride: vi.fn(),
+};
+vi.mock('../contexts/RuntimeContext.js', () => ({
+    getRuntimeApi: () => mockRuntime,
+}));
 describe('toolformatCommand', () => {
     let mockContext;
-    let providerManager;
-    let provider;
-    let mockSettingsService;
     beforeEach(() => {
-        provider = mockProvider();
-        providerManager = {
-            hasActiveProvider: vi.fn().mockReturnValue(true),
-            getActiveProvider: vi.fn().mockReturnValue(provider),
-            listProviders: vi.fn().mockReturnValue([]),
-            switchProvider: vi.fn(),
-            resetAllProviders: vi.fn(),
-        };
-        getProviderManager.mockReturnValue(providerManager);
-        // Mock SettingsService
-        mockSettingsService = {
-            getSettings: vi.fn().mockResolvedValue({ toolFormat: undefined }),
-            updateSettings: vi.fn().mockResolvedValue(undefined),
-        };
+        vi.resetAllMocks();
+        mockRuntime.getActiveToolFormatState.mockResolvedValue({
+            providerName: 'openai',
+            currentFormat: 'openai',
+            override: null,
+            isAutoDetected: true,
+        });
+        mockRuntime.setActiveToolFormatOverride.mockResolvedValue({
+            providerName: 'openai',
+            currentFormat: 'openai',
+            override: null,
+            isAutoDetected: true,
+        });
         mockContext = createMockCommandContext();
         mockContext.services.settings.merged.providerToolFormatOverrides = {
             openai: 'xml',
         };
         mockContext.services.settings.setValue = vi.fn();
-        mockContext.services.config = {
-            getSettingsService: vi.fn().mockReturnValue(mockSettingsService),
-        };
     });
-    it('shows current format and persist status if called with no arguments', async () => {
+    it('shows the current format when invoked without arguments', async () => {
         const result = await toolformatCommand.action(mockContext, '');
-        expect(result).toBeDefined();
         expect(result?.type).toBe('message');
-        if (result && result.type === 'message') {
+        if (result?.type === 'message') {
             expect(result.content).toContain('Current tool format: openai');
-            expect(result.content).toMatch(/auto-detected|manual override/);
         }
+        expect(mockRuntime.getActiveToolFormatState).toHaveBeenCalled();
     });
-    it('clears the override with auto', async () => {
+    it('clears overrides when auto is provided', async () => {
         const result = await toolformatCommand.action(mockContext, 'auto');
+        expect(mockRuntime.setActiveToolFormatOverride).toHaveBeenCalledWith(null);
         expect(result?.type).toBe('message');
-        if (result && result.type === 'message') {
-            expect(result.content).toMatch(/override cleared|auto-detection/);
+        if (result?.type === 'message') {
+            expect(result.messageType).toBe('info');
+            expect(result.content).toContain('override cleared');
         }
-        expect(provider.setToolFormatOverride).toHaveBeenCalledWith(null);
-        // Should use SettingsService, not legacy settings
-        expect(mockSettingsService.updateSettings).toHaveBeenCalledWith('openai', { toolFormat: 'auto' });
     });
-    it('errors for invalid format', async () => {
-        const result = await toolformatCommand.action(mockContext, 'notrealformat');
+    it('rejects invalid formats', async () => {
+        const result = await toolformatCommand.action(mockContext, 'invalid');
         expect(result?.type).toBe('message');
-        if (result && result.type === 'message') {
+        if (result?.type === 'message') {
             expect(result.messageType).toBe('error');
             expect(result.content).toContain('Invalid tool format');
         }
     });
-    it('sets a valid override and persists', async () => {
+    it('persists valid overrides through SettingsService', async () => {
+        mockRuntime.setActiveToolFormatOverride.mockResolvedValue({
+            providerName: 'openai',
+            currentFormat: 'hermes',
+            override: 'hermes',
+            isAutoDetected: false,
+        });
         const result = await toolformatCommand.action(mockContext, 'hermes');
-        expect(provider.setToolFormatOverride).toHaveBeenCalledWith('hermes');
-        // Should use SettingsService, not legacy settings
-        expect(mockSettingsService.updateSettings).toHaveBeenCalledWith('openai', { toolFormat: 'hermes' });
+        expect(mockRuntime.setActiveToolFormatOverride).toHaveBeenCalledWith('hermes');
         expect(result?.type).toBe('message');
-        if (result && result.type === 'message') {
+        if (result?.type === 'message') {
             expect(result.messageType).toBe('info');
             expect(result.content).toContain("override set to 'hermes'");
         }
     });
-    it('shows error if no active provider', async () => {
-        providerManager.hasActiveProvider = vi.fn().mockReturnValue(false);
+    it('works when settings service is unavailable', async () => {
+        mockContext.services.config = {
+            getSettingsService: vi.fn().mockReturnValue(null),
+        };
         const result = await toolformatCommand.action(mockContext, 'hermes');
+        expect(mockRuntime.setActiveToolFormatOverride).toHaveBeenCalledWith('hermes');
         expect(result?.type).toBe('message');
-        if (result && result.type === 'message') {
-            expect(result.messageType).toBe('error');
-            expect(result.content).toContain('No active provider');
+        if (result?.type === 'message') {
+            expect(result.messageType).toBe('info');
         }
     });
-    describe('SettingsService integration', () => {
-        it('uses SettingsService when available for setting format', async () => {
-            const result = await toolformatCommand.action(mockContext, 'xml');
-            expect(mockSettingsService.updateSettings).toHaveBeenCalledWith('openai', { toolFormat: 'xml' });
-            expect(result?.type).toBe('message');
-            if (result && result.type === 'message') {
-                expect(result.messageType).toBe('info');
-                expect(result.content).toContain("override set to 'xml'");
-            }
-        });
-        it('uses SettingsService when available for clearing format', async () => {
-            const result = await toolformatCommand.action(mockContext, 'auto');
-            expect(mockSettingsService.updateSettings).toHaveBeenCalledWith('openai', { toolFormat: 'auto' });
-            expect(result?.type).toBe('message');
-            if (result && result.type === 'message') {
-                expect(result.content).toMatch(/override cleared|auto-detection/);
-            }
-        });
-        it('falls back to legacy settings when SettingsService is not available', async () => {
-            // Remove SettingsService
-            mockContext.services.config = {
-                getSettingsService: vi.fn().mockReturnValue(null),
-            };
-            const result = await toolformatCommand.action(mockContext, 'hermes');
-            expect(mockContext.services.settings.setValue).toHaveBeenCalledWith('User', 'providerToolFormatOverrides', { openai: 'hermes' });
-            expect(result?.type).toBe('message');
-            if (result && result.type === 'message') {
-                expect(result.messageType).toBe('info');
-                expect(result.content).toContain("override set to 'hermes'");
-            }
-        });
-        it('handles SettingsService errors gracefully', async () => {
-            // Make SettingsService throw an error
-            mockSettingsService.updateSettings = vi
-                .fn()
-                .mockRejectedValue(new Error('Settings update failed'));
-            const result = await toolformatCommand.action(mockContext, 'xml');
-            expect(result?.type).toBe('message');
-            if (result && result.type === 'message') {
-                expect(result.messageType).toBe('error');
-                expect(result.content).toContain('Failed to set tool format override');
-                expect(result.content).toContain('Settings update failed');
-            }
-        });
+    it('surfaces runtime errors when override update fails', async () => {
+        mockRuntime.setActiveToolFormatOverride.mockRejectedValue(new Error('failure'));
+        const result = await toolformatCommand.action(mockContext, 'xml');
+        expect(result?.type).toBe('message');
+        if (result?.type === 'message') {
+            expect(result.messageType).toBe('error');
+            expect(result.content).toContain('failure');
+        }
     });
 });
 //# sourceMappingURL=toolformatCommand.test.js.map

package/dist/src/ui/commands/toolformatCommand.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"toolformatCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/toolformatCommand.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAa,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAIhF,EAAE,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;AAEtD,SAAS,YAAY,CAAC,QAA4B,EAAE;IAClD,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC;QAChD,qBAAqB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC9B,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACxC,sBAAsB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC/B,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3C,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC/C,GAAG,KAAK;KACe,CAAC;AAC5B,CAAC;AAED,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,IAAI,WAA2B,CAAC;IAChC,IAAI,eAAiC,CAAC;IACtC,IAAI,QAAmB,CAAC;IACxB,IAAI,mBAA4B,CAAC;IACjC,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,YAAY,EAAE,CAAC;QAC1B,eAAe,GAAG;YAChB,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;YAChD,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC;YACpD,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YAC1C,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;YACvB,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;SACI,CAAC;QAChC,kBAAsC,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAEzE,uBAAuB;QACvB,mBAAmB,GAAG;YACpB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;YACjE,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;SACrD,CAAC;QAEF,WAAW,GAAG,wBAAwB,EAAE,CAAC;QACzC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,2BAA2B,GAAG;YACjE,MAAM,EAAE,KAAK;SACd,CAAC;QACF,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACjD,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG;YAC5B,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,mBAAmB,CAAC;SACxD,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;QACnF,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,6BAA6B,CAAC,CAAC;YAChE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;QAClE,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAClE,kDAAkD;QAClD,MAAM,CACH,mBAAgD,CAAC,cAAc,CACjE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAC5C,WAAW,EACX,eAAe,CAChB,CAAC;QACF,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACtE,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACtE,kDAAkD;QAClD,MAAM,CACH,mBAAgD,CAAC,cAAc,CACjE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QACjD,eAAe,CAAC,iBAAiB,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QACzD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;QAC3C,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YACnE,MAAM,CACH,mBAAgD,CAAC,cAAc,CACjE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;YACxD,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACpE,MAAM,CACH,mBAAgD,CAAC,cAAc,CACjE,CAAC,oBAAoB,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;YACzD,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACnF,yBAAyB;YACzB,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG;gBAC5B,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;aACzC,CAAC;YAEX,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACtE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CACjE,MAAM,EACN,6BAA6B,EAC7B,EAAE,MAAM,EAAE,QAAQ,EAAE,CACrB,CAAC;YACF,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzD,sCAAsC;YACrC,mBAAgD,CAAC,cAAc,GAAG,EAAE;iBAClE,EAAE,EAAE;iBACJ,iBAAiB,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;YAE1D,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YACnE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrC,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,oCAAoC,CAAC,CAAC;gBACvE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"toolformatCommand.test.js","sourceRoot":"","sources":["../../../../src/ui/commands/toolformatCommand.test.ts"],"names":[],"mappings":"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"}