@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpointUtils.js","sourceRoot":"","sources":["../../../src/utils/checkpointUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAGlC,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAexB,MAAM,aAAa,GAAG,CAAC;KACpB,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;CACtC,CAAC;KACD,WAAW,EAAE,CAAC;AAEjB,MAAM,UAAU,qBAAqB,CAAC,iBAAgC;IACpE,MAAM,MAAM,GAAG,iBAAiB,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;IAE5C,OAAO,CAAC,CAAC,MAAM,CAAC;QACd,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;QACnC,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;QAChD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACjC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;SAC5B,CAAC;QACF,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KACjC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,QAA6B;IAE7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"checkpointUtils.js","sourceRoot":"","sources":["../../../src/utils/checkpointUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ export declare abstract class ExtensionLoader {
|
|
|
46
46
|
* then calls `startExtension` to include all extension features into the
|
|
47
47
|
* program.
|
|
48
48
|
*/
|
|
49
|
-
protected maybeStartExtension(extension: GeminiCLIExtension): Promise<void
|
|
49
|
+
protected maybeStartExtension(extension: GeminiCLIExtension): Promise<void> | undefined;
|
|
50
50
|
/**
|
|
51
51
|
* Unconditionally stops an `extension` and unloads all its MCP servers,
|
|
52
52
|
* context, custom commands, etc. Assumes that `start` has already been called
|
|
@@ -62,7 +62,7 @@ export declare abstract class ExtensionLoader {
|
|
|
62
62
|
* then this also performs all necessary steps to remove all extension
|
|
63
63
|
* features from the rest of the system.
|
|
64
64
|
*/
|
|
65
|
-
protected maybeStopExtension(extension: GeminiCLIExtension): Promise<void
|
|
65
|
+
protected maybeStopExtension(extension: GeminiCLIExtension): Promise<void> | undefined;
|
|
66
66
|
restartExtension(extension: GeminiCLIExtension): Promise<void>;
|
|
67
67
|
}
|
|
68
68
|
export interface ExtensionEvents {
|
|
@@ -94,7 +94,6 @@ export class ExtensionLoader {
|
|
|
94
94
|
// reload memory, this is somewhat expensive and also busts the context
|
|
95
95
|
// cache, we want to only do it once.
|
|
96
96
|
await refreshServerHierarchicalMemory(this.config);
|
|
97
|
-
await this.config.getHookSystem()?.initialize();
|
|
98
97
|
}
|
|
99
98
|
}
|
|
100
99
|
/**
|
|
@@ -114,10 +113,11 @@ export class ExtensionLoader {
|
|
|
114
113
|
* then calls `startExtension` to include all extension features into the
|
|
115
114
|
* program.
|
|
116
115
|
*/
|
|
117
|
-
|
|
116
|
+
maybeStartExtension(extension) {
|
|
118
117
|
if (this.config && this.config.getEnableExtensionReloading()) {
|
|
119
|
-
|
|
118
|
+
return this.startExtension(extension);
|
|
120
119
|
}
|
|
120
|
+
return;
|
|
121
121
|
}
|
|
122
122
|
/**
|
|
123
123
|
* Unconditionally stops an `extension` and unloads all its MCP servers,
|
|
@@ -165,10 +165,11 @@ export class ExtensionLoader {
|
|
|
165
165
|
* then this also performs all necessary steps to remove all extension
|
|
166
166
|
* features from the rest of the system.
|
|
167
167
|
*/
|
|
168
|
-
|
|
168
|
+
maybeStopExtension(extension) {
|
|
169
169
|
if (this.config && this.config.getEnableExtensionReloading()) {
|
|
170
|
-
|
|
170
|
+
return this.stopExtension(extension);
|
|
171
171
|
}
|
|
172
|
+
return;
|
|
172
173
|
}
|
|
173
174
|
async restartExtension(extension) {
|
|
174
175
|
await this.stopExtension(extension);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensionLoader.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"extensionLoader.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,6 @@ describe('SimpleExtensionLoader', () => {
|
|
|
19
19
|
let extensionReloadingEnabled;
|
|
20
20
|
let mockMcpClientManager;
|
|
21
21
|
let mockGeminiClientSetTools;
|
|
22
|
-
let mockHookSystemInit;
|
|
23
22
|
const activeExtension = {
|
|
24
23
|
name: 'test-extension',
|
|
25
24
|
isActive: true,
|
|
@@ -44,7 +43,6 @@ describe('SimpleExtensionLoader', () => {
|
|
|
44
43
|
};
|
|
45
44
|
extensionReloadingEnabled = false;
|
|
46
45
|
mockGeminiClientSetTools = vi.fn();
|
|
47
|
-
mockHookSystemInit = vi.fn();
|
|
48
46
|
mockConfig = {
|
|
49
47
|
getMcpClientManager: () => mockMcpClientManager,
|
|
50
48
|
getEnableExtensionReloading: () => extensionReloadingEnabled,
|
|
@@ -52,9 +50,6 @@ describe('SimpleExtensionLoader', () => {
|
|
|
52
50
|
isInitialized: () => true,
|
|
53
51
|
setTools: mockGeminiClientSetTools,
|
|
54
52
|
})),
|
|
55
|
-
getHookSystem: () => ({
|
|
56
|
-
initialize: mockHookSystemInit,
|
|
57
|
-
}),
|
|
58
53
|
};
|
|
59
54
|
});
|
|
60
55
|
afterEach(() => {
|
|
@@ -97,29 +92,24 @@ describe('SimpleExtensionLoader', () => {
|
|
|
97
92
|
if (reloadingEnabled) {
|
|
98
93
|
expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
|
|
99
94
|
expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
|
|
100
|
-
expect(mockHookSystemInit).toHaveBeenCalledOnce();
|
|
101
95
|
expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
|
|
102
96
|
}
|
|
103
97
|
else {
|
|
104
98
|
expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
|
|
105
99
|
expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
|
|
106
|
-
expect(mockHookSystemInit).not.toHaveBeenCalled();
|
|
107
100
|
expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
|
|
108
101
|
}
|
|
109
102
|
mockRefreshServerHierarchicalMemory.mockClear();
|
|
110
|
-
mockHookSystemInit.mockClear();
|
|
111
103
|
mockGeminiClientSetTools.mockClear();
|
|
112
104
|
await loader.unloadExtension(activeExtension);
|
|
113
105
|
if (reloadingEnabled) {
|
|
114
106
|
expect(mockMcpClientManager.stopExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
|
|
115
107
|
expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
|
|
116
|
-
expect(mockHookSystemInit).toHaveBeenCalledOnce();
|
|
117
108
|
expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
|
|
118
109
|
}
|
|
119
110
|
else {
|
|
120
111
|
expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
|
|
121
112
|
expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
|
|
122
|
-
expect(mockHookSystemInit).not.toHaveBeenCalled();
|
|
123
113
|
expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
|
|
124
114
|
}
|
|
125
115
|
});
|
|
@@ -137,7 +127,6 @@ describe('SimpleExtensionLoader', () => {
|
|
|
137
127
|
loader.loadExtension(anotherExtension),
|
|
138
128
|
]);
|
|
139
129
|
expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
|
|
140
|
-
expect(mockHookSystemInit).toHaveBeenCalledOnce();
|
|
141
130
|
});
|
|
142
131
|
});
|
|
143
132
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensionLoader.test.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EACR,MAAM,EACN,EAAE,EACF,EAAE,EACF,UAAU,EACV,SAAS,GAEV,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAyB,MAAM,gCAAgC,CAAC;AAGvE,MAAM,mCAAmC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAEtE,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;IACrD,MAAM,MAAM,GAAG,MAAM,YAAY,EAAyC,CAAC;IAC3E,OAAO;QACL,GAAG,MAAM;QACT,+BAA+B,EAAE,mCAAmC;KACrE,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,UAAkB,CAAC;IACvB,IAAI,yBAAkC,CAAC;IACvC,IAAI,oBAAsC,CAAC;IAC3C,IAAI,wBAEH,CAAC;
|
|
1
|
+
{"version":3,"file":"extensionLoader.test.js","sourceRoot":"","sources":["../../../src/utils/extensionLoader.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crawlCache.js","sourceRoot":"","sources":["../../../../src/utils/filesearch/crawlCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;AAC/C,MAAM,WAAW,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEtD;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,SAAiB,EACjB,aAAqB,EACrB,QAAiB,EACT,EAAE;IACV,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAwB,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/E;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,OAAiB,EAAE,KAAa,EAAQ,EAAE;IAC3E,sEAAsE;IACtE,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"crawlCache.js","sourceRoot":"","sources":["../../../../src/utils/filesearch/crawlCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;AAC/C,MAAM,WAAW,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEtD;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,SAAiB,EACjB,aAAqB,EACrB,QAAiB,EACT,EAAE;IACV,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACvB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAW,EAAwB,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/E;;GAEG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAW,EAAE,OAAiB,EAAE,KAAa,EAAQ,EAAE;IAC3E,sEAAsE;IACtE,IAAI,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,CAAC;IACtC,CAAC;IAED,qBAAqB;IACrB,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAE7B,oEAAoE;IACpE,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC,EAAE,KAAK,CAAC,CAAC;IAEV,oEAAoE;IACpE,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,GAAS,EAAE;IAC9B,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3C,YAAY,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IACD,UAAU,CAAC,KAAK,EAAE,CAAC;IACnB,WAAW,CAAC,KAAK,EAAE,CAAC;AACtB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileSearch.js","sourceRoot":"","sources":["../../../../src/utils/filesearch/fileSearch.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fileSearch.js","sourceRoot":"","sources":["../../../../src/utils/filesearch/fileSearch.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import * as fs from 'node:fs';
|
|
7
7
|
import * as path from 'node:path';
|
|
8
|
-
import { bfsFileSearchSync } from './bfsFileSearch.js';
|
|
9
8
|
export function correctPath(filePath, config) {
|
|
10
9
|
// Check for direct path relative to the primary target directory.
|
|
11
10
|
const directPath = path.join(config.getTargetDir(), filePath);
|
|
@@ -14,18 +13,9 @@ export function correctPath(filePath, config) {
|
|
|
14
13
|
}
|
|
15
14
|
// If not found directly, search across all workspace directories for ambiguous matches.
|
|
16
15
|
const workspaceContext = config.getWorkspaceContext();
|
|
16
|
+
const fileSystem = config.getFileSystemService();
|
|
17
17
|
const searchPaths = workspaceContext.getDirectories();
|
|
18
|
-
const
|
|
19
|
-
const normalizedTarget = filePath.replace(/\\/g, '/');
|
|
20
|
-
// Normalize path for matching and check if it ends with the provided relative path
|
|
21
|
-
const foundFiles = searchPaths
|
|
22
|
-
.flatMap((searchPath) => bfsFileSearchSync(searchPath, {
|
|
23
|
-
fileName: basename,
|
|
24
|
-
maxDirs: 50, // Capped to avoid deep hangs
|
|
25
|
-
fileService: config.getFileService(),
|
|
26
|
-
fileFilteringOptions: config.getFileFilteringOptions(),
|
|
27
|
-
}))
|
|
28
|
-
.filter((f) => f.replace(/\\/g, '/').endsWith(normalizedTarget));
|
|
18
|
+
const foundFiles = fileSystem.findFiles(filePath, searchPaths);
|
|
29
19
|
if (foundFiles.length === 0) {
|
|
30
20
|
return {
|
|
31
21
|
success: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathCorrector.js","sourceRoot":"","sources":["../../../src/utils/pathCorrector.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"pathCorrector.js","sourceRoot":"","sources":["../../../src/utils/pathCorrector.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAwBlC,MAAM,UAAU,WAAW,CACzB,QAAgB,EAChB,MAAc;IAEd,kEAAkE;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC9D,IAAI,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;IACtD,CAAC;IAED,wFAAwF;IACxF,MAAM,gBAAgB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,MAAM,CAAC,oBAAoB,EAAE,CAAC;IACjD,MAAM,WAAW,GAAG,gBAAgB,CAAC,cAAc,EAAE,CAAC;IACtD,MAAM,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAE/D,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,uBAAuB,QAAQ,6BAA6B;SACpE,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,kBAAkB,QAAQ,4FAA4F,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;SACrJ,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;AACzD,CAAC"}
|
|
@@ -8,7 +8,7 @@ import * as fs from 'node:fs';
|
|
|
8
8
|
import * as path from 'node:path';
|
|
9
9
|
import * as os from 'node:os';
|
|
10
10
|
import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
|
|
11
|
-
import {
|
|
11
|
+
import { StandardFileSystemService } from '../services/fileSystemService.js';
|
|
12
12
|
import { correctPath } from './pathCorrector.js';
|
|
13
13
|
describe('pathCorrector', () => {
|
|
14
14
|
let tempDir;
|
|
@@ -24,11 +24,7 @@ describe('pathCorrector', () => {
|
|
|
24
24
|
mockConfig = {
|
|
25
25
|
getTargetDir: () => rootDir,
|
|
26
26
|
getWorkspaceContext: () => createMockWorkspaceContext(rootDir, [otherWorkspaceDir]),
|
|
27
|
-
|
|
28
|
-
getFileFilteringOptions: () => ({
|
|
29
|
-
respectGitIgnore: true,
|
|
30
|
-
respectGeminiIgnore: true,
|
|
31
|
-
}),
|
|
27
|
+
getFileSystemService: () => new StandardFileSystemService(),
|
|
32
28
|
};
|
|
33
29
|
});
|
|
34
30
|
afterEach(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pathCorrector.test.js","sourceRoot":"","sources":["../../../src/utils/pathCorrector.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pathCorrector.test.js","sourceRoot":"","sources":["../../../src/utils/pathCorrector.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
+
import type { AnyToolInvocation } from '../index.js';
|
|
7
|
+
import type { Config } from '../config/config.js';
|
|
6
8
|
import { type SpawnOptionsWithoutStdio } from 'node:child_process';
|
|
7
9
|
export declare const SHELL_TOOL_NAMES: string[];
|
|
8
10
|
/**
|
|
@@ -23,15 +25,6 @@ export interface ShellConfiguration {
|
|
|
23
25
|
shell: ShellType;
|
|
24
26
|
}
|
|
25
27
|
export declare function initializeShellParsers(): Promise<void>;
|
|
26
|
-
export interface ParsedCommandDetail {
|
|
27
|
-
name: string;
|
|
28
|
-
text: string;
|
|
29
|
-
}
|
|
30
|
-
interface CommandParseResult {
|
|
31
|
-
details: ParsedCommandDetail[];
|
|
32
|
-
hasError: boolean;
|
|
33
|
-
}
|
|
34
|
-
export declare function parseCommandDetails(command: string): CommandParseResult | null;
|
|
35
28
|
/**
|
|
36
29
|
* Determines the appropriate shell configuration for the current platform.
|
|
37
30
|
*
|
|
@@ -80,6 +73,36 @@ export declare function stripShellWrapper(command: string): string;
|
|
|
80
73
|
* @param command The shell command string to check
|
|
81
74
|
* @returns true if command substitution would be executed by bash
|
|
82
75
|
*/
|
|
76
|
+
/**
|
|
77
|
+
* Checks a shell command against security policies and allowlists.
|
|
78
|
+
*
|
|
79
|
+
* This function operates in one of two modes depending on the presence of
|
|
80
|
+
* the `sessionAllowlist` parameter:
|
|
81
|
+
*
|
|
82
|
+
* 1. **"Default Deny" Mode (sessionAllowlist is provided):** This is the
|
|
83
|
+
* strictest mode, used for user-defined scripts like custom commands.
|
|
84
|
+
* A command is only permitted if it is found on the global `coreTools`
|
|
85
|
+
* allowlist OR the provided `sessionAllowlist`. It must not be on the
|
|
86
|
+
* global `excludeTools` blocklist.
|
|
87
|
+
*
|
|
88
|
+
* 2. **"Default Allow" Mode (sessionAllowlist is NOT provided):** This mode
|
|
89
|
+
* is used for direct tool invocations (e.g., by the model). If a strict
|
|
90
|
+
* global `coreTools` allowlist exists, commands must be on it. Otherwise,
|
|
91
|
+
* any command is permitted as long as it is not on the `excludeTools`
|
|
92
|
+
* blocklist.
|
|
93
|
+
*
|
|
94
|
+
* @param command The shell command string to validate.
|
|
95
|
+
* @param config The application configuration.
|
|
96
|
+
* @param sessionAllowlist A session-level list of approved commands. Its
|
|
97
|
+
* presence activates "Default Deny" mode.
|
|
98
|
+
* @returns An object detailing which commands are not allowed.
|
|
99
|
+
*/
|
|
100
|
+
export declare function checkCommandPermissions(command: string, config: Config, sessionAllowlist?: Set<string>): {
|
|
101
|
+
allAllowed: boolean;
|
|
102
|
+
disallowedCommands: string[];
|
|
103
|
+
blockReason?: string;
|
|
104
|
+
isHardDenial?: boolean;
|
|
105
|
+
};
|
|
83
106
|
/**
|
|
84
107
|
* Determines whether a given shell command is allowed to execute based on
|
|
85
108
|
* the tool's configuration including allowlists and blocklists.
|
|
@@ -95,4 +118,18 @@ export declare const spawnAsync: (command: string, args: string[], options?: Spa
|
|
|
95
118
|
stdout: string;
|
|
96
119
|
stderr: string;
|
|
97
120
|
}>;
|
|
98
|
-
export {
|
|
121
|
+
export declare function isCommandAllowed(command: string, config: Config): {
|
|
122
|
+
allowed: boolean;
|
|
123
|
+
reason?: string;
|
|
124
|
+
};
|
|
125
|
+
/**
|
|
126
|
+
* Determines whether a shell invocation should be auto-approved based on an allowlist.
|
|
127
|
+
*
|
|
128
|
+
* This reuses the same parsing logic as command-permission enforcement so that
|
|
129
|
+
* chained commands must be individually covered by the allowlist.
|
|
130
|
+
*
|
|
131
|
+
* @param invocation The shell tool invocation being evaluated.
|
|
132
|
+
* @param allowedPatterns The configured allowlist patterns (e.g. `run_shell_command(git)`).
|
|
133
|
+
* @returns True if every parsed command segment is allowed by the patterns; false otherwise.
|
|
134
|
+
*/
|
|
135
|
+
export declare function isShellInvocationAllowlisted(invocation: AnyToolInvocation, allowedPatterns: string[]): boolean;
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import os from 'node:os';
|
|
7
7
|
import { quote } from 'shell-quote';
|
|
8
|
+
import { doesToolInvocationMatch } from './tool-utils.js';
|
|
8
9
|
import { spawn, spawnSync, } from 'node:child_process';
|
|
9
10
|
import { Language, Parser } from 'web-tree-sitter';
|
|
10
11
|
import { loadWasmBinary } from './fileUtils.js';
|
|
@@ -297,7 +298,7 @@ function parsePowerShellCommandDetails(command, executable) {
|
|
|
297
298
|
return null;
|
|
298
299
|
}
|
|
299
300
|
}
|
|
300
|
-
|
|
301
|
+
function parseCommandDetails(command) {
|
|
301
302
|
const configuration = getShellConfiguration();
|
|
302
303
|
if (configuration.shell === 'powershell') {
|
|
303
304
|
return parsePowerShellCommandDetails(command, configuration.executable);
|
|
@@ -427,6 +428,132 @@ export function stripShellWrapper(command) {
|
|
|
427
428
|
* @param command The shell command string to check
|
|
428
429
|
* @returns true if command substitution would be executed by bash
|
|
429
430
|
*/
|
|
431
|
+
/**
|
|
432
|
+
* Checks a shell command against security policies and allowlists.
|
|
433
|
+
*
|
|
434
|
+
* This function operates in one of two modes depending on the presence of
|
|
435
|
+
* the `sessionAllowlist` parameter:
|
|
436
|
+
*
|
|
437
|
+
* 1. **"Default Deny" Mode (sessionAllowlist is provided):** This is the
|
|
438
|
+
* strictest mode, used for user-defined scripts like custom commands.
|
|
439
|
+
* A command is only permitted if it is found on the global `coreTools`
|
|
440
|
+
* allowlist OR the provided `sessionAllowlist`. It must not be on the
|
|
441
|
+
* global `excludeTools` blocklist.
|
|
442
|
+
*
|
|
443
|
+
* 2. **"Default Allow" Mode (sessionAllowlist is NOT provided):** This mode
|
|
444
|
+
* is used for direct tool invocations (e.g., by the model). If a strict
|
|
445
|
+
* global `coreTools` allowlist exists, commands must be on it. Otherwise,
|
|
446
|
+
* any command is permitted as long as it is not on the `excludeTools`
|
|
447
|
+
* blocklist.
|
|
448
|
+
*
|
|
449
|
+
* @param command The shell command string to validate.
|
|
450
|
+
* @param config The application configuration.
|
|
451
|
+
* @param sessionAllowlist A session-level list of approved commands. Its
|
|
452
|
+
* presence activates "Default Deny" mode.
|
|
453
|
+
* @returns An object detailing which commands are not allowed.
|
|
454
|
+
*/
|
|
455
|
+
export function checkCommandPermissions(command, config, sessionAllowlist) {
|
|
456
|
+
const parseResult = parseCommandDetails(command);
|
|
457
|
+
if (!parseResult || parseResult.hasError) {
|
|
458
|
+
return {
|
|
459
|
+
allAllowed: false,
|
|
460
|
+
disallowedCommands: [command],
|
|
461
|
+
blockReason: 'Command rejected because it could not be parsed safely',
|
|
462
|
+
isHardDenial: true,
|
|
463
|
+
};
|
|
464
|
+
}
|
|
465
|
+
const normalize = (cmd) => cmd.trim().replace(/\s+/g, ' ');
|
|
466
|
+
const commandsToValidate = parseResult.details
|
|
467
|
+
.map((detail) => normalize(detail.text))
|
|
468
|
+
.filter(Boolean);
|
|
469
|
+
const invocation = {
|
|
470
|
+
params: { command: '' },
|
|
471
|
+
};
|
|
472
|
+
// 1. Blocklist Check (Highest Priority)
|
|
473
|
+
const excludeTools = config.getExcludeTools() || new Set([]);
|
|
474
|
+
const isWildcardBlocked = SHELL_TOOL_NAMES.some((name) => excludeTools.has(name));
|
|
475
|
+
if (isWildcardBlocked) {
|
|
476
|
+
return {
|
|
477
|
+
allAllowed: false,
|
|
478
|
+
disallowedCommands: commandsToValidate,
|
|
479
|
+
blockReason: 'Shell tool is globally disabled in configuration',
|
|
480
|
+
isHardDenial: true,
|
|
481
|
+
};
|
|
482
|
+
}
|
|
483
|
+
for (const cmd of commandsToValidate) {
|
|
484
|
+
invocation.params['command'] = cmd;
|
|
485
|
+
if (doesToolInvocationMatch('run_shell_command', invocation, [
|
|
486
|
+
...excludeTools,
|
|
487
|
+
])) {
|
|
488
|
+
return {
|
|
489
|
+
allAllowed: false,
|
|
490
|
+
disallowedCommands: [cmd],
|
|
491
|
+
blockReason: `Command '${cmd}' is blocked by configuration`,
|
|
492
|
+
isHardDenial: true,
|
|
493
|
+
};
|
|
494
|
+
}
|
|
495
|
+
}
|
|
496
|
+
const coreTools = config.getCoreTools() || [];
|
|
497
|
+
const isWildcardAllowed = SHELL_TOOL_NAMES.some((name) => coreTools.includes(name));
|
|
498
|
+
// If there's a global wildcard, all commands are allowed at this point
|
|
499
|
+
// because they have already passed the blocklist check.
|
|
500
|
+
if (isWildcardAllowed) {
|
|
501
|
+
return { allAllowed: true, disallowedCommands: [] };
|
|
502
|
+
}
|
|
503
|
+
const disallowedCommands = [];
|
|
504
|
+
if (sessionAllowlist) {
|
|
505
|
+
// "DEFAULT DENY" MODE: A session allowlist is provided.
|
|
506
|
+
// All commands must be in either the session or global allowlist.
|
|
507
|
+
const normalizedSessionAllowlist = new Set([...sessionAllowlist].flatMap((cmd) => SHELL_TOOL_NAMES.map((name) => `${name}(${cmd})`)));
|
|
508
|
+
for (const cmd of commandsToValidate) {
|
|
509
|
+
invocation.params['command'] = cmd;
|
|
510
|
+
const isSessionAllowed = doesToolInvocationMatch('run_shell_command', invocation, [...normalizedSessionAllowlist]);
|
|
511
|
+
if (isSessionAllowed)
|
|
512
|
+
continue;
|
|
513
|
+
const isGloballyAllowed = doesToolInvocationMatch('run_shell_command', invocation, coreTools);
|
|
514
|
+
if (isGloballyAllowed)
|
|
515
|
+
continue;
|
|
516
|
+
disallowedCommands.push(cmd);
|
|
517
|
+
}
|
|
518
|
+
if (disallowedCommands.length > 0) {
|
|
519
|
+
return {
|
|
520
|
+
allAllowed: false,
|
|
521
|
+
disallowedCommands,
|
|
522
|
+
blockReason: `Command(s) not on the global or session allowlist. Disallowed commands: ${disallowedCommands
|
|
523
|
+
.map((c) => JSON.stringify(c))
|
|
524
|
+
.join(', ')}`,
|
|
525
|
+
isHardDenial: false, // This is a soft denial; confirmation is possible.
|
|
526
|
+
};
|
|
527
|
+
}
|
|
528
|
+
}
|
|
529
|
+
else {
|
|
530
|
+
// "DEFAULT ALLOW" MODE: No session allowlist.
|
|
531
|
+
const hasSpecificAllowedCommands = coreTools.filter((tool) => SHELL_TOOL_NAMES.some((name) => tool.startsWith(`${name}(`))).length > 0;
|
|
532
|
+
if (hasSpecificAllowedCommands) {
|
|
533
|
+
for (const cmd of commandsToValidate) {
|
|
534
|
+
invocation.params['command'] = cmd;
|
|
535
|
+
const isGloballyAllowed = doesToolInvocationMatch('run_shell_command', invocation, coreTools);
|
|
536
|
+
if (!isGloballyAllowed) {
|
|
537
|
+
disallowedCommands.push(cmd);
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
if (disallowedCommands.length > 0) {
|
|
541
|
+
return {
|
|
542
|
+
allAllowed: false,
|
|
543
|
+
disallowedCommands,
|
|
544
|
+
blockReason: `Command(s) not in the allowed commands list. Disallowed commands: ${disallowedCommands
|
|
545
|
+
.map((c) => JSON.stringify(c))
|
|
546
|
+
.join(', ')}`,
|
|
547
|
+
isHardDenial: false, // This is a soft denial.
|
|
548
|
+
};
|
|
549
|
+
}
|
|
550
|
+
}
|
|
551
|
+
// If no specific global allowlist exists, and it passed the blocklist,
|
|
552
|
+
// the command is allowed by default.
|
|
553
|
+
}
|
|
554
|
+
// If all checks for the current mode pass, the command is allowed.
|
|
555
|
+
return { allAllowed: true, disallowedCommands: [] };
|
|
556
|
+
}
|
|
430
557
|
/**
|
|
431
558
|
* Determines whether a given shell command is allowed to execute based on
|
|
432
559
|
* the tool's configuration including allowlists and blocklists.
|
|
@@ -460,4 +587,58 @@ export const spawnAsync = (command, args, options) => new Promise((resolve, reje
|
|
|
460
587
|
reject(err);
|
|
461
588
|
});
|
|
462
589
|
});
|
|
590
|
+
export function isCommandAllowed(command, config) {
|
|
591
|
+
// By not providing a sessionAllowlist, we invoke "default allow" behavior.
|
|
592
|
+
const { allAllowed, blockReason } = checkCommandPermissions(command, config);
|
|
593
|
+
if (allAllowed) {
|
|
594
|
+
return { allowed: true };
|
|
595
|
+
}
|
|
596
|
+
return { allowed: false, reason: blockReason };
|
|
597
|
+
}
|
|
598
|
+
/**
|
|
599
|
+
* Determines whether a shell invocation should be auto-approved based on an allowlist.
|
|
600
|
+
*
|
|
601
|
+
* This reuses the same parsing logic as command-permission enforcement so that
|
|
602
|
+
* chained commands must be individually covered by the allowlist.
|
|
603
|
+
*
|
|
604
|
+
* @param invocation The shell tool invocation being evaluated.
|
|
605
|
+
* @param allowedPatterns The configured allowlist patterns (e.g. `run_shell_command(git)`).
|
|
606
|
+
* @returns True if every parsed command segment is allowed by the patterns; false otherwise.
|
|
607
|
+
*/
|
|
608
|
+
export function isShellInvocationAllowlisted(invocation, allowedPatterns) {
|
|
609
|
+
if (!allowedPatterns.length) {
|
|
610
|
+
return false;
|
|
611
|
+
}
|
|
612
|
+
const hasShellWildcard = allowedPatterns.some((pattern) => SHELL_TOOL_NAMES.includes(pattern));
|
|
613
|
+
const hasShellSpecificPattern = allowedPatterns.some((pattern) => SHELL_TOOL_NAMES.some((name) => pattern.startsWith(`${name}(`)));
|
|
614
|
+
if (!hasShellWildcard && !hasShellSpecificPattern) {
|
|
615
|
+
return false;
|
|
616
|
+
}
|
|
617
|
+
if (hasShellWildcard) {
|
|
618
|
+
return true;
|
|
619
|
+
}
|
|
620
|
+
if (!('params' in invocation) ||
|
|
621
|
+
typeof invocation.params !== 'object' ||
|
|
622
|
+
invocation.params === null ||
|
|
623
|
+
!('command' in invocation.params)) {
|
|
624
|
+
return false;
|
|
625
|
+
}
|
|
626
|
+
const commandValue = invocation.params.command;
|
|
627
|
+
if (typeof commandValue !== 'string' || !commandValue.trim()) {
|
|
628
|
+
return false;
|
|
629
|
+
}
|
|
630
|
+
const command = commandValue.trim();
|
|
631
|
+
const parseResult = parseCommandDetails(command);
|
|
632
|
+
if (!parseResult || parseResult.hasError) {
|
|
633
|
+
return false;
|
|
634
|
+
}
|
|
635
|
+
const normalize = (cmd) => cmd.trim().replace(/\s+/g, ' ');
|
|
636
|
+
const commandsToValidate = parseResult.details
|
|
637
|
+
.map((detail) => normalize(detail.text))
|
|
638
|
+
.filter(Boolean);
|
|
639
|
+
if (commandsToValidate.length === 0) {
|
|
640
|
+
return false;
|
|
641
|
+
}
|
|
642
|
+
return commandsToValidate.every((commandSegment) => doesToolInvocationMatch(SHELL_TOOL_NAMES[0], { params: { command: commandSegment } }, allowedPatterns));
|
|
643
|
+
}
|
|
463
644
|
//# sourceMappingURL=shell-utils.js.map
|