@vybestack/llxprt-code-core 0.1.14 → 0.1.15
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 +53 -0
- package/dist/src/code_assist/oauth2.test.d.ts +1 -1
- package/dist/src/code_assist/oauth2.test.js +15 -15
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/config/config.d.ts +15 -1
- package/dist/src/config/config.js +27 -5
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +5 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/flashFallback.test.js +12 -46
- package/dist/src/config/flashFallback.test.js.map +1 -1
- package/dist/src/config/models.d.ts +1 -0
- package/dist/src/config/models.js +1 -0
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/core/client.d.ts +4 -0
- package/dist/src/core/client.js +75 -15
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.d.ts +1 -1
- package/dist/src/core/client.test.js +204 -22
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +2 -7
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +6 -2
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +1 -3
- package/dist/src/core/coreToolScheduler.js +9 -4
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +76 -1
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +1 -0
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/googleGenAIWrapper.d.ts +21 -0
- package/dist/src/core/googleGenAIWrapper.js +36 -0
- package/dist/src/core/googleGenAIWrapper.js.map +1 -0
- package/dist/src/core/googleGenAIWrapper.test.d.ts +6 -0
- package/dist/src/core/googleGenAIWrapper.test.js +104 -0
- package/dist/src/core/googleGenAIWrapper.test.js.map +1 -0
- package/dist/src/core/logger.d.ts +1 -0
- package/dist/src/core/logger.js +22 -8
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +60 -9
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.js +8 -1
- package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +3 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +1 -1
- package/dist/src/core/tokenLimits.js +1 -0
- package/dist/src/core/tokenLimits.js.map +1 -1
- package/dist/src/core/turn.d.ts +2 -1
- package/dist/src/core/turn.js +4 -2
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +2 -2
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/ide/ide-client.d.ts +8 -6
- package/dist/src/ide/ide-client.js +73 -36
- package/dist/src/ide/ide-client.js.map +1 -1
- package/dist/src/ide/ideContext.d.ts +212 -107
- package/dist/src/ide/ideContext.js +45 -44
- package/dist/src/ide/ideContext.js.map +1 -1
- package/dist/src/ide/ideContext.test.js +254 -100
- package/dist/src/ide/ideContext.test.js.map +1 -1
- package/dist/src/index.d.ts +7 -0
- package/dist/src/index.js +9 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/integration-tests/todo-system.test.d.ts +6 -0
- package/dist/src/integration-tests/todo-system.test.js +610 -0
- package/dist/src/integration-tests/todo-system.test.js.map +1 -0
- package/dist/src/mcp/oauth-provider.d.ts +5 -1
- package/dist/src/mcp/oauth-provider.js +36 -11
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-provider.test.js +2 -2
- package/dist/src/mcp/oauth-provider.test.js.map +1 -1
- package/dist/src/mcp/oauth-token-storage.d.ts +3 -1
- package/dist/src/mcp/oauth-token-storage.js +3 -1
- package/dist/src/mcp/oauth-token-storage.js.map +1 -1
- package/dist/src/mcp/oauth-utils.js +2 -2
- package/dist/src/mcp/oauth-utils.js.map +1 -1
- package/dist/src/mcp/oauth-utils.test.js +1 -1
- package/dist/src/mcp/oauth-utils.test.js.map +1 -1
- package/dist/src/prompts/mcp-prompts.d.ts +8 -0
- package/dist/src/prompts/mcp-prompts.js +13 -0
- package/dist/src/prompts/mcp-prompts.js.map +1 -0
- package/dist/src/prompts/prompt-registry.d.ts +26 -0
- package/dist/src/prompts/prompt-registry.js +47 -0
- package/dist/src/prompts/prompt-registry.js.map +1 -0
- package/dist/src/providers/adapters/GeminiCompatibleWrapper.js +24 -9
- package/dist/src/providers/adapters/GeminiCompatibleWrapper.js.map +1 -1
- package/dist/src/providers/adapters/GeminiCompatibleWrapper.test.js +1 -1
- package/dist/src/providers/adapters/GeminiCompatibleWrapper.test.js.map +1 -1
- package/dist/src/providers/gemini/GeminiProvider.js +8 -16
- package/dist/src/providers/gemini/GeminiProvider.js.map +1 -1
- package/dist/src/providers/openai/OpenAIProvider.js +54 -6
- package/dist/src/providers/openai/OpenAIProvider.js.map +1 -1
- package/dist/src/services/complexity-analyzer.d.ts +92 -0
- package/dist/src/services/complexity-analyzer.js +287 -0
- package/dist/src/services/complexity-analyzer.js.map +1 -0
- package/dist/src/services/fileDiscoveryService.test.js +101 -60
- package/dist/src/services/fileDiscoveryService.test.js.map +1 -1
- package/dist/src/services/gitService.test.d.ts +1 -1
- package/dist/src/services/gitService.test.js +65 -102
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/index.d.ts +9 -0
- package/dist/src/services/index.js +8 -0
- package/dist/src/services/index.js.map +1 -0
- package/dist/src/services/loopDetectionService.d.ts +3 -0
- package/dist/src/services/loopDetectionService.js +18 -0
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/loopDetectionService.test.js +90 -11
- package/dist/src/services/loopDetectionService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +70 -0
- package/dist/src/services/shellExecutionService.js +152 -0
- package/dist/src/services/shellExecutionService.js.map +1 -0
- package/dist/src/services/shellExecutionService.test.d.ts +6 -0
- package/dist/src/services/shellExecutionService.test.js +258 -0
- package/dist/src/services/shellExecutionService.test.js.map +1 -0
- package/dist/src/services/todo-reminder-service.d.ts +42 -0
- package/dist/src/services/todo-reminder-service.js +77 -0
- package/dist/src/services/todo-reminder-service.js.map +1 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +2 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +59 -31
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +3 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +7 -0
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/constants.d.ts +1 -0
- package/dist/src/telemetry/constants.js +1 -0
- package/dist/src/telemetry/constants.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +2 -2
- package/dist/src/telemetry/index.js +2 -2
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +2 -1
- package/dist/src/telemetry/loggers.js +18 -1
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +5 -0
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +8 -1
- package/dist/src/telemetry/types.js +12 -0
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/tools/edit.js +2 -1
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/glob.test.js +7 -4
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.test.js +4 -4
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +26 -2
- package/dist/src/tools/mcp-client.js +64 -21
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +53 -1
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/modifiable-tool.test.js +51 -62
- package/dist/src/tools/modifiable-tool.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +8 -3
- package/dist/src/tools/shell.js +169 -114
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.d.ts +1 -1
- package/dist/src/tools/shell.test.js +298 -145
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/todo-read.d.ts +4 -1
- package/dist/src/tools/todo-read.js +136 -20
- package/dist/src/tools/todo-read.js.map +1 -1
- package/dist/src/tools/todo-read.test.js +10 -6
- package/dist/src/tools/todo-read.test.js.map +1 -1
- package/dist/src/tools/todo-schemas.d.ts +4 -4
- package/dist/src/tools/todo-write.d.ts +3 -0
- package/dist/src/tools/todo-write.js +96 -9
- package/dist/src/tools/todo-write.js.map +1 -1
- package/dist/src/tools/todo-write.test.js +17 -13
- package/dist/src/tools/todo-write.test.js.map +1 -1
- package/dist/src/tools/tool-context.d.ts +14 -0
- package/dist/src/tools/tool-context.js +7 -0
- package/dist/src/tools/tool-context.js.map +1 -0
- package/dist/src/tools/tool-registry.d.ts +4 -1
- package/dist/src/tools/tool-registry.js +14 -5
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +2 -2
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +8 -1
- package/dist/src/tools/tools.js +2 -0
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js +18 -4
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.js +51 -27
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.test.js +57 -0
- package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
- package/dist/src/utils/formatters.d.ts +6 -0
- package/dist/src/utils/formatters.js +16 -0
- package/dist/src/utils/formatters.js.map +1 -0
- package/dist/src/utils/nextSpeakerChecker.js +2 -2
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.test.js +2 -2
- package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
- package/dist/src/utils/retry.d.ts +3 -0
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +37 -3
- package/dist/src/utils/shell-utils.js +110 -47
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +146 -396
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/textUtils.d.ts +13 -0
- package/dist/src/utils/textUtils.js +28 -0
- package/dist/src/utils/textUtils.js.map +1 -0
- package/package.json +2 -2
- package/dist/tsconfig.tsbuildinfo +0 -1
package/dist/src/tools/shell.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @license
|
|
3
|
-
* Copyright 2025
|
|
3
|
+
* Copyright 2025 Vybestack LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import fs from 'fs';
|
|
@@ -11,12 +11,14 @@ import { BaseTool, Icon, } from './tools.js';
|
|
|
11
11
|
import { SchemaValidator } from '../utils/schemaValidator.js';
|
|
12
12
|
import { getErrorMessage } from '../utils/errors.js';
|
|
13
13
|
import { Type } from '@google/genai';
|
|
14
|
-
import stripAnsi from 'strip-ansi';
|
|
15
|
-
import { getCommandRoots, isCommandAllowed, stripShellWrapper, } from '../utils/shell-utils.js';
|
|
16
14
|
import { summarizeToolOutput } from '../utils/summarizer.js';
|
|
15
|
+
import { ShellExecutionService, } from '../services/shellExecutionService.js';
|
|
16
|
+
import { formatMemoryUsage } from '../utils/formatters.js';
|
|
17
|
+
import { getCommandRoots, isCommandAllowed, stripShellWrapper, } from '../utils/shell-utils.js';
|
|
18
|
+
export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
|
|
17
19
|
export class ShellTool extends BaseTool {
|
|
18
20
|
config;
|
|
19
|
-
static Name = '
|
|
21
|
+
static Name = 'run_shell_command';
|
|
20
22
|
constructor(config) {
|
|
21
23
|
super(ShellTool.Name, 'RunShellCommand', 'Execute a shell command within a secure sandboxed environment', Icon.Terminal, {
|
|
22
24
|
properties: {
|
|
@@ -28,6 +30,10 @@ export class ShellTool extends BaseTool {
|
|
|
28
30
|
description: 'Optional description of what this command does, used for confirmation prompts',
|
|
29
31
|
type: Type.STRING,
|
|
30
32
|
},
|
|
33
|
+
directory: {
|
|
34
|
+
description: 'Optional directory to execute the command in, relative to the target directory',
|
|
35
|
+
type: Type.STRING,
|
|
36
|
+
},
|
|
31
37
|
},
|
|
32
38
|
required: ['command'],
|
|
33
39
|
type: Type.OBJECT,
|
|
@@ -79,136 +85,185 @@ export class ShellTool extends BaseTool {
|
|
|
79
85
|
},
|
|
80
86
|
};
|
|
81
87
|
}
|
|
82
|
-
async execute(params, signal) {
|
|
88
|
+
async execute(params, signal, updateOutput) {
|
|
89
|
+
const strippedCommand = stripShellWrapper(params.command);
|
|
90
|
+
const validationError = this.validateToolParams({
|
|
91
|
+
...params,
|
|
92
|
+
command: strippedCommand,
|
|
93
|
+
});
|
|
94
|
+
if (validationError) {
|
|
95
|
+
return {
|
|
96
|
+
llmContent: validationError,
|
|
97
|
+
returnDisplay: validationError,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
if (signal.aborted) {
|
|
101
|
+
return {
|
|
102
|
+
llmContent: 'Command was cancelled by user before it could start.',
|
|
103
|
+
returnDisplay: 'Command cancelled by user.',
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
const isWindows = os.platform() === 'win32';
|
|
107
|
+
const tempFileName = `shell_pgrep_${crypto
|
|
108
|
+
.randomBytes(6)
|
|
109
|
+
.toString('hex')}.tmp`;
|
|
110
|
+
const tempFilePath = path.join(os.tmpdir(), tempFileName);
|
|
83
111
|
try {
|
|
84
|
-
|
|
85
|
-
const
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
112
|
+
// pgrep is not available on Windows, so we can't get background PIDs
|
|
113
|
+
const commandToExecute = isWindows
|
|
114
|
+
? strippedCommand
|
|
115
|
+
: (() => {
|
|
116
|
+
// wrap command to append subprocess pids (via pgrep) to temporary file
|
|
117
|
+
let command = strippedCommand.trim();
|
|
118
|
+
if (!command.endsWith('&'))
|
|
119
|
+
command += ';';
|
|
120
|
+
return `{ ${command} }; __code=$?; pgrep -g 0 >${tempFilePath} 2>&1; exit $__code;`;
|
|
121
|
+
})();
|
|
122
|
+
const cwd = path.resolve(this.config.getTargetDir(), params.directory || '');
|
|
123
|
+
let cumulativeStdout = '';
|
|
124
|
+
let cumulativeStderr = '';
|
|
125
|
+
let lastUpdateTime = Date.now();
|
|
126
|
+
let isBinaryStream = false;
|
|
127
|
+
const { result: resultPromise } = ShellExecutionService.execute(commandToExecute, cwd, (event) => {
|
|
128
|
+
if (!updateOutput) {
|
|
129
|
+
return;
|
|
99
130
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
timeout: 1000 * 60 * 15, // 15 minutes
|
|
109
|
-
all: true,
|
|
110
|
-
shell: false,
|
|
111
|
-
});
|
|
112
|
-
// Read the captured PWD
|
|
113
|
-
let finalPwd = this.config.getTargetDir();
|
|
114
|
-
if (fs.existsSync(pwdFilePath)) {
|
|
115
|
-
try {
|
|
116
|
-
finalPwd = fs.readFileSync(pwdFilePath, 'utf8').trim();
|
|
131
|
+
let currentDisplayOutput = '';
|
|
132
|
+
let shouldUpdate = false;
|
|
133
|
+
switch (event.type) {
|
|
134
|
+
case 'data':
|
|
135
|
+
if (isBinaryStream)
|
|
136
|
+
break; // Don't process text if we are in binary mode
|
|
137
|
+
if (event.stream === 'stdout') {
|
|
138
|
+
cumulativeStdout += event.chunk;
|
|
117
139
|
}
|
|
118
|
-
|
|
119
|
-
|
|
140
|
+
else {
|
|
141
|
+
cumulativeStderr += event.chunk;
|
|
120
142
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
catch (unlinkError) {
|
|
127
|
-
console.debug('Failed to unlink PWD file:', unlinkError);
|
|
128
|
-
}
|
|
143
|
+
currentDisplayOutput =
|
|
144
|
+
cumulativeStdout +
|
|
145
|
+
(cumulativeStderr ? `\n${cumulativeStderr}` : '');
|
|
146
|
+
if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
|
|
147
|
+
shouldUpdate = true;
|
|
129
148
|
}
|
|
149
|
+
break;
|
|
150
|
+
case 'binary_detected':
|
|
151
|
+
isBinaryStream = true;
|
|
152
|
+
currentDisplayOutput =
|
|
153
|
+
'[Binary output detected. Halting stream...]';
|
|
154
|
+
shouldUpdate = true;
|
|
155
|
+
break;
|
|
156
|
+
case 'binary_progress':
|
|
157
|
+
isBinaryStream = true;
|
|
158
|
+
currentDisplayOutput = `[Receiving binary output... ${formatMemoryUsage(event.bytesReceived)} received]`;
|
|
159
|
+
if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
|
|
160
|
+
shouldUpdate = true;
|
|
161
|
+
}
|
|
162
|
+
break;
|
|
163
|
+
default: {
|
|
164
|
+
throw new Error('An unhandled ShellOutputEvent was found.');
|
|
130
165
|
}
|
|
131
|
-
const allOutput = stripAnsi(result.all || '');
|
|
132
|
-
let response = allOutput;
|
|
133
|
-
// Add warning if directory changed
|
|
134
|
-
if (finalPwd !== this.config.getTargetDir()) {
|
|
135
|
-
response = `WARNING: shell mode is stateless; the directory change to '${finalPwd}' will not persist.\n\n${response}`;
|
|
136
|
-
}
|
|
137
|
-
// Check if summarization is enabled for this tool
|
|
138
|
-
const summarizerConfig = this.config.getSummarizeToolOutputConfig();
|
|
139
|
-
const toolSummarizeConfig = summarizerConfig
|
|
140
|
-
? summarizerConfig[this.name]
|
|
141
|
-
: undefined;
|
|
142
|
-
let llmContent = response;
|
|
143
|
-
if (toolSummarizeConfig) {
|
|
144
|
-
const tokenBudget = toolSummarizeConfig.tokenBudget;
|
|
145
|
-
llmContent = await summarizeToolOutput(response, this.config.getGeminiClient(), signal, tokenBudget);
|
|
146
|
-
}
|
|
147
|
-
return {
|
|
148
|
-
summary: `Executed command: ${params.command}`,
|
|
149
|
-
returnDisplay: response,
|
|
150
|
-
llmContent,
|
|
151
|
-
};
|
|
152
166
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
167
|
+
if (shouldUpdate) {
|
|
168
|
+
updateOutput(currentDisplayOutput);
|
|
169
|
+
lastUpdateTime = Date.now();
|
|
170
|
+
}
|
|
171
|
+
}, signal);
|
|
172
|
+
const result = await resultPromise;
|
|
173
|
+
const backgroundPIDs = [];
|
|
174
|
+
if (os.platform() !== 'win32') {
|
|
175
|
+
if (fs.existsSync(tempFilePath)) {
|
|
176
|
+
const pgrepLines = fs
|
|
177
|
+
.readFileSync(tempFilePath, 'utf8')
|
|
178
|
+
.split('\n')
|
|
179
|
+
.filter(Boolean);
|
|
180
|
+
for (const line of pgrepLines) {
|
|
181
|
+
if (!/^\d+$/.test(line)) {
|
|
182
|
+
console.error(`pgrep: ${line}`);
|
|
158
183
|
}
|
|
159
|
-
|
|
160
|
-
|
|
184
|
+
const pid = Number(line);
|
|
185
|
+
if (pid !== result.pid) {
|
|
186
|
+
backgroundPIDs.push(pid);
|
|
161
187
|
}
|
|
162
188
|
}
|
|
163
|
-
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
if (!signal.aborted) {
|
|
192
|
+
console.error('missing pgrep output');
|
|
193
|
+
}
|
|
164
194
|
}
|
|
165
195
|
}
|
|
196
|
+
let llmContent = '';
|
|
197
|
+
if (result.aborted) {
|
|
198
|
+
llmContent = 'Command was cancelled by user before it could complete.';
|
|
199
|
+
if (result.output.trim()) {
|
|
200
|
+
llmContent += ` Below is the output (on stdout and stderr) before it was cancelled:\n${result.output}`;
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
llmContent += ' There was no output before it was cancelled.';
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
else {
|
|
207
|
+
// Create a formatted error string for display, replacing the wrapper command
|
|
208
|
+
// with the user-facing command.
|
|
209
|
+
const finalError = result.error
|
|
210
|
+
? result.error.message.replace(commandToExecute, params.command)
|
|
211
|
+
: '(none)';
|
|
212
|
+
llmContent = [
|
|
213
|
+
`Command: ${params.command}`,
|
|
214
|
+
`Directory: ${params.directory || '(root)'}`,
|
|
215
|
+
`Stdout: ${result.stdout || '(empty)'}`,
|
|
216
|
+
`Stderr: ${result.stderr || '(empty)'}`,
|
|
217
|
+
`Error: ${finalError}`, // Use the cleaned error string.
|
|
218
|
+
`Exit Code: ${result.exitCode ?? '(none)'}`,
|
|
219
|
+
`Signal: ${result.signal ?? '(none)'}`,
|
|
220
|
+
`Background PIDs: ${backgroundPIDs.length ? backgroundPIDs.join(', ') : '(none)'}`,
|
|
221
|
+
`Process Group PGID: ${result.pid ?? '(none)'}`,
|
|
222
|
+
].join('\n');
|
|
223
|
+
}
|
|
224
|
+
let returnDisplayMessage = '';
|
|
225
|
+
if (this.config.getDebugMode()) {
|
|
226
|
+
returnDisplayMessage = llmContent;
|
|
227
|
+
}
|
|
166
228
|
else {
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
}
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
if (toolSummarizeConfig) {
|
|
186
|
-
const tokenBudget = toolSummarizeConfig.tokenBudget;
|
|
187
|
-
llmContent = await summarizeToolOutput(allOutput, this.config.getGeminiClient(), signal, tokenBudget);
|
|
229
|
+
if (result.output.trim()) {
|
|
230
|
+
returnDisplayMessage = result.output;
|
|
231
|
+
}
|
|
232
|
+
else {
|
|
233
|
+
if (result.aborted) {
|
|
234
|
+
returnDisplayMessage = 'Command cancelled by user.';
|
|
235
|
+
}
|
|
236
|
+
else if (result.signal) {
|
|
237
|
+
returnDisplayMessage = `Command terminated by signal: ${result.signal}`;
|
|
238
|
+
}
|
|
239
|
+
else if (result.error) {
|
|
240
|
+
returnDisplayMessage = `Command failed: ${getErrorMessage(result.error)}`;
|
|
241
|
+
}
|
|
242
|
+
else if (result.exitCode !== null && result.exitCode !== 0) {
|
|
243
|
+
returnDisplayMessage = `Command exited with code: ${result.exitCode}`;
|
|
244
|
+
}
|
|
245
|
+
// If output is empty and command succeeded (code 0, no error/signal/abort),
|
|
246
|
+
// returnDisplayMessage will remain empty, which is fine.
|
|
188
247
|
}
|
|
248
|
+
}
|
|
249
|
+
const summarizeConfig = this.config.getSummarizeToolOutputConfig();
|
|
250
|
+
if (summarizeConfig && summarizeConfig[this.name]) {
|
|
251
|
+
const summary = await summarizeToolOutput(llmContent, this.config.getGeminiClient(), signal, summarizeConfig[this.name].tokenBudget);
|
|
189
252
|
return {
|
|
190
|
-
|
|
191
|
-
returnDisplay:
|
|
192
|
-
llmContent,
|
|
253
|
+
llmContent: summary,
|
|
254
|
+
returnDisplay: returnDisplayMessage,
|
|
193
255
|
};
|
|
194
256
|
}
|
|
195
|
-
}
|
|
196
|
-
catch (error) {
|
|
197
|
-
let errorMessage = getErrorMessage(error);
|
|
198
|
-
// Check if error has execa-specific properties
|
|
199
|
-
if (error && typeof error === 'object' && 'all' in error) {
|
|
200
|
-
const execaError = error;
|
|
201
|
-
if (execaError.all) {
|
|
202
|
-
const allOutput = stripAnsi(execaError.all);
|
|
203
|
-
errorMessage += `\nOutput:\n${allOutput}`;
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
257
|
return {
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
returnDisplay: errorMessage,
|
|
258
|
+
llmContent,
|
|
259
|
+
returnDisplay: returnDisplayMessage,
|
|
210
260
|
};
|
|
211
261
|
}
|
|
262
|
+
finally {
|
|
263
|
+
if (fs.existsSync(tempFilePath)) {
|
|
264
|
+
fs.unlinkSync(tempFilePath);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
212
267
|
}
|
|
213
268
|
}
|
|
214
269
|
//# sourceMappingURL=shell.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../../src/tools/shell.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EACL,QAAQ,EAGR,IAAI,GACL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../../src/tools/shell.ts"],"names":[],"mappings":"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"}
|