@google/gemini-cli-core 0.22.0-preview.3 → 0.22.1
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/src/agents/executor.js +1 -1
- package/dist/src/agents/executor.js.map +1 -1
- package/dist/src/agents/executor.test.js.map +1 -1
- package/dist/src/agents/registry.d.ts +0 -15
- package/dist/src/agents/registry.js +0 -39
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +0 -18
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/availability/policyCatalog.test.js.map +1 -1
- package/dist/src/code_assist/experiments/client_metadata.js +1 -2
- package/dist/src/code_assist/experiments/client_metadata.js.map +1 -1
- package/dist/src/code_assist/experiments/client_metadata.test.js +10 -7
- package/dist/src/code_assist/experiments/client_metadata.test.js.map +1 -1
- package/dist/src/config/config.js +17 -25
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +8 -32
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +0 -10
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/models.d.ts +1 -9
- package/dist/src/config/models.js +1 -11
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +1 -14
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/confirmation-bus/message-bus.js.map +1 -1
- package/dist/src/confirmation-bus/types.d.ts +0 -4
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/contentGenerator.js +3 -5
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +2 -29
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +1 -1
- package/dist/src/core/coreToolScheduler.js +34 -72
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +37 -134
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +3 -1
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/nonInteractiveToolExecutor.test.js +5 -4
- package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
- package/dist/src/core/prompts.js +6 -8
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/prompts.test.js +3 -9
- package/dist/src/core/prompts.test.js.map +1 -1
- package/dist/src/core/turn.js +1 -1
- package/dist/src/core/turn.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/hooks/hookEventHandler.js +1 -6
- package/dist/src/hooks/hookEventHandler.js.map +1 -1
- package/dist/src/hooks/hookEventHandler.test.js +1 -8
- package/dist/src/hooks/hookEventHandler.test.js.map +1 -1
- package/dist/src/hooks/hookRegistry.d.ts +7 -0
- package/dist/src/hooks/hookRegistry.js +20 -0
- package/dist/src/hooks/hookRegistry.js.map +1 -1
- package/dist/src/hooks/hookRegistry.test.js +7 -1
- package/dist/src/hooks/hookRegistry.test.js.map +1 -1
- package/dist/src/hooks/hookRunner.test.js +1 -1
- package/dist/src/hooks/hookRunner.test.js.map +1 -1
- package/dist/src/hooks/hookSystem.d.ts +8 -0
- package/dist/src/hooks/hookSystem.js +18 -0
- package/dist/src/hooks/hookSystem.js.map +1 -1
- package/dist/src/hooks/hookSystem.test.js +21 -2
- package/dist/src/hooks/hookSystem.test.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +1 -32
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +1 -1
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/index.d.ts +0 -3
- package/dist/src/index.js +0 -3
- package/dist/src/index.js.map +1 -1
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/output/json-formatter.test.js +0 -2
- package/dist/src/output/json-formatter.test.js.map +1 -1
- package/dist/src/output/stream-json-formatter.js +0 -6
- package/dist/src/output/stream-json-formatter.js.map +1 -1
- package/dist/src/output/stream-json-formatter.test.js +100 -98
- package/dist/src/output/stream-json-formatter.test.js.map +1 -1
- package/dist/src/output/types.d.ts +0 -2
- package/dist/src/policy/config.js +2 -71
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/policy-engine.js +1 -55
- package/dist/src/policy/policy-engine.js.map +1 -1
- package/dist/src/policy/toml-loader.d.ts +0 -8
- package/dist/src/policy/toml-loader.js +3 -3
- package/dist/src/policy/toml-loader.js.map +1 -1
- package/dist/src/safety/checker-runner.js +6 -17
- package/dist/src/safety/checker-runner.js.map +1 -1
- package/dist/src/services/chatRecordingService.d.ts +0 -5
- package/dist/src/services/chatRecordingService.js +0 -7
- 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/loopDetectionService.js +2 -2
- package/dist/src/services/loopDetectionService.js.map +1 -1
- package/dist/src/services/modelConfig.golden.test.js +0 -32
- package/dist/src/services/modelConfig.golden.test.js.map +1 -1
- package/dist/src/services/modelConfigService.d.ts +0 -3
- package/dist/src/services/modelConfigService.js +2 -3
- package/dist/src/services/modelConfigService.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +0 -110
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.js +2 -1
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +3 -6
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/activity-detector.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +5 -5
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +1 -18
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/config.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +5 -5
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/telemetry/startupProfiler.test.js +2 -1
- package/dist/src/telemetry/startupProfiler.test.js.map +1 -1
- package/dist/src/telemetry/trace.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +5 -10
- package/dist/src/telemetry/types.js +8 -16
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +0 -1
- package/dist/src/telemetry/uiTelemetry.js +0 -2
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +0 -4
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/test-utils/mock-message-bus.js.map +1 -1
- package/dist/src/tools/edit.js +0 -1
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/mcp-tool.js +0 -13
- package/dist/src/tools/mcp-tool.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +0 -25
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/memoryTool.js +0 -1
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/modifiable-tool.js.map +1 -1
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +1 -2
- package/dist/src/tools/shell.js +1 -9
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +1 -2
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/smart-edit.js +0 -1
- package/dist/src/tools/smart-edit.js.map +1 -1
- package/dist/src/tools/smart-edit.test.js.map +1 -1
- package/dist/src/tools/tool-names.d.ts +0 -1
- package/dist/src/tools/tool-names.js +0 -1
- package/dist/src/tools/tool-names.js.map +1 -1
- package/dist/src/tools/tools.d.ts +0 -19
- package/dist/src/tools/tools.js +9 -28
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js +0 -1
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/write-file.js +0 -1
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.d.ts +0 -8
- package/dist/src/utils/bfsFileSearch.js +23 -63
- package/dist/src/utils/bfsFileSearch.js.map +1 -1
- package/dist/src/utils/bfsFileSearch.test.js +1 -65
- package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
- package/dist/src/utils/checkpointUtils.js.map +1 -1
- package/dist/src/utils/extensionLoader.d.ts +2 -2
- package/dist/src/utils/extensionLoader.js +6 -5
- package/dist/src/utils/extensionLoader.js.map +1 -1
- package/dist/src/utils/extensionLoader.test.js +0 -11
- package/dist/src/utils/extensionLoader.test.js.map +1 -1
- package/dist/src/utils/filesearch/crawlCache.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/pathCorrector.js +2 -12
- package/dist/src/utils/pathCorrector.js.map +1 -1
- package/dist/src/utils/pathCorrector.test.js +2 -6
- package/dist/src/utils/pathCorrector.test.js.map +1 -1
- package/dist/src/utils/shell-utils.d.ts +47 -10
- package/dist/src/utils/shell-utils.js +182 -1
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +288 -1
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/src/utils/tool-utils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -2
- package/dist/google-gemini-cli-core-0.22.0-preview.2.tgz +0 -0
- package/dist/src/agents/delegate-to-agent-tool.d.ts +0 -19
- package/dist/src/agents/delegate-to-agent-tool.js +0 -111
- package/dist/src/agents/delegate-to-agent-tool.js.map +0 -1
- package/dist/src/agents/delegate-to-agent-tool.test.d.ts +0 -6
- package/dist/src/agents/delegate-to-agent-tool.test.js +0 -133
- package/dist/src/agents/delegate-to-agent-tool.test.js.map +0 -1
- package/dist/src/commands/init.d.ts +0 -7
- package/dist/src/commands/init.js +0 -53
- package/dist/src/commands/init.js.map +0 -1
- package/dist/src/commands/init.test.d.ts +0 -6
- package/dist/src/commands/init.test.js +0 -25
- package/dist/src/commands/init.test.js.map +0 -1
- package/dist/src/policy/persistence.test.d.ts +0 -6
- package/dist/src/policy/persistence.test.js +0 -149
- package/dist/src/policy/persistence.test.js.map +0 -1
- package/dist/src/policy/policies/agent.toml +0 -31
- package/dist/src/policy/shell-safety.test.d.ts +0 -6
- package/dist/src/policy/shell-safety.test.js +0 -74
- package/dist/src/policy/shell-safety.test.js.map +0 -1
- package/dist/src/services/test-data/resolved-aliases-retry.golden.json +0 -238
- package/dist/src/utils/shell-permissions.d.ts +0 -52
- package/dist/src/utils/shell-permissions.js +0 -188
- package/dist/src/utils/shell-permissions.js.map +0 -1
- package/dist/src/utils/shell-permissions.test.d.ts +0 -6
- package/dist/src/utils/shell-permissions.test.js +0 -342
- package/dist/src/utils/shell-permissions.test.js.map +0 -1
- package/dist/src/utils/version.d.ts +0 -6
- package/dist/src/utils/version.js +0 -15
- package/dist/src/utils/version.js.map +0 -1
- package/dist/src/utils/version.test.d.ts +0 -6
- package/dist/src/utils/version.test.js +0 -39
- package/dist/src/utils/version.test.js.map +0 -1
|
@@ -115,8 +115,6 @@ describe('StreamJsonFormatter', () => {
|
|
|
115
115
|
total_tokens: 100,
|
|
116
116
|
input_tokens: 50,
|
|
117
117
|
output_tokens: 50,
|
|
118
|
-
cached: 0,
|
|
119
|
-
input: 50,
|
|
120
118
|
duration_ms: 1200,
|
|
121
119
|
tool_calls: 2,
|
|
122
120
|
},
|
|
@@ -138,8 +136,6 @@ describe('StreamJsonFormatter', () => {
|
|
|
138
136
|
total_tokens: 100,
|
|
139
137
|
input_tokens: 50,
|
|
140
138
|
output_tokens: 50,
|
|
141
|
-
cached: 0,
|
|
142
|
-
input: 50,
|
|
143
139
|
duration_ms: 1200,
|
|
144
140
|
tool_calls: 0,
|
|
145
141
|
},
|
|
@@ -194,129 +190,139 @@ describe('StreamJsonFormatter', () => {
|
|
|
194
190
|
});
|
|
195
191
|
});
|
|
196
192
|
describe('convertToStreamStats', () => {
|
|
197
|
-
const createMockMetrics = () => ({
|
|
198
|
-
models: {},
|
|
199
|
-
tools: {
|
|
200
|
-
totalCalls: 0,
|
|
201
|
-
totalSuccess: 0,
|
|
202
|
-
totalFail: 0,
|
|
203
|
-
totalDurationMs: 0,
|
|
204
|
-
totalDecisions: {
|
|
205
|
-
[ToolCallDecision.ACCEPT]: 0,
|
|
206
|
-
[ToolCallDecision.REJECT]: 0,
|
|
207
|
-
[ToolCallDecision.MODIFY]: 0,
|
|
208
|
-
[ToolCallDecision.AUTO_ACCEPT]: 0,
|
|
209
|
-
},
|
|
210
|
-
byName: {},
|
|
211
|
-
},
|
|
212
|
-
files: {
|
|
213
|
-
totalLinesAdded: 0,
|
|
214
|
-
totalLinesRemoved: 0,
|
|
215
|
-
},
|
|
216
|
-
});
|
|
217
193
|
it('should aggregate token counts from single model', () => {
|
|
218
|
-
const metrics =
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
194
|
+
const metrics = {
|
|
195
|
+
models: {
|
|
196
|
+
'gemini-2.0-flash': {
|
|
197
|
+
api: {
|
|
198
|
+
totalRequests: 1,
|
|
199
|
+
totalErrors: 0,
|
|
200
|
+
totalLatencyMs: 1000,
|
|
201
|
+
},
|
|
202
|
+
tokens: {
|
|
203
|
+
prompt: 50,
|
|
204
|
+
candidates: 30,
|
|
205
|
+
total: 80,
|
|
206
|
+
cached: 0,
|
|
207
|
+
thoughts: 0,
|
|
208
|
+
tool: 0,
|
|
209
|
+
},
|
|
210
|
+
},
|
|
224
211
|
},
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
212
|
+
tools: {
|
|
213
|
+
totalCalls: 2,
|
|
214
|
+
totalSuccess: 2,
|
|
215
|
+
totalFail: 0,
|
|
216
|
+
totalDurationMs: 500,
|
|
217
|
+
totalDecisions: {
|
|
218
|
+
[ToolCallDecision.ACCEPT]: 0,
|
|
219
|
+
[ToolCallDecision.REJECT]: 0,
|
|
220
|
+
[ToolCallDecision.MODIFY]: 0,
|
|
221
|
+
[ToolCallDecision.AUTO_ACCEPT]: 2,
|
|
222
|
+
},
|
|
223
|
+
byName: {},
|
|
224
|
+
},
|
|
225
|
+
files: {
|
|
226
|
+
totalLinesAdded: 0,
|
|
227
|
+
totalLinesRemoved: 0,
|
|
233
228
|
},
|
|
234
229
|
};
|
|
235
|
-
metrics.tools.totalCalls = 2;
|
|
236
|
-
metrics.tools.totalDecisions[ToolCallDecision.AUTO_ACCEPT] = 2;
|
|
237
230
|
const result = formatter.convertToStreamStats(metrics, 1200);
|
|
238
231
|
expect(result).toEqual({
|
|
239
232
|
total_tokens: 80,
|
|
240
233
|
input_tokens: 50,
|
|
241
234
|
output_tokens: 30,
|
|
242
|
-
cached: 0,
|
|
243
|
-
input: 50,
|
|
244
235
|
duration_ms: 1200,
|
|
245
236
|
tool_calls: 2,
|
|
246
237
|
});
|
|
247
238
|
});
|
|
248
239
|
it('should aggregate token counts from multiple models', () => {
|
|
249
|
-
const metrics =
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
240
|
+
const metrics = {
|
|
241
|
+
models: {
|
|
242
|
+
'gemini-2.0-flash': {
|
|
243
|
+
api: {
|
|
244
|
+
totalRequests: 1,
|
|
245
|
+
totalErrors: 0,
|
|
246
|
+
totalLatencyMs: 1000,
|
|
247
|
+
},
|
|
248
|
+
tokens: {
|
|
249
|
+
prompt: 50,
|
|
250
|
+
candidates: 30,
|
|
251
|
+
total: 80,
|
|
252
|
+
cached: 0,
|
|
253
|
+
thoughts: 0,
|
|
254
|
+
tool: 0,
|
|
255
|
+
},
|
|
256
|
+
},
|
|
257
|
+
'gemini-1.5-pro': {
|
|
258
|
+
api: {
|
|
259
|
+
totalRequests: 1,
|
|
260
|
+
totalErrors: 0,
|
|
261
|
+
totalLatencyMs: 2000,
|
|
262
|
+
},
|
|
263
|
+
tokens: {
|
|
264
|
+
prompt: 100,
|
|
265
|
+
candidates: 70,
|
|
266
|
+
total: 170,
|
|
267
|
+
cached: 0,
|
|
268
|
+
thoughts: 0,
|
|
269
|
+
tool: 0,
|
|
270
|
+
},
|
|
271
|
+
},
|
|
260
272
|
},
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
273
|
+
tools: {
|
|
274
|
+
totalCalls: 5,
|
|
275
|
+
totalSuccess: 5,
|
|
276
|
+
totalFail: 0,
|
|
277
|
+
totalDurationMs: 1000,
|
|
278
|
+
totalDecisions: {
|
|
279
|
+
[ToolCallDecision.ACCEPT]: 0,
|
|
280
|
+
[ToolCallDecision.REJECT]: 0,
|
|
281
|
+
[ToolCallDecision.MODIFY]: 0,
|
|
282
|
+
[ToolCallDecision.AUTO_ACCEPT]: 5,
|
|
283
|
+
},
|
|
284
|
+
byName: {},
|
|
285
|
+
},
|
|
286
|
+
files: {
|
|
287
|
+
totalLinesAdded: 0,
|
|
288
|
+
totalLinesRemoved: 0,
|
|
272
289
|
},
|
|
273
290
|
};
|
|
274
|
-
metrics.tools.totalCalls = 5;
|
|
275
291
|
const result = formatter.convertToStreamStats(metrics, 3000);
|
|
276
292
|
expect(result).toEqual({
|
|
277
293
|
total_tokens: 250, // 80 + 170
|
|
278
294
|
input_tokens: 150, // 50 + 100
|
|
279
295
|
output_tokens: 100, // 30 + 70
|
|
280
|
-
cached: 0,
|
|
281
|
-
input: 150,
|
|
282
296
|
duration_ms: 3000,
|
|
283
297
|
tool_calls: 5,
|
|
284
298
|
});
|
|
285
299
|
});
|
|
286
|
-
it('should
|
|
287
|
-
const metrics =
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
300
|
+
it('should handle empty metrics', () => {
|
|
301
|
+
const metrics = {
|
|
302
|
+
models: {},
|
|
303
|
+
tools: {
|
|
304
|
+
totalCalls: 0,
|
|
305
|
+
totalSuccess: 0,
|
|
306
|
+
totalFail: 0,
|
|
307
|
+
totalDurationMs: 0,
|
|
308
|
+
totalDecisions: {
|
|
309
|
+
[ToolCallDecision.ACCEPT]: 0,
|
|
310
|
+
[ToolCallDecision.REJECT]: 0,
|
|
311
|
+
[ToolCallDecision.MODIFY]: 0,
|
|
312
|
+
[ToolCallDecision.AUTO_ACCEPT]: 0,
|
|
313
|
+
},
|
|
314
|
+
byName: {},
|
|
315
|
+
},
|
|
316
|
+
files: {
|
|
317
|
+
totalLinesAdded: 0,
|
|
318
|
+
totalLinesRemoved: 0,
|
|
298
319
|
},
|
|
299
320
|
};
|
|
300
|
-
const result = formatter.convertToStreamStats(metrics, 1200);
|
|
301
|
-
expect(result).toEqual({
|
|
302
|
-
total_tokens: 80,
|
|
303
|
-
input_tokens: 50,
|
|
304
|
-
output_tokens: 30,
|
|
305
|
-
cached: 30,
|
|
306
|
-
input: 20,
|
|
307
|
-
duration_ms: 1200,
|
|
308
|
-
tool_calls: 0,
|
|
309
|
-
});
|
|
310
|
-
});
|
|
311
|
-
it('should handle empty metrics', () => {
|
|
312
|
-
const metrics = createMockMetrics();
|
|
313
321
|
const result = formatter.convertToStreamStats(metrics, 100);
|
|
314
322
|
expect(result).toEqual({
|
|
315
323
|
total_tokens: 0,
|
|
316
324
|
input_tokens: 0,
|
|
317
325
|
output_tokens: 0,
|
|
318
|
-
cached: 0,
|
|
319
|
-
input: 0,
|
|
320
326
|
duration_ms: 100,
|
|
321
327
|
tool_calls: 0,
|
|
322
328
|
});
|
|
@@ -437,8 +443,6 @@ describe('StreamJsonFormatter', () => {
|
|
|
437
443
|
total_tokens: 0,
|
|
438
444
|
input_tokens: 0,
|
|
439
445
|
output_tokens: 0,
|
|
440
|
-
cached: 0,
|
|
441
|
-
input: 0,
|
|
442
446
|
duration_ms: 0,
|
|
443
447
|
tool_calls: 0,
|
|
444
448
|
},
|
|
@@ -458,8 +462,6 @@ describe('StreamJsonFormatter', () => {
|
|
|
458
462
|
total_tokens: 100,
|
|
459
463
|
input_tokens: 50,
|
|
460
464
|
output_tokens: 50,
|
|
461
|
-
cached: 0,
|
|
462
|
-
input: 50,
|
|
463
465
|
duration_ms: 1200,
|
|
464
466
|
tool_calls: 2,
|
|
465
467
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-json-formatter.test.js","sourceRoot":"","sources":["../../../src/output/stream-json-formatter.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stream-json-formatter.test.js","sourceRoot":"","sources":["../../../src/output/stream-json-formatter.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,11 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import * as fs from 'node:fs/promises';
|
|
7
6
|
import * as path from 'node:path';
|
|
8
7
|
import { fileURLToPath } from 'node:url';
|
|
9
8
|
import { Storage } from '../config/storage.js';
|
|
10
9
|
import { PolicyDecision, } from './types.js';
|
|
11
|
-
import { loadPoliciesFromToml
|
|
12
|
-
import toml from '@iarna/toml';
|
|
10
|
+
import { loadPoliciesFromToml } from './toml-loader.js';
|
|
13
11
|
import { MessageBusType, } from '../confirmation-bus/types.js';
|
|
14
12
|
import {} from '../confirmation-bus/message-bus.js';
|
|
15
13
|
import { coreEvents } from '../utils/events.js';
|
|
@@ -186,17 +184,8 @@ export async function createPolicyEngineConfig(settings, approvalMode, defaultPo
|
|
|
186
184
|
};
|
|
187
185
|
}
|
|
188
186
|
export function createPolicyUpdater(policyEngine, messageBus) {
|
|
189
|
-
messageBus.subscribe(MessageBusType.UPDATE_POLICY,
|
|
187
|
+
messageBus.subscribe(MessageBusType.UPDATE_POLICY, (message) => {
|
|
190
188
|
const toolName = message.toolName;
|
|
191
|
-
let argsPattern = message.argsPattern
|
|
192
|
-
? new RegExp(message.argsPattern)
|
|
193
|
-
: undefined;
|
|
194
|
-
if (message.commandPrefix) {
|
|
195
|
-
// Convert commandPrefix to argsPattern for in-memory rule
|
|
196
|
-
// This mimics what toml-loader does
|
|
197
|
-
const escapedPrefix = escapeRegex(message.commandPrefix);
|
|
198
|
-
argsPattern = new RegExp(`"command":"${escapedPrefix}`);
|
|
199
|
-
}
|
|
200
189
|
policyEngine.addRule({
|
|
201
190
|
toolName,
|
|
202
191
|
decision: PolicyDecision.ALLOW,
|
|
@@ -204,65 +193,7 @@ export function createPolicyUpdater(policyEngine, messageBus) {
|
|
|
204
193
|
// This ensures user "always allow" selections are high priority
|
|
205
194
|
// but still lose to admin policies (3.xxx) and settings excludes (200)
|
|
206
195
|
priority: 2.95,
|
|
207
|
-
argsPattern,
|
|
208
196
|
});
|
|
209
|
-
if (message.persist) {
|
|
210
|
-
try {
|
|
211
|
-
const userPoliciesDir = Storage.getUserPoliciesDir();
|
|
212
|
-
await fs.mkdir(userPoliciesDir, { recursive: true });
|
|
213
|
-
const policyFile = path.join(userPoliciesDir, 'auto-saved.toml');
|
|
214
|
-
// Read existing file
|
|
215
|
-
let existingData = {};
|
|
216
|
-
try {
|
|
217
|
-
const fileContent = await fs.readFile(policyFile, 'utf-8');
|
|
218
|
-
existingData = toml.parse(fileContent);
|
|
219
|
-
}
|
|
220
|
-
catch (error) {
|
|
221
|
-
if (error.code !== 'ENOENT') {
|
|
222
|
-
console.warn(`Failed to parse ${policyFile}, overwriting with new policy.`, error);
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
// Initialize rule array if needed
|
|
226
|
-
if (!existingData.rule) {
|
|
227
|
-
existingData.rule = [];
|
|
228
|
-
}
|
|
229
|
-
// Create new rule object
|
|
230
|
-
const newRule = {};
|
|
231
|
-
if (message.mcpName) {
|
|
232
|
-
newRule.mcpName = message.mcpName;
|
|
233
|
-
// Extract simple tool name
|
|
234
|
-
const simpleToolName = toolName.startsWith(`${message.mcpName}__`)
|
|
235
|
-
? toolName.slice(message.mcpName.length + 2)
|
|
236
|
-
: toolName;
|
|
237
|
-
newRule.toolName = simpleToolName;
|
|
238
|
-
newRule.decision = 'allow';
|
|
239
|
-
newRule.priority = 200;
|
|
240
|
-
}
|
|
241
|
-
else {
|
|
242
|
-
newRule.toolName = toolName;
|
|
243
|
-
newRule.decision = 'allow';
|
|
244
|
-
newRule.priority = 100;
|
|
245
|
-
}
|
|
246
|
-
if (message.commandPrefix) {
|
|
247
|
-
newRule.commandPrefix = message.commandPrefix;
|
|
248
|
-
}
|
|
249
|
-
else if (message.argsPattern) {
|
|
250
|
-
newRule.argsPattern = message.argsPattern;
|
|
251
|
-
}
|
|
252
|
-
// Add to rules
|
|
253
|
-
existingData.rule.push(newRule);
|
|
254
|
-
// Serialize back to TOML
|
|
255
|
-
// @iarna/toml stringify might not produce beautiful output but it handles escaping correctly
|
|
256
|
-
const newContent = toml.stringify(existingData);
|
|
257
|
-
// Atomic write: write to tmp then rename
|
|
258
|
-
const tmpFile = `${policyFile}.tmp`;
|
|
259
|
-
await fs.writeFile(tmpFile, newContent, 'utf-8');
|
|
260
|
-
await fs.rename(tmpFile, policyFile);
|
|
261
|
-
}
|
|
262
|
-
catch (error) {
|
|
263
|
-
coreEvents.emitFeedback('error', `Failed to persist policy for ${toolName}`, error);
|
|
264
|
-
}
|
|
265
|
-
}
|
|
266
197
|
});
|
|
267
198
|
}
|
|
268
199
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/policy/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/policy/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ import { PolicyDecision, getHookSource, } from './types.js';
|
|
|
8
8
|
import { stableStringify } from './stable-stringify.js';
|
|
9
9
|
import { debugLogger } from '../utils/debugLogger.js';
|
|
10
10
|
import { SafetyCheckDecision } from '../safety/protocol.js';
|
|
11
|
-
import { SHELL_TOOL_NAMES, initializeShellParsers, splitCommands, } from '../utils/shell-utils.js';
|
|
12
11
|
function ruleMatches(rule, toolCall, stringifiedArgs, serverName) {
|
|
13
12
|
// Check tool name if specified
|
|
14
13
|
if (rule.toolName) {
|
|
@@ -95,61 +94,8 @@ export class PolicyEngine {
|
|
|
95
94
|
for (const rule of this.rules) {
|
|
96
95
|
if (ruleMatches(rule, toolCall, stringifiedArgs, serverName)) {
|
|
97
96
|
debugLogger.debug(`[PolicyEngine.check] MATCHED rule: toolName=${rule.toolName}, decision=${rule.decision}, priority=${rule.priority}, argsPattern=${rule.argsPattern?.source || 'none'}`);
|
|
98
|
-
// Special handling for shell commands: check sub-commands if present
|
|
99
|
-
if (toolCall.name &&
|
|
100
|
-
SHELL_TOOL_NAMES.includes(toolCall.name) &&
|
|
101
|
-
rule.decision === PolicyDecision.ALLOW) {
|
|
102
|
-
const command = toolCall.args?.command;
|
|
103
|
-
if (command) {
|
|
104
|
-
await initializeShellParsers();
|
|
105
|
-
const subCommands = splitCommands(command);
|
|
106
|
-
// If there are multiple sub-commands, we must verify EACH of them matches an ALLOW rule.
|
|
107
|
-
// If any sub-command results in DENY -> the whole thing is DENY.
|
|
108
|
-
// If any sub-command results in ASK_USER -> the whole thing is ASK_USER (unless one is DENY).
|
|
109
|
-
// Only if ALL sub-commands are ALLOW do we proceed with ALLOW.
|
|
110
|
-
if (subCommands.length === 0) {
|
|
111
|
-
// This case occurs if the command is non-empty but parsing fails.
|
|
112
|
-
// An ALLOW rule for a prefix might have matched, but since the rest of
|
|
113
|
-
// the command is un-parseable, it's unsafe to proceed.
|
|
114
|
-
// Fall back to a safe decision.
|
|
115
|
-
debugLogger.debug(`[PolicyEngine.check] Command parsing failed for: ${command}. Falling back to safe decision because implicit ALLOW is unsafe.`);
|
|
116
|
-
decision = this.applyNonInteractiveMode(PolicyDecision.ASK_USER);
|
|
117
|
-
}
|
|
118
|
-
else if (subCommands.length > 1) {
|
|
119
|
-
debugLogger.debug(`[PolicyEngine.check] Compound command detected: ${subCommands.length} parts`);
|
|
120
|
-
let aggregateDecision = PolicyDecision.ALLOW;
|
|
121
|
-
for (const subCmd of subCommands) {
|
|
122
|
-
// Recursively check each sub-command
|
|
123
|
-
const subCall = {
|
|
124
|
-
name: toolCall.name,
|
|
125
|
-
args: { command: subCmd },
|
|
126
|
-
};
|
|
127
|
-
const subResult = await this.check(subCall, serverName);
|
|
128
|
-
if (subResult.decision === PolicyDecision.DENY) {
|
|
129
|
-
aggregateDecision = PolicyDecision.DENY;
|
|
130
|
-
break; // Fail fast
|
|
131
|
-
}
|
|
132
|
-
else if (subResult.decision === PolicyDecision.ASK_USER) {
|
|
133
|
-
aggregateDecision = PolicyDecision.ASK_USER;
|
|
134
|
-
// efficient: we can only strictly downgrade from ALLOW to ASK_USER,
|
|
135
|
-
// but we must continue looking for DENY.
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
decision = aggregateDecision;
|
|
139
|
-
}
|
|
140
|
-
else {
|
|
141
|
-
// Single command, rule match is valid
|
|
142
|
-
decision = this.applyNonInteractiveMode(rule.decision);
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
else {
|
|
146
|
-
decision = this.applyNonInteractiveMode(rule.decision);
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
else {
|
|
150
|
-
decision = this.applyNonInteractiveMode(rule.decision);
|
|
151
|
-
}
|
|
152
97
|
matchedRule = rule;
|
|
98
|
+
decision = this.applyNonInteractiveMode(rule.decision);
|
|
153
99
|
break;
|
|
154
100
|
}
|
|
155
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"policy-engine.js","sourceRoot":"","sources":["../../../src/policy/policy-engine.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAqB,MAAM,eAAe,CAAC;AAClD,OAAO,EACL,cAAc,EAMd,aAAa,GACd,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"policy-engine.js","sourceRoot":"","sources":["../../../src/policy/policy-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,14 +29,6 @@ export interface PolicyLoadResult {
|
|
|
29
29
|
checkers: SafetyCheckerRule[];
|
|
30
30
|
errors: PolicyFileError[];
|
|
31
31
|
}
|
|
32
|
-
/**
|
|
33
|
-
* Escapes special regex characters in a string for use in a regex pattern.
|
|
34
|
-
* This is used for commandPrefix to ensure literal string matching.
|
|
35
|
-
*
|
|
36
|
-
* @param str The string to escape
|
|
37
|
-
* @returns The escaped string safe for use in a regex
|
|
38
|
-
*/
|
|
39
|
-
export declare function escapeRegex(str: string): string;
|
|
40
32
|
/**
|
|
41
33
|
* Loads and parses policies from TOML files in the specified directories.
|
|
42
34
|
*
|
|
@@ -75,7 +75,7 @@ const PolicyFileSchema = z.object({
|
|
|
75
75
|
* @param str The string to escape
|
|
76
76
|
* @returns The escaped string safe for use in a regex
|
|
77
77
|
*/
|
|
78
|
-
|
|
78
|
+
function escapeRegex(str) {
|
|
79
79
|
return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
80
80
|
}
|
|
81
81
|
/**
|
|
@@ -268,7 +268,7 @@ export async function loadPoliciesFromToml(approvalMode, policyDirs, getPolicyTi
|
|
|
268
268
|
}
|
|
269
269
|
// Expand command prefixes to multiple patterns
|
|
270
270
|
const argsPatterns = commandPrefixes.length > 0
|
|
271
|
-
? commandPrefixes.map((prefix) => `"command":"${escapeRegex(prefix)}
|
|
271
|
+
? commandPrefixes.map((prefix) => `"command":"${escapeRegex(prefix)}`)
|
|
272
272
|
: [effectiveArgsPattern];
|
|
273
273
|
// For each argsPattern, expand toolName arrays
|
|
274
274
|
return argsPatterns.flatMap((argsPattern) => {
|
|
@@ -342,7 +342,7 @@ export async function loadPoliciesFromToml(approvalMode, policyDirs, getPolicyTi
|
|
|
342
342
|
effectiveArgsPattern = `"command":"${checker.commandRegex}`;
|
|
343
343
|
}
|
|
344
344
|
const argsPatterns = commandPrefixes.length > 0
|
|
345
|
-
? commandPrefixes.map((prefix) => `"command":"${escapeRegex(prefix)}
|
|
345
|
+
? commandPrefixes.map((prefix) => `"command":"${escapeRegex(prefix)}`)
|
|
346
346
|
: [effectiveArgsPattern];
|
|
347
347
|
return argsPatterns.flatMap((argsPattern) => {
|
|
348
348
|
const toolNames = checker.toolName
|