@terminai/core 0.21.0 → 0.23.0
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/assets/image.png +0 -0
- package/dist/src/auth/geminiAuthStatus.js +1 -1
- package/dist/src/auth/geminiAuthStatus.js.map +1 -1
- package/dist/src/auth/geminiAuthStatus.test.js +1 -1
- package/dist/src/auth/geminiAuthStatus.test.js.map +1 -1
- package/dist/src/auth/wizardSettings.js +5 -1
- package/dist/src/auth/wizardSettings.js.map +1 -1
- package/dist/src/auth/wizardSettings.test.js +10 -2
- package/dist/src/auth/wizardSettings.test.js.map +1 -1
- package/dist/src/auth/wizardState.js +4 -0
- package/dist/src/auth/wizardState.js.map +1 -1
- package/dist/src/availability/policyHelpers.test.js +4 -4
- package/dist/src/availability/policyHelpers.test.js.map +1 -1
- package/dist/src/brain/__tests__/environmentDetector.test.js +2 -1
- package/dist/src/brain/__tests__/environmentDetector.test.js.map +1 -1
- package/dist/src/brain/__tests__/orchestratorFlag.test.d.ts +7 -0
- package/dist/src/brain/__tests__/orchestratorFlag.test.js +47 -0
- package/dist/src/brain/__tests__/orchestratorFlag.test.js.map +1 -0
- package/dist/src/brain/__tests__/orchestratorRecovery.test.d.ts +7 -0
- package/dist/src/brain/__tests__/orchestratorRecovery.test.js +85 -0
- package/dist/src/brain/__tests__/orchestratorRecovery.test.js.map +1 -0
- package/dist/src/brain/__tests__/thinkingOrchestrator.test.js +1 -0
- package/dist/src/brain/__tests__/thinkingOrchestrator.test.js.map +1 -1
- package/dist/src/brain/__tests__/toolIntegration.test.d.ts +7 -0
- package/dist/src/brain/__tests__/toolIntegration.test.js +154 -0
- package/dist/src/brain/__tests__/toolIntegration.test.js.map +1 -0
- package/dist/src/brain/advisors/codeGenerator.js +3 -2
- package/dist/src/brain/advisors/codeGenerator.js.map +1 -1
- package/dist/src/brain/advisors/depScanner.js +3 -2
- package/dist/src/brain/advisors/depScanner.js.map +1 -1
- package/dist/src/brain/advisors/enumerator.js +3 -2
- package/dist/src/brain/advisors/enumerator.js.map +1 -1
- package/dist/src/brain/advisors/fallbackChain.js +3 -2
- package/dist/src/brain/advisors/fallbackChain.js.map +1 -1
- package/dist/src/brain/advisors/patternMatcher.js +3 -2
- package/dist/src/brain/advisors/patternMatcher.js.map +1 -1
- package/dist/src/brain/consensus.js +2 -1
- package/dist/src/brain/consensus.js.map +1 -1
- package/dist/src/brain/environmentDetector.d.ts +1 -0
- package/dist/src/brain/environmentDetector.js +35 -20
- package/dist/src/brain/environmentDetector.js.map +1 -1
- package/dist/src/brain/pacLoop.js +2 -1
- package/dist/src/brain/pacLoop.js.map +1 -1
- package/dist/src/brain/riskAssessor.d.ts +6 -2
- package/dist/src/brain/riskAssessor.js +7 -4
- package/dist/src/brain/riskAssessor.js.map +1 -1
- package/dist/src/brain/stepBackEvaluator.js +2 -1
- package/dist/src/brain/stepBackEvaluator.js.map +1 -1
- package/dist/src/brain/thinkingOrchestrator.d.ts +9 -1
- package/dist/src/brain/thinkingOrchestrator.js +47 -1
- package/dist/src/brain/thinkingOrchestrator.js.map +1 -1
- package/dist/src/brain/toolIntegration.d.ts +51 -0
- package/dist/src/brain/toolIntegration.js +202 -0
- package/dist/src/brain/toolIntegration.js.map +1 -0
- package/dist/src/code_assist/oauth2.begin.test.js +4 -1
- package/dist/src/code_assist/oauth2.begin.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.d.ts +1 -1
- package/dist/src/code_assist/oauth2.js +9 -13
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +69 -41
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/commands/init.js +5 -0
- package/dist/src/commands/init.js.map +1 -1
- package/dist/src/computer/PersistentShell.d.ts +5 -0
- package/dist/src/computer/PersistentShell.js +21 -2
- package/dist/src/computer/PersistentShell.js.map +1 -1
- package/dist/src/computer/PersistentShell.test.js +23 -11
- package/dist/src/computer/PersistentShell.test.js.map +1 -1
- package/dist/src/config/builder.js +55 -5
- package/dist/src/config/builder.js.map +1 -1
- package/dist/src/config/config.d.ts +12 -1
- package/dist/src/config/config.js +25 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +39 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/models.d.ts +2 -2
- package/dist/src/config/models.js +2 -2
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +1 -1
- package/dist/src/config/settings/schema.d.ts +28 -4
- package/dist/src/config/settings/schema.js +28 -4
- package/dist/src/config/settings/schema.js.map +1 -1
- package/dist/src/core/openaiContentGenerator.js +8 -1
- package/dist/src/core/openaiContentGenerator.js.map +1 -1
- package/dist/src/fallback/handler.test.js +14 -14
- 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/gui/drivers/__tests__/sidecarContract.test.d.ts +2 -2
- package/dist/src/gui/drivers/__tests__/sidecarContract.test.js +3 -4
- package/dist/src/gui/drivers/__tests__/sidecarContract.test.js.map +1 -1
- package/dist/src/gui/drivers/linuxAtspiDriver.js +11 -4
- package/dist/src/gui/drivers/linuxAtspiDriver.js.map +1 -1
- package/dist/src/gui/drivers/windowsUiaDriver.js +2 -2
- package/dist/src/gui/drivers/windowsUiaDriver.js.map +1 -1
- package/dist/src/gui/selectors/__tests__/selectors.test.js +5 -2
- package/dist/src/gui/selectors/__tests__/selectors.test.js.map +1 -1
- package/dist/src/gui/selectors/parser.d.ts +1 -1
- package/dist/src/gui/selectors/parser.js +1 -1
- package/dist/src/gui/selectors/parser.js.map +1 -1
- package/dist/src/gui/service/DesktopAutomationService.d.ts +1 -1
- package/dist/src/gui/service/DesktopAutomationService.js +8 -9
- package/dist/src/gui/service/DesktopAutomationService.js.map +1 -1
- package/dist/src/gui/service/__tests__/capabilities.test.d.ts +6 -0
- package/dist/src/gui/service/__tests__/capabilities.test.js +32 -4
- package/dist/src/gui/service/__tests__/capabilities.test.js.map +1 -1
- package/dist/src/gui/service/__tests__/diagnose.test.d.ts +6 -0
- package/dist/src/gui/service/__tests__/diagnose.test.js +6 -0
- package/dist/src/gui/service/__tests__/diagnose.test.js.map +1 -1
- package/dist/src/gui/service/__tests__/progressive.test.d.ts +6 -0
- package/dist/src/gui/service/__tests__/progressive.test.js +30 -3
- package/dist/src/gui/service/__tests__/progressive.test.js.map +1 -1
- package/dist/src/gui/service/__tests__/redaction.test.d.ts +6 -0
- package/dist/src/gui/service/__tests__/redaction.test.js +27 -1
- package/dist/src/gui/service/__tests__/redaction.test.js.map +1 -1
- package/dist/src/gui/service/__tests__/selectorError.test.d.ts +6 -0
- package/dist/src/gui/service/__tests__/selectorError.test.js +6 -0
- package/dist/src/gui/service/__tests__/selectorError.test.js.map +1 -1
- package/dist/src/gui/service/__tests__/wait.test.d.ts +6 -0
- package/dist/src/gui/service/__tests__/wait.test.js +29 -2
- package/dist/src/gui/service/__tests__/wait.test.js.map +1 -1
- package/dist/src/policy/shell-safety.test.js +2 -1
- package/dist/src/policy/shell-safety.test.js.map +1 -1
- package/dist/src/safety/approval-ladder/__tests__/buildShellActionProfile.test.js +2 -1
- package/dist/src/safety/approval-ladder/__tests__/buildShellActionProfile.test.js.map +1 -1
- package/dist/src/safety/built-in.test.js +4 -2
- package/dist/src/safety/built-in.test.js.map +1 -1
- package/dist/src/telemetry/metrics.test.js +95 -75
- package/dist/src/telemetry/metrics.test.js.map +1 -1
- package/dist/src/tools/__tests__/edit.risk.test.d.ts +7 -0
- package/dist/src/tools/__tests__/edit.risk.test.js +138 -0
- package/dist/src/tools/__tests__/edit.risk.test.js.map +1 -0
- package/dist/src/tools/__tests__/memoryToolDedupe.test.d.ts +7 -0
- package/dist/src/tools/__tests__/memoryToolDedupe.test.js +53 -0
- package/dist/src/tools/__tests__/memoryToolDedupe.test.js.map +1 -0
- package/dist/src/tools/__tests__/shell.pin.test.js +2 -1
- package/dist/src/tools/__tests__/shell.pin.test.js.map +1 -1
- package/dist/src/tools/__tests__/shell.provenance.test.js +14 -4
- package/dist/src/tools/__tests__/shell.provenance.test.js.map +1 -1
- package/dist/src/tools/__tests__/ui-diagnose.test.d.ts +6 -0
- package/dist/src/tools/__tests__/ui-diagnose.test.js +11 -8
- package/dist/src/tools/__tests__/ui-diagnose.test.js.map +1 -1
- package/dist/src/tools/__tests__/ui-health.test.d.ts +6 -0
- package/dist/src/tools/__tests__/ui-health.test.js +37 -37
- package/dist/src/tools/__tests__/ui-health.test.js.map +1 -1
- package/dist/src/tools/agent-control.js +6 -18
- package/dist/src/tools/agent-control.js.map +1 -1
- package/dist/src/tools/agent-control.test.js +2 -28
- package/dist/src/tools/agent-control.test.js.map +1 -1
- package/dist/src/tools/edit.js +49 -9
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +1 -19
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/file-ops.js +9 -10
- package/dist/src/tools/file-ops.js.map +1 -1
- package/dist/src/tools/file-ops.test.js +0 -7
- package/dist/src/tools/file-ops.test.js.map +1 -1
- package/dist/src/tools/glob.js +4 -16
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +0 -29
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.js +4 -10
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/ls.d.ts +1 -1
- package/dist/src/tools/ls.js +8 -7
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.js +0 -7
- package/dist/src/tools/ls.test.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.js +8 -6
- package/dist/src/tools/mcp-client-manager.js.map +1 -1
- package/dist/src/tools/mcp-client-manager.test.js +0 -10
- package/dist/src/tools/mcp-client-manager.test.js.map +1 -1
- package/dist/src/tools/memoryTool.js +10 -0
- package/dist/src/tools/memoryTool.js.map +1 -1
- package/dist/src/tools/process-manager.js +6 -5
- package/dist/src/tools/process-manager.js.map +1 -1
- package/dist/src/tools/process-manager.test.js +2 -1
- package/dist/src/tools/process-manager.test.js.map +1 -1
- package/dist/src/tools/read-file.js +8 -10
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-file.test.js +0 -12
- package/dist/src/tools/read-file.test.js.map +1 -1
- package/dist/src/tools/read-many-files.js +2 -7
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/repl.js +10 -45
- package/dist/src/tools/repl.js.map +1 -1
- package/dist/src/tools/ripGrep.js +2 -5
- package/dist/src/tools/ripGrep.js.map +1 -1
- package/dist/src/tools/ripGrep.test.js +1 -1
- package/dist/src/tools/ripGrep.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +2 -11
- package/dist/src/tools/shell.js +31 -191
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.test.js +2 -1
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/smart-edit.js +2 -5
- package/dist/src/tools/smart-edit.js.map +1 -1
- package/dist/src/tools/smart-edit.test.js +0 -9
- package/dist/src/tools/smart-edit.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +5 -0
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/ui-click.js +69 -3
- package/dist/src/tools/ui-click.js.map +1 -1
- package/dist/src/tools/write-file.js +34 -8
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +1 -15
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +11 -0
- package/dist/src/utils/events.js +1 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/fileUtils.js +2 -7
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/processUtils.d.ts +43 -0
- package/dist/src/utils/processUtils.js +134 -0
- package/dist/src/utils/processUtils.js.map +1 -0
- package/dist/src/utils/shell-permissions.d.ts +1 -0
- package/dist/src/utils/shell-permissions.js +3 -3
- package/dist/src/utils/shell-permissions.js.map +1 -1
- package/dist/src/utils/shell-permissions.test.js +11 -5
- package/dist/src/utils/shell-permissions.test.js.map +1 -1
- package/dist/src/utils/shell-utils.js +6 -3
- package/dist/src/utils/shell-utils.js.map +1 -1
- package/dist/src/utils/shell-utils.test.js +6 -2
- package/dist/src/utils/shell-utils.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -3
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* Portions Copyright 2025 TerminaI Authors
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { describe, expect, it, vi, beforeEach } from 'vitest';
|
|
8
|
+
import * as fs from 'node:fs/promises';
|
|
9
|
+
import { MemoryTool, MEMORY_SECTION_HEADER } from '../memoryTool.js';
|
|
10
|
+
import * as path from 'node:path';
|
|
11
|
+
// Mock fs and diff
|
|
12
|
+
vi.mock('node:fs/promises');
|
|
13
|
+
vi.mock('node:path');
|
|
14
|
+
describe('MemoryTool Deduplication', () => {
|
|
15
|
+
const mockFs = fs;
|
|
16
|
+
const mockPath = path;
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
vi.resetAllMocks();
|
|
19
|
+
mockPath.dirname.mockReturnValue('/mock/dir');
|
|
20
|
+
});
|
|
21
|
+
it('should not add duplicate fact if it already exists', async () => {
|
|
22
|
+
const existingContent = `${MEMORY_SECTION_HEADER}\n- existing fact\n`;
|
|
23
|
+
const fact = 'existing fact';
|
|
24
|
+
const filePath = '/mock/file.md';
|
|
25
|
+
mockFs.readFile.mockResolvedValue(existingContent);
|
|
26
|
+
mockFs.mkdir.mockResolvedValue(undefined);
|
|
27
|
+
mockFs.writeFile.mockResolvedValue(undefined);
|
|
28
|
+
await MemoryTool.performAddMemoryEntry(fact, filePath, {
|
|
29
|
+
readFile: mockFs.readFile,
|
|
30
|
+
writeFile: mockFs.writeFile,
|
|
31
|
+
mkdir: mockFs.mkdir,
|
|
32
|
+
});
|
|
33
|
+
// writeFile should be called with the SAME content if duplicate
|
|
34
|
+
expect(mockFs.writeFile).toHaveBeenCalledWith(filePath, existingContent, // Expect no change (or at least no new item appended)
|
|
35
|
+
'utf-8');
|
|
36
|
+
});
|
|
37
|
+
it('should add new fact if it does not exist', async () => {
|
|
38
|
+
const existingContent = `${MEMORY_SECTION_HEADER}\n- existing fact\n`;
|
|
39
|
+
const fact = 'new fact';
|
|
40
|
+
const filePath = '/mock/file.md';
|
|
41
|
+
mockFs.readFile.mockResolvedValue(existingContent);
|
|
42
|
+
mockFs.mkdir.mockResolvedValue(undefined);
|
|
43
|
+
mockFs.writeFile.mockResolvedValue(undefined);
|
|
44
|
+
await MemoryTool.performAddMemoryEntry(fact, filePath, {
|
|
45
|
+
readFile: mockFs.readFile,
|
|
46
|
+
writeFile: mockFs.writeFile,
|
|
47
|
+
mkdir: mockFs.mkdir,
|
|
48
|
+
});
|
|
49
|
+
// writeFile should be called with updated content
|
|
50
|
+
expect(mockFs.writeFile).toHaveBeenCalledWith(filePath, expect.stringContaining(`${MEMORY_SECTION_HEADER}\n- existing fact\n- new fact`), 'utf-8');
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
//# sourceMappingURL=memoryToolDedupe.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"memoryToolDedupe.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/memoryToolDedupe.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,mBAAmB;AACnB,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;AAC5B,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAErB,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;IACxC,MAAM,MAAM,GAAG,EAId,CAAC;IAEF,MAAM,QAAQ,GAAG,IAGhB,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,eAAe,GAAG,GAAG,qBAAqB,qBAAqB,CAAC;QACtE,MAAM,IAAI,GAAG,eAAe,CAAC;QAC7B,MAAM,QAAQ,GAAG,eAAe,CAAC;QAEjC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAE9C,MAAM,UAAU,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE;YACrD,QAAQ,EAAE,MAAM,CAAC,QAGG;YACpB,SAAS,EAAE,MAAM,CAAC,SAIA;YAClB,KAAK,EAAE,MAAM,CAAC,KAGkB;SACjC,CAAC,CAAC;QAEH,gEAAgE;QAChE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAC3C,QAAQ,EACR,eAAe,EAAE,sDAAsD;QACvE,OAAO,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,eAAe,GAAG,GAAG,qBAAqB,qBAAqB,CAAC;QACtE,MAAM,IAAI,GAAG,UAAU,CAAC;QACxB,MAAM,QAAQ,GAAG,eAAe,CAAC;QAEjC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACnD,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAE9C,MAAM,UAAU,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE;YACrD,QAAQ,EAAE,MAAM,CAAC,QAGG;YACpB,SAAS,EAAE,MAAM,CAAC,SAIA;YAClB,KAAK,EAAE,MAAM,CAAC,KAGkB;SACjC,CAAC,CAAC;QAEH,kDAAkD;QAClD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAC3C,QAAQ,EACR,MAAM,CAAC,gBAAgB,CACrB,GAAG,qBAAqB,+BAA+B,CACxD,EACD,OAAO,CACR,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
import { describe, it, expect } from 'vitest';
|
|
8
8
|
import { buildShellActionProfile } from '../../safety/approval-ladder/buildShellActionProfile.js';
|
|
9
9
|
import { computeMinimumReviewLevel } from '../../safety/approval-ladder/computeMinimumReviewLevel.js';
|
|
10
|
-
|
|
10
|
+
// Skip on Windows - buildShellActionProfile uses shell parsing which hangs
|
|
11
|
+
describe.skipIf(process.platform === 'win32')('PIN Verification Logic', () => {
|
|
11
12
|
const mockConfig = {
|
|
12
13
|
getSecurityProfile: () => 'balanced',
|
|
13
14
|
getApprovalPin: () => undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.pin.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/shell.pin.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yDAAyD,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AAGtG,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"shell.pin.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/shell.pin.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,yDAAyD,CAAC;AAClG,OAAO,EAAE,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AAGtG,2EAA2E;AAC3E,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAC3E,MAAM,UAAU,GAAG;QACjB,kBAAkB,EAAE,GAAG,EAAE,CAAC,UAAU;QACpC,cAAc,EAAE,GAAG,EAAE,CAAC,SAAS;QAC/B,iBAAiB,EAAE,GAAG,EAAE,CAAC,EAAE;QAC3B,gBAAgB,EAAE,GAAG,EAAE,CAAC,EAAE;QAC1B,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1B,qBAAqB,EAAE,GAAG,EAAE,CAAC,IAAI;YACjC,SAAS,EAAE,YAAY;SACxB,CAAC;QACF,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY;KACZ,CAAC;IAEvB,MAAM,aAAa,GAAG,YAAY,CAAC;IACnC,MAAM,OAAO,GAAG,aAAa,CAAC;IAE9B,QAAQ,CAAC,qDAAqD,EAAE,GAAG,EAAE;QACnE,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;YACnE,MAAM,OAAO,GAAG,uBAAuB,CAAC;gBACtC,OAAO,EAAE,UAAU;gBACnB,GAAG,EAAE,OAAO;gBACZ,UAAU,EAAE,CAAC,aAAa,CAAC;aAC5B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAE9D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,0CAA0C;YAC1C,MAAM,CACJ,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAClE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,MAAM,OAAO,GAAG,uBAAuB,CAAC;gBACtC,OAAO,EAAE,6BAA6B;gBACtC,GAAG,EAAE,OAAO;gBACZ,UAAU,EAAE,CAAC,aAAa,CAAC;aAC5B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAE9D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,2CAA2C;YAC3C,MAAM,CACJ,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAC/D,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACrE,MAAM,OAAO,GAAG,uBAAuB,CAAC;gBACtC,OAAO,EAAE,yBAAyB;gBAClC,GAAG,EAAE,OAAO;gBACZ,UAAU,EAAE,CAAC,aAAa,CAAC;aAC5B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAE9D,0EAA0E;YAC1E,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;YAC3E,MAAM,OAAO,GAAG,uBAAuB,CAAC;gBACtC,OAAO,EAAE,UAAU;gBACnB,GAAG,EAAE,OAAO;gBACZ,UAAU,EAAE,CAAC,aAAa,CAAC;aAC5B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAE9D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,0CAA0C;YAC1C,MAAM,CACJ,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAClE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,+CAA+C,EAAE,GAAG,EAAE;QAC7D,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;YACjE,MAAM,OAAO,GAAG,uBAAuB,CAAC;gBACtC,OAAO,EAAE,SAAS;gBAClB,GAAG,EAAE,OAAO;gBACZ,UAAU,EAAE,CAAC,aAAa,CAAC;aAC5B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAE9D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;YACrE,MAAM,OAAO,GAAG,uBAAuB,CAAC;gBACtC,OAAO,EAAE,uBAAuB;gBAChC,GAAG,EAAE,OAAO;gBACZ,UAAU,EAAE,CAAC,aAAa,CAAC;aAC5B,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAE9D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;YACpF,MAAM,OAAO,GAAG,uBAAuB,CAAC;gBACtC,OAAO,EAAE,oBAAoB;gBAC7B,GAAG,EAAE,OAAO;gBACZ,UAAU,EAAE,CAAC,aAAa,CAAC;gBAC3B,UAAU,EAAE,CAAC,kBAAkB,CAAC;aACjC,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,yBAAyB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAE9D,4CAA4C;YAC5C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;QAC/C,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,MAAM,aAAa,GAAG,QAAQ,CAAC;YAC/B,MAAM,cAAc,GAAG,QAAQ,CAAC;YAEhC,0DAA0D;YAC1D,SAAS,SAAS,CAChB,UAA8B,EAC9B,WAAoB;gBAEpB,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;oBACrD,CAAC;oBACD,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;wBACjC,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;oBACnC,CAAC;gBACH,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,+BAA+B;YAC/B,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACnD,MAAM,aAAa,GAAG,QAAQ,CAAC;YAC/B,MAAM,QAAQ,GAAG,QAAQ,CAAC;YAE1B,SAAS,SAAS,CAChB,UAA8B,EAC9B,WAAoB;gBAEpB,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;oBACrD,CAAC;oBACD,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;wBACjC,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;oBACnC,CAAC;gBACH,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,MAAM,aAAa,GAAG,QAAQ,CAAC;YAE/B,SAAS,SAAS,CAChB,UAA8B,EAC9B,WAAoB;gBAEpB,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;oBACrD,CAAC;oBACD,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;wBACjC,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;oBACnC,CAAC;gBACH,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAC9C,iCAAiC,CAClC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,SAAS,SAAS,CAChB,UAA8B,EAC9B,WAAoB;gBAEpB,IAAI,WAAW,EAAE,CAAC;oBAChB,IAAI,CAAC,UAAU,EAAE,CAAC;wBAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;oBACrD,CAAC;oBACD,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;wBAC5B,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;oBACnC,CAAC;gBACH,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,8BAA8B;YAC9B,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
import { describe, it, expect, vi } from 'vitest';
|
|
8
8
|
import { ApprovalMode } from '../../policy/types.js';
|
|
9
9
|
import { ShellToolInvocation } from '../shell.js';
|
|
10
|
-
|
|
10
|
+
// Skip on Windows - shell parsing times out
|
|
11
|
+
describe.skipIf(process.platform === 'win32')('ShellToolInvocation provenance', () => {
|
|
11
12
|
it('should include provenance in confirmation details and escalate review', async () => {
|
|
12
13
|
const mockConfig = {
|
|
13
14
|
isInteractive: () => true,
|
|
@@ -21,9 +22,18 @@ describe('ShellToolInvocation provenance', () => {
|
|
|
21
22
|
getTrustedDomains: () => [],
|
|
22
23
|
getCriticalPaths: () => [],
|
|
23
24
|
};
|
|
24
|
-
const invocation = new ShellToolInvocation(mockConfig, { command: 'touch /workspace/test.txt', dir_path: '/workspace' }
|
|
25
|
-
//
|
|
26
|
-
|
|
25
|
+
const invocation = new ShellToolInvocation(mockConfig, { command: 'touch /workspace/test.txt', dir_path: '/workspace' });
|
|
26
|
+
// Directly mock the private brainManager property
|
|
27
|
+
invocation.brainManager = {
|
|
28
|
+
evaluateBrain: vi.fn().mockResolvedValue(null),
|
|
29
|
+
applyBrainAuthority: vi.fn((r) => r),
|
|
30
|
+
getBrainContext: vi.fn().mockReturnValue(null),
|
|
31
|
+
formatRiskPreamble: vi
|
|
32
|
+
.fn()
|
|
33
|
+
.mockReturnValue({ text: '', surfaceToUser: false }),
|
|
34
|
+
recordOutcome: vi.fn(),
|
|
35
|
+
};
|
|
36
|
+
// Set provenance via the public setter
|
|
27
37
|
invocation.setProvenance(['web_remote_user']);
|
|
28
38
|
const details = await invocation.shouldConfirmExecute(new AbortController().signal);
|
|
29
39
|
expect(details && details.type).toBe('exec');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.provenance.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/shell.provenance.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,QAAQ,CAAC,gCAAgC,
|
|
1
|
+
{"version":3,"file":"shell.provenance.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/shell.provenance.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,4CAA4C;AAC5C,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAC3C,gCAAgC,EAChC,GAAG,EAAE;IACH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;QACrF,MAAM,UAAU,GAAG;YACjB,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI;YACzB,eAAe,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO;YAC3C,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;YACxD,eAAe,EAAE,GAAG,EAAE,CAAC,EAAE;YACzB,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY;YAChC,cAAc,EAAE,GAAG,EAAE,CAAC,QAAQ;YAC9B,iBAAiB,EAAE,GAAG,EAAE,CAAC,eAAe;YACxC,kBAAkB,EAAE,GAAG,EAAE,CAAC,UAAU;YACpC,iBAAiB,EAAE,GAAG,EAAE,CAAC,EAAE;YAC3B,gBAAgB,EAAE,GAAG,EAAE,CAAC,EAAE;SAC3B,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,mBAAmB,CACxC,UAA+B,EAC/B,EAAE,OAAO,EAAE,2BAA2B,EAAE,QAAQ,EAAE,YAAY,EAAE,CACjE,CAAC;QAEF,kDAAkD;QACjD,UAAmD,CAAC,YAAY,GAAG;YAClE,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;YAC9C,mBAAmB,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YACpC,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;YAC9C,kBAAkB,EAAE,EAAE;iBACnB,EAAE,EAAE;iBACJ,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;YACtD,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;SACvB,CAAC;QACF,uCAAuC;QACvC,UAAU,CAAC,aAAa,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAE9C,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,oBAAoB,CACnD,IAAI,eAAe,EAAE,CAAC,MAAM,CAC7B,CAAC;QAEF,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACvC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACxD,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CACF,CAAC"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* Portions Copyright 2025 TerminaI Authors
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
1
7
|
import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
|
|
2
8
|
import { UiDiagnoseTool } from '../ui-diagnose.js';
|
|
3
9
|
import { DesktopAutomationService } from '../../gui/service/DesktopAutomationService.js';
|
|
4
10
|
import { MockDriver } from '../../gui/drivers/mockDriver.js';
|
|
5
|
-
import {
|
|
6
|
-
vi.mock('../../config/config.js', () => ({
|
|
7
|
-
Config: vi.fn(),
|
|
8
|
-
}));
|
|
11
|
+
import { makeFakeConfig } from '../../test-utils/config.js';
|
|
9
12
|
describe('UiDiagnoseTool', () => {
|
|
10
13
|
let mockDriver;
|
|
11
14
|
beforeEach(() => {
|
|
@@ -17,9 +20,9 @@ describe('UiDiagnoseTool', () => {
|
|
|
17
20
|
vi.clearAllMocks();
|
|
18
21
|
});
|
|
19
22
|
it('executes diagnose successfully', async () => {
|
|
20
|
-
const config =
|
|
23
|
+
const config = makeFakeConfig();
|
|
21
24
|
const tool = new UiDiagnoseTool(config);
|
|
22
|
-
const invocation = tool.
|
|
25
|
+
const invocation = tool.build({});
|
|
23
26
|
// Override snapshot to return minimal tree
|
|
24
27
|
mockDriver.snapshot = async () => ({
|
|
25
28
|
snapshotId: 'test',
|
|
@@ -52,9 +55,9 @@ describe('UiDiagnoseTool', () => {
|
|
|
52
55
|
]);
|
|
53
56
|
});
|
|
54
57
|
it('handles exceptions gracefully', async () => {
|
|
55
|
-
const config =
|
|
58
|
+
const config = makeFakeConfig();
|
|
56
59
|
const tool = new UiDiagnoseTool(config);
|
|
57
|
-
const invocation = tool.
|
|
60
|
+
const invocation = tool.build({});
|
|
58
61
|
// Force an error in snapshot provided by mockDriver to simulate service failure?
|
|
59
62
|
// Or easier: Mock implementation of diagnose on service
|
|
60
63
|
const svc = DesktopAutomationService.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-diagnose.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/ui-diagnose.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ui-diagnose.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/ui-diagnose.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* Portions Copyright 2025 TerminaI Authors
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
1
7
|
import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
|
|
2
8
|
import { UiHealthTool } from '../ui-health.js';
|
|
3
9
|
import { DesktopAutomationService } from '../../gui/service/DesktopAutomationService.js';
|
|
4
10
|
import { MockDriver } from '../../gui/drivers/mockDriver.js';
|
|
5
|
-
import {
|
|
6
|
-
vi.mock('../../config/config.js', () => ({
|
|
7
|
-
Config: vi.fn(),
|
|
8
|
-
}));
|
|
11
|
+
import { makeFakeConfig } from '../../test-utils/config.js';
|
|
9
12
|
describe('UiHealthTool', () => {
|
|
10
13
|
let mockDriver;
|
|
11
14
|
beforeEach(() => {
|
|
@@ -16,19 +19,23 @@ describe('UiHealthTool', () => {
|
|
|
16
19
|
afterEach(() => {
|
|
17
20
|
vi.clearAllMocks();
|
|
18
21
|
});
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const tool = new UiHealthTool(config);
|
|
22
|
-
const invocation = tool.createInvocation({});
|
|
23
|
-
// Mock diagnose to return clean report
|
|
24
|
-
const svc = DesktopAutomationService.getInstance();
|
|
25
|
-
vi.spyOn(svc, 'diagnose').mockResolvedValue({
|
|
22
|
+
function makeReport(overrides = {}) {
|
|
23
|
+
return {
|
|
26
24
|
connection: { connected: true },
|
|
27
25
|
driver: {
|
|
28
26
|
name: 'mock',
|
|
29
27
|
kind: 'mock',
|
|
30
28
|
version: '1.0',
|
|
31
|
-
capabilities: {
|
|
29
|
+
capabilities: {
|
|
30
|
+
canSnapshot: true,
|
|
31
|
+
canClick: true,
|
|
32
|
+
canType: true,
|
|
33
|
+
canScroll: true,
|
|
34
|
+
canKey: true,
|
|
35
|
+
canOcr: false,
|
|
36
|
+
canScreenshot: false,
|
|
37
|
+
canInjectInput: false,
|
|
38
|
+
},
|
|
32
39
|
},
|
|
33
40
|
snapshotSanity: {
|
|
34
41
|
desktopRootChildren: 1,
|
|
@@ -38,25 +45,27 @@ describe('UiHealthTool', () => {
|
|
|
38
45
|
},
|
|
39
46
|
warnings: [],
|
|
40
47
|
suggestedFixes: [],
|
|
41
|
-
|
|
48
|
+
...overrides,
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
it('reports healthy when diagnose returns no warnings', async () => {
|
|
52
|
+
const config = makeFakeConfig();
|
|
53
|
+
const tool = new UiHealthTool(config);
|
|
54
|
+
const invocation = tool.build({});
|
|
55
|
+
// Mock diagnose to return clean report
|
|
56
|
+
const svc = DesktopAutomationService.getInstance();
|
|
57
|
+
vi.spyOn(svc, 'diagnose').mockResolvedValue(makeReport());
|
|
42
58
|
const result = await invocation.execute(new AbortController().signal);
|
|
43
59
|
const content = JSON.parse(result.llmContent);
|
|
44
60
|
expect(content.status).toBe('success');
|
|
45
61
|
expect(content.data.health).toBe('healthy');
|
|
46
62
|
});
|
|
47
63
|
it('reports degraded when warnings exist', async () => {
|
|
48
|
-
const config =
|
|
64
|
+
const config = makeFakeConfig();
|
|
49
65
|
const tool = new UiHealthTool(config);
|
|
50
|
-
const invocation = tool.
|
|
66
|
+
const invocation = tool.build({});
|
|
51
67
|
const svc = DesktopAutomationService.getInstance();
|
|
52
|
-
vi.spyOn(svc, 'diagnose').mockResolvedValue({
|
|
53
|
-
connection: { connected: true },
|
|
54
|
-
driver: {
|
|
55
|
-
name: 'mock',
|
|
56
|
-
kind: 'mock',
|
|
57
|
-
version: '1.0',
|
|
58
|
-
capabilities: {},
|
|
59
|
-
},
|
|
68
|
+
vi.spyOn(svc, 'diagnose').mockResolvedValue(makeReport({
|
|
60
69
|
snapshotSanity: {
|
|
61
70
|
desktopRootChildren: 0,
|
|
62
71
|
applicationNamesSample: [],
|
|
@@ -64,8 +73,7 @@ describe('UiHealthTool', () => {
|
|
|
64
73
|
notes: [],
|
|
65
74
|
},
|
|
66
75
|
warnings: ['Something is wrong'],
|
|
67
|
-
|
|
68
|
-
});
|
|
76
|
+
}));
|
|
69
77
|
const result = await invocation.execute(new AbortController().signal);
|
|
70
78
|
const content = JSON.parse(result.llmContent);
|
|
71
79
|
// Our implementation sets status 'mixed' for warnings, which formatUiResult handles?
|
|
@@ -83,22 +91,14 @@ describe('UiHealthTool', () => {
|
|
|
83
91
|
expect(content.message).toContain('Driver connected but has warnings');
|
|
84
92
|
});
|
|
85
93
|
it('reports error when disconnected', async () => {
|
|
86
|
-
const config =
|
|
94
|
+
const config = makeFakeConfig();
|
|
87
95
|
const tool = new UiHealthTool(config);
|
|
88
|
-
const invocation = tool.
|
|
96
|
+
const invocation = tool.build({});
|
|
89
97
|
const svc = DesktopAutomationService.getInstance();
|
|
90
|
-
vi.spyOn(svc, 'diagnose').mockResolvedValue({
|
|
98
|
+
vi.spyOn(svc, 'diagnose').mockResolvedValue(makeReport({
|
|
91
99
|
connection: { connected: false, error: 'Disconnected' },
|
|
92
|
-
driver: {
|
|
93
|
-
name: 'mock',
|
|
94
|
-
kind: 'mock',
|
|
95
|
-
version: '1.0',
|
|
96
|
-
capabilities: {},
|
|
97
|
-
},
|
|
98
|
-
snapshotSanity: {},
|
|
99
100
|
warnings: ['Driver disconnected or disabled'],
|
|
100
|
-
|
|
101
|
-
});
|
|
101
|
+
}));
|
|
102
102
|
const result = await invocation.execute(new AbortController().signal);
|
|
103
103
|
const content = JSON.parse(result.llmContent);
|
|
104
104
|
expect(content.status).toBe('error');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-health.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/ui-health.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ui-health.test.js","sourceRoot":"","sources":["../../../../src/tools/__tests__/ui-health.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,12 @@
|
|
|
4
4
|
* Portions Copyright 2025 TerminaI Authors
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import path from 'node:path';
|
|
8
7
|
import { escapeShellArg, getShellConfiguration, getCommandRoots, initializeShellParsers, } from '../utils/shell-utils.js';
|
|
9
8
|
import { isCommandAllowed } from '../utils/shell-permissions.js';
|
|
10
9
|
import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
|
|
11
10
|
import { ToolErrorType } from './tool-error.js';
|
|
12
11
|
import { AGENT_CONTROL_TOOL_NAME } from './tool-names.js';
|
|
13
12
|
import { ProcessManager, getSharedProcessManagerState, } from './process-manager.js';
|
|
14
|
-
const DEFAULT_ALLOWED_AGENTS = new Set(['claude', 'aider']);
|
|
15
13
|
const normalizeAgentName = (value) => (value ?? '').trim();
|
|
16
14
|
const buildAgentCommand = (agent, args) => {
|
|
17
15
|
const { shell } = getShellConfiguration();
|
|
@@ -177,23 +175,13 @@ export class AgentControlTool extends BaseDeclarativeTool {
|
|
|
177
175
|
if (!agent) {
|
|
178
176
|
return "The 'agent' parameter must be provided for start.";
|
|
179
177
|
}
|
|
180
|
-
if (!DEFAULT_ALLOWED_AGENTS.has(agent)) {
|
|
181
|
-
return `Agent '${agent}' is not in the allowlist. Allowed: ${[
|
|
182
|
-
...DEFAULT_ALLOWED_AGENTS,
|
|
183
|
-
].join(', ')}`;
|
|
184
|
-
}
|
|
185
|
-
if (params.background !== true) {
|
|
186
|
-
return "The 'background' parameter must be set to true to start an agent.";
|
|
187
|
-
}
|
|
188
|
-
if (params.args && !Array.isArray(params.args)) {
|
|
189
|
-
return "The 'args' parameter must be an array of strings.";
|
|
190
|
-
}
|
|
191
178
|
if (params.cwd) {
|
|
192
|
-
|
|
193
|
-
const
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
179
|
+
// Unshackled: cwd can be anywhere.
|
|
180
|
+
// const resolvedPath = path.resolve(
|
|
181
|
+
// this.config.getTargetDir(),
|
|
182
|
+
// params.cwd,
|
|
183
|
+
// );
|
|
184
|
+
// We no longer enforce isPathWithinWorkspace(resolvedPath)
|
|
197
185
|
}
|
|
198
186
|
const args = params.args ?? [];
|
|
199
187
|
if (!args.every((arg) => typeof arg === 'string')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-control.js","sourceRoot":"","sources":["../../../src/tools/agent-control.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"agent-control.js","sourceRoot":"","sources":["../../../src/tools/agent-control.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,eAAe,EACf,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAQjE,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EACL,cAAc,EAEd,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AA0B9B,MAAM,kBAAkB,GAAG,CAAC,KAAc,EAAU,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAE5E,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,IAAc,EAAU,EAAE;IAClE,MAAM,EAAE,KAAK,EAAE,GAAG,qBAAqB,EAAE,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI;SACrB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACxC,MAAM,CAAC,OAAO,CAAC,CAAC;IACnB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,GAAG,KAAK,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,0BAA2B,SAAQ,kBAGxC;IAEoB;IADnB,YACmB,cAA8B,EAC/C,MAA8B,EAC9B,UAAuB,EACvB,SAAkB,EAClB,gBAAyB;QAEzB,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;QANtC,mBAAc,GAAd,cAAc,CAAgB;IAOjD,CAAC;IAED,cAAc;QACZ,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC9B,KAAK,OAAO;gBACV,OAAO,gBAAgB,IAAI,CAAC,MAAM,CAAC,KAAK,iBAAiB,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;YAC/E,KAAK,MAAM;gBACT,OAAO,gCAAgC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;YAC7D,KAAK,MAAM;gBACT,OAAO,mCAAmC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;YAChE,KAAK,MAAM;gBACT,OAAO,uBAAuB,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;YACpD,KAAK,MAAM;gBACT,OAAO,qBAAqB,CAAC;YAC/B,KAAK,QAAQ;gBACX,OAAO,iCAAiC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;YAC9D;gBACE,OAAO,uBAAuB,CAAC;QACnC,CAAC;IACH,CAAC;IAEkB,KAAK,CAAC,sBAAsB,CAC7C,YAAyB;QAEzB,MAAM,iBAAiB,GACrB,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,MAAM,CAAC;QACxE,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE;YACpB,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;gBACtC,OAAO,SAAS,IAAI,CAAC,MAAM,CAAC,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YAC7D,CAAC;YACD,OAAO,QAAQ,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,mBAAmB,GAAmC;YAC1D,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,sBAAsB;YAC7B,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAClC,SAAS,EAAE,KAAK,EAAE,OAAgC,EAAE,EAAE;gBACpD,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC1C,CAAC;SACF,CAAC;QAEF,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAoB;QAChC,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC9B,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,MAAM,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACxD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;gBACpC,MAAM,OAAO,GACX,IAAI,CAAC,MAAM,CAAC,OAAO;oBACnB,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACxD,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC;oBACtC,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE;oBACrC,OAAO;oBACP,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;oBACpB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;iBACrB,CAAC,CAAC;YACL,CAAC;YACD,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAClC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CACvB,CAAC;YACJ,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CACnC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAClB,CAAC;YACJ,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CACpC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAC/B,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS,CAChC,CAAC;YACJ,KAAK,MAAM;gBACT,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;YAC5C,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACxE;gBACE,OAAO;oBACL,UAAU,EAAE,iCAAiC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;oBACpE,aAAa,EAAE,0BAA0B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;oBAChE,KAAK,EAAE;wBACL,OAAO,EAAE,0BAA0B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;wBAC1D,IAAI,EAAE,aAAa,CAAC,gBAAgB;qBACrC;iBACF,CAAC;QACN,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,mBAGrC;IAMoB;IALnB,MAAM,CAAU,IAAI,GAAG,uBAAuB,CAAC;IAE9B,cAAc,CAAiB;IAEhD,YACmB,MAAc,EAC/B,UAAuB,EACvB,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,EAAE,4BAA4B,EAAE,CAAC;QAE3E,KAAK,sBAAsB,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;YACvC,6CAA6C;QAC/C,CAAC,CAAC,CAAC;QACH,KAAK,CACH,gBAAgB,CAAC,IAAI,EACrB,cAAc,EACd,2EAA2E,EAC3E,IAAI,CAAC,OAAO,EACZ;YACE,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,SAAS,EAAE;oBACT,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;oBACzD,WAAW,EAAE,yCAAyC;iBACvD;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,0CAA0C;iBACxD;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,oCAAoC;iBAClD;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,OAAO;oBACb,WAAW,EAAE,wCAAwC;oBACrD,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBAC1B;gBACD,GAAG,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,mDAAmD;iBACjE;gBACD,GAAG,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,+CAA+C;oBAC5D,oBAAoB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBACzC;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,mDAAmD;iBACjE;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,+CAA+C;iBAC7D;gBACD,IAAI,EAAE;oBACJ,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,kCAAkC;iBAChD;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC;oBACtC,WAAW,EAAE,wCAAwC;iBACtD;aACF;YACD,QAAQ,EAAE,CAAC,WAAW,CAAC;SACxB,EACD,KAAK,EACL,KAAK,EACL,UAAU,CACX,CAAC;QAjEe,WAAM,GAAN,MAAM,CAAQ;QAmE/B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;IAEkB,uBAAuB,CACxC,MAA8B;QAE9B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QACnC,MAAM,SAAS,GAAG,SAAS,KAAK,MAAM,CAAC;QACvC,IAAI,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YACvD,OAAO,2DAA2D,CAAC;QACrE,CAAC;QAED,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;YAC1B,MAAM,KAAK,GAAG,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC/C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,mDAAmD,CAAC;YAC7D,CAAC;YACD,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;gBACf,mCAAmC;gBACnC,qCAAqC;gBACrC,gCAAgC;gBAChC,gBAAgB;gBAChB,KAAK;gBACL,2DAA2D;YAC7D,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,EAAE,CAAC;gBAClD,OAAO,iDAAiD,CAAC;YAC3D,CAAC;YAED,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC/C,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;gBAC1B,OAAO,YAAY,CAAC,MAAM,IAAI,2BAA2B,OAAO,EAAE,CAAC;YACrE,CAAC;YACD,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1C,OAAO,iEAAiE,CAAC;YAC3E,CAAC;YAED,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;gBACf,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC1C,OAAO,sCAAsC,GAAG,EAAE,CAAC;oBACrD,CAAC;oBACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC9B,OAAO,yBAAyB,GAAG,qBAAqB,CAAC;oBAC3D,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QAC3B,CAAC;QAED,IAAI,SAAS,KAAK,MAAM,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACvD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC;gBACxD,OAAO,mDAAmD,CAAC;YAC7D,CAAC;QACH,CAAC;QAED,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,iDAAiD,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAES,gBAAgB,CACxB,MAA8B,EAC9B,UAAuB,EACvB,SAAkB,EAClB,gBAAyB;QAEzB,OAAO,IAAI,0BAA0B,CACnC,IAAI,CAAC,cAAc,EACnB,MAAM,EACN,UAAU,EACV,SAAS,EACT,gBAAgB,CACjB,CAAC;IACJ,CAAC"}
|
|
@@ -20,7 +20,8 @@ import { initializeShellParsers } from '../utils/shell-utils.js';
|
|
|
20
20
|
import * as fs from 'node:fs';
|
|
21
21
|
import * as os from 'node:os';
|
|
22
22
|
import * as path from 'node:path';
|
|
23
|
-
|
|
23
|
+
// Skip on Windows - initializeShellParsers() hangs
|
|
24
|
+
describe.skipIf(process.platform === 'win32')('AgentControlTool', () => {
|
|
24
25
|
let mockConfig;
|
|
25
26
|
let tempRootDir;
|
|
26
27
|
beforeAll(async () => {
|
|
@@ -54,23 +55,6 @@ describe('AgentControlTool', () => {
|
|
|
54
55
|
fs.rmSync(tempRootDir, { recursive: true, force: true });
|
|
55
56
|
}
|
|
56
57
|
});
|
|
57
|
-
it('requires background=true to start an agent session', () => {
|
|
58
|
-
const tool = new AgentControlTool(mockConfig);
|
|
59
|
-
expect(() => tool.build({
|
|
60
|
-
operation: 'start',
|
|
61
|
-
name: 'agent',
|
|
62
|
-
agent: 'claude',
|
|
63
|
-
})).toThrow('background');
|
|
64
|
-
});
|
|
65
|
-
it('rejects non-allowlisted agent binaries', () => {
|
|
66
|
-
const tool = new AgentControlTool(mockConfig);
|
|
67
|
-
expect(() => tool.build({
|
|
68
|
-
operation: 'start',
|
|
69
|
-
name: 'agent',
|
|
70
|
-
agent: 'unknown-agent',
|
|
71
|
-
background: true,
|
|
72
|
-
})).toThrow('allowlist');
|
|
73
|
-
});
|
|
74
58
|
it('starts an agent session and passes args to the command', async () => {
|
|
75
59
|
const tool = new AgentControlTool(mockConfig);
|
|
76
60
|
const invocation = tool.build({
|
|
@@ -112,15 +96,5 @@ describe('AgentControlTool', () => {
|
|
|
112
96
|
}
|
|
113
97
|
expect(confirmation.type).toBe('exec');
|
|
114
98
|
});
|
|
115
|
-
it('rejects cwd outside workspace', () => {
|
|
116
|
-
const tool = new AgentControlTool(mockConfig);
|
|
117
|
-
expect(() => tool.build({
|
|
118
|
-
operation: 'start',
|
|
119
|
-
name: 'agent',
|
|
120
|
-
agent: 'claude',
|
|
121
|
-
background: true,
|
|
122
|
-
cwd: '/etc',
|
|
123
|
-
})).toThrow('Directory');
|
|
124
|
-
});
|
|
125
99
|
});
|
|
126
100
|
//# sourceMappingURL=agent-control.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-control.test.js","sourceRoot":"","sources":["../../../src/tools/agent-control.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,MAAM,EACN,EAAE,EACF,EAAE,GACH,MAAM,QAAQ,CAAC;AAEhB,MAAM,yBAAyB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAClD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;IAChB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;IACnB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;CACrB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE,CAAC,CAAC;IACrD,qBAAqB,EAAE,yBAAyB;CACjD,CAAC,CAAC,CAAC;AAGJ,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"agent-control.test.js","sourceRoot":"","sources":["../../../src/tools/agent-control.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,MAAM,EACN,EAAE,EACF,EAAE,GACH,MAAM,QAAQ,CAAC;AAEhB,MAAM,yBAAyB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAClD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;IAChB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE;IACnB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;CACrB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE,CAAC,CAAC;IACrD,qBAAqB,EAAE,yBAAyB;CACjD,CAAC,CAAC,CAAC;AAGJ,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,mDAAmD;AACnD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,kBAAkB,EAAE,GAAG,EAAE;IACrE,IAAI,UAAkB,CAAC;IACvB,IAAI,WAAmB,CAAC;IAExB,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,sBAAsB,EAAE,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,4BAA4B,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEhD,WAAW,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAEvE,UAAU,GAAG;YACX,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YAC5C,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC;YAClD,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YACzC,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;YACrD,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,WAAW,CAAC;YAClD,yBAAyB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;YACxD,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;YACpD,mBAAmB,EAAE,EAAE;iBACpB,EAAE,EAAE;iBACJ,eAAe,CAAC,IAAI,gBAAgB,CAAC,WAAW,CAAC,CAAC;SACjC,CAAC;QAEvB,yBAAyB,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACjE,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,IAAI,OAAO,CAAuB,GAAG,EAAE,GAAE,CAAC,CAAC;YACnD,OAAO;SACR,CAAC,CAAC,CAAC;QAEJ,yBAAyB,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,IAAI,GAAG,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5B,SAAS,EAAE,OAAO;YAClB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,QAAQ;YACf,IAAI,EAAE,CAAC,QAAQ,CAAC;YAChB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC1D,MAAM,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC7D,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,IAAI,GAAG,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAM,IAAI;aACP,KAAK,CAAC;YACL,SAAS,EAAE,OAAO;YAClB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,QAAQ;YACf,UAAU,EAAE,IAAI;SACjB,CAAC;aACD,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAG,MAAM,IAAI;aACtB,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;aAC5D,OAAO,CAAC,IAAI,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;QAEzC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAC/D,GAAG,EACH,SAAS,CACV,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC9C,MAAM,IAAI,GAAG,IAAI,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QACpE,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,oBAAoB,CACxD,IAAI,eAAe,EAAE,CAAC,MAAM,CAC7B,CAAC;QAEF,IAAI,YAAY,KAAK,KAAK,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QACD,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|