@google/gemini-cli-core 0.34.0-preview.2 → 0.35.0-nightly.20260313.bb060d7a9
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 +19 -0
- package/dist/docs/changelogs/latest.md +214 -191
- package/dist/docs/changelogs/preview.md +447 -184
- package/dist/docs/cli/model-routing.md +18 -1
- package/dist/docs/cli/model-steering.md +79 -0
- package/dist/docs/cli/plan-mode.md +99 -14
- package/dist/docs/cli/settings.md +14 -12
- package/dist/docs/cli/telemetry.md +45 -0
- package/dist/docs/cli/tutorials/plan-mode-steering.md +89 -0
- package/dist/docs/core/index.md +2 -0
- package/dist/docs/core/local-model-routing.md +193 -0
- package/dist/docs/reference/configuration.md +27 -3
- package/dist/docs/reference/keyboard-shortcuts.md +168 -90
- package/dist/docs/reference/policy-engine.md +30 -6
- package/dist/docs/resources/troubleshooting.md +15 -0
- package/dist/docs/sidebar.json +10 -0
- package/dist/docs/tools/shell.md +8 -0
- package/dist/google-gemini-cli-core-0.35.0-nightly.20260311.657f19c1f.tgz +0 -0
- package/dist/src/agents/a2a-client-manager.d.ts +11 -4
- package/dist/src/agents/a2a-client-manager.js +61 -34
- package/dist/src/agents/a2a-client-manager.js.map +1 -1
- package/dist/src/agents/a2a-client-manager.test.js +178 -115
- package/dist/src/agents/a2a-client-manager.test.js.map +1 -1
- package/dist/src/agents/a2aUtils.d.ts +4 -28
- package/dist/src/agents/a2aUtils.js +20 -181
- package/dist/src/agents/a2aUtils.js.map +1 -1
- package/dist/src/agents/a2aUtils.test.js +19 -106
- package/dist/src/agents/a2aUtils.test.js.map +1 -1
- package/dist/src/agents/agent-scheduler.d.ts +2 -0
- package/dist/src/agents/agent-scheduler.js +3 -2
- package/dist/src/agents/agent-scheduler.js.map +1 -1
- package/dist/src/agents/agent-scheduler.test.js +12 -3
- package/dist/src/agents/agent-scheduler.test.js.map +1 -1
- package/dist/src/agents/agentLoader.d.ts +2 -2
- package/dist/src/agents/agentLoader.js +15 -0
- package/dist/src/agents/agentLoader.js.map +1 -1
- package/dist/src/agents/auth-provider/factory.d.ts +2 -0
- package/dist/src/agents/auth-provider/factory.js +6 -3
- package/dist/src/agents/auth-provider/factory.js.map +1 -1
- package/dist/src/agents/auth-provider/google-credentials-provider.d.ts +26 -0
- package/dist/src/agents/auth-provider/google-credentials-provider.js +117 -0
- package/dist/src/agents/auth-provider/google-credentials-provider.js.map +1 -0
- package/dist/src/agents/auth-provider/google-credentials-provider.test.d.ts +6 -0
- package/dist/src/agents/auth-provider/google-credentials-provider.test.js +126 -0
- package/dist/src/agents/auth-provider/google-credentials-provider.test.js.map +1 -0
- package/dist/src/agents/browser/browserAgentFactory.js +11 -2
- package/dist/src/agents/browser/browserAgentFactory.js.map +1 -1
- package/dist/src/agents/browser/browserAgentInvocation.d.ts +4 -3
- package/dist/src/agents/browser/browserAgentInvocation.js +10 -4
- package/dist/src/agents/browser/browserAgentInvocation.js.map +1 -1
- package/dist/src/agents/browser/browserAgentInvocation.test.js +1 -0
- package/dist/src/agents/browser/browserAgentInvocation.test.js.map +1 -1
- package/dist/src/agents/browser/browserManager.d.ts +10 -0
- package/dist/src/agents/browser/browserManager.js +53 -8
- package/dist/src/agents/browser/browserManager.js.map +1 -1
- package/dist/src/agents/browser/inputBlocker.d.ts +51 -0
- package/dist/src/agents/browser/inputBlocker.js +234 -0
- package/dist/src/agents/browser/inputBlocker.js.map +1 -0
- package/dist/src/agents/browser/inputBlocker.test.d.ts +6 -0
- package/dist/src/agents/browser/inputBlocker.test.js +82 -0
- package/dist/src/agents/browser/inputBlocker.test.js.map +1 -0
- package/dist/src/agents/browser/mcpToolWrapper.d.ts +3 -2
- package/dist/src/agents/browser/mcpToolWrapper.js +49 -8
- package/dist/src/agents/browser/mcpToolWrapper.js.map +1 -1
- package/dist/src/agents/browser/mcpToolWrapper.test.js +51 -0
- package/dist/src/agents/browser/mcpToolWrapper.test.js.map +1 -1
- package/dist/src/agents/local-executor.d.ts +5 -4
- package/dist/src/agents/local-executor.js +30 -25
- package/dist/src/agents/local-executor.js.map +1 -1
- package/dist/src/agents/local-executor.test.js +269 -3
- package/dist/src/agents/local-executor.test.js.map +1 -1
- package/dist/src/agents/local-invocation.d.ts +4 -4
- package/dist/src/agents/local-invocation.js +12 -9
- package/dist/src/agents/local-invocation.js.map +1 -1
- package/dist/src/agents/local-invocation.test.js +19 -3
- package/dist/src/agents/local-invocation.test.js.map +1 -1
- package/dist/src/agents/registry.js +3 -2
- package/dist/src/agents/registry.js.map +1 -1
- package/dist/src/agents/registry.test.js +1 -0
- package/dist/src/agents/registry.test.js.map +1 -1
- package/dist/src/agents/remote-invocation.d.ts +0 -9
- package/dist/src/agents/remote-invocation.js +1 -28
- package/dist/src/agents/remote-invocation.js.map +1 -1
- package/dist/src/agents/remote-invocation.test.js +1 -0
- package/dist/src/agents/remote-invocation.test.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.d.ts +5 -4
- package/dist/src/agents/subagent-tool-wrapper.js +9 -5
- package/dist/src/agents/subagent-tool-wrapper.js.map +1 -1
- package/dist/src/agents/subagent-tool-wrapper.test.js +15 -1
- package/dist/src/agents/subagent-tool-wrapper.test.js.map +1 -1
- package/dist/src/agents/subagent-tool.d.ts +3 -3
- package/dist/src/agents/subagent-tool.js +16 -12
- package/dist/src/agents/subagent-tool.js.map +1 -1
- package/dist/src/agents/subagent-tool.test.js +13 -3
- package/dist/src/agents/subagent-tool.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.js +0 -1
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/server.js +2 -2
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +5 -1
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/telemetry.d.ts +2 -2
- package/dist/src/code_assist/telemetry.js +5 -3
- package/dist/src/code_assist/telemetry.js.map +1 -1
- package/dist/src/code_assist/telemetry.test.js +14 -12
- package/dist/src/code_assist/telemetry.test.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +14 -12
- package/dist/src/code_assist/types.js.map +1 -1
- package/dist/src/config/agent-loop-context.d.ts +3 -0
- package/dist/src/config/config.d.ts +75 -2
- package/dist/src/config/config.js +78 -11
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +170 -10
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/models.d.ts +14 -0
- package/dist/src/config/models.js +37 -0
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +51 -1
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/config/storage.d.ts +1 -0
- package/dist/src/config/storage.js +3 -0
- package/dist/src/config/storage.js.map +1 -1
- package/dist/src/core/baseLlmClient.js +19 -3
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +2 -0
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.d.ts +4 -3
- package/dist/src/core/client.js +42 -17
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +8 -0
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +1 -0
- package/dist/src/core/contentGenerator.js +35 -3
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +137 -2
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolHookTriggers.d.ts +2 -3
- package/dist/src/core/coreToolHookTriggers.js +5 -11
- package/dist/src/core/coreToolHookTriggers.js.map +1 -1
- package/dist/src/core/coreToolHookTriggers.test.js +24 -0
- package/dist/src/core/coreToolHookTriggers.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.js +1 -1
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/geminiChat.js +31 -21
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +6 -4
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/geminiChat_network_retry.test.js +21 -11
- package/dist/src/core/geminiChat_network_retry.test.js.map +1 -1
- package/dist/src/fallback/handler.js +0 -4
- package/dist/src/fallback/handler.js.map +1 -1
- package/dist/src/fallback/handler.test.js +0 -6
- package/dist/src/fallback/handler.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ide/detect-ide.d.ts +8 -0
- package/dist/src/ide/detect-ide.js +12 -1
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/detect-ide.test.js +12 -0
- package/dist/src/ide/detect-ide.test.js.map +1 -1
- package/dist/src/ide/ide-installer.js +20 -8
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +60 -4
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/mcp/oauth-provider.js +0 -2
- package/dist/src/mcp/oauth-provider.js.map +1 -1
- package/dist/src/mcp/oauth-utils.js +0 -2
- package/dist/src/mcp/oauth-utils.js.map +1 -1
- package/dist/src/policy/config.d.ts +14 -2
- package/dist/src/policy/config.js +94 -49
- package/dist/src/policy/config.js.map +1 -1
- package/dist/src/policy/config.test.js +208 -488
- package/dist/src/policy/config.test.js.map +1 -1
- package/dist/src/policy/policies/plan.toml +1 -1
- package/dist/src/policy/stable-stringify.js +15 -5
- package/dist/src/policy/stable-stringify.js.map +1 -1
- package/dist/src/policy/types.d.ts +1 -0
- package/dist/src/policy/types.js.map +1 -1
- package/dist/src/policy/utils.d.ts +17 -0
- package/dist/src/policy/utils.js +27 -7
- package/dist/src/policy/utils.js.map +1 -1
- package/dist/src/prompts/snippets.js +2 -1
- package/dist/src/prompts/snippets.js.map +1 -1
- package/dist/src/prompts/utils.test.d.ts +6 -0
- package/dist/src/prompts/utils.test.js +225 -0
- package/dist/src/prompts/utils.test.js.map +1 -0
- package/dist/src/routing/modelRouterService.js +2 -2
- package/dist/src/routing/modelRouterService.js.map +1 -1
- package/dist/src/routing/modelRouterService.test.js +4 -3
- package/dist/src/routing/modelRouterService.test.js.map +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.js +6 -40
- package/dist/src/routing/strategies/numericalClassifierStrategy.js.map +1 -1
- package/dist/src/routing/strategies/numericalClassifierStrategy.test.js +29 -64
- package/dist/src/routing/strategies/numericalClassifierStrategy.test.js.map +1 -1
- package/dist/src/scheduler/policy.d.ts +3 -7
- package/dist/src/scheduler/policy.js +4 -3
- package/dist/src/scheduler/policy.js.map +1 -1
- package/dist/src/scheduler/policy.test.js +51 -31
- package/dist/src/scheduler/policy.test.js.map +1 -1
- package/dist/src/scheduler/scheduler.d.ts +4 -2
- package/dist/src/scheduler/scheduler.js +19 -16
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/scheduler/scheduler.test.js +33 -10
- package/dist/src/scheduler/scheduler.test.js.map +1 -1
- package/dist/src/scheduler/scheduler_parallel.test.js +40 -2
- package/dist/src/scheduler/scheduler_parallel.test.js.map +1 -1
- package/dist/src/scheduler/scheduler_waiting_callback.test.js +1 -1
- package/dist/src/scheduler/scheduler_waiting_callback.test.js.map +1 -1
- package/dist/src/scheduler/tool-executor.d.ts +3 -3
- package/dist/src/scheduler/tool-executor.js +15 -21
- package/dist/src/scheduler/tool-executor.js.map +1 -1
- package/dist/src/scheduler/tool-executor.test.js +43 -8
- package/dist/src/scheduler/tool-executor.test.js.map +1 -1
- package/dist/src/services/chatRecordingService.js +2 -1
- package/dist/src/services/chatRecordingService.js.map +1 -1
- package/dist/src/services/chatRecordingService.test.js +21 -0
- package/dist/src/services/chatRecordingService.test.js.map +1 -1
- package/dist/src/services/executionLifecycleService.d.ts +83 -0
- package/dist/src/services/executionLifecycleService.js +271 -0
- package/dist/src/services/executionLifecycleService.js.map +1 -0
- package/dist/src/services/executionLifecycleService.test.d.ts +6 -0
- package/dist/src/services/executionLifecycleService.test.js +227 -0
- package/dist/src/services/executionLifecycleService.test.js.map +1 -0
- package/dist/src/services/sandboxManager.d.ts +54 -0
- package/dist/src/services/sandboxManager.js +30 -0
- package/dist/src/services/sandboxManager.js.map +1 -0
- package/dist/src/services/sandboxManager.test.d.ts +6 -0
- package/dist/src/services/sandboxManager.test.js +95 -0
- package/dist/src/services/sandboxManager.test.js.map +1 -0
- package/dist/src/services/shellExecutionService.d.ts +4 -52
- package/dist/src/services/shellExecutionService.js +437 -498
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +10 -21
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +13 -2
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +91 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +77 -0
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +10 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +25 -1
- package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +3 -3
- package/dist/src/telemetry/index.js +3 -3
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.d.ts +2 -1
- package/dist/src/telemetry/loggers.js +32 -1
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +37 -2
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/metrics.d.ts +13 -0
- package/dist/src/telemetry/metrics.js +17 -0
- package/dist/src/telemetry/metrics.js.map +1 -1
- package/dist/src/telemetry/startupProfiler.js +4 -4
- package/dist/src/telemetry/startupProfiler.js.map +1 -1
- package/dist/src/telemetry/startupProfiler.test.js +19 -0
- package/dist/src/telemetry/startupProfiler.test.js.map +1 -1
- package/dist/src/telemetry/telemetry-utils.test.js +3 -3
- package/dist/src/telemetry/types.d.ts +16 -2
- package/dist/src/telemetry/types.js +34 -0
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.d.ts +7 -0
- package/dist/src/telemetry/uiTelemetry.js +78 -0
- package/dist/src/telemetry/uiTelemetry.js.map +1 -1
- package/dist/src/telemetry/uiTelemetry.test.js +101 -0
- package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
- package/dist/src/tools/exit-plan-mode.js +10 -2
- package/dist/src/tools/exit-plan-mode.js.map +1 -1
- package/dist/src/tools/exit-plan-mode.test.js +15 -0
- package/dist/src/tools/exit-plan-mode.test.js.map +1 -1
- package/dist/src/tools/ls.js +2 -2
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/mcp-client.js +0 -1
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +4 -0
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/mcp-tool.test.js +10 -1
- package/dist/src/tools/mcp-tool.test.js.map +1 -1
- package/dist/src/tools/read-many-files.js +2 -4
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/shell.d.ts +1 -1
- package/dist/src/tools/shell.js +3 -3
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +4 -0
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +34 -1
- package/dist/src/tools/tools.js +47 -1
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.d.ts +5 -0
- package/dist/src/tools/web-fetch.js +177 -100
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-fetch.test.js +130 -26
- package/dist/src/tools/web-fetch.test.js.map +1 -1
- package/dist/src/tools/web-search.test.js +2 -0
- package/dist/src/tools/web-search.test.js.map +1 -1
- package/dist/src/utils/fetch.d.ts +0 -29
- package/dist/src/utils/fetch.js +10 -123
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/fetch.test.js +1 -103
- package/dist/src/utils/fetch.test.js.map +1 -1
- package/dist/src/utils/language-detection.js +96 -89
- package/dist/src/utils/language-detection.js.map +1 -1
- package/dist/src/utils/language-detection.test.d.ts +6 -0
- package/dist/src/utils/language-detection.test.js +39 -0
- package/dist/src/utils/language-detection.test.js.map +1 -0
- package/dist/src/utils/oauth-flow.js +0 -2
- package/dist/src/utils/oauth-flow.js.map +1 -1
- package/dist/src/utils/paths.js +5 -2
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.js +11 -0
- package/dist/src/utils/paths.test.js.map +1 -1
- package/dist/src/utils/process-utils.js +18 -4
- package/dist/src/utils/process-utils.js.map +1 -1
- package/dist/src/utils/process-utils.test.js +32 -10
- package/dist/src/utils/process-utils.test.js.map +1 -1
- package/dist/src/utils/retry.d.ts +7 -0
- package/dist/src/utils/retry.js +40 -3
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +13 -0
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/summarizer.test.js +5 -0
- package/dist/src/utils/summarizer.test.js.map +1 -1
- package/dist/src/utils/surface.d.ts +18 -0
- package/dist/src/utils/surface.js +46 -0
- package/dist/src/utils/surface.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/google-gemini-cli-core-0.34.0-preview.1.tgz +0 -0
|
@@ -0,0 +1,271 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
const NON_PROCESS_EXECUTION_ID_START = 2_000_000_000;
|
|
7
|
+
/**
|
|
8
|
+
* Central owner for execution backgrounding lifecycle across shell and tools.
|
|
9
|
+
*/
|
|
10
|
+
export class ExecutionLifecycleService {
|
|
11
|
+
static EXIT_INFO_TTL_MS = 5 * 60 * 1000;
|
|
12
|
+
static nextExecutionId = NON_PROCESS_EXECUTION_ID_START;
|
|
13
|
+
static activeExecutions = new Map();
|
|
14
|
+
static activeResolvers = new Map();
|
|
15
|
+
static activeListeners = new Map();
|
|
16
|
+
static exitedExecutionInfo = new Map();
|
|
17
|
+
static storeExitInfo(executionId, exitCode, signal) {
|
|
18
|
+
this.exitedExecutionInfo.set(executionId, {
|
|
19
|
+
exitCode,
|
|
20
|
+
signal,
|
|
21
|
+
});
|
|
22
|
+
setTimeout(() => {
|
|
23
|
+
this.exitedExecutionInfo.delete(executionId);
|
|
24
|
+
}, this.EXIT_INFO_TTL_MS).unref();
|
|
25
|
+
}
|
|
26
|
+
static allocateExecutionId() {
|
|
27
|
+
let executionId = ++this.nextExecutionId;
|
|
28
|
+
while (this.activeExecutions.has(executionId)) {
|
|
29
|
+
executionId = ++this.nextExecutionId;
|
|
30
|
+
}
|
|
31
|
+
return executionId;
|
|
32
|
+
}
|
|
33
|
+
static createPendingResult(executionId) {
|
|
34
|
+
return new Promise((resolve) => {
|
|
35
|
+
this.activeResolvers.set(executionId, resolve);
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
static createAbortedResult(executionId, execution) {
|
|
39
|
+
const output = execution.getBackgroundOutput?.() ?? execution.output;
|
|
40
|
+
return {
|
|
41
|
+
rawOutput: Buffer.from(output, 'utf8'),
|
|
42
|
+
output,
|
|
43
|
+
exitCode: 130,
|
|
44
|
+
signal: null,
|
|
45
|
+
error: new Error('Operation cancelled by user.'),
|
|
46
|
+
aborted: true,
|
|
47
|
+
pid: executionId,
|
|
48
|
+
executionMethod: execution.executionMethod,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Resets lifecycle state for isolated unit tests.
|
|
53
|
+
*/
|
|
54
|
+
static resetForTest() {
|
|
55
|
+
this.activeExecutions.clear();
|
|
56
|
+
this.activeResolvers.clear();
|
|
57
|
+
this.activeListeners.clear();
|
|
58
|
+
this.exitedExecutionInfo.clear();
|
|
59
|
+
this.nextExecutionId = NON_PROCESS_EXECUTION_ID_START;
|
|
60
|
+
}
|
|
61
|
+
static attachExecution(executionId, registration) {
|
|
62
|
+
if (this.activeExecutions.has(executionId) ||
|
|
63
|
+
this.activeResolvers.has(executionId)) {
|
|
64
|
+
throw new Error(`Execution ${executionId} is already attached.`);
|
|
65
|
+
}
|
|
66
|
+
this.exitedExecutionInfo.delete(executionId);
|
|
67
|
+
this.activeExecutions.set(executionId, {
|
|
68
|
+
executionMethod: registration.executionMethod,
|
|
69
|
+
output: registration.initialOutput ?? '',
|
|
70
|
+
kind: 'external',
|
|
71
|
+
getBackgroundOutput: registration.getBackgroundOutput,
|
|
72
|
+
getSubscriptionSnapshot: registration.getSubscriptionSnapshot,
|
|
73
|
+
writeInput: registration.writeInput,
|
|
74
|
+
kill: registration.kill,
|
|
75
|
+
isActive: registration.isActive,
|
|
76
|
+
});
|
|
77
|
+
return {
|
|
78
|
+
pid: executionId,
|
|
79
|
+
result: this.createPendingResult(executionId),
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
static createExecution(initialOutput = '', onKill, executionMethod = 'none') {
|
|
83
|
+
const executionId = this.allocateExecutionId();
|
|
84
|
+
this.activeExecutions.set(executionId, {
|
|
85
|
+
executionMethod,
|
|
86
|
+
output: initialOutput,
|
|
87
|
+
kind: 'virtual',
|
|
88
|
+
onKill,
|
|
89
|
+
getBackgroundOutput: () => {
|
|
90
|
+
const state = this.activeExecutions.get(executionId);
|
|
91
|
+
return state?.output ?? initialOutput;
|
|
92
|
+
},
|
|
93
|
+
getSubscriptionSnapshot: () => {
|
|
94
|
+
const state = this.activeExecutions.get(executionId);
|
|
95
|
+
return state?.output ?? initialOutput;
|
|
96
|
+
},
|
|
97
|
+
});
|
|
98
|
+
return {
|
|
99
|
+
pid: executionId,
|
|
100
|
+
result: this.createPendingResult(executionId),
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
static appendOutput(executionId, chunk) {
|
|
104
|
+
const execution = this.activeExecutions.get(executionId);
|
|
105
|
+
if (!execution || chunk.length === 0) {
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
execution.output += chunk;
|
|
109
|
+
this.emitEvent(executionId, { type: 'data', chunk });
|
|
110
|
+
}
|
|
111
|
+
static emitEvent(executionId, event) {
|
|
112
|
+
const listeners = this.activeListeners.get(executionId);
|
|
113
|
+
if (listeners) {
|
|
114
|
+
listeners.forEach((listener) => listener(event));
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
static resolvePending(executionId, result) {
|
|
118
|
+
const resolve = this.activeResolvers.get(executionId);
|
|
119
|
+
if (!resolve) {
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
resolve(result);
|
|
123
|
+
this.activeResolvers.delete(executionId);
|
|
124
|
+
}
|
|
125
|
+
static settleExecution(executionId, result) {
|
|
126
|
+
if (!this.activeExecutions.has(executionId)) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
this.resolvePending(executionId, result);
|
|
130
|
+
this.emitEvent(executionId, {
|
|
131
|
+
type: 'exit',
|
|
132
|
+
exitCode: result.exitCode,
|
|
133
|
+
signal: result.signal,
|
|
134
|
+
});
|
|
135
|
+
this.activeListeners.delete(executionId);
|
|
136
|
+
this.activeExecutions.delete(executionId);
|
|
137
|
+
this.storeExitInfo(executionId, result.exitCode ?? 0, result.signal ?? undefined);
|
|
138
|
+
}
|
|
139
|
+
static completeExecution(executionId, options) {
|
|
140
|
+
const execution = this.activeExecutions.get(executionId);
|
|
141
|
+
if (!execution) {
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
const { error = null, aborted = false, exitCode = error ? 1 : 0, signal = null, } = options ?? {};
|
|
145
|
+
const output = execution.getBackgroundOutput?.() ?? execution.output;
|
|
146
|
+
this.settleExecution(executionId, {
|
|
147
|
+
rawOutput: Buffer.from(output, 'utf8'),
|
|
148
|
+
output,
|
|
149
|
+
exitCode,
|
|
150
|
+
signal,
|
|
151
|
+
error,
|
|
152
|
+
aborted,
|
|
153
|
+
pid: executionId,
|
|
154
|
+
executionMethod: execution.executionMethod,
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
static completeWithResult(executionId, result) {
|
|
158
|
+
this.settleExecution(executionId, result);
|
|
159
|
+
}
|
|
160
|
+
static background(executionId) {
|
|
161
|
+
const resolve = this.activeResolvers.get(executionId);
|
|
162
|
+
if (!resolve) {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
const execution = this.activeExecutions.get(executionId);
|
|
166
|
+
if (!execution) {
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
const output = execution.getBackgroundOutput?.() ?? execution.output;
|
|
170
|
+
resolve({
|
|
171
|
+
rawOutput: Buffer.from(''),
|
|
172
|
+
output,
|
|
173
|
+
exitCode: null,
|
|
174
|
+
signal: null,
|
|
175
|
+
error: null,
|
|
176
|
+
aborted: false,
|
|
177
|
+
pid: executionId,
|
|
178
|
+
executionMethod: execution.executionMethod,
|
|
179
|
+
backgrounded: true,
|
|
180
|
+
});
|
|
181
|
+
this.activeResolvers.delete(executionId);
|
|
182
|
+
}
|
|
183
|
+
static subscribe(executionId, listener) {
|
|
184
|
+
if (!this.activeListeners.has(executionId)) {
|
|
185
|
+
this.activeListeners.set(executionId, new Set());
|
|
186
|
+
}
|
|
187
|
+
this.activeListeners.get(executionId)?.add(listener);
|
|
188
|
+
const execution = this.activeExecutions.get(executionId);
|
|
189
|
+
if (execution) {
|
|
190
|
+
const snapshot = execution.getSubscriptionSnapshot?.() ??
|
|
191
|
+
(execution.output.length > 0 ? execution.output : undefined);
|
|
192
|
+
if (snapshot && (typeof snapshot !== 'string' || snapshot.length > 0)) {
|
|
193
|
+
listener({ type: 'data', chunk: snapshot });
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
return () => {
|
|
197
|
+
this.activeListeners.get(executionId)?.delete(listener);
|
|
198
|
+
if (this.activeListeners.get(executionId)?.size === 0) {
|
|
199
|
+
this.activeListeners.delete(executionId);
|
|
200
|
+
}
|
|
201
|
+
};
|
|
202
|
+
}
|
|
203
|
+
static onExit(executionId, callback) {
|
|
204
|
+
if (this.activeExecutions.has(executionId)) {
|
|
205
|
+
const listener = (event) => {
|
|
206
|
+
if (event.type === 'exit') {
|
|
207
|
+
callback(event.exitCode ?? 0, event.signal ?? undefined);
|
|
208
|
+
unsubscribe();
|
|
209
|
+
}
|
|
210
|
+
};
|
|
211
|
+
const unsubscribe = this.subscribe(executionId, listener);
|
|
212
|
+
return unsubscribe;
|
|
213
|
+
}
|
|
214
|
+
const exitedInfo = this.exitedExecutionInfo.get(executionId);
|
|
215
|
+
if (exitedInfo) {
|
|
216
|
+
callback(exitedInfo.exitCode, exitedInfo.signal);
|
|
217
|
+
}
|
|
218
|
+
return () => { };
|
|
219
|
+
}
|
|
220
|
+
static kill(executionId) {
|
|
221
|
+
const execution = this.activeExecutions.get(executionId);
|
|
222
|
+
if (!execution) {
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
if (execution.kind === 'virtual') {
|
|
226
|
+
execution.onKill?.();
|
|
227
|
+
}
|
|
228
|
+
if (execution.kind === 'external') {
|
|
229
|
+
execution.kill?.();
|
|
230
|
+
}
|
|
231
|
+
this.completeWithResult(executionId, this.createAbortedResult(executionId, execution));
|
|
232
|
+
}
|
|
233
|
+
static isActive(executionId) {
|
|
234
|
+
const execution = this.activeExecutions.get(executionId);
|
|
235
|
+
if (!execution) {
|
|
236
|
+
if (executionId >= NON_PROCESS_EXECUTION_ID_START) {
|
|
237
|
+
return false;
|
|
238
|
+
}
|
|
239
|
+
try {
|
|
240
|
+
return process.kill(executionId, 0);
|
|
241
|
+
}
|
|
242
|
+
catch {
|
|
243
|
+
return false;
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
if (execution.kind === 'virtual') {
|
|
247
|
+
return true;
|
|
248
|
+
}
|
|
249
|
+
if (execution.kind === 'external' && execution.isActive) {
|
|
250
|
+
try {
|
|
251
|
+
return execution.isActive();
|
|
252
|
+
}
|
|
253
|
+
catch {
|
|
254
|
+
return false;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
try {
|
|
258
|
+
return process.kill(executionId, 0);
|
|
259
|
+
}
|
|
260
|
+
catch {
|
|
261
|
+
return false;
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
static writeInput(executionId, input) {
|
|
265
|
+
const execution = this.activeExecutions.get(executionId);
|
|
266
|
+
if (execution?.kind === 'external') {
|
|
267
|
+
execution.writeInput?.(input);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
//# sourceMappingURL=executionLifecycleService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executionLifecycleService.js","sourceRoot":"","sources":["../../../src/services/executionLifecycleService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,227 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
7
|
+
import { ExecutionLifecycleService, } from './executionLifecycleService.js';
|
|
8
|
+
function createResult(overrides = {}) {
|
|
9
|
+
return {
|
|
10
|
+
rawOutput: Buffer.from(''),
|
|
11
|
+
output: '',
|
|
12
|
+
exitCode: 0,
|
|
13
|
+
signal: null,
|
|
14
|
+
error: null,
|
|
15
|
+
aborted: false,
|
|
16
|
+
pid: 123,
|
|
17
|
+
executionMethod: 'child_process',
|
|
18
|
+
...overrides,
|
|
19
|
+
};
|
|
20
|
+
}
|
|
21
|
+
describe('ExecutionLifecycleService', () => {
|
|
22
|
+
beforeEach(() => {
|
|
23
|
+
ExecutionLifecycleService.resetForTest();
|
|
24
|
+
});
|
|
25
|
+
it('completes managed executions in the foreground and notifies exit subscribers', async () => {
|
|
26
|
+
const handle = ExecutionLifecycleService.createExecution();
|
|
27
|
+
if (handle.pid === undefined) {
|
|
28
|
+
throw new Error('Expected execution ID.');
|
|
29
|
+
}
|
|
30
|
+
const onExit = vi.fn();
|
|
31
|
+
const unsubscribe = ExecutionLifecycleService.onExit(handle.pid, onExit);
|
|
32
|
+
ExecutionLifecycleService.appendOutput(handle.pid, 'Hello');
|
|
33
|
+
ExecutionLifecycleService.appendOutput(handle.pid, ' World');
|
|
34
|
+
ExecutionLifecycleService.completeExecution(handle.pid, {
|
|
35
|
+
exitCode: 0,
|
|
36
|
+
});
|
|
37
|
+
const result = await handle.result;
|
|
38
|
+
expect(result.output).toBe('Hello World');
|
|
39
|
+
expect(result.executionMethod).toBe('none');
|
|
40
|
+
expect(result.backgrounded).toBeUndefined();
|
|
41
|
+
await vi.waitFor(() => {
|
|
42
|
+
expect(onExit).toHaveBeenCalledWith(0, undefined);
|
|
43
|
+
});
|
|
44
|
+
unsubscribe();
|
|
45
|
+
});
|
|
46
|
+
it('supports explicit execution methods for managed executions', async () => {
|
|
47
|
+
const handle = ExecutionLifecycleService.createExecution('', undefined, 'remote_agent');
|
|
48
|
+
if (handle.pid === undefined) {
|
|
49
|
+
throw new Error('Expected execution ID.');
|
|
50
|
+
}
|
|
51
|
+
ExecutionLifecycleService.completeExecution(handle.pid, {
|
|
52
|
+
exitCode: 0,
|
|
53
|
+
});
|
|
54
|
+
const result = await handle.result;
|
|
55
|
+
expect(result.executionMethod).toBe('remote_agent');
|
|
56
|
+
});
|
|
57
|
+
it('supports backgrounding managed executions and continues streaming updates', async () => {
|
|
58
|
+
const handle = ExecutionLifecycleService.createExecution();
|
|
59
|
+
if (handle.pid === undefined) {
|
|
60
|
+
throw new Error('Expected execution ID.');
|
|
61
|
+
}
|
|
62
|
+
const chunks = [];
|
|
63
|
+
const onExit = vi.fn();
|
|
64
|
+
const unsubscribeStream = ExecutionLifecycleService.subscribe(handle.pid, (event) => {
|
|
65
|
+
if (event.type === 'data' && typeof event.chunk === 'string') {
|
|
66
|
+
chunks.push(event.chunk);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
const unsubscribeExit = ExecutionLifecycleService.onExit(handle.pid, onExit);
|
|
70
|
+
ExecutionLifecycleService.appendOutput(handle.pid, 'Chunk 1');
|
|
71
|
+
ExecutionLifecycleService.background(handle.pid);
|
|
72
|
+
const backgroundResult = await handle.result;
|
|
73
|
+
expect(backgroundResult.backgrounded).toBe(true);
|
|
74
|
+
expect(backgroundResult.output).toBe('Chunk 1');
|
|
75
|
+
ExecutionLifecycleService.appendOutput(handle.pid, '\nChunk 2');
|
|
76
|
+
ExecutionLifecycleService.completeExecution(handle.pid, {
|
|
77
|
+
exitCode: 0,
|
|
78
|
+
});
|
|
79
|
+
await vi.waitFor(() => {
|
|
80
|
+
expect(chunks.join('')).toContain('Chunk 2');
|
|
81
|
+
expect(onExit).toHaveBeenCalledWith(0, undefined);
|
|
82
|
+
});
|
|
83
|
+
unsubscribeStream();
|
|
84
|
+
unsubscribeExit();
|
|
85
|
+
});
|
|
86
|
+
it('kills managed executions and resolves with aborted result', async () => {
|
|
87
|
+
const onKill = vi.fn();
|
|
88
|
+
const handle = ExecutionLifecycleService.createExecution('', onKill);
|
|
89
|
+
if (handle.pid === undefined) {
|
|
90
|
+
throw new Error('Expected execution ID.');
|
|
91
|
+
}
|
|
92
|
+
ExecutionLifecycleService.appendOutput(handle.pid, 'work');
|
|
93
|
+
ExecutionLifecycleService.kill(handle.pid);
|
|
94
|
+
const result = await handle.result;
|
|
95
|
+
expect(onKill).toHaveBeenCalledTimes(1);
|
|
96
|
+
expect(result.aborted).toBe(true);
|
|
97
|
+
expect(result.exitCode).toBe(130);
|
|
98
|
+
expect(result.error?.message).toContain('Operation cancelled by user');
|
|
99
|
+
});
|
|
100
|
+
it('does not probe OS process state for completed non-process execution IDs', async () => {
|
|
101
|
+
const handle = ExecutionLifecycleService.createExecution();
|
|
102
|
+
if (handle.pid === undefined) {
|
|
103
|
+
throw new Error('Expected execution ID.');
|
|
104
|
+
}
|
|
105
|
+
ExecutionLifecycleService.completeExecution(handle.pid, { exitCode: 0 });
|
|
106
|
+
await handle.result;
|
|
107
|
+
const processKillSpy = vi.spyOn(process, 'kill');
|
|
108
|
+
expect(ExecutionLifecycleService.isActive(handle.pid)).toBe(false);
|
|
109
|
+
expect(processKillSpy).not.toHaveBeenCalled();
|
|
110
|
+
processKillSpy.mockRestore();
|
|
111
|
+
});
|
|
112
|
+
it('manages external executions through registration hooks', async () => {
|
|
113
|
+
const writeInput = vi.fn();
|
|
114
|
+
const isActive = vi.fn().mockReturnValue(true);
|
|
115
|
+
const exitListener = vi.fn();
|
|
116
|
+
const chunks = [];
|
|
117
|
+
let output = 'seed';
|
|
118
|
+
const handle = ExecutionLifecycleService.attachExecution(4321, {
|
|
119
|
+
executionMethod: 'child_process',
|
|
120
|
+
getBackgroundOutput: () => output,
|
|
121
|
+
getSubscriptionSnapshot: () => output,
|
|
122
|
+
writeInput,
|
|
123
|
+
isActive,
|
|
124
|
+
});
|
|
125
|
+
const unsubscribe = ExecutionLifecycleService.subscribe(4321, (event) => {
|
|
126
|
+
if (event.type === 'data' && typeof event.chunk === 'string') {
|
|
127
|
+
chunks.push(event.chunk);
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
ExecutionLifecycleService.onExit(4321, exitListener);
|
|
131
|
+
ExecutionLifecycleService.writeInput(4321, 'stdin');
|
|
132
|
+
expect(writeInput).toHaveBeenCalledWith('stdin');
|
|
133
|
+
expect(ExecutionLifecycleService.isActive(4321)).toBe(true);
|
|
134
|
+
const firstChunk = { type: 'data', chunk: ' +delta' };
|
|
135
|
+
ExecutionLifecycleService.emitEvent(4321, firstChunk);
|
|
136
|
+
output += firstChunk.chunk;
|
|
137
|
+
ExecutionLifecycleService.background(4321);
|
|
138
|
+
const backgroundResult = await handle.result;
|
|
139
|
+
expect(backgroundResult.backgrounded).toBe(true);
|
|
140
|
+
expect(backgroundResult.output).toBe('seed +delta');
|
|
141
|
+
expect(backgroundResult.executionMethod).toBe('child_process');
|
|
142
|
+
ExecutionLifecycleService.completeWithResult(4321, createResult({
|
|
143
|
+
pid: 4321,
|
|
144
|
+
output: 'seed +delta done',
|
|
145
|
+
rawOutput: Buffer.from('seed +delta done'),
|
|
146
|
+
executionMethod: 'child_process',
|
|
147
|
+
}));
|
|
148
|
+
await vi.waitFor(() => {
|
|
149
|
+
expect(exitListener).toHaveBeenCalledWith(0, undefined);
|
|
150
|
+
});
|
|
151
|
+
const lateExit = vi.fn();
|
|
152
|
+
ExecutionLifecycleService.onExit(4321, lateExit);
|
|
153
|
+
expect(lateExit).toHaveBeenCalledWith(0, undefined);
|
|
154
|
+
unsubscribe();
|
|
155
|
+
});
|
|
156
|
+
it('supports late subscription catch-up after backgrounding an external execution', async () => {
|
|
157
|
+
let output = 'seed';
|
|
158
|
+
const onExit = vi.fn();
|
|
159
|
+
const handle = ExecutionLifecycleService.attachExecution(4322, {
|
|
160
|
+
executionMethod: 'child_process',
|
|
161
|
+
getBackgroundOutput: () => output,
|
|
162
|
+
getSubscriptionSnapshot: () => output,
|
|
163
|
+
});
|
|
164
|
+
ExecutionLifecycleService.onExit(4322, onExit);
|
|
165
|
+
ExecutionLifecycleService.background(4322);
|
|
166
|
+
const backgroundResult = await handle.result;
|
|
167
|
+
expect(backgroundResult.backgrounded).toBe(true);
|
|
168
|
+
expect(backgroundResult.output).toBe('seed');
|
|
169
|
+
output += ' +late';
|
|
170
|
+
ExecutionLifecycleService.emitEvent(4322, {
|
|
171
|
+
type: 'data',
|
|
172
|
+
chunk: ' +late',
|
|
173
|
+
});
|
|
174
|
+
const chunks = [];
|
|
175
|
+
const unsubscribe = ExecutionLifecycleService.subscribe(4322, (event) => {
|
|
176
|
+
if (event.type === 'data' && typeof event.chunk === 'string') {
|
|
177
|
+
chunks.push(event.chunk);
|
|
178
|
+
}
|
|
179
|
+
});
|
|
180
|
+
expect(chunks[0]).toBe('seed +late');
|
|
181
|
+
output += ' +live';
|
|
182
|
+
ExecutionLifecycleService.emitEvent(4322, {
|
|
183
|
+
type: 'data',
|
|
184
|
+
chunk: ' +live',
|
|
185
|
+
});
|
|
186
|
+
expect(chunks[chunks.length - 1]).toBe(' +live');
|
|
187
|
+
ExecutionLifecycleService.completeWithResult(4322, createResult({
|
|
188
|
+
pid: 4322,
|
|
189
|
+
output,
|
|
190
|
+
rawOutput: Buffer.from(output),
|
|
191
|
+
executionMethod: 'child_process',
|
|
192
|
+
}));
|
|
193
|
+
await vi.waitFor(() => {
|
|
194
|
+
expect(onExit).toHaveBeenCalledWith(0, undefined);
|
|
195
|
+
});
|
|
196
|
+
unsubscribe();
|
|
197
|
+
});
|
|
198
|
+
it('kills external executions and settles pending promises', async () => {
|
|
199
|
+
const terminate = vi.fn();
|
|
200
|
+
const onExit = vi.fn();
|
|
201
|
+
const handle = ExecutionLifecycleService.attachExecution(4323, {
|
|
202
|
+
executionMethod: 'child_process',
|
|
203
|
+
initialOutput: 'running',
|
|
204
|
+
kill: terminate,
|
|
205
|
+
});
|
|
206
|
+
ExecutionLifecycleService.onExit(4323, onExit);
|
|
207
|
+
ExecutionLifecycleService.kill(4323);
|
|
208
|
+
const result = await handle.result;
|
|
209
|
+
expect(terminate).toHaveBeenCalledTimes(1);
|
|
210
|
+
expect(result.aborted).toBe(true);
|
|
211
|
+
expect(result.exitCode).toBe(130);
|
|
212
|
+
expect(result.output).toBe('running');
|
|
213
|
+
expect(result.error?.message).toContain('Operation cancelled by user');
|
|
214
|
+
expect(onExit).toHaveBeenCalledWith(130, undefined);
|
|
215
|
+
});
|
|
216
|
+
it('rejects duplicate execution registration for active execution IDs', () => {
|
|
217
|
+
ExecutionLifecycleService.attachExecution(4324, {
|
|
218
|
+
executionMethod: 'child_process',
|
|
219
|
+
});
|
|
220
|
+
expect(() => {
|
|
221
|
+
ExecutionLifecycleService.attachExecution(4324, {
|
|
222
|
+
executionMethod: 'child_process',
|
|
223
|
+
});
|
|
224
|
+
}).toThrow('Execution 4324 is already attached.');
|
|
225
|
+
});
|
|
226
|
+
});
|
|
227
|
+
//# sourceMappingURL=executionLifecycleService.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"executionLifecycleService.test.js","sourceRoot":"","sources":["../../../src/services/executionLifecycleService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { type EnvironmentSanitizationConfig } from './environmentSanitization.js';
|
|
7
|
+
/**
|
|
8
|
+
* Request for preparing a command to run in a sandbox.
|
|
9
|
+
*/
|
|
10
|
+
export interface SandboxRequest {
|
|
11
|
+
/** The program to execute. */
|
|
12
|
+
command: string;
|
|
13
|
+
/** Arguments for the program. */
|
|
14
|
+
args: string[];
|
|
15
|
+
/** The working directory. */
|
|
16
|
+
cwd: string;
|
|
17
|
+
/** Environment variables to be passed to the program. */
|
|
18
|
+
env: NodeJS.ProcessEnv;
|
|
19
|
+
/** Optional sandbox-specific configuration. */
|
|
20
|
+
config?: {
|
|
21
|
+
sanitizationConfig?: Partial<EnvironmentSanitizationConfig>;
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* A command that has been prepared for sandboxed execution.
|
|
26
|
+
*/
|
|
27
|
+
export interface SandboxedCommand {
|
|
28
|
+
/** The program or wrapper to execute. */
|
|
29
|
+
program: string;
|
|
30
|
+
/** Final arguments for the program. */
|
|
31
|
+
args: string[];
|
|
32
|
+
/** Sanitized environment variables. */
|
|
33
|
+
env: NodeJS.ProcessEnv;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Interface for a service that prepares commands for sandboxed execution.
|
|
37
|
+
*/
|
|
38
|
+
export interface SandboxManager {
|
|
39
|
+
/**
|
|
40
|
+
* Prepares a command to run in a sandbox, including environment sanitization.
|
|
41
|
+
*/
|
|
42
|
+
prepareCommand(req: SandboxRequest): Promise<SandboxedCommand>;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* A no-op implementation of SandboxManager that silently passes commands
|
|
46
|
+
* through while applying environment sanitization.
|
|
47
|
+
*/
|
|
48
|
+
export declare class NoopSandboxManager implements SandboxManager {
|
|
49
|
+
/**
|
|
50
|
+
* Prepares a command by sanitizing the environment and passing through
|
|
51
|
+
* the original program and arguments.
|
|
52
|
+
*/
|
|
53
|
+
prepareCommand(req: SandboxRequest): Promise<SandboxedCommand>;
|
|
54
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { sanitizeEnvironment, } from './environmentSanitization.js';
|
|
7
|
+
/**
|
|
8
|
+
* A no-op implementation of SandboxManager that silently passes commands
|
|
9
|
+
* through while applying environment sanitization.
|
|
10
|
+
*/
|
|
11
|
+
export class NoopSandboxManager {
|
|
12
|
+
/**
|
|
13
|
+
* Prepares a command by sanitizing the environment and passing through
|
|
14
|
+
* the original program and arguments.
|
|
15
|
+
*/
|
|
16
|
+
async prepareCommand(req) {
|
|
17
|
+
const sanitizationConfig = {
|
|
18
|
+
allowedEnvironmentVariables: req.config?.sanitizationConfig?.allowedEnvironmentVariables ?? [],
|
|
19
|
+
blockedEnvironmentVariables: req.config?.sanitizationConfig?.blockedEnvironmentVariables ?? [],
|
|
20
|
+
enableEnvironmentVariableRedaction: true, // Forced for safety
|
|
21
|
+
};
|
|
22
|
+
const sanitizedEnv = sanitizeEnvironment(req.env, sanitizationConfig);
|
|
23
|
+
return {
|
|
24
|
+
program: req.command,
|
|
25
|
+
args: req.args,
|
|
26
|
+
env: sanitizedEnv,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=sandboxManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sandboxManager.js","sourceRoot":"","sources":["../../../src/services/sandboxManager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,mBAAmB,GAEpB,MAAM,8BAA8B,CAAC;AA0CtC;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAC7B;;;OAGG;IACH,KAAK,CAAC,cAAc,CAAC,GAAmB;QACtC,MAAM,kBAAkB,GAAkC;YACxD,2BAA2B,EACzB,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,2BAA2B,IAAI,EAAE;YACnE,2BAA2B,EACzB,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,2BAA2B,IAAI,EAAE;YACnE,kCAAkC,EAAE,IAAI,EAAE,oBAAoB;SAC/D,CAAC;QAEF,MAAM,YAAY,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAEtE,OAAO;YACL,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,YAAY;SAClB,CAAC;IACJ,CAAC;CACF"}
|