@google/gemini-cli-core 0.0.77777772 → 0.0.77777773
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +108 -71
- package/dist/index.d.ts +3 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/src/agents/codebase-investigator.d.ts +46 -0
- package/dist/src/agents/codebase-investigator.js +136 -0
- package/dist/src/agents/codebase-investigator.js.map +1 -0
- package/dist/src/agents/executor.d.ts +92 -0
- package/dist/src/agents/executor.js +579 -0
- package/dist/src/agents/executor.js.map +1 -0
- package/dist/src/agents/executor.test.d.ts +6 -0
- package/dist/src/agents/executor.test.js +595 -0
- package/dist/src/agents/executor.test.js.map +1 -0
- package/dist/src/agents/invocation.d.ts +46 -0
- package/dist/src/agents/invocation.js +102 -0
- package/dist/src/agents/invocation.js.map +1 -0
- package/dist/src/agents/invocation.test.d.ts +6 -0
- package/dist/src/agents/invocation.test.js +215 -0
- package/dist/src/agents/invocation.test.js.map +1 -0
- package/dist/src/agents/registry.d.ts +36 -0
- package/dist/src/agents/registry.js +60 -0
- package/dist/src/agents/registry.js.map +1 -0
- package/dist/src/agents/registry.test.d.ts +6 -0
- package/dist/src/agents/registry.test.js +146 -0
- package/dist/src/agents/registry.test.js.map +1 -0
- package/dist/src/agents/schema-utils.d.ts +39 -0
- package/dist/src/agents/schema-utils.js +57 -0
- package/dist/src/agents/schema-utils.js.map +1 -0
- package/dist/src/agents/schema-utils.test.d.ts +6 -0
- package/dist/src/agents/schema-utils.test.js +144 -0
- package/dist/src/agents/schema-utils.test.js.map +1 -0
- package/dist/src/agents/subagent-tool-wrapper.d.ts +38 -0
- package/dist/src/agents/subagent-tool-wrapper.js +48 -0
- package/dist/src/agents/subagent-tool-wrapper.js.map +1 -0
- package/dist/src/agents/subagent-tool-wrapper.test.d.ts +6 -0
- package/dist/src/agents/subagent-tool-wrapper.test.js +112 -0
- package/dist/src/agents/subagent-tool-wrapper.test.js.map +1 -0
- package/dist/src/agents/types.d.ts +145 -0
- package/dist/src/agents/types.js +18 -0
- package/dist/src/agents/types.js.map +1 -0
- package/dist/src/agents/utils.d.ts +15 -0
- package/dist/src/agents/utils.js +29 -0
- package/dist/src/agents/utils.js.map +1 -0
- package/dist/src/agents/utils.test.d.ts +6 -0
- package/dist/src/agents/utils.test.js +87 -0
- package/dist/src/agents/utils.test.js.map +1 -0
- package/dist/src/code_assist/oauth-credential-storage.js +1 -1
- package/dist/src/code_assist/oauth-credential-storage.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +14 -13
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/setup.js +4 -2
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/config/config.d.ts +37 -11
- package/dist/src/config/config.js +77 -18
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +88 -3
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/storage.d.ts +0 -1
- package/dist/src/config/storage.js +2 -2
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/config/storage.test.js +7 -6
- package/dist/src/config/storage.test.js.map +1 -1
- package/dist/src/core/baseLlmClient.js +19 -21
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +57 -17
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.d.ts +3 -1
- package/dist/src/core/client.js +68 -46
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +385 -95
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +3 -1
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/coreToolScheduler.js +12 -12
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +260 -23
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +7 -11
- package/dist/src/core/geminiChat.js +31 -74
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +60 -229
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.test.js +2 -2
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +11 -11
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.d.ts +2 -1
- package/dist/src/core/prompts.js +91 -17
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +78 -29
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/turn.d.ts +14 -2
- package/dist/src/core/turn.js +12 -1
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +14 -2
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/ide/detect-ide.d.ts +1 -0
- package/dist/src/ide/detect-ide.js +4 -1
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +11 -0
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-client.js +3 -3
- package/dist/src/ide/ide-client.test.js +4 -4
- package/dist/src/ide/ide-installer.js +1 -1
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +13 -1
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/sa-impersonation-provider.d.ts +33 -0
- package/dist/src/mcp/sa-impersonation-provider.js +130 -0
- package/dist/src/mcp/sa-impersonation-provider.js.map +1 -0
- package/dist/src/mcp/sa-impersonation-provider.test.d.ts +6 -0
- package/dist/src/mcp/sa-impersonation-provider.test.js +117 -0
- package/dist/src/mcp/sa-impersonation-provider.test.js.map +1 -0
- package/dist/src/mcp/token-storage/file-token-storage.js +2 -1
- package/dist/src/mcp/token-storage/file-token-storage.js.map +1 -1
- package/dist/src/mcp/token-storage/file-token-storage.test.js +4 -3
- package/dist/src/mcp/token-storage/file-token-storage.test.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +2 -1
- package/dist/src/services/chatRecordingService.js +2 -1
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/fileSystemService.d.ts +9 -0
- package/dist/src/services/fileSystemService.js +11 -0
- package/dist/src/services/fileSystemService.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +3 -0
- package/dist/src/services/shellExecutionService.js +165 -49
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +74 -5
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +14 -2
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +119 -12
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +99 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +13 -3
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +32 -5
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +0 -52
- package/dist/src/telemetry/constants.js +0 -54
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +5 -3
- package/dist/src/telemetry/index.js +11 -4
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +8 -2
- package/dist/src/telemetry/loggers.js +187 -288
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.circular.js +3 -3
- package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +232 -13
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/memory-monitor.d.ts +149 -0
- package/dist/src/telemetry/memory-monitor.js +335 -0
- package/dist/src/telemetry/memory-monitor.js.map +1 -0
- package/dist/src/telemetry/memory-monitor.test.d.ts +6 -0
- package/dist/src/telemetry/memory-monitor.test.js +472 -0
- package/dist/src/telemetry/memory-monitor.test.js.map +1 -0
- package/dist/src/telemetry/metrics.d.ts +406 -20
- package/dist/src/telemetry/metrics.js +479 -235
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +551 -55
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/telemetryAttributes.d.ts +8 -0
- package/dist/src/telemetry/telemetryAttributes.js +18 -0
- package/dist/src/telemetry/telemetryAttributes.js.map +1 -0
- package/dist/src/telemetry/types.d.ts +150 -3
- package/dist/src/telemetry/types.js +664 -33
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +1 -1
- package/dist/src/telemetry/uiTelemetry.js +1 -1
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +3 -3
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/mock-tool.d.ts +28 -3
- package/dist/src/test-utils/mock-tool.js +71 -1
- package/dist/src/test-utils/mock-tool.js.map +1 -1
- package/dist/src/tools/glob.js +2 -1
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +3 -2
- package/dist/src/tools/mcp-client.js +45 -33
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +168 -5
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/memoryTool.d.ts +1 -1
- package/dist/src/tools/memoryTool.js +1 -2
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/memoryTool.test.js +9 -8
- package/dist/src/tools/memoryTool.test.js.map +1 -1
- package/dist/src/tools/shell.js +2 -2
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +1 -1
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/smart-edit.d.ts +1 -1
- package/dist/src/tools/smart-edit.js +114 -10
- package/dist/src/tools/smart-edit.js.map +1 -1
- package/dist/src/tools/smart-edit.test.js +91 -29
- package/dist/src/tools/smart-edit.test.js.map +1 -1
- package/dist/src/tools/tool-error.d.ts +21 -0
- package/dist/src/tools/tool-error.js +27 -0
- package/dist/src/tools/tool-error.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +9 -0
- package/dist/src/tools/tool-names.js +18 -0
- package/dist/src/tools/tool-names.js.map +1 -0
- package/dist/src/tools/tool-registry.test.js +10 -10
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/web-fetch.js +3 -0
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +44 -0
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.js +2 -1
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.js +2 -1
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-todos.d.ts +1 -1
- package/dist/src/tools/write-todos.js +4 -3
- package/dist/src/tools/write-todos.js.map +1 -1
- package/dist/src/utils/editCorrector.js +2 -2
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editor.js +1 -0
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +1 -0
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/errorParsing.d.ts +1 -1
- package/dist/src/utils/errorParsing.js +5 -33
- package/dist/src/utils/errorParsing.js.map +1 -1
- package/dist/src/utils/errorParsing.test.js +0 -88
- package/dist/src/utils/errorParsing.test.js.map +1 -1
- package/dist/src/utils/flashFallback.test.js +26 -45
- package/dist/src/utils/flashFallback.test.js.map +1 -1
- package/dist/src/utils/formatters.d.ts +1 -0
- package/dist/src/utils/formatters.js +2 -1
- package/dist/src/utils/formatters.js.map +1 -1
- package/dist/src/utils/formatters.test.d.ts +6 -0
- package/dist/src/utils/formatters.test.js +26 -0
- package/dist/src/utils/formatters.test.js.map +1 -0
- package/dist/src/utils/getFolderStructure.test.js +7 -6
- package/dist/src/utils/getFolderStructure.test.js.map +1 -1
- package/dist/src/utils/googleErrors.d.ts +104 -0
- package/dist/src/utils/googleErrors.js +108 -0
- package/dist/src/utils/googleErrors.js.map +1 -0
- package/dist/src/utils/googleErrors.test.d.ts +6 -0
- package/dist/src/utils/googleErrors.test.js +212 -0
- package/dist/src/utils/googleErrors.test.js.map +1 -0
- package/dist/src/utils/googleQuotaErrors.d.ts +35 -0
- package/dist/src/utils/googleQuotaErrors.js +108 -0
- package/dist/src/utils/googleQuotaErrors.js.map +1 -0
- package/dist/src/utils/googleQuotaErrors.test.d.ts +6 -0
- package/dist/src/utils/googleQuotaErrors.test.js +189 -0
- package/dist/src/utils/googleQuotaErrors.test.js.map +1 -0
- package/dist/src/utils/installationManager.test.js +2 -1
- package/dist/src/utils/installationManager.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.js +13 -4
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +81 -0
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.d.ts +1 -0
- package/dist/src/utils/memoryDiscovery.js +2 -1
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.test.js +99 -21
- package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.js +13 -20
- package/dist/src/utils/memoryImportProcessor.js.map +1 -1
- package/dist/src/utils/memoryImportProcessor.test.js +14 -0
- package/dist/src/utils/memoryImportProcessor.test.js.map +1 -1
- package/dist/src/utils/pathCorrector.d.ts +25 -0
- package/dist/src/utils/pathCorrector.js +33 -0
- package/dist/src/utils/pathCorrector.js.map +1 -0
- package/dist/src/utils/pathCorrector.test.d.ts +6 -0
- package/dist/src/utils/pathCorrector.test.js +83 -0
- package/dist/src/utils/pathCorrector.test.js.map +1 -0
- package/dist/src/utils/quotaErrorDetection.d.ts +0 -2
- package/dist/src/utils/quotaErrorDetection.js +0 -46
- package/dist/src/utils/quotaErrorDetection.js.map +1 -1
- package/dist/src/utils/retry.d.ts +3 -1
- package/dist/src/utils/retry.js +53 -161
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +90 -149
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/terminalSerializer.d.ts +1 -4
- package/dist/src/utils/terminalSerializer.js +3 -3
- package/dist/src/utils/terminalSerializer.js.map +1 -1
- package/dist/src/utils/userAccountManager.test.js +2 -1
- package/dist/src/utils/userAccountManager.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/src/test-utils/tools.d.ts +0 -45
- package/dist/src/test-utils/tools.js +0 -105
- package/dist/src/test-utils/tools.js.map +0 -1
|
@@ -14,6 +14,7 @@ import pkg from '@xterm/headless';
|
|
|
14
14
|
import { serializeTerminalToObject, } from '../utils/terminalSerializer.js';
|
|
15
15
|
const { Terminal } = pkg;
|
|
16
16
|
const SIGKILL_TIMEOUT_MS = 200;
|
|
17
|
+
const MAX_CHILD_PROCESS_BUFFER_SIZE = 16 * 1024 * 1024; // 16MB
|
|
17
18
|
const getFullBufferText = (terminal) => {
|
|
18
19
|
const buffer = terminal.buffer.active;
|
|
19
20
|
const lines = [];
|
|
@@ -55,6 +56,28 @@ export class ShellExecutionService {
|
|
|
55
56
|
}
|
|
56
57
|
return this.childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal);
|
|
57
58
|
}
|
|
59
|
+
static appendAndTruncate(currentBuffer, chunk, maxSize) {
|
|
60
|
+
const chunkLength = chunk.length;
|
|
61
|
+
const currentLength = currentBuffer.length;
|
|
62
|
+
const newTotalLength = currentLength + chunkLength;
|
|
63
|
+
if (newTotalLength <= maxSize) {
|
|
64
|
+
return { newBuffer: currentBuffer + chunk, truncated: false };
|
|
65
|
+
}
|
|
66
|
+
// Truncation is needed.
|
|
67
|
+
if (chunkLength >= maxSize) {
|
|
68
|
+
// The new chunk is larger than or equal to the max buffer size.
|
|
69
|
+
// The new buffer will be the tail of the new chunk.
|
|
70
|
+
return {
|
|
71
|
+
newBuffer: chunk.substring(chunkLength - maxSize),
|
|
72
|
+
truncated: true,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
// The combined buffer exceeds the max size, but the new chunk is smaller than it.
|
|
76
|
+
// We need to truncate the current buffer from the beginning to make space.
|
|
77
|
+
const charsToTrim = newTotalLength - maxSize;
|
|
78
|
+
const truncatedBuffer = currentBuffer.substring(charsToTrim);
|
|
79
|
+
return { newBuffer: truncatedBuffer + chunk, truncated: true };
|
|
80
|
+
}
|
|
58
81
|
static childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal) {
|
|
59
82
|
try {
|
|
60
83
|
const isWindows = os.platform() === 'win32';
|
|
@@ -76,6 +99,8 @@ export class ShellExecutionService {
|
|
|
76
99
|
let stderrDecoder = null;
|
|
77
100
|
let stdout = '';
|
|
78
101
|
let stderr = '';
|
|
102
|
+
let stdoutTruncated = false;
|
|
103
|
+
let stderrTruncated = false;
|
|
79
104
|
const outputChunks = [];
|
|
80
105
|
let error = null;
|
|
81
106
|
let exited = false;
|
|
@@ -106,10 +131,18 @@ export class ShellExecutionService {
|
|
|
106
131
|
const decoder = stream === 'stdout' ? stdoutDecoder : stderrDecoder;
|
|
107
132
|
const decodedChunk = decoder.decode(data, { stream: true });
|
|
108
133
|
if (stream === 'stdout') {
|
|
109
|
-
stdout
|
|
134
|
+
const { newBuffer, truncated } = this.appendAndTruncate(stdout, decodedChunk, MAX_CHILD_PROCESS_BUFFER_SIZE);
|
|
135
|
+
stdout = newBuffer;
|
|
136
|
+
if (truncated) {
|
|
137
|
+
stdoutTruncated = true;
|
|
138
|
+
}
|
|
110
139
|
}
|
|
111
140
|
else {
|
|
112
|
-
stderr
|
|
141
|
+
const { newBuffer, truncated } = this.appendAndTruncate(stderr, decodedChunk, MAX_CHILD_PROCESS_BUFFER_SIZE);
|
|
142
|
+
stderr = newBuffer;
|
|
143
|
+
if (truncated) {
|
|
144
|
+
stderrTruncated = true;
|
|
145
|
+
}
|
|
113
146
|
}
|
|
114
147
|
}
|
|
115
148
|
};
|
|
@@ -117,7 +150,11 @@ export class ShellExecutionService {
|
|
|
117
150
|
const { finalBuffer } = cleanup();
|
|
118
151
|
// Ensure we don't add an extra newline if stdout already ends with one.
|
|
119
152
|
const separator = stdout.endsWith('\n') ? '' : '\n';
|
|
120
|
-
|
|
153
|
+
let combinedOutput = stdout + (stderr ? (stdout ? separator : '') + stderr : '');
|
|
154
|
+
if (stdoutTruncated || stderrTruncated) {
|
|
155
|
+
const truncationMessage = `\n[GEMINI_CLI_WARNING: Output truncated. The buffer is limited to ${MAX_CHILD_PROCESS_BUFFER_SIZE / (1024 * 1024)}MB.]`;
|
|
156
|
+
combinedOutput += truncationMessage;
|
|
157
|
+
}
|
|
121
158
|
const finalStrippedOutput = stripAnsi(combinedOutput).trim();
|
|
122
159
|
if (isStreamingRawContent) {
|
|
123
160
|
if (finalStrippedOutput) {
|
|
@@ -253,58 +290,89 @@ export class ShellExecutionService {
|
|
|
253
290
|
const MAX_SNIFF_SIZE = 4096;
|
|
254
291
|
let sniffedBytes = 0;
|
|
255
292
|
let isWriting = false;
|
|
293
|
+
let hasStartedOutput = false;
|
|
256
294
|
let renderTimeout = null;
|
|
257
|
-
const
|
|
258
|
-
|
|
259
|
-
|
|
295
|
+
const renderFn = () => {
|
|
296
|
+
renderTimeout = null;
|
|
297
|
+
if (!isStreamingRawContent) {
|
|
298
|
+
return;
|
|
260
299
|
}
|
|
261
|
-
|
|
262
|
-
if (!
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
if (shellExecutionConfig.showColor) {
|
|
267
|
-
newOutput = serializeTerminalToObject(headlessTerminal, {
|
|
268
|
-
defaultFg: shellExecutionConfig.defaultFg,
|
|
269
|
-
defaultBg: shellExecutionConfig.defaultBg,
|
|
270
|
-
});
|
|
271
|
-
}
|
|
272
|
-
else {
|
|
273
|
-
const buffer = headlessTerminal.buffer.active;
|
|
274
|
-
const lines = [];
|
|
275
|
-
for (let y = 0; y < headlessTerminal.rows; y++) {
|
|
276
|
-
const line = buffer.getLine(buffer.viewportY + y);
|
|
277
|
-
const lineContent = line ? line.translateToString(true) : '';
|
|
278
|
-
lines.push([
|
|
279
|
-
{
|
|
280
|
-
text: lineContent,
|
|
281
|
-
bold: false,
|
|
282
|
-
italic: false,
|
|
283
|
-
underline: false,
|
|
284
|
-
dim: false,
|
|
285
|
-
inverse: false,
|
|
286
|
-
fg: '',
|
|
287
|
-
bg: '',
|
|
288
|
-
},
|
|
289
|
-
]);
|
|
300
|
+
if (!shellExecutionConfig.disableDynamicLineTrimming) {
|
|
301
|
+
if (!hasStartedOutput) {
|
|
302
|
+
const bufferText = getFullBufferText(headlessTerminal);
|
|
303
|
+
if (bufferText.trim().length === 0) {
|
|
304
|
+
return;
|
|
290
305
|
}
|
|
291
|
-
|
|
306
|
+
hasStartedOutput = true;
|
|
292
307
|
}
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
308
|
+
}
|
|
309
|
+
const buffer = headlessTerminal.buffer.active;
|
|
310
|
+
let newOutput;
|
|
311
|
+
if (shellExecutionConfig.showColor) {
|
|
312
|
+
newOutput = serializeTerminalToObject(headlessTerminal);
|
|
313
|
+
}
|
|
314
|
+
else {
|
|
315
|
+
const lines = [];
|
|
316
|
+
for (let y = 0; y < headlessTerminal.rows; y++) {
|
|
317
|
+
const line = buffer.getLine(buffer.viewportY + y);
|
|
318
|
+
const lineContent = line ? line.translateToString(true) : '';
|
|
319
|
+
lines.push([
|
|
320
|
+
{
|
|
321
|
+
text: lineContent,
|
|
322
|
+
bold: false,
|
|
323
|
+
italic: false,
|
|
324
|
+
underline: false,
|
|
325
|
+
dim: false,
|
|
326
|
+
inverse: false,
|
|
327
|
+
fg: '',
|
|
328
|
+
bg: '',
|
|
329
|
+
},
|
|
330
|
+
]);
|
|
300
331
|
}
|
|
301
|
-
|
|
332
|
+
newOutput = lines;
|
|
333
|
+
}
|
|
334
|
+
let lastNonEmptyLine = -1;
|
|
335
|
+
for (let i = newOutput.length - 1; i >= 0; i--) {
|
|
336
|
+
const line = newOutput[i];
|
|
337
|
+
if (line
|
|
338
|
+
.map((segment) => segment.text)
|
|
339
|
+
.join('')
|
|
340
|
+
.trim().length > 0) {
|
|
341
|
+
lastNonEmptyLine = i;
|
|
342
|
+
break;
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
if (buffer.cursorY > lastNonEmptyLine) {
|
|
346
|
+
lastNonEmptyLine = buffer.cursorY;
|
|
347
|
+
}
|
|
348
|
+
const trimmedOutput = newOutput.slice(0, lastNonEmptyLine + 1);
|
|
349
|
+
const finalOutput = shellExecutionConfig.disableDynamicLineTrimming
|
|
350
|
+
? newOutput
|
|
351
|
+
: trimmedOutput;
|
|
352
|
+
// Using stringify for a quick deep comparison.
|
|
353
|
+
if (JSON.stringify(output) !== JSON.stringify(finalOutput)) {
|
|
354
|
+
output = finalOutput;
|
|
355
|
+
onOutputEvent({
|
|
356
|
+
type: 'data',
|
|
357
|
+
chunk: finalOutput,
|
|
358
|
+
});
|
|
359
|
+
}
|
|
360
|
+
};
|
|
361
|
+
const render = (finalRender = false) => {
|
|
302
362
|
if (finalRender) {
|
|
363
|
+
if (renderTimeout) {
|
|
364
|
+
clearTimeout(renderTimeout);
|
|
365
|
+
}
|
|
303
366
|
renderFn();
|
|
367
|
+
return;
|
|
304
368
|
}
|
|
305
|
-
|
|
306
|
-
|
|
369
|
+
if (renderTimeout) {
|
|
370
|
+
return;
|
|
307
371
|
}
|
|
372
|
+
renderTimeout = setTimeout(() => {
|
|
373
|
+
renderFn();
|
|
374
|
+
renderTimeout = null;
|
|
375
|
+
}, 68);
|
|
308
376
|
};
|
|
309
377
|
headlessTerminal.onScroll(() => {
|
|
310
378
|
if (!isWriting) {
|
|
@@ -333,6 +401,10 @@ export class ShellExecutionService {
|
|
|
333
401
|
}
|
|
334
402
|
if (isStreamingRawContent) {
|
|
335
403
|
const decodedChunk = decoder.decode(data, { stream: true });
|
|
404
|
+
if (decodedChunk.length === 0) {
|
|
405
|
+
resolve();
|
|
406
|
+
return;
|
|
407
|
+
}
|
|
336
408
|
isWriting = true;
|
|
337
409
|
headlessTerminal.write(decodedChunk, () => {
|
|
338
410
|
render();
|
|
@@ -358,7 +430,7 @@ export class ShellExecutionService {
|
|
|
358
430
|
exited = true;
|
|
359
431
|
abortSignal.removeEventListener('abort', abortHandler);
|
|
360
432
|
this.activePtys.delete(ptyProcess.pid);
|
|
361
|
-
|
|
433
|
+
const finalize = () => {
|
|
362
434
|
render(true);
|
|
363
435
|
const finalBuffer = Buffer.concat(outputChunks);
|
|
364
436
|
resolve({
|
|
@@ -372,6 +444,23 @@ export class ShellExecutionService {
|
|
|
372
444
|
executionMethod: ptyInfo?.name ??
|
|
373
445
|
'node-pty',
|
|
374
446
|
});
|
|
447
|
+
};
|
|
448
|
+
if (abortSignal.aborted) {
|
|
449
|
+
finalize();
|
|
450
|
+
return;
|
|
451
|
+
}
|
|
452
|
+
const processingComplete = processingChain.then(() => 'processed');
|
|
453
|
+
const abortFired = new Promise((res) => {
|
|
454
|
+
if (abortSignal.aborted) {
|
|
455
|
+
res('aborted');
|
|
456
|
+
return;
|
|
457
|
+
}
|
|
458
|
+
abortSignal.addEventListener('abort', () => res('aborted'), {
|
|
459
|
+
once: true,
|
|
460
|
+
});
|
|
461
|
+
});
|
|
462
|
+
Promise.race([processingComplete, abortFired]).then(() => {
|
|
463
|
+
finalize();
|
|
375
464
|
});
|
|
376
465
|
});
|
|
377
466
|
const abortHandler = async () => {
|
|
@@ -382,11 +471,19 @@ export class ShellExecutionService {
|
|
|
382
471
|
else {
|
|
383
472
|
try {
|
|
384
473
|
// Kill the entire process group
|
|
385
|
-
process.kill(-ptyProcess.pid, '
|
|
474
|
+
process.kill(-ptyProcess.pid, 'SIGTERM');
|
|
475
|
+
await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
|
|
476
|
+
if (!exited) {
|
|
477
|
+
process.kill(-ptyProcess.pid, 'SIGKILL');
|
|
478
|
+
}
|
|
386
479
|
}
|
|
387
480
|
catch (_e) {
|
|
388
481
|
// Fallback to killing just the process if the group kill fails
|
|
389
|
-
ptyProcess.kill('
|
|
482
|
+
ptyProcess.kill('SIGTERM');
|
|
483
|
+
await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
|
|
484
|
+
if (!exited) {
|
|
485
|
+
ptyProcess.kill('SIGKILL');
|
|
486
|
+
}
|
|
390
487
|
}
|
|
391
488
|
}
|
|
392
489
|
}
|
|
@@ -419,11 +516,24 @@ export class ShellExecutionService {
|
|
|
419
516
|
* @param input The string to write to the terminal.
|
|
420
517
|
*/
|
|
421
518
|
static writeToPty(pid, input) {
|
|
519
|
+
if (!this.isPtyActive(pid)) {
|
|
520
|
+
return;
|
|
521
|
+
}
|
|
422
522
|
const activePty = this.activePtys.get(pid);
|
|
423
523
|
if (activePty) {
|
|
424
524
|
activePty.ptyProcess.write(input);
|
|
425
525
|
}
|
|
426
526
|
}
|
|
527
|
+
static isPtyActive(pid) {
|
|
528
|
+
try {
|
|
529
|
+
// process.kill with signal 0 is a way to check for the existence of a process.
|
|
530
|
+
// It doesn't actually send a signal.
|
|
531
|
+
return process.kill(pid, 0);
|
|
532
|
+
}
|
|
533
|
+
catch (_) {
|
|
534
|
+
return false;
|
|
535
|
+
}
|
|
536
|
+
}
|
|
427
537
|
/**
|
|
428
538
|
* Resizes the pseudo-terminal (PTY) of a running process.
|
|
429
539
|
*
|
|
@@ -432,6 +542,9 @@ export class ShellExecutionService {
|
|
|
432
542
|
* @param rows The new number of rows.
|
|
433
543
|
*/
|
|
434
544
|
static resizePty(pid, cols, rows) {
|
|
545
|
+
if (!this.isPtyActive(pid)) {
|
|
546
|
+
return;
|
|
547
|
+
}
|
|
435
548
|
const activePty = this.activePtys.get(pid);
|
|
436
549
|
if (activePty) {
|
|
437
550
|
try {
|
|
@@ -457,6 +570,9 @@ export class ShellExecutionService {
|
|
|
457
570
|
* @param lines The number of lines to scroll.
|
|
458
571
|
*/
|
|
459
572
|
static scrollPty(pid, lines) {
|
|
573
|
+
if (!this.isPtyActive(pid)) {
|
|
574
|
+
return;
|
|
575
|
+
}
|
|
460
576
|
const activePty = this.activePtys.get(pid);
|
|
461
577
|
if (activePty) {
|
|
462
578
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shellExecutionService.js","sourceRoot":"","sources":["../../../src/services/shellExecutionService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"shellExecutionService.js","sourceRoot":"","sources":["../../../src/services/shellExecutionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ const shellExecutionConfig = {
|
|
|
56
56
|
terminalHeight: 24,
|
|
57
57
|
pager: 'cat',
|
|
58
58
|
showColor: false,
|
|
59
|
+
disableDynamicLineTrimming: true,
|
|
59
60
|
};
|
|
60
61
|
const createExpectedAnsiOutput = (text) => {
|
|
61
62
|
const lines = Array.isArray(text) ? text : text.split('\n');
|
|
@@ -109,7 +110,7 @@ describe('ShellExecutionService', () => {
|
|
|
109
110
|
const abortController = new AbortController();
|
|
110
111
|
const handle = await ShellExecutionService.execute(command, '/test/dir', onOutputEventMock, abortController.signal, true, config);
|
|
111
112
|
await new Promise((resolve) => process.nextTick(resolve));
|
|
112
|
-
simulation(mockPtyProcess, abortController);
|
|
113
|
+
await simulation(mockPtyProcess, abortController);
|
|
113
114
|
const result = await handle.result;
|
|
114
115
|
return { result, handle, abortController };
|
|
115
116
|
};
|
|
@@ -247,6 +248,45 @@ describe('ShellExecutionService', () => {
|
|
|
247
248
|
expect(result.aborted).toBe(true);
|
|
248
249
|
// The process kill is mocked, so we just check that the flag is set.
|
|
249
250
|
});
|
|
251
|
+
it('should send SIGTERM and then SIGKILL on abort', async () => {
|
|
252
|
+
const sigkillPromise = new Promise((resolve) => {
|
|
253
|
+
mockProcessKill.mockImplementation((pid, signal) => {
|
|
254
|
+
if (signal === 'SIGKILL' && pid === -mockPtyProcess.pid) {
|
|
255
|
+
resolve();
|
|
256
|
+
}
|
|
257
|
+
return true;
|
|
258
|
+
});
|
|
259
|
+
});
|
|
260
|
+
const { result } = await simulateExecution('long-running-process', async (pty, abortController) => {
|
|
261
|
+
abortController.abort();
|
|
262
|
+
await sigkillPromise; // Wait for SIGKILL to be sent before exiting.
|
|
263
|
+
pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: 9 });
|
|
264
|
+
});
|
|
265
|
+
expect(result.aborted).toBe(true);
|
|
266
|
+
// Verify the calls were made in the correct order.
|
|
267
|
+
const killCalls = mockProcessKill.mock.calls;
|
|
268
|
+
const sigtermCallIndex = killCalls.findIndex((call) => call[0] === -mockPtyProcess.pid && call[1] === 'SIGTERM');
|
|
269
|
+
const sigkillCallIndex = killCalls.findIndex((call) => call[0] === -mockPtyProcess.pid && call[1] === 'SIGKILL');
|
|
270
|
+
expect(sigtermCallIndex).toBe(0);
|
|
271
|
+
expect(sigkillCallIndex).toBe(1);
|
|
272
|
+
expect(sigtermCallIndex).toBeLessThan(sigkillCallIndex);
|
|
273
|
+
expect(result.signal).toBe(9);
|
|
274
|
+
});
|
|
275
|
+
it('should resolve without waiting for the processing chain on abort', async () => {
|
|
276
|
+
const { result } = await simulateExecution('long-output', (pty, abortController) => {
|
|
277
|
+
// Simulate a lot of data being in the queue to be processed
|
|
278
|
+
for (let i = 0; i < 1000; i++) {
|
|
279
|
+
pty.onData.mock.calls[0][0]('some data');
|
|
280
|
+
}
|
|
281
|
+
abortController.abort();
|
|
282
|
+
pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
|
|
283
|
+
});
|
|
284
|
+
// The main assertion here is implicit: the `await` for the result above
|
|
285
|
+
// should complete without timing out. This proves that the resolution
|
|
286
|
+
// was not blocked by the long chain of data processing promises,
|
|
287
|
+
// which is the desired behavior on abort.
|
|
288
|
+
expect(result.aborted).toBe(true);
|
|
289
|
+
});
|
|
250
290
|
});
|
|
251
291
|
describe('Binary Output', () => {
|
|
252
292
|
it('should detect binary output and switch to progress events', async () => {
|
|
@@ -306,6 +346,7 @@ describe('ShellExecutionService', () => {
|
|
|
306
346
|
showColor: true,
|
|
307
347
|
defaultFg: '#ffffff',
|
|
308
348
|
defaultBg: '#000000',
|
|
349
|
+
disableDynamicLineTrimming: true,
|
|
309
350
|
};
|
|
310
351
|
const mockAnsiOutput = [
|
|
311
352
|
[{ text: 'hello', fg: '#ffffff', bg: '#000000' }],
|
|
@@ -315,8 +356,7 @@ describe('ShellExecutionService', () => {
|
|
|
315
356
|
pty.onData.mock.calls[0][0]('a\u001b[31mred\u001b[0mword');
|
|
316
357
|
pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
|
|
317
358
|
}, coloredShellExecutionConfig);
|
|
318
|
-
expect(mockSerializeTerminalToObject).toHaveBeenCalledWith(expect.anything()
|
|
319
|
-
{ defaultFg: '#ffffff', defaultBg: '#000000' });
|
|
359
|
+
expect(mockSerializeTerminalToObject).toHaveBeenCalledWith(expect.anything());
|
|
320
360
|
expect(onOutputEventMock).toHaveBeenCalledWith(expect.objectContaining({
|
|
321
361
|
type: 'data',
|
|
322
362
|
chunk: mockAnsiOutput,
|
|
@@ -326,7 +366,11 @@ describe('ShellExecutionService', () => {
|
|
|
326
366
|
await simulateExecution('ls --color=auto', (pty) => {
|
|
327
367
|
pty.onData.mock.calls[0][0]('a\u001b[31mred\u001b[0mword');
|
|
328
368
|
pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
|
|
329
|
-
}, {
|
|
369
|
+
}, {
|
|
370
|
+
...shellExecutionConfig,
|
|
371
|
+
showColor: false,
|
|
372
|
+
disableDynamicLineTrimming: true,
|
|
373
|
+
});
|
|
330
374
|
const expected = createExpectedAnsiOutput('aredword');
|
|
331
375
|
expect(onOutputEventMock).toHaveBeenCalledWith(expect.objectContaining({
|
|
332
376
|
type: 'data',
|
|
@@ -337,7 +381,11 @@ describe('ShellExecutionService', () => {
|
|
|
337
381
|
await simulateExecution('ls --color=auto', (pty) => {
|
|
338
382
|
pty.onData.mock.calls[0][0]('line 1\n\u001b[32mline 2\u001b[0m\nline 3');
|
|
339
383
|
pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
|
|
340
|
-
}, {
|
|
384
|
+
}, {
|
|
385
|
+
...shellExecutionConfig,
|
|
386
|
+
showColor: false,
|
|
387
|
+
disableDynamicLineTrimming: true,
|
|
388
|
+
});
|
|
341
389
|
const expected = createExpectedAnsiOutput(['line 1', 'line 2', 'line 3']);
|
|
342
390
|
expect(onOutputEventMock).toHaveBeenCalledWith(expect.objectContaining({
|
|
343
391
|
type: 'data',
|
|
@@ -424,6 +472,27 @@ describe('ShellExecutionService child_process fallback', () => {
|
|
|
424
472
|
expect(result.output.trim()).toBe('');
|
|
425
473
|
expect(onOutputEventMock).not.toHaveBeenCalled();
|
|
426
474
|
});
|
|
475
|
+
it('should truncate stdout using a sliding window and show a warning', async () => {
|
|
476
|
+
const MAX_SIZE = 16 * 1024 * 1024;
|
|
477
|
+
const chunk1 = 'a'.repeat(MAX_SIZE / 2 - 5);
|
|
478
|
+
const chunk2 = 'b'.repeat(MAX_SIZE / 2 - 5);
|
|
479
|
+
const chunk3 = 'c'.repeat(20);
|
|
480
|
+
const { result } = await simulateExecution('large-output', (cp) => {
|
|
481
|
+
cp.stdout?.emit('data', Buffer.from(chunk1));
|
|
482
|
+
cp.stdout?.emit('data', Buffer.from(chunk2));
|
|
483
|
+
cp.stdout?.emit('data', Buffer.from(chunk3));
|
|
484
|
+
cp.emit('exit', 0, null);
|
|
485
|
+
});
|
|
486
|
+
const truncationMessage = '[GEMINI_CLI_WARNING: Output truncated. The buffer is limited to 16MB.]';
|
|
487
|
+
expect(result.output).toContain(truncationMessage);
|
|
488
|
+
const outputWithoutMessage = result.output
|
|
489
|
+
.substring(0, result.output.indexOf(truncationMessage))
|
|
490
|
+
.trimEnd();
|
|
491
|
+
expect(outputWithoutMessage.length).toBe(MAX_SIZE);
|
|
492
|
+
const expectedStart = (chunk1 + chunk2 + chunk3).slice(-MAX_SIZE);
|
|
493
|
+
expect(outputWithoutMessage.startsWith(expectedStart.substring(0, 10))).toBe(true);
|
|
494
|
+
expect(outputWithoutMessage.endsWith('c'.repeat(20))).toBe(true);
|
|
495
|
+
}, 20000);
|
|
427
496
|
});
|
|
428
497
|
describe('Failed Execution', () => {
|
|
429
498
|
it('should capture a non-zero exit code and format output correctly', async () => {
|