@umsai/ums-code 0.0.14-v2 → 0.3.0-v1

package/dist/src/nonInteractiveCli.js

@@ -3,90 +3,266 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { executeToolCall, shutdownTelemetry, isTelemetrySdkInitialized, GeminiEventType, parseAndFormatApiError, FatalInputError, FatalTurnLimitedError, } from '@umsai/ums-code-core';
-import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
+import { isSlashCommand } from './ui/utils/commandUtils.js';
+import { executeToolCall, shutdownTelemetry, isTelemetrySdkInitialized, GeminiEventType, FatalInputError, promptIdContext, OutputFormat, uiTelemetryService, } from '@umsai/ums-code-core';
+import { JsonOutputAdapter } from './nonInteractive/io/JsonOutputAdapter.js';
+import { StreamJsonOutputAdapter } from './nonInteractive/io/StreamJsonOutputAdapter.js';
+import { handleSlashCommand } from './nonInteractiveCliCommands.js';
 import { handleAtCommand } from './ui/hooks/atCommandProcessor.js';
-export async function runNonInteractive(config, input, prompt_id) {
-    const consolePatcher = new ConsolePatcher({
-        stderr: true,
-        debugMode: config.getDebugMode(),
-    });
-    try {
-        consolePatcher.patch();
-        // Handle EPIPE errors when the output is piped to a command that closes early.
-        process.stdout.on('error', (err) => {
+import { handleError, handleToolError, handleCancellationError, handleMaxTurnsExceededError, } from './utils/errors.js';
+import { normalizePartList, extractPartsFromUserMessage, buildSystemMessage, createTaskToolProgressHandler, computeUsageFromMetrics, } from './utils/nonInteractiveHelpers.js';
+/**
+ * Executes the non-interactive CLI flow for a single request.
+ */
+export async function runNonInteractive(config, settings, input, prompt_id, options = {}) {
+    return promptIdContext.run(prompt_id, async () => {
+        // Create output adapter based on format
+        let adapter;
+        const outputFormat = config.getOutputFormat();
+        if (options.adapter) {
+            adapter = options.adapter;
+        }
+        else if (outputFormat === OutputFormat.JSON) {
+            adapter = new JsonOutputAdapter(config);
+        }
+        else if (outputFormat === OutputFormat.STREAM_JSON) {
+            adapter = new StreamJsonOutputAdapter(config, config.getIncludePartialMessages());
+        }
+        // Get readonly values once at the start
+        const sessionId = config.getSessionId();
+        const permissionMode = config.getApprovalMode();
+        let turnCount = 0;
+        let totalApiDurationMs = 0;
+        const startTime = Date.now();
+        const stdoutErrorHandler = (err) => {
             if (err.code === 'EPIPE') {
-                // Exit gracefully if the pipe is closed.
+                process.stdout.removeListener('error', stdoutErrorHandler);
                 process.exit(0);
             }
-        });
+        };
         const geminiClient = config.getGeminiClient();
-        const abortController = new AbortController();
-        const { processedQuery, shouldProceed } = await handleAtCommand({
-            query: input,
-            config,
-            addItem: (_item, _timestamp) => 0,
-            onDebugMessage: () => { },
-            messageId: Date.now(),
-            signal: abortController.signal,
-        });
-        if (!shouldProceed || !processedQuery) {
-            // An error occurred during @include processing (e.g., file not found).
-            // The error message is already logged by handleAtCommand.
-            throw new FatalInputError('Exiting due to an error processing the @ command.');
-        }
-        let currentMessages = [
-            { role: 'user', parts: processedQuery },
-        ];
-        let turnCount = 0;
-        while (true) {
-            turnCount++;
-            if (config.getMaxSessionTurns() >= 0 &&
-                turnCount > config.getMaxSessionTurns()) {
-                throw new FatalTurnLimitedError('Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.');
+        const abortController = options.abortController ?? new AbortController();
+        // Setup signal handlers for graceful shutdown
+        const shutdownHandler = () => {
+            if (config.getDebugMode()) {
+                console.error('[runNonInteractive] Shutdown signal received');
             }
-            const toolCallRequests = [];
-            const responseStream = geminiClient.sendMessageStream(currentMessages[0]?.parts || [], abortController.signal, prompt_id);
-            for await (const event of responseStream) {
-                if (abortController.signal.aborted) {
-                    console.error('Operation cancelled.');
-                    return;
-                }
-                if (event.type === GeminiEventType.Content) {
-                    process.stdout.write(event.value);
+            abortController.abort();
+        };
+        try {
+            process.stdout.on('error', stdoutErrorHandler);
+            process.on('SIGINT', shutdownHandler);
+            process.on('SIGTERM', shutdownHandler);
+            let initialPartList = extractPartsFromUserMessage(options.userMessage);
+            if (!initialPartList) {
+                let slashHandled = false;
+                if (isSlashCommand(input)) {
+                    const slashCommandResult = await handleSlashCommand(input, abortController, config, settings);
+                    if (slashCommandResult) {
+                        // A slash command can replace the prompt entirely; fall back to @-command processing otherwise.
+                        initialPartList = slashCommandResult;
+                        slashHandled = true;
+                    }
                 }
-                else if (event.type === GeminiEventType.ToolCallRequest) {
-                    toolCallRequests.push(event.value);
+                if (!slashHandled) {
+                    const { processedQuery, shouldProceed } = await handleAtCommand({
+                        query: input,
+                        config,
+                        addItem: (_item, _timestamp) => 0,
+                        onDebugMessage: () => { },
+                        messageId: Date.now(),
+                        signal: abortController.signal,
+                    });
+                    if (!shouldProceed || !processedQuery) {
+                        // An error occurred during @include processing (e.g., file not found).
+                        // The error message is already logged by handleAtCommand.
+                        throw new FatalInputError('Exiting due to an error processing the @ command.');
+                    }
+                    initialPartList = processedQuery;
                 }
             }
-            if (toolCallRequests.length > 0) {
-                const toolResponseParts = [];
-                for (const requestInfo of toolCallRequests) {
-                    const toolResponse = await executeToolCall(config, requestInfo, abortController.signal);
-                    if (toolResponse.error) {
-                        console.error(`Error executing tool ${requestInfo.name}: ${toolResponse.resultDisplay || toolResponse.error.message}`);
+            if (!initialPartList) {
+                initialPartList = [{ text: input }];
+            }
+            const initialParts = normalizePartList(initialPartList);
+            let currentMessages = [{ role: 'user', parts: initialParts }];
+            if (adapter) {
+                const systemMessage = await buildSystemMessage(config, sessionId, permissionMode);
+                adapter.emitMessage(systemMessage);
+            }
+            while (true) {
+                turnCount++;
+                if (config.getMaxSessionTurns() >= 0 &&
+                    turnCount > config.getMaxSessionTurns()) {
+                    handleMaxTurnsExceededError(config);
+                }
+                const toolCallRequests = [];
+                const apiStartTime = Date.now();
+                const responseStream = geminiClient.sendMessageStream(currentMessages[0]?.parts || [], abortController.signal, prompt_id);
+                // Start assistant message for this turn
+                if (adapter) {
+                    adapter.startAssistantMessage();
+                }
+                for await (const event of responseStream) {
+                    if (abortController.signal.aborted) {
+                        handleCancellationError(config);
+                    }
+                    if (adapter) {
+                        // Use adapter for all event processing
+                        adapter.processEvent(event);
+                        if (event.type === GeminiEventType.ToolCallRequest) {
+                            toolCallRequests.push(event.value);
+                        }
+                    }
+                    else {
+                        // Text output mode - direct stdout
+                        if (event.type === GeminiEventType.Content) {
+                            process.stdout.write(event.value);
+                        }
+                        else if (event.type === GeminiEventType.ToolCallRequest) {
+                            toolCallRequests.push(event.value);
+                        }
+                    }
+                }
+                // Finalize assistant message
+                if (adapter) {
+                    adapter.finalizeAssistantMessage();
+                }
+                totalApiDurationMs += Date.now() - apiStartTime;
+                if (toolCallRequests.length > 0) {
+                    const toolResponseParts = [];
+                    for (const requestInfo of toolCallRequests) {
+                        const finalRequestInfo = requestInfo;
+                        /*
+                        if (options.controlService) {
+                          const permissionResult =
+                            await options.controlService.permission.shouldAllowTool(
+                              requestInfo,
+                            );
+                          if (!permissionResult.allowed) {
+                            if (config.getDebugMode()) {
+                              console.error(
+                                `[runNonInteractive] Tool execution denied: ${requestInfo.name}`,
+                                permissionResult.message ?? '',
+                              );
+                            }
+                            if (adapter && permissionResult.message) {
+                              adapter.emitSystemMessage('tool_denied', {
+                                tool: requestInfo.name,
+                                message: permissionResult.message,
+                              });
+                            }
+                            continue;
+                          }
+            
+                          if (permissionResult.updatedArgs) {
+                            finalRequestInfo = {
+                              ...requestInfo,
+                              args: permissionResult.updatedArgs,
+                            };
+                          }
+                        }
+            
+                        const toolCallUpdateCallback = options.controlService
+                          ? options.controlService.permission.getToolCallUpdateCallback()
+                          : undefined;
+                        */
+                        // Only pass outputUpdateHandler for Task tool
+                        const isTaskTool = finalRequestInfo.name === 'task';
+                        const taskToolProgress = isTaskTool
+                            ? createTaskToolProgressHandler(config, finalRequestInfo.callId, adapter)
+                            : undefined;
+                        const taskToolProgressHandler = taskToolProgress?.handler;
+                        const toolResponse = await executeToolCall(config, finalRequestInfo, abortController.signal, isTaskTool && taskToolProgressHandler
+                            ? {
+                                outputUpdateHandler: taskToolProgressHandler,
+                                /*
+                                toolCallUpdateCallback
+                                  ? { onToolCallsUpdate: toolCallUpdateCallback }
+                                  : undefined,
+                                */
+                            }
+                            : undefined);
+                        // Note: In JSON mode, subagent messages are automatically added to the main
+                        // adapter's messages array and will be output together on emitResult()
+                        if (toolResponse.error) {
+                            // In JSON/STREAM_JSON mode, tool errors are tolerated and formatted
+                            // as tool_result blocks. handleToolError will detect JSON/STREAM_JSON mode
+                            // from config and allow the session to continue so the LLM can decide what to do next.
+                            // In text mode, we still log the error.
+                            handleToolError(finalRequestInfo.name, toolResponse.error, config, toolResponse.errorType || 'TOOL_EXECUTION_ERROR', typeof toolResponse.resultDisplay === 'string'
+                                ? toolResponse.resultDisplay
+                                : undefined);
+                            // Note: We no longer emit a separate system message for tool errors
+                            // in JSON/STREAM_JSON mode, as the error is already captured in the
+                            // tool_result block with is_error=true.
+                        }
+                        if (adapter) {
+                            adapter.emitToolResult(finalRequestInfo, toolResponse);
+                        }
+                        if (toolResponse.responseParts) {
+                            toolResponseParts.push(...toolResponse.responseParts);
+                        }
+                    }
+                    currentMessages = [{ role: 'user', parts: toolResponseParts }];
+                }
+                else {
+                    // For JSON and STREAM_JSON modes, compute usage from metrics
+                    if (adapter) {
+                        const metrics = uiTelemetryService.getMetrics();
+                        const usage = computeUsageFromMetrics(metrics);
+                        // Get stats for JSON format output
+                        const stats = outputFormat === OutputFormat.JSON
+                            ? uiTelemetryService.getMetrics()
+                            : undefined;
+                        adapter.emitResult({
+                            isError: false,
+                            durationMs: Date.now() - startTime,
+                            apiDurationMs: totalApiDurationMs,
+                            numTurns: turnCount,
+                            usage,
+                            stats,
+                        });
                     }
-                    if (toolResponse.responseParts) {
-                        toolResponseParts.push(...toolResponse.responseParts);
+                    else {
+                        // Text output mode - no usage needed
+                        process.stdout.write('\n');
                     }
+                    return;
                 }
-                currentMessages = [{ role: 'user', parts: toolResponseParts }];
             }
-            else {
-                process.stdout.write('\n'); // Ensure a final newline
-                return;
+        }
+        catch (error) {
+            // For JSON and STREAM_JSON modes, compute usage from metrics
+            const message = error instanceof Error ? error.message : String(error);
+            if (adapter) {
+                const metrics = uiTelemetryService.getMetrics();
+                const usage = computeUsageFromMetrics(metrics);
+                // Get stats for JSON format output
+                const stats = outputFormat === OutputFormat.JSON
+                    ? uiTelemetryService.getMetrics()
+                    : undefined;
+                adapter.emitResult({
+                    isError: true,
+                    durationMs: Date.now() - startTime,
+                    apiDurationMs: totalApiDurationMs,
+                    numTurns: turnCount,
+                    errorMessage: message,
+                    usage,
+                    stats,
+                });
             }
+            handleError(error, config);
         }
-    }
-    catch (error) {
-        console.error(parseAndFormatApiError(error, config.getContentGeneratorConfig()?.authType));
-        throw error;
-    }
-    finally {
-        consolePatcher.cleanup();
-        if (isTelemetrySdkInitialized()) {
-            await shutdownTelemetry(config);
+        finally {
+            process.stdout.removeListener('error', stdoutErrorHandler);
+            // Cleanup signal handlers
+            process.removeListener('SIGINT', shutdownHandler);
+            process.removeListener('SIGTERM', shutdownHandler);
+            if (isTelemetrySdkInitialized()) {
+                await shutdownTelemetry(config);
+            }
         }
-    }
+    });
 }
 //# sourceMappingURL=nonInteractiveCli.js.map

package/dist/src/nonInteractiveCli.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonInteractiveCli.js","sourceRoot":"","sources":["../../src/nonInteractiveCli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nonInteractiveCli.js","sourceRoot":"","sources":["../../src/nonInteractiveCli.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,yBAAyB,EACzB,eAAe,EACf,eAAe,EACf,eAAe,EACf,YAAY,EACZ,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAGzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EACL,WAAW,EACX,eAAe,EACf,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,iBAAiB,EACjB,2BAA2B,EAC3B,kBAAkB,EAClB,6BAA6B,EAC7B,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAiB1C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAc,EACd,QAAwB,EACxB,KAAa,EACb,SAAiB,EACjB,UAAoC,EAAE;IAEtC,OAAO,eAAe,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;QAC/C,wCAAwC;QACxC,IAAI,OAA+C,CAAC;QACpD,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAE9C,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,CAAC;aAAM,IAAI,YAAY,KAAK,YAAY,CAAC,IAAI,EAAE,CAAC;YAC9C,OAAO,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC;aAAM,IAAI,YAAY,KAAK,YAAY,CAAC,WAAW,EAAE,CAAC;YACrD,OAAO,GAAG,IAAI,uBAAuB,CACnC,MAAM,EACN,MAAM,CAAC,yBAAyB,EAAE,CACnC,CAAC;QACJ,CAAC;QAED,wCAAwC;QACxC,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;QACxC,MAAM,cAAc,GAAG,MAAM,CAAC,eAAe,EAAoB,CAAC;QAElE,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,kBAAkB,GAAG,CAAC,CAAC;QAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE7B,MAAM,kBAAkB,GAAG,CAAC,GAA0B,EAAE,EAAE;YACxD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACzB,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;QAC9C,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,eAAe,EAAE,CAAC;QAEzE,8CAA8C;QAC9C,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC1B,OAAO,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAChE,CAAC;YACD,eAAe,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC,CAAC;QAEF,IAAI,CAAC;YACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YAE/C,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;YACtC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAEvC,IAAI,eAAe,GAAyB,2BAA2B,CACrE,OAAO,CAAC,WAAW,CACpB,CAAC;YAEF,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,IAAI,YAAY,GAAG,KAAK,CAAC;gBACzB,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC1B,MAAM,kBAAkB,GAAG,MAAM,kBAAkB,CACjD,KAAK,EACL,eAAe,EACf,MAAM,EACN,QAAQ,CACT,CAAC;oBACF,IAAI,kBAAkB,EAAE,CAAC;wBACvB,gGAAgG;wBAChG,eAAe,GAAG,kBAAmC,CAAC;wBACtD,YAAY,GAAG,IAAI,CAAC;oBACtB,CAAC;gBACH,CAAC;gBAED,IAAI,CAAC,YAAY,EAAE,CAAC;oBAClB,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,MAAM,eAAe,CAAC;wBAC9D,KAAK,EAAE,KAAK;wBACZ,MAAM;wBACN,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;wBACjC,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;wBACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;wBACrB,MAAM,EAAE,eAAe,CAAC,MAAM;qBAC/B,CAAC,CAAC;oBAEH,IAAI,CAAC,aAAa,IAAI,CAAC,cAAc,EAAE,CAAC;wBACtC,uEAAuE;wBACvE,0DAA0D;wBAC1D,MAAM,IAAI,eAAe,CACvB,mDAAmD,CACpD,CAAC;oBACJ,CAAC;oBACD,eAAe,GAAG,cAA+B,CAAC;gBACpD,CAAC;YACH,CAAC;YAED,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,eAAe,GAAG,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACtC,CAAC;YAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;YACxD,IAAI,eAAe,GAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;YAEzE,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAC5C,MAAM,EACN,SAAS,EACT,cAAc,CACf,CAAC;gBACF,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACrC,CAAC;YAED,OAAO,IAAI,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;gBACZ,IACE,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC;oBAChC,SAAS,GAAG,MAAM,CAAC,kBAAkB,EAAE,EACvC,CAAC;oBACD,2BAA2B,CAAC,MAAM,CAAC,CAAC;gBACtC,CAAC;gBAED,MAAM,gBAAgB,GAA0B,EAAE,CAAC;gBACnD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAChC,MAAM,cAAc,GAAG,YAAY,CAAC,iBAAiB,CACnD,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,EAAE,EAC/B,eAAe,CAAC,MAAM,EACtB,SAAS,CACV,CAAC;gBAEF,wCAAwC;gBACxC,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,CAAC,qBAAqB,EAAE,CAAC;gBAClC,CAAC;gBAED,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;oBACzC,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;wBACnC,uBAAuB,CAAC,MAAM,CAAC,CAAC;oBAClC,CAAC;oBAED,IAAI,OAAO,EAAE,CAAC;wBACZ,uCAAuC;wBACvC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;wBAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,eAAe,EAAE,CAAC;4BACnD,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACrC,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACN,mCAAmC;wBACnC,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;4BAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACpC,CAAC;6BAAM,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,CAAC,eAAe,EAAE,CAAC;4BAC1D,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACrC,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,6BAA6B;gBAC7B,IAAI,OAAO,EAAE,CAAC;oBACZ,OAAO,CAAC,wBAAwB,EAAE,CAAC;gBACrC,CAAC;gBACD,kBAAkB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC;gBAEhD,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChC,MAAM,iBAAiB,GAAW,EAAE,CAAC;oBAErC,KAAK,MAAM,WAAW,IAAI,gBAAgB,EAAE,CAAC;wBAC3C,MAAM,gBAAgB,GAAG,WAAW,CAAC;wBAErC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAiCE;wBAEF,8CAA8C;wBAC9C,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,KAAK,MAAM,CAAC;wBACpD,MAAM,gBAAgB,GAAG,UAAU;4BACjC,CAAC,CAAC,6BAA6B,CAC3B,MAAM,EACN,gBAAgB,CAAC,MAAM,EACvB,OAAO,CACR;4BACH,CAAC,CAAC,SAAS,CAAC;wBACd,MAAM,uBAAuB,GAAG,gBAAgB,EAAE,OAAO,CAAC;wBAC1D,MAAM,YAAY,GAAG,MAAM,eAAe,CACxC,MAAM,EACN,gBAAgB,EAChB,eAAe,CAAC,MAAM,EACtB,UAAU,IAAI,uBAAuB;4BACnC,CAAC,CAAC;gCACE,mBAAmB,EAAE,uBAAuB;gCAC5C;;;;kCAIE;6BACH;4BACH,CAAC,CAAC,SAAS,CACd,CAAC;wBAEF,4EAA4E;wBAC5E,uEAAuE;wBAEvE,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;4BACvB,oEAAoE;4BACpE,2EAA2E;4BAC3E,uFAAuF;4BACvF,wCAAwC;4BACxC,eAAe,CACb,gBAAgB,CAAC,IAAI,EACrB,YAAY,CAAC,KAAK,EAClB,MAAM,EACN,YAAY,CAAC,SAAS,IAAI,sBAAsB,EAChD,OAAO,YAAY,CAAC,aAAa,KAAK,QAAQ;gCAC5C,CAAC,CAAC,YAAY,CAAC,aAAa;gCAC5B,CAAC,CAAC,SAAS,CACd,CAAC;4BACF,oEAAoE;4BACpE,oEAAoE;4BACpE,wCAAwC;wBAC1C,CAAC;wBAED,IAAI,OAAO,EAAE,CAAC;4BACZ,OAAO,CAAC,cAAc,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;wBACzD,CAAC;wBAED,IAAI,YAAY,CAAC,aAAa,EAAE,CAAC;4BAC/B,iBAAiB,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;wBACxD,CAAC;oBACH,CAAC;oBACD,eAAe,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBACjE,CAAC;qBAAM,CAAC;oBACN,6DAA6D;oBAC7D,IAAI,OAAO,EAAE,CAAC;wBACZ,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,EAAE,CAAC;wBAChD,MAAM,KAAK,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;wBAC/C,mCAAmC;wBACnC,MAAM,KAAK,GACT,YAAY,KAAK,YAAY,CAAC,IAAI;4BAChC,CAAC,CAAC,kBAAkB,CAAC,UAAU,EAAE;4BACjC,CAAC,CAAC,SAAS,CAAC;wBAChB,OAAO,CAAC,UAAU,CAAC;4BACjB,OAAO,EAAE,KAAK;4BACd,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;4BAClC,aAAa,EAAE,kBAAkB;4BACjC,QAAQ,EAAE,SAAS;4BACnB,KAAK;4BACL,KAAK;yBACN,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,qCAAqC;wBACrC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC7B,CAAC;oBACD,OAAO;gBACT,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,6DAA6D;YAC7D,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,EAAE,CAAC;gBAChD,MAAM,KAAK,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;gBAC/C,mCAAmC;gBACnC,MAAM,KAAK,GACT,YAAY,KAAK,YAAY,CAAC,IAAI;oBAChC,CAAC,CAAC,kBAAkB,CAAC,UAAU,EAAE;oBACjC,CAAC,CAAC,SAAS,CAAC;gBAChB,OAAO,CAAC,UAAU,CAAC;oBACjB,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;oBAClC,aAAa,EAAE,kBAAkB;oBACjC,QAAQ,EAAE,SAAS;oBACnB,YAAY,EAAE,OAAO;oBACrB,KAAK;oBACL,KAAK;iBACN,CAAC,CAAC;YACL,CAAC;YACD,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YAC3D,0BAA0B;YAC1B,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;YAClD,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YACnD,IAAI,yBAAyB,EAAE,EAAE,CAAC;gBAChC,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/src/nonInteractiveCliCommands.d.ts

@@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type { PartListUnion } from '@google/genai';
+import { type Config } from '@umsai/ums-code-core';
+import { type SlashCommand } from './ui/commands/types.js';
+import type { LoadedSettings } from './config/settings.js';
+/**
+ * Processes a slash command in a non-interactive environment.
+ *
+ * @param rawQuery The raw query string (should start with '/')
+ * @param abortController Controller to cancel the operation
+ * @param config The configuration object
+ * @param settings The loaded settings
+ * @param allowedBuiltinCommandNames Optional array of built-in command names that are
+ *   allowed. If not provided or empty, only file commands are available.
+ * @returns A Promise that resolves to `PartListUnion` if a valid command is
+ *   found and results in a prompt, or `undefined` otherwise.
+ * @throws {FatalInputError} if the command result is not supported in
+ *   non-interactive mode.
+ */
+export declare const handleSlashCommand: (rawQuery: string, abortController: AbortController, config: Config, settings: LoadedSettings, allowedBuiltinCommandNames?: string[]) => Promise<PartListUnion | undefined>;
+/**
+ * Retrieves all available slash commands for the current configuration.
+ *
+ * @param config The configuration object
+ * @param settings The loaded settings
+ * @param abortSignal Signal to cancel the loading process
+ * @param allowedBuiltinCommandNames Optional array of built-in command names that are
+ *   allowed. If not provided or empty, only file commands are available.
+ * @returns A Promise that resolves to an array of SlashCommand objects
+ */
+export declare const getAvailableCommands: (config: Config, settings: LoadedSettings, abortSignal: AbortSignal, allowedBuiltinCommandNames?: string[]) => Promise<SlashCommand[]>;

package/dist/src/nonInteractiveCliCommands.js

@@ -0,0 +1,144 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { parseSlashCommand } from './utils/commands.js';
+import { FatalInputError, Logger, uiTelemetryService, } from '@umsai/ums-code-core';
+import { CommandService } from './services/CommandService.js';
+import { BuiltinCommandLoader } from './services/BuiltinCommandLoader.js';
+import { FileCommandLoader } from './services/FileCommandLoader.js';
+import { CommandKind, } from './ui/commands/types.js';
+import { createNonInteractiveUI } from './ui/noninteractive/nonInteractiveUi.js';
+/**
+ * Filters commands based on the allowed built-in command names.
+ *
+ * - Always includes FILE commands
+ * - Only includes BUILT_IN commands if their name is in the allowed set
+ * - Excludes other command types (e.g., MCP_PROMPT) in non-interactive mode
+ *
+ * @param commands All loaded commands
+ * @param allowedBuiltinCommandNames Set of allowed built-in command names (empty = none allowed)
+ * @returns Filtered commands
+ */
+function filterCommandsForNonInteractive(commands, allowedBuiltinCommandNames) {
+    return commands.filter((cmd) => {
+        if (cmd.kind === CommandKind.FILE) {
+            return true;
+        }
+        // Built-in commands: only include if in the allowed list
+        if (cmd.kind === CommandKind.BUILT_IN) {
+            return allowedBuiltinCommandNames.has(cmd.name);
+        }
+        // Exclude other types (e.g., MCP_PROMPT) in non-interactive mode
+        return false;
+    });
+}
+/**
+ * Processes a slash command in a non-interactive environment.
+ *
+ * @param rawQuery The raw query string (should start with '/')
+ * @param abortController Controller to cancel the operation
+ * @param config The configuration object
+ * @param settings The loaded settings
+ * @param allowedBuiltinCommandNames Optional array of built-in command names that are
+ *   allowed. If not provided or empty, only file commands are available.
+ * @returns A Promise that resolves to `PartListUnion` if a valid command is
+ *   found and results in a prompt, or `undefined` otherwise.
+ * @throws {FatalInputError} if the command result is not supported in
+ *   non-interactive mode.
+ */
+export const handleSlashCommand = async (rawQuery, abortController, config, settings, allowedBuiltinCommandNames) => {
+    const trimmed = rawQuery.trim();
+    if (!trimmed.startsWith('/')) {
+        return;
+    }
+    const allowedBuiltinSet = new Set(allowedBuiltinCommandNames ?? []);
+    // Only load BuiltinCommandLoader if there are allowed built-in commands
+    const loaders = allowedBuiltinSet.size > 0
+        ? [new BuiltinCommandLoader(config), new FileCommandLoader(config)]
+        : [new FileCommandLoader(config)];
+    const commandService = await CommandService.create(loaders, abortController.signal);
+    const commands = commandService.getCommands();
+    const filteredCommands = filterCommandsForNonInteractive(commands, allowedBuiltinSet);
+    const { commandToExecute, args } = parseSlashCommand(rawQuery, filteredCommands);
+    if (commandToExecute) {
+        if (commandToExecute.action) {
+            // Not used by custom commands but may be in the future.
+            const sessionStats = {
+                sessionId: config?.getSessionId(),
+                sessionStartTime: new Date(),
+                metrics: uiTelemetryService.getMetrics(),
+                lastPromptTokenCount: 0,
+                promptCount: 1,
+            };
+            const logger = new Logger(config?.getSessionId() || '', config?.storage);
+            const context = {
+                services: {
+                    config,
+                    settings,
+                    git: undefined,
+                    logger,
+                },
+                ui: createNonInteractiveUI(),
+                session: {
+                    stats: sessionStats,
+                    sessionShellAllowlist: new Set(),
+                },
+                invocation: {
+                    raw: trimmed,
+                    name: commandToExecute.name,
+                    args,
+                },
+            };
+            const result = await commandToExecute.action(context, args);
+            if (result) {
+                switch (result.type) {
+                    case 'submit_prompt':
+                        return result.content;
+                    case 'confirm_shell_commands':
+                        // This result indicates a command attempted to confirm shell commands.
+                        // However note that currently, ShellTool is excluded in non-interactive
+                        // mode unless 'YOLO mode' is active, so confirmation actually won't
+                        // occur because of YOLO mode.
+                        // This ensures that if a command *does* request confirmation (e.g.
+                        // in the future with more granular permissions), it's handled appropriately.
+                        throw new FatalInputError('Exiting due to a confirmation prompt requested by the command.');
+                    default:
+                        throw new FatalInputError('Exiting due to command result that is not supported in non-interactive mode.');
+                }
+            }
+        }
+    }
+    return;
+};
+/**
+ * Retrieves all available slash commands for the current configuration.
+ *
+ * @param config The configuration object
+ * @param settings The loaded settings
+ * @param abortSignal Signal to cancel the loading process
+ * @param allowedBuiltinCommandNames Optional array of built-in command names that are
+ *   allowed. If not provided or empty, only file commands are available.
+ * @returns A Promise that resolves to an array of SlashCommand objects
+ */
+export const getAvailableCommands = async (config, settings, abortSignal, allowedBuiltinCommandNames) => {
+    try {
+        const allowedBuiltinSet = new Set(allowedBuiltinCommandNames ?? []);
+        // Only load BuiltinCommandLoader if there are allowed built-in commands
+        const loaders = allowedBuiltinSet.size > 0
+            ? [new BuiltinCommandLoader(config), new FileCommandLoader(config)]
+            : [new FileCommandLoader(config)];
+        const commandService = await CommandService.create(loaders, abortSignal);
+        const commands = commandService.getCommands();
+        const filteredCommands = filterCommandsForNonInteractive(commands, allowedBuiltinSet);
+        // Filter out hidden commands
+        return filteredCommands.filter((cmd) => !cmd.hidden);
+    }
+    catch (error) {
+        // Handle errors gracefully - log and return empty array
+        console.error('Error loading available commands:', error);
+        return [];
+    }
+};
+//# sourceMappingURL=nonInteractiveCliCommands.js.map

package/dist/src/nonInteractiveCliCommands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nonInteractiveCliCommands.js","sourceRoot":"","sources":["../../src/nonInteractiveCliCommands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EACL,eAAe,EACf,MAAM,EACN,kBAAkB,GAEnB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EACL,WAAW,GAGZ,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAIjF;;;;;;;;;;GAUG;AACH,SAAS,+BAA+B,CACtC,QAAiC,EACjC,0BAAuC;IAEvC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7B,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,yDAAyD;QACzD,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC,QAAQ,EAAE,CAAC;YACtC,OAAO,0BAA0B,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC;QAED,iEAAiE;QACjE,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,QAAgB,EAChB,eAAgC,EAChC,MAAc,EACd,QAAwB,EACxB,0BAAqC,EACD,EAAE;IACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO;IACT,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC;IAEpE,wEAAwE;IACxE,MAAM,OAAO,GACX,iBAAiB,CAAC,IAAI,GAAG,CAAC;QACxB,CAAC,CAAC,CAAC,IAAI,oBAAoB,CAAC,MAAM,CAAC,EAAE,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtC,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,MAAM,CAChD,OAAO,EACP,eAAe,CAAC,MAAM,CACvB,CAAC;IACF,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;IAC9C,MAAM,gBAAgB,GAAG,+BAA+B,CACtD,QAAQ,EACR,iBAAiB,CAClB,CAAC;IAEF,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAClD,QAAQ,EACR,gBAAgB,CACjB,CAAC;IAEF,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;YAC5B,wDAAwD;YACxD,MAAM,YAAY,GAAsB;gBACtC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE;gBACjC,gBAAgB,EAAE,IAAI,IAAI,EAAE;gBAC5B,OAAO,EAAE,kBAAkB,CAAC,UAAU,EAAE;gBACxC,oBAAoB,EAAE,CAAC;gBACvB,WAAW,EAAE,CAAC;aACf,CAAC;YAEF,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAEzE,MAAM,OAAO,GAAmB;gBAC9B,QAAQ,EAAE;oBACR,MAAM;oBACN,QAAQ;oBACR,GAAG,EAAE,SAAS;oBACd,MAAM;iBACP;gBACD,EAAE,EAAE,sBAAsB,EAAE;gBAC5B,OAAO,EAAE;oBACP,KAAK,EAAE,YAAY;oBACnB,qBAAqB,EAAE,IAAI,GAAG,EAAE;iBACjC;gBACD,UAAU,EAAE;oBACV,GAAG,EAAE,OAAO;oBACZ,IAAI,EAAE,gBAAgB,CAAC,IAAI;oBAC3B,IAAI;iBACL;aACF,CAAC;YAEF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAE5D,IAAI,MAAM,EAAE,CAAC;gBACX,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACpB,KAAK,eAAe;wBAClB,OAAO,MAAM,CAAC,OAAO,CAAC;oBACxB,KAAK,wBAAwB;wBAC3B,uEAAuE;wBACvE,wEAAwE;wBACxE,oEAAoE;wBACpE,8BAA8B;wBAC9B,mEAAmE;wBACnE,6EAA6E;wBAC7E,MAAM,IAAI,eAAe,CACvB,gEAAgE,CACjE,CAAC;oBACJ;wBACE,MAAM,IAAI,eAAe,CACvB,8EAA8E,CAC/E,CAAC;gBACN,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;AACT,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,MAAc,EACd,QAAwB,EACxB,WAAwB,EACxB,0BAAqC,EACZ,EAAE;IAC3B,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,0BAA0B,IAAI,EAAE,CAAC,CAAC;QAEpE,wEAAwE;QACxE,MAAM,OAAO,GACX,iBAAiB,CAAC,IAAI,GAAG,CAAC;YACxB,CAAC,CAAC,CAAC,IAAI,oBAAoB,CAAC,MAAM,CAAC,EAAE,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACnE,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;QAEtC,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;QAC9C,MAAM,gBAAgB,GAAG,+BAA+B,CACtD,QAAQ,EACR,iBAAiB,CAClB,CAAC;QAEF,6BAA6B;QAC7B,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,wDAAwD;QACxD,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAC;QAC1D,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC,CAAC"}

package/dist/src/services/BuiltinCommandLoader.js

@@ -20,10 +20,11 @@ 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 { languageCommand } from '../ui/commands/languageCommand.js';
 import { mcpCommand } from '../ui/commands/mcpCommand.js';
 import { memoryCommand } from '../ui/commands/memoryCommand.js';
 import { modelCommand } from '../ui/commands/modelCommand.js';
-import { privacyCommand } from '../ui/commands/privacyCommand.js';
+import { permissionsCommand } from '../ui/commands/permissionsCommand.js';
 import { quitCommand, quitConfirmCommand } from '../ui/commands/quitCommand.js';
 import { restoreCommand } from '../ui/commands/restoreCommand.js';
 import { settingsCommand } from '../ui/commands/settingsCommand.js';
@@ -69,12 +70,13 @@ export class BuiltinCommandLoader {
             editorCommand,
             extensionsCommand,
             helpCommand,
-            ideCommand(this.config),
+            await ideCommand(),
             initCommand,
+            languageCommand,
             mcpCommand,
             memoryCommand,
             modelCommand,
-            privacyCommand,
+            ...(this.config?.getFolderTrust() ? [permissionsCommand] : []),
             quitCommand,
             quitConfirmCommand,
             restoreCommand(this.config),

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

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