@google/gemini-cli-core 0.70.0 → 0.71.0-nightly.20261121.geecccfcd5
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/dist/docs/changelogs/index.md +46 -0
- package/dist/docs/changelogs/latest.md +82 -100
- package/dist/docs/changelogs/preview.md +82 -115
- package/dist/google-gemini-cli-core-0.71.0-nightly.20261118.g615d6bc8c.tgz +0 -0
- package/dist/src/confirmation-bus/types.d.ts +1 -0
- package/dist/src/confirmation-bus/types.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/generated/git-commit.js.map +1 -1
- package/dist/src/policy/policy-engine.d.ts +1 -0
- package/dist/src/policy/policy-engine.js +15 -6
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/sandbox/utils/commandUtils.js +35 -25
- package/dist/src/sandbox/utils/commandUtils.js.map +1 -1
- package/dist/src/sandbox/windows/WindowsSandboxManager.d.ts +1 -0
- package/dist/src/sandbox/windows/WindowsSandboxManager.js +9 -2
- package/dist/src/sandbox/windows/WindowsSandboxManager.js.map +1 -1
- package/dist/src/sandbox/windows/commandSafety.js +4 -2
- package/dist/src/sandbox/windows/commandSafety.js.map +1 -1
- package/dist/src/scheduler/policy.js +6 -0
- package/dist/src/scheduler/policy.js.map +1 -1
- package/dist/src/scheduler/scheduler.js +79 -59
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/services/fileDiscoveryService.test.js +15 -0
- package/dist/src/services/fileDiscoveryService.test.js.map +1 -1
- package/dist/src/tools/shell-powershell-parsing.integration.test.d.ts +6 -0
- package/dist/src/tools/shell-powershell-parsing.integration.test.js +576 -0
- package/dist/src/tools/shell-powershell-parsing.integration.test.js.map +1 -0
- package/dist/src/tools/shell.d.ts +6 -1
- package/dist/src/tools/shell.js +281 -189
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/tools.d.ts +1 -0
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.js +33 -1
- package/dist/src/utils/gitIgnoreParser.js.map +1 -1
- package/dist/src/utils/gitIgnoreParser.test.js +32 -0
- package/dist/src/utils/gitIgnoreParser.test.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.d.ts +1 -1
- package/dist/src/utils/ignorePathUtils.js +3 -2
- package/dist/src/utils/ignorePathUtils.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.test.js +8 -0
- package/dist/src/utils/ignorePathUtils.test.js.map +1 -1
- package/dist/src/utils/shell-parse-cache.d.ts +37 -0
- package/dist/src/utils/shell-parse-cache.js +55 -0
- package/dist/src/utils/shell-parse-cache.js.map +1 -0
- package/dist/src/utils/shell-parse-cache.test.d.ts +6 -0
- package/dist/src/utils/shell-parse-cache.test.js +478 -0
- package/dist/src/utils/shell-parse-cache.test.js.map +1 -0
- package/dist/src/utils/shell-utils.d.ts +27 -29
- package/dist/src/utils/shell-utils.js +385 -89
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/untrustedContextTracker.d.ts +2 -6
- package/dist/src/utils/untrustedContextTracker.js +65 -27
- package/dist/src/utils/untrustedContextTracker.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,576 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import fs from 'node:fs';
|
|
7
|
+
import os from 'node:os';
|
|
8
|
+
import path from 'node:path';
|
|
9
|
+
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi, } from 'vitest';
|
|
10
|
+
const mockPlatform = vi.hoisted(() => vi.fn());
|
|
11
|
+
vi.mock('node:os', async (importOriginal) => {
|
|
12
|
+
const actualOs = await importOriginal();
|
|
13
|
+
return {
|
|
14
|
+
...actualOs,
|
|
15
|
+
default: {
|
|
16
|
+
...actualOs,
|
|
17
|
+
platform: mockPlatform,
|
|
18
|
+
},
|
|
19
|
+
platform: mockPlatform,
|
|
20
|
+
};
|
|
21
|
+
});
|
|
22
|
+
import { MessageBusType } from '../confirmation-bus/types.js';
|
|
23
|
+
import { PolicyEngine } from '../policy/policy-engine.js';
|
|
24
|
+
import { SafeRegExp } from '../policy/safe-regex.js';
|
|
25
|
+
import { ApprovalMode, PolicyDecision } from '../policy/types.js';
|
|
26
|
+
import { buildArgsPatterns } from '../policy/utils.js';
|
|
27
|
+
import { isStrictlyApproved } from '../sandbox/windows/commandSafety.js';
|
|
28
|
+
import { Scheduler } from '../scheduler/scheduler.js';
|
|
29
|
+
import { CoreToolCallStatus, ROOT_SCHEDULER_ID } from '../scheduler/types.js';
|
|
30
|
+
import { ShellExecutionService } from '../services/shellExecutionService.js';
|
|
31
|
+
import { makeFakeConfig } from '../test-utils/config.js';
|
|
32
|
+
import { initializeShellParsers } from '../utils/shell-utils.js';
|
|
33
|
+
import { ShellTool } from './shell.js';
|
|
34
|
+
import { SHELL_TOOL_NAME } from './tool-names.js';
|
|
35
|
+
import { ToolRegistry } from './tool-registry.js';
|
|
36
|
+
import { ToolConfirmationOutcome } from './tools.js';
|
|
37
|
+
const PIPELINE_COMMAND = 'Get-ChildItem | Sort-Object LastWriteTime -Descending | Select-Object -First 5 Name,Length,LastWriteTime';
|
|
38
|
+
const FAKE_POWERSHELL_DELAY_MS = 100;
|
|
39
|
+
const TIMER_INTERVAL_MS = 15;
|
|
40
|
+
describe('PowerShell command parsing event-loop responsiveness (#30249)', () => {
|
|
41
|
+
let tempDir;
|
|
42
|
+
let powerShellExecutable;
|
|
43
|
+
let spawnLogPath;
|
|
44
|
+
beforeAll(async () => {
|
|
45
|
+
mockPlatform.mockReturnValue(process.platform);
|
|
46
|
+
await initializeShellParsers();
|
|
47
|
+
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gcli-ps-responsiveness-'));
|
|
48
|
+
spawnLogPath = path.join(tempDir, 'ps-spawns.log');
|
|
49
|
+
if (process.platform === 'win32') {
|
|
50
|
+
const systemRoot = process.env['SystemRoot'] || 'C:\\Windows';
|
|
51
|
+
const winPsPath = path.win32.join(systemRoot, 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe');
|
|
52
|
+
powerShellExecutable = fs.existsSync(winPsPath)
|
|
53
|
+
? winPsPath
|
|
54
|
+
: 'powershell.exe';
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
powerShellExecutable = path.join(tempDir, 'powershell.exe');
|
|
58
|
+
const script = [
|
|
59
|
+
`#!${process.execPath}`,
|
|
60
|
+
'const fs = require("node:fs");',
|
|
61
|
+
'const delayMs = Number(process.env.__GCLI_FAKE_PS_DELAY_MS ?? "100");',
|
|
62
|
+
'const exitCode = Number(process.env.__GCLI_FAKE_PS_EXIT_CODE ?? "0");',
|
|
63
|
+
'const logPath = process.env.__GCLI_FAKE_PS_LOG_PATH;',
|
|
64
|
+
'const commandText = process.env.__GCLI_POWERSHELL_COMMAND__ ?? "";',
|
|
65
|
+
'if (logPath) {',
|
|
66
|
+
' fs.appendFileSync(logPath, JSON.stringify(commandText) + "\\n");',
|
|
67
|
+
'}',
|
|
68
|
+
'setTimeout(() => {',
|
|
69
|
+
' if (exitCode !== 0) {',
|
|
70
|
+
' process.stderr.write("Simulated PowerShell failure\\n");',
|
|
71
|
+
' process.exit(exitCode);',
|
|
72
|
+
' }',
|
|
73
|
+
' if (!commandText.trim()) {',
|
|
74
|
+
' process.stdout.write(JSON.stringify({ success: false }) + "\\n");',
|
|
75
|
+
' process.exit(0);',
|
|
76
|
+
' }',
|
|
77
|
+
' const segments = commandText.split("|");',
|
|
78
|
+
' let searchFrom = 0;',
|
|
79
|
+
' const commands = [];',
|
|
80
|
+
' let hasRedirection = false;',
|
|
81
|
+
' for (const rawSegment of segments) {',
|
|
82
|
+
' const rawIdx = commandText.indexOf(rawSegment, searchFrom);',
|
|
83
|
+
' const trimmed = rawSegment.trim();',
|
|
84
|
+
' if (trimmed) {',
|
|
85
|
+
' const unquoted = trimmed.replace(/"[^"]*"|\'[^\']*\'/g, "");',
|
|
86
|
+
' if (/[><]/.test(unquoted)) {',
|
|
87
|
+
' hasRedirection = true;',
|
|
88
|
+
' }',
|
|
89
|
+
' const withoutRedir = trimmed.replace(/\\s*>+\\s*\\S+$/, "").trim();',
|
|
90
|
+
' const leadingWs = rawSegment.indexOf(trimmed);',
|
|
91
|
+
' const tokens = withoutRedir.split(/\\s+/);',
|
|
92
|
+
' commands.push({',
|
|
93
|
+
' name: tokens[0],',
|
|
94
|
+
' text: trimmed,',
|
|
95
|
+
' startIndex: rawIdx + leadingWs,',
|
|
96
|
+
' args: tokens.slice(1),',
|
|
97
|
+
' });',
|
|
98
|
+
' }',
|
|
99
|
+
' searchFrom = rawIdx + rawSegment.length;',
|
|
100
|
+
' }',
|
|
101
|
+
' process.stdout.write(',
|
|
102
|
+
' JSON.stringify({',
|
|
103
|
+
' success: true,',
|
|
104
|
+
' commands,',
|
|
105
|
+
' hasRedirection,',
|
|
106
|
+
' hasCommandSubstitution: commandText.includes("$(") || commandText.includes("@("),',
|
|
107
|
+
' }) + "\\n",',
|
|
108
|
+
' );',
|
|
109
|
+
' process.exit(0);',
|
|
110
|
+
'}, delayMs);',
|
|
111
|
+
'',
|
|
112
|
+
].join('\n');
|
|
113
|
+
fs.writeFileSync(powerShellExecutable, script, { mode: 0o755 });
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
afterAll(() => {
|
|
117
|
+
if (tempDir) {
|
|
118
|
+
fs.rmSync(tempDir, { recursive: true, force: true });
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
beforeEach(() => {
|
|
122
|
+
fs.rmSync(spawnLogPath, { force: true });
|
|
123
|
+
mockPlatform.mockReturnValue('win32');
|
|
124
|
+
vi.stubEnv('ComSpec', powerShellExecutable);
|
|
125
|
+
vi.stubEnv('__GCLI_FAKE_PS_DELAY_MS', String(FAKE_POWERSHELL_DELAY_MS));
|
|
126
|
+
vi.stubEnv('__GCLI_FAKE_PS_LOG_PATH', spawnLogPath);
|
|
127
|
+
});
|
|
128
|
+
afterEach(() => {
|
|
129
|
+
mockPlatform.mockReturnValue(process.platform);
|
|
130
|
+
vi.restoreAllMocks();
|
|
131
|
+
vi.unstubAllEnvs();
|
|
132
|
+
});
|
|
133
|
+
it('keeps interval timers responsive and reuses cached parses while Scheduler validates a PowerShell pipeline for confirmation', async () => {
|
|
134
|
+
const config = makeFakeConfig({
|
|
135
|
+
interactive: true,
|
|
136
|
+
usageStatisticsEnabled: false,
|
|
137
|
+
targetDir: tempDir,
|
|
138
|
+
cwd: tempDir,
|
|
139
|
+
approvalMode: ApprovalMode.DEFAULT,
|
|
140
|
+
policyEngineConfig: {
|
|
141
|
+
rules: [
|
|
142
|
+
{
|
|
143
|
+
toolName: SHELL_TOOL_NAME,
|
|
144
|
+
decision: PolicyDecision.ASK_USER,
|
|
145
|
+
priority: 1.01,
|
|
146
|
+
interactive: true,
|
|
147
|
+
},
|
|
148
|
+
],
|
|
149
|
+
defaultDecision: PolicyDecision.ASK_USER,
|
|
150
|
+
},
|
|
151
|
+
});
|
|
152
|
+
vi.spyOn(config.geminiClient, 'getHistory').mockReturnValue([]);
|
|
153
|
+
const messageBus = config.getMessageBus();
|
|
154
|
+
const toolRegistry = new ToolRegistry(config, messageBus, true);
|
|
155
|
+
toolRegistry.registerTool(new ShellTool(config, messageBus));
|
|
156
|
+
config.toolRegistry = toolRegistry;
|
|
157
|
+
const scheduler = new Scheduler({
|
|
158
|
+
context: config,
|
|
159
|
+
messageBus,
|
|
160
|
+
getPreferredEditor: () => undefined,
|
|
161
|
+
schedulerId: ROOT_SCHEDULER_ID,
|
|
162
|
+
});
|
|
163
|
+
let ticksWhileValidating = 0;
|
|
164
|
+
let reachedAwaitingApproval = false;
|
|
165
|
+
let capturedDetails;
|
|
166
|
+
const timer = setInterval(() => {
|
|
167
|
+
if (!reachedAwaitingApproval) {
|
|
168
|
+
ticksWhileValidating++;
|
|
169
|
+
}
|
|
170
|
+
}, TIMER_INTERVAL_MS);
|
|
171
|
+
messageBus.subscribe(MessageBusType.TOOL_CALLS_UPDATE, (event) => {
|
|
172
|
+
for (const tc of event.toolCalls) {
|
|
173
|
+
if (tc.status === CoreToolCallStatus.AwaitingApproval &&
|
|
174
|
+
tc.correlationId &&
|
|
175
|
+
!reachedAwaitingApproval) {
|
|
176
|
+
reachedAwaitingApproval = true;
|
|
177
|
+
capturedDetails = tc.confirmationDetails;
|
|
178
|
+
const { correlationId } = tc;
|
|
179
|
+
setTimeout(() => {
|
|
180
|
+
void messageBus.publish({
|
|
181
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
182
|
+
correlationId,
|
|
183
|
+
confirmed: false,
|
|
184
|
+
outcome: ToolConfirmationOutcome.Cancel,
|
|
185
|
+
});
|
|
186
|
+
}, 0);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
});
|
|
190
|
+
let completedCalls;
|
|
191
|
+
try {
|
|
192
|
+
completedCalls = await scheduler.schedule([
|
|
193
|
+
{
|
|
194
|
+
callId: 'call-ps-pipeline-1',
|
|
195
|
+
name: SHELL_TOOL_NAME,
|
|
196
|
+
args: { command: PIPELINE_COMMAND },
|
|
197
|
+
isClientInitiated: false,
|
|
198
|
+
prompt_id: 'prompt-ps-pipeline-1',
|
|
199
|
+
},
|
|
200
|
+
], new AbortController().signal);
|
|
201
|
+
}
|
|
202
|
+
finally {
|
|
203
|
+
clearInterval(timer);
|
|
204
|
+
scheduler.dispose();
|
|
205
|
+
}
|
|
206
|
+
expect(completedCalls[0]?.response.error).toBeUndefined();
|
|
207
|
+
expect(reachedAwaitingApproval).toBe(true);
|
|
208
|
+
expect(capturedDetails?.type).toBe('exec');
|
|
209
|
+
if (capturedDetails?.type === 'exec') {
|
|
210
|
+
expect(capturedDetails.rootCommands).toEqual([
|
|
211
|
+
'Get-ChildItem',
|
|
212
|
+
'Sort-Object',
|
|
213
|
+
'Select-Object',
|
|
214
|
+
]);
|
|
215
|
+
expect(capturedDetails.rootCommand).toBe('Get-ChildItem, Sort-Object, Select-Object');
|
|
216
|
+
expect(capturedDetails.hasRedirection).toBe(false);
|
|
217
|
+
}
|
|
218
|
+
expect(ticksWhileValidating).toBeGreaterThanOrEqual(2);
|
|
219
|
+
if (process.platform !== 'win32') {
|
|
220
|
+
const loggedSpawns = fs
|
|
221
|
+
.readFileSync(spawnLogPath, 'utf-8')
|
|
222
|
+
.trim()
|
|
223
|
+
.split('\n')
|
|
224
|
+
.filter(Boolean);
|
|
225
|
+
// 1 full pipeline parse + 3 unique segment parses (reused across MessageBus, taint checks, and confirmation details)
|
|
226
|
+
expect(loggedSpawns).toHaveLength(4);
|
|
227
|
+
}
|
|
228
|
+
});
|
|
229
|
+
it('keeps interval timers responsive across ProceedAlways policy update and full ShellTool execution', async () => {
|
|
230
|
+
const config = makeFakeConfig({
|
|
231
|
+
interactive: true,
|
|
232
|
+
usageStatisticsEnabled: false,
|
|
233
|
+
targetDir: tempDir,
|
|
234
|
+
cwd: tempDir,
|
|
235
|
+
approvalMode: ApprovalMode.DEFAULT,
|
|
236
|
+
policyEngineConfig: {
|
|
237
|
+
rules: [
|
|
238
|
+
{
|
|
239
|
+
toolName: SHELL_TOOL_NAME,
|
|
240
|
+
decision: PolicyDecision.ASK_USER,
|
|
241
|
+
priority: 1.01,
|
|
242
|
+
interactive: true,
|
|
243
|
+
},
|
|
244
|
+
],
|
|
245
|
+
defaultDecision: PolicyDecision.ASK_USER,
|
|
246
|
+
},
|
|
247
|
+
});
|
|
248
|
+
vi.spyOn(config.geminiClient, 'getHistory').mockReturnValue([]);
|
|
249
|
+
vi.spyOn(ShellExecutionService, 'execute').mockResolvedValue({
|
|
250
|
+
pid: 9999,
|
|
251
|
+
result: Promise.resolve({
|
|
252
|
+
rawOutput: Buffer.from('file1.txt\n'),
|
|
253
|
+
output: 'file1.txt\n',
|
|
254
|
+
exitCode: 0,
|
|
255
|
+
signal: null,
|
|
256
|
+
error: null,
|
|
257
|
+
aborted: false,
|
|
258
|
+
pid: 9999,
|
|
259
|
+
executionMethod: 'child_process',
|
|
260
|
+
}),
|
|
261
|
+
});
|
|
262
|
+
const messageBus = config.getMessageBus();
|
|
263
|
+
const policyUpdates = [];
|
|
264
|
+
messageBus.subscribe(MessageBusType.UPDATE_POLICY, (msg) => {
|
|
265
|
+
policyUpdates.push(msg);
|
|
266
|
+
});
|
|
267
|
+
const toolRegistry = new ToolRegistry(config, messageBus, true);
|
|
268
|
+
toolRegistry.registerTool(new ShellTool(config, messageBus));
|
|
269
|
+
config.toolRegistry = toolRegistry;
|
|
270
|
+
const scheduler = new Scheduler({
|
|
271
|
+
context: config,
|
|
272
|
+
messageBus,
|
|
273
|
+
getPreferredEditor: () => undefined,
|
|
274
|
+
schedulerId: ROOT_SCHEDULER_ID,
|
|
275
|
+
});
|
|
276
|
+
let totalTicks = 0;
|
|
277
|
+
const timer = setInterval(() => {
|
|
278
|
+
totalTicks++;
|
|
279
|
+
}, TIMER_INTERVAL_MS);
|
|
280
|
+
messageBus.subscribe(MessageBusType.TOOL_CALLS_UPDATE, (event) => {
|
|
281
|
+
for (const tc of event.toolCalls) {
|
|
282
|
+
if (tc.status === CoreToolCallStatus.AwaitingApproval &&
|
|
283
|
+
tc.correlationId) {
|
|
284
|
+
const { correlationId } = tc;
|
|
285
|
+
setTimeout(() => {
|
|
286
|
+
void messageBus.publish({
|
|
287
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
288
|
+
correlationId,
|
|
289
|
+
confirmed: true,
|
|
290
|
+
outcome: ToolConfirmationOutcome.ProceedAlways,
|
|
291
|
+
});
|
|
292
|
+
}, 0);
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
});
|
|
296
|
+
let completedCalls;
|
|
297
|
+
try {
|
|
298
|
+
completedCalls = await scheduler.schedule([
|
|
299
|
+
{
|
|
300
|
+
callId: 'call-ps-exec-1',
|
|
301
|
+
name: SHELL_TOOL_NAME,
|
|
302
|
+
args: { command: PIPELINE_COMMAND },
|
|
303
|
+
isClientInitiated: false,
|
|
304
|
+
prompt_id: 'prompt-ps-exec-1',
|
|
305
|
+
},
|
|
306
|
+
], new AbortController().signal);
|
|
307
|
+
}
|
|
308
|
+
finally {
|
|
309
|
+
clearInterval(timer);
|
|
310
|
+
scheduler.dispose();
|
|
311
|
+
}
|
|
312
|
+
expect(completedCalls[0]?.status).toBe(CoreToolCallStatus.Success);
|
|
313
|
+
expect(policyUpdates).toHaveLength(1);
|
|
314
|
+
expect(policyUpdates[0]?.commandPrefix).toEqual([
|
|
315
|
+
'Get-ChildItem',
|
|
316
|
+
'Sort-Object',
|
|
317
|
+
'Select-Object',
|
|
318
|
+
]);
|
|
319
|
+
expect(totalTicks).toBeGreaterThanOrEqual(2);
|
|
320
|
+
if (process.platform !== 'win32') {
|
|
321
|
+
const loggedSpawns = fs
|
|
322
|
+
.readFileSync(spawnLogPath, 'utf-8')
|
|
323
|
+
.trim()
|
|
324
|
+
.split('\n')
|
|
325
|
+
.filter(Boolean);
|
|
326
|
+
// Zero extra parser spawns during ProceedAlways policy update or pre/post execution checks
|
|
327
|
+
expect(loggedSpawns).toHaveLength(4);
|
|
328
|
+
}
|
|
329
|
+
});
|
|
330
|
+
it('keeps interval timers responsive during PolicyEngine.check on allowed, redirected, and quoted-arrow PowerShell commands', async () => {
|
|
331
|
+
const patterns = buildArgsPatterns(undefined, [
|
|
332
|
+
'Get-ChildItem',
|
|
333
|
+
'Sort-Object',
|
|
334
|
+
'Select-Object',
|
|
335
|
+
'Write-Output',
|
|
336
|
+
]);
|
|
337
|
+
const rules = patterns
|
|
338
|
+
.filter((pattern) => pattern !== undefined)
|
|
339
|
+
.map((pattern) => ({
|
|
340
|
+
toolName: SHELL_TOOL_NAME,
|
|
341
|
+
decision: PolicyDecision.ALLOW,
|
|
342
|
+
argsPattern: SafeRegExp.compile(pattern),
|
|
343
|
+
priority: 10,
|
|
344
|
+
}));
|
|
345
|
+
const policyEngine = new PolicyEngine({
|
|
346
|
+
rules,
|
|
347
|
+
approvalMode: ApprovalMode.DEFAULT,
|
|
348
|
+
defaultDecision: PolicyDecision.ASK_USER,
|
|
349
|
+
});
|
|
350
|
+
let ticksDuringPolicyChecks = 0;
|
|
351
|
+
const timer = setInterval(() => {
|
|
352
|
+
ticksDuringPolicyChecks++;
|
|
353
|
+
}, TIMER_INTERVAL_MS);
|
|
354
|
+
try {
|
|
355
|
+
const pipelineRes = await policyEngine.check({ name: SHELL_TOOL_NAME, args: { command: PIPELINE_COMMAND } }, undefined);
|
|
356
|
+
expect(pipelineRes.decision).toBe(PolicyDecision.ALLOW);
|
|
357
|
+
const redirectedRes = await policyEngine.check({
|
|
358
|
+
name: SHELL_TOOL_NAME,
|
|
359
|
+
args: { command: 'Get-ChildItem > out.txt' },
|
|
360
|
+
}, undefined);
|
|
361
|
+
expect(redirectedRes.decision).toBe(PolicyDecision.ASK_USER);
|
|
362
|
+
const quotedArrowRes = await policyEngine.check({
|
|
363
|
+
name: SHELL_TOOL_NAME,
|
|
364
|
+
args: { command: 'Write-Output "a -> b"' },
|
|
365
|
+
}, undefined);
|
|
366
|
+
expect(quotedArrowRes.decision).toBe(PolicyDecision.ALLOW);
|
|
367
|
+
}
|
|
368
|
+
finally {
|
|
369
|
+
clearInterval(timer);
|
|
370
|
+
}
|
|
371
|
+
expect(ticksDuringPolicyChecks).toBeGreaterThanOrEqual(4);
|
|
372
|
+
});
|
|
373
|
+
it('keeps interval timers responsive during Windows sandbox isStrictlyApproved check', async () => {
|
|
374
|
+
let ticks = 0;
|
|
375
|
+
const timer = setInterval(() => {
|
|
376
|
+
ticks++;
|
|
377
|
+
}, TIMER_INTERVAL_MS);
|
|
378
|
+
let approved = false;
|
|
379
|
+
try {
|
|
380
|
+
approved = await isStrictlyApproved('powershell.exe', ['-NoProfile', '-Command', 'Get-ChildItem | Get-Content'], ['Get-ChildItem', 'Get-Content'], tempDir, tempDir);
|
|
381
|
+
}
|
|
382
|
+
finally {
|
|
383
|
+
clearInterval(timer);
|
|
384
|
+
}
|
|
385
|
+
expect(approved).toBe(true);
|
|
386
|
+
expect(ticks).toBeGreaterThanOrEqual(2);
|
|
387
|
+
});
|
|
388
|
+
it('populates confirmationDetails.hasRedirection accurately for redirected and quoted-arrow commands without blocking timers', async () => {
|
|
389
|
+
const config = makeFakeConfig({
|
|
390
|
+
interactive: true,
|
|
391
|
+
usageStatisticsEnabled: false,
|
|
392
|
+
targetDir: tempDir,
|
|
393
|
+
cwd: tempDir,
|
|
394
|
+
approvalMode: ApprovalMode.DEFAULT,
|
|
395
|
+
policyEngineConfig: {
|
|
396
|
+
rules: [
|
|
397
|
+
{
|
|
398
|
+
toolName: SHELL_TOOL_NAME,
|
|
399
|
+
decision: PolicyDecision.ASK_USER,
|
|
400
|
+
priority: 1.01,
|
|
401
|
+
interactive: true,
|
|
402
|
+
},
|
|
403
|
+
],
|
|
404
|
+
defaultDecision: PolicyDecision.ASK_USER,
|
|
405
|
+
},
|
|
406
|
+
});
|
|
407
|
+
vi.spyOn(config.geminiClient, 'getHistory').mockReturnValue([]);
|
|
408
|
+
const messageBus = config.getMessageBus();
|
|
409
|
+
const toolRegistry = new ToolRegistry(config, messageBus, true);
|
|
410
|
+
toolRegistry.registerTool(new ShellTool(config, messageBus));
|
|
411
|
+
config.toolRegistry = toolRegistry;
|
|
412
|
+
const scheduler = new Scheduler({
|
|
413
|
+
context: config,
|
|
414
|
+
messageBus,
|
|
415
|
+
getPreferredEditor: () => undefined,
|
|
416
|
+
schedulerId: ROOT_SCHEDULER_ID,
|
|
417
|
+
});
|
|
418
|
+
const seenConfirmations = new Map();
|
|
419
|
+
const respondedCorrelations = new Set();
|
|
420
|
+
let ticks = 0;
|
|
421
|
+
const timer = setInterval(() => {
|
|
422
|
+
ticks++;
|
|
423
|
+
}, TIMER_INTERVAL_MS);
|
|
424
|
+
messageBus.subscribe(MessageBusType.TOOL_CALLS_UPDATE, (event) => {
|
|
425
|
+
for (const tc of event.toolCalls) {
|
|
426
|
+
if (tc.status === CoreToolCallStatus.AwaitingApproval &&
|
|
427
|
+
tc.correlationId &&
|
|
428
|
+
tc.confirmationDetails &&
|
|
429
|
+
!respondedCorrelations.has(tc.correlationId)) {
|
|
430
|
+
respondedCorrelations.add(tc.correlationId);
|
|
431
|
+
seenConfirmations.set(tc.request.callId, tc.confirmationDetails);
|
|
432
|
+
const { correlationId } = tc;
|
|
433
|
+
setTimeout(() => {
|
|
434
|
+
void messageBus.publish({
|
|
435
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
436
|
+
correlationId,
|
|
437
|
+
confirmed: false,
|
|
438
|
+
outcome: ToolConfirmationOutcome.Cancel,
|
|
439
|
+
});
|
|
440
|
+
}, 0);
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
});
|
|
444
|
+
try {
|
|
445
|
+
await scheduler.schedule([
|
|
446
|
+
{
|
|
447
|
+
callId: 'call-redir',
|
|
448
|
+
name: SHELL_TOOL_NAME,
|
|
449
|
+
args: { command: 'Get-ChildItem > out.txt' },
|
|
450
|
+
isClientInitiated: false,
|
|
451
|
+
prompt_id: 'prompt-redir',
|
|
452
|
+
},
|
|
453
|
+
{
|
|
454
|
+
callId: 'call-quoted-arrow',
|
|
455
|
+
name: SHELL_TOOL_NAME,
|
|
456
|
+
args: { command: 'Write-Output "a -> b"' },
|
|
457
|
+
isClientInitiated: false,
|
|
458
|
+
prompt_id: 'prompt-redir',
|
|
459
|
+
},
|
|
460
|
+
], new AbortController().signal);
|
|
461
|
+
}
|
|
462
|
+
finally {
|
|
463
|
+
clearInterval(timer);
|
|
464
|
+
scheduler.dispose();
|
|
465
|
+
}
|
|
466
|
+
const redirDetails = seenConfirmations.get('call-redir');
|
|
467
|
+
const quotedDetails = seenConfirmations.get('call-quoted-arrow');
|
|
468
|
+
expect(redirDetails?.type).toBe('exec');
|
|
469
|
+
expect(quotedDetails?.type).toBe('exec');
|
|
470
|
+
if (redirDetails?.type === 'exec') {
|
|
471
|
+
expect(redirDetails.hasRedirection).toBe(true);
|
|
472
|
+
}
|
|
473
|
+
if (quotedDetails?.type === 'exec') {
|
|
474
|
+
expect(quotedDetails.hasRedirection).toBe(false);
|
|
475
|
+
}
|
|
476
|
+
expect(ticks).toBeGreaterThanOrEqual(2);
|
|
477
|
+
});
|
|
478
|
+
it('caches failed PowerShell exits within an invocation so ProceedAlways does not respawn repeatedly or block timers', async () => {
|
|
479
|
+
if (process.platform === 'win32') {
|
|
480
|
+
return;
|
|
481
|
+
}
|
|
482
|
+
vi.stubEnv('__GCLI_FAKE_PS_EXIT_CODE', '1');
|
|
483
|
+
const config = makeFakeConfig({
|
|
484
|
+
interactive: true,
|
|
485
|
+
usageStatisticsEnabled: false,
|
|
486
|
+
targetDir: tempDir,
|
|
487
|
+
cwd: tempDir,
|
|
488
|
+
approvalMode: ApprovalMode.DEFAULT,
|
|
489
|
+
policyEngineConfig: {
|
|
490
|
+
rules: [
|
|
491
|
+
{
|
|
492
|
+
toolName: SHELL_TOOL_NAME,
|
|
493
|
+
decision: PolicyDecision.ASK_USER,
|
|
494
|
+
priority: 1.01,
|
|
495
|
+
interactive: true,
|
|
496
|
+
},
|
|
497
|
+
],
|
|
498
|
+
defaultDecision: PolicyDecision.ASK_USER,
|
|
499
|
+
},
|
|
500
|
+
});
|
|
501
|
+
vi.spyOn(config.geminiClient, 'getHistory').mockReturnValue([]);
|
|
502
|
+
vi.spyOn(ShellExecutionService, 'execute').mockResolvedValue({
|
|
503
|
+
pid: 9998,
|
|
504
|
+
result: Promise.resolve({
|
|
505
|
+
rawOutput: Buffer.from('ok\n'),
|
|
506
|
+
output: 'ok\n',
|
|
507
|
+
exitCode: 0,
|
|
508
|
+
signal: null,
|
|
509
|
+
error: null,
|
|
510
|
+
aborted: false,
|
|
511
|
+
pid: 9998,
|
|
512
|
+
executionMethod: 'child_process',
|
|
513
|
+
}),
|
|
514
|
+
});
|
|
515
|
+
const messageBus = config.getMessageBus();
|
|
516
|
+
const toolRegistry = new ToolRegistry(config, messageBus, true);
|
|
517
|
+
toolRegistry.registerTool(new ShellTool(config, messageBus));
|
|
518
|
+
config.toolRegistry = toolRegistry;
|
|
519
|
+
const scheduler = new Scheduler({
|
|
520
|
+
context: config,
|
|
521
|
+
messageBus,
|
|
522
|
+
getPreferredEditor: () => undefined,
|
|
523
|
+
schedulerId: ROOT_SCHEDULER_ID,
|
|
524
|
+
});
|
|
525
|
+
let ticks = 0;
|
|
526
|
+
const timer = setInterval(() => {
|
|
527
|
+
ticks++;
|
|
528
|
+
}, TIMER_INTERVAL_MS);
|
|
529
|
+
messageBus.subscribe(MessageBusType.TOOL_CALLS_UPDATE, (event) => {
|
|
530
|
+
for (const tc of event.toolCalls) {
|
|
531
|
+
if (tc.status === CoreToolCallStatus.AwaitingApproval &&
|
|
532
|
+
tc.correlationId) {
|
|
533
|
+
const { correlationId } = tc;
|
|
534
|
+
setTimeout(() => {
|
|
535
|
+
void messageBus.publish({
|
|
536
|
+
type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
|
|
537
|
+
correlationId,
|
|
538
|
+
confirmed: true,
|
|
539
|
+
outcome: ToolConfirmationOutcome.ProceedAlways,
|
|
540
|
+
});
|
|
541
|
+
}, 0);
|
|
542
|
+
}
|
|
543
|
+
}
|
|
544
|
+
});
|
|
545
|
+
try {
|
|
546
|
+
const completed = await scheduler.schedule([
|
|
547
|
+
{
|
|
548
|
+
callId: 'call-ps-fail-1',
|
|
549
|
+
name: SHELL_TOOL_NAME,
|
|
550
|
+
args: { command: 'git status && echo ok' },
|
|
551
|
+
isClientInitiated: false,
|
|
552
|
+
prompt_id: 'prompt-ps-fail-1',
|
|
553
|
+
},
|
|
554
|
+
], new AbortController().signal);
|
|
555
|
+
expect(completed[0]?.status).toBe(CoreToolCallStatus.Success);
|
|
556
|
+
}
|
|
557
|
+
finally {
|
|
558
|
+
clearInterval(timer);
|
|
559
|
+
scheduler.dispose();
|
|
560
|
+
}
|
|
561
|
+
expect(ticks).toBeGreaterThanOrEqual(2);
|
|
562
|
+
const loggedSpawns = fs
|
|
563
|
+
.readFileSync(spawnLogPath, 'utf-8')
|
|
564
|
+
.trim()
|
|
565
|
+
.split('\n')
|
|
566
|
+
.filter(Boolean);
|
|
567
|
+
// Cached null ensures each unique command string (1 compound + 2 fallback sub-commands)
|
|
568
|
+
// is spawned only once across policy, confirmation, ProceedAlways, and execution.
|
|
569
|
+
expect(loggedSpawns).toEqual([
|
|
570
|
+
JSON.stringify('git status && echo ok'),
|
|
571
|
+
JSON.stringify('git status'),
|
|
572
|
+
JSON.stringify('echo ok'),
|
|
573
|
+
]);
|
|
574
|
+
});
|
|
575
|
+
});
|
|
576
|
+
//# sourceMappingURL=shell-powershell-parsing.integration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shell-powershell-parsing.integration.test.js","sourceRoot":"","sources":["../../../src/tools/shell-powershell-parsing.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,11 @@ export declare class ShellToolInvocation extends BaseToolInvocation<ShellToolPar
|
|
|
22
22
|
private readonly context;
|
|
23
23
|
private proactivePermissionsConfirmed?;
|
|
24
24
|
private confirmedCommand?;
|
|
25
|
+
private readonly parseCache;
|
|
25
26
|
constructor(context: AgentLoopContext, params: ShellToolParams, messageBus: MessageBus, _toolName?: string, _toolDisplayName?: string);
|
|
27
|
+
runInCommandParseCache<T>(fn: () => T): T;
|
|
28
|
+
prepareCommandParseCache(signal?: AbortSignal): Promise<void>;
|
|
29
|
+
private hasCachedCommandParse;
|
|
26
30
|
/**
|
|
27
31
|
* Wraps a command in a subshell to capture background process IDs (PIDs)
|
|
28
32
|
* using an EXIT trap. Uses newlines to prevent breaking heredocs or trailing
|
|
@@ -49,9 +53,10 @@ export declare class ShellToolInvocation extends BaseToolInvocation<ShellToolPar
|
|
|
49
53
|
hasTaintedOrBuildFileRisk(): boolean;
|
|
50
54
|
getPolicyUpdateOptions(outcome: ToolConfirmationOutcome): PolicyUpdateOptions | undefined;
|
|
51
55
|
shouldConfirmExecute(abortSignal: AbortSignal, forcedDecision?: ForcedToolDecision): Promise<ToolCallConfirmationDetails | false>;
|
|
52
|
-
protected getConfirmationDetails(
|
|
56
|
+
protected getConfirmationDetails(abortSignal: AbortSignal, proactivePermissions?: SandboxPermissions): Promise<ToolCallConfirmationDetails | false>;
|
|
53
57
|
private isCommandSubstitutionAllowed;
|
|
54
58
|
execute(options: ExecuteOptions): Promise<ToolResult>;
|
|
59
|
+
private executeInternal;
|
|
55
60
|
}
|
|
56
61
|
export declare class ShellTool extends BaseDeclarativeTool<ShellToolParams, ToolResult> {
|
|
57
62
|
private readonly context;
|