@machina.ai/cell-cli 1.10.0-rc1 → 1.13.0-rc1

package/dist/src/nonInteractiveCli.js

@@ -4,19 +4,104 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { isSlashCommand } from './ui/utils/commandUtils.js';
-import { executeToolCall, shutdownTelemetry, isTelemetrySdkInitialized, GeminiEventType, FatalInputError, promptIdContext, OutputFormat, JsonFormatter, uiTelemetryService, } from '@google/gemini-cli-core';
+import { executeToolCall, shutdownTelemetry, isTelemetrySdkInitialized, GeminiEventType, FatalInputError, promptIdContext, OutputFormat, JsonFormatter, StreamJsonFormatter, JsonStreamEventType, uiTelemetryService, debugLogger, coreEvents, CoreEvent, } from '@google/gemini-cli-core';
+import readline from 'node:readline';
 import { handleSlashCommand } from './nonInteractiveCliCommands.js';
 import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
 import { handleAtCommand } from './ui/hooks/atCommandProcessor.js';
 import { handleError, handleToolError, handleCancellationError, handleMaxTurnsExceededError, } from './utils/errors.js';
-export async function runNonInteractive(config, settings, input, prompt_id) {
+import { TextOutput } from './ui/utils/textOutput.js';
+export async function runNonInteractive({ config, settings, input, prompt_id, hasDeprecatedPromptArg, }) {
     return promptIdContext.run(prompt_id, async () => {
         const consolePatcher = new ConsolePatcher({
             stderr: true,
             debugMode: config.getDebugMode(),
         });
+        const textOutput = new TextOutput();
+        const handleUserFeedback = (payload) => {
+            const prefix = payload.severity.toUpperCase();
+            process.stderr.write(`[${prefix}] ${payload.message}\n`);
+            if (payload.error && config.getDebugMode()) {
+                const errorToLog = payload.error instanceof Error
+                    ? payload.error.stack || payload.error.message
+                    : String(payload.error);
+                process.stderr.write(`${errorToLog}\n`);
+            }
+        };
+        const startTime = Date.now();
+        const streamFormatter = config.getOutputFormat() === OutputFormat.STREAM_JSON
+            ? new StreamJsonFormatter()
+            : null;
+        const abortController = new AbortController();
+        // Track cancellation state
+        let isAborting = false;
+        let cancelMessageTimer = null;
+        // Setup stdin listener for Ctrl+C detection
+        let stdinWasRaw = false;
+        let rl = null;
+        const setupStdinCancellation = () => {
+            // Only setup if stdin is a TTY (user can interact)
+            if (!process.stdin.isTTY) {
+                return;
+            }
+            // Save original raw mode state
+            stdinWasRaw = process.stdin.isRaw || false;
+            // Enable raw mode to capture individual keypresses
+            process.stdin.setRawMode(true);
+            process.stdin.resume();
+            // Setup readline to emit keypress events
+            rl = readline.createInterface({
+                input: process.stdin,
+                escapeCodeTimeout: 0,
+            });
+            readline.emitKeypressEvents(process.stdin, rl);
+            // Listen for Ctrl+C
+            const keypressHandler = (str, key) => {
+                // Detect Ctrl+C: either ctrl+c key combo or raw character code 3
+                if ((key && key.ctrl && key.name === 'c') || str === '\u0003') {
+                    // Only handle once
+                    if (isAborting) {
+                        return;
+                    }
+                    isAborting = true;
+                    // Only show message if cancellation takes longer than 200ms
+                    // This reduces verbosity for fast cancellations
+                    cancelMessageTimer = setTimeout(() => {
+                        process.stderr.write('\nCancelling...\n');
+                    }, 200);
+                    abortController.abort();
+                    // Note: Don't exit here - let the abort flow through the system
+                    // and trigger handleCancellationError() which will exit with proper code
+                }
+            };
+            process.stdin.on('keypress', keypressHandler);
+        };
+        const cleanupStdinCancellation = () => {
+            // Clear any pending cancel message timer
+            if (cancelMessageTimer) {
+                clearTimeout(cancelMessageTimer);
+                cancelMessageTimer = null;
+            }
+            // Cleanup readline and stdin listeners
+            if (rl) {
+                rl.close();
+                rl = null;
+            }
+            // Remove keypress listener
+            process.stdin.removeAllListeners('keypress');
+            // Restore stdin to original state
+            if (process.stdin.isTTY) {
+                process.stdin.setRawMode(stdinWasRaw);
+                process.stdin.pause();
+            }
+        };
+        let errorToHandle;
         try {
             consolePatcher.patch();
+            // Setup stdin cancellation listener
+            setupStdinCancellation();
+            coreEvents.on(CoreEvent.UserFeedback, handleUserFeedback);
+            coreEvents.drainFeedbackBacklog();
             // Handle EPIPE errors when the output is piped to a command that closes early.
             process.stdout.on('error', (err) => {
                 if (err.code === 'EPIPE') {
@@ -25,7 +110,15 @@ export async function runNonInteractive(config, settings, input, prompt_id) {
                 }
             });
             const geminiClient = config.getGeminiClient();
-            const abortController = new AbortController();
+            // Emit init event for streaming JSON
+            if (streamFormatter) {
+                streamFormatter.emitEvent({
+                    type: JsonStreamEventType.INIT,
+                    timestamp: new Date().toISOString(),
+                    session_id: config.getSessionId(),
+                    model: config.getModel(),
+                });
+            }
             let query;
             if (isSlashCommand(input)) {
                 const slashCommandResult = await handleSlashCommand(input, abortController, config, settings);
@@ -52,8 +145,32 @@ export async function runNonInteractive(config, settings, input, prompt_id) {
                 }
                 query = processedQuery;
             }
+            // Emit user message event for streaming JSON
+            if (streamFormatter) {
+                streamFormatter.emitEvent({
+                    type: JsonStreamEventType.MESSAGE,
+                    timestamp: new Date().toISOString(),
+                    role: 'user',
+                    content: input,
+                });
+            }
             let currentMessages = [{ role: 'user', parts: query }];
             let turnCount = 0;
+            const deprecateText = 'The --prompt (-p) flag has been deprecated and will be removed in a future version. Please use a positional argument for your prompt. See gemini --help for more information.\n';
+            if (hasDeprecatedPromptArg) {
+                if (streamFormatter) {
+                    streamFormatter.emitEvent({
+                        type: JsonStreamEventType.MESSAGE,
+                        timestamp: new Date().toISOString(),
+                        role: 'assistant',
+                        content: deprecateText,
+                        delta: true,
+                    });
+                }
+                else {
+                    process.stderr.write(deprecateText);
+                }
+            }
             while (true) {
                 turnCount++;
                 if (config.getMaxSessionTurns() >= 0 &&
@@ -68,24 +185,85 @@ export async function runNonInteractive(config, settings, input, prompt_id) {
                         handleCancellationError(config);
                     }
                     if (event.type === GeminiEventType.Content) {
-                        if (config.getOutputFormat() === OutputFormat.JSON) {
+                        if (streamFormatter) {
+                            streamFormatter.emitEvent({
+                                type: JsonStreamEventType.MESSAGE,
+                                timestamp: new Date().toISOString(),
+                                role: 'assistant',
+                                content: event.value,
+                                delta: true,
+                            });
+                        }
+                        else if (config.getOutputFormat() === OutputFormat.JSON) {
                             responseText += event.value;
                         }
                         else {
-                            process.stdout.write(event.value);
+                            if (event.value) {
+                                textOutput.write(event.value);
+                            }
                         }
                     }
                     else if (event.type === GeminiEventType.ToolCallRequest) {
+                        if (streamFormatter) {
+                            streamFormatter.emitEvent({
+                                type: JsonStreamEventType.TOOL_USE,
+                                timestamp: new Date().toISOString(),
+                                tool_name: event.value.name,
+                                tool_id: event.value.callId,
+                                parameters: event.value.args,
+                            });
+                        }
                         toolCallRequests.push(event.value);
                     }
+                    else if (event.type === GeminiEventType.LoopDetected) {
+                        if (streamFormatter) {
+                            streamFormatter.emitEvent({
+                                type: JsonStreamEventType.ERROR,
+                                timestamp: new Date().toISOString(),
+                                severity: 'warning',
+                                message: 'Loop detected, stopping execution',
+                            });
+                        }
+                    }
+                    else if (event.type === GeminiEventType.MaxSessionTurns) {
+                        if (streamFormatter) {
+                            streamFormatter.emitEvent({
+                                type: JsonStreamEventType.ERROR,
+                                timestamp: new Date().toISOString(),
+                                severity: 'error',
+                                message: 'Maximum session turns exceeded',
+                            });
+                        }
+                    }
+                    else if (event.type === GeminiEventType.Error) {
+                        throw event.value.error;
+                    }
                 }
                 if (toolCallRequests.length > 0) {
+                    textOutput.ensureTrailingNewline();
                     const toolResponseParts = [];
                     const completedToolCalls = [];
                     for (const requestInfo of toolCallRequests) {
                         const completedToolCall = await executeToolCall(config, requestInfo, abortController.signal);
                         const toolResponse = completedToolCall.response;
                         completedToolCalls.push(completedToolCall);
+                        if (streamFormatter) {
+                            streamFormatter.emitEvent({
+                                type: JsonStreamEventType.TOOL_RESULT,
+                                timestamp: new Date().toISOString(),
+                                tool_id: requestInfo.callId,
+                                status: toolResponse.error ? 'error' : 'success',
+                                output: typeof toolResponse.resultDisplay === 'string'
+                                    ? toolResponse.resultDisplay
+                                    : undefined,
+                                error: toolResponse.error
+                                    ? {
+                                        type: toolResponse.errorType || 'TOOL_EXECUTION_ERROR',
+                                        message: toolResponse.error.message,
+                                    }
+                                    : undefined,
+                            });
+                        }
                         if (toolResponse.error) {
                             handleToolError(requestInfo.name, toolResponse.error, config, toolResponse.errorType || 'TOOL_EXECUTION_ERROR', typeof toolResponse.resultDisplay === 'string'
                                 ? toolResponse.resultDisplay
@@ -103,32 +281,49 @@ export async function runNonInteractive(config, settings, input, prompt_id) {
                             .recordCompletedToolCalls(currentModel, completedToolCalls);
                     }
                     catch (error) {
-                        console.error(`Error recording completed tool call information: ${error}`);
+                        debugLogger.error(`Error recording completed tool call information: ${error}`);
                     }
                     currentMessages = [{ role: 'user', parts: toolResponseParts }];
                 }
                 else {
-                    if (config.getOutputFormat() === OutputFormat.JSON) {
+                    // Emit final result event for streaming JSON
+                    if (streamFormatter) {
+                        const metrics = uiTelemetryService.getMetrics();
+                        const durationMs = Date.now() - startTime;
+                        streamFormatter.emitEvent({
+                            type: JsonStreamEventType.RESULT,
+                            timestamp: new Date().toISOString(),
+                            status: 'success',
+                            stats: streamFormatter.convertToStreamStats(metrics, durationMs),
+                        });
+                    }
+                    else if (config.getOutputFormat() === OutputFormat.JSON) {
                         const formatter = new JsonFormatter();
                         const stats = uiTelemetryService.getMetrics();
-                        process.stdout.write(formatter.format(responseText, stats));
+                        textOutput.write(formatter.format(responseText, stats));
                     }
                     else {
-                        process.stdout.write('\n'); // Ensure a final newline
+                        textOutput.ensureTrailingNewline(); // Ensure a final newline
                     }
                     return;
                 }
             }
         }
         catch (error) {
-            handleError(error, config);
+            errorToHandle = error;
         }
         finally {
+            // Cleanup stdin cancellation before other cleanup
+            cleanupStdinCancellation();
             consolePatcher.cleanup();
+            coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
             if (isTelemetrySdkInitialized()) {
                 await shutdownTelemetry(config);
             }
         }
+        if (errorToHandle) {
+            handleError(errorToHandle, 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":"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"}

package/dist/src/nonInteractiveCli.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};