@machina.ai/cell-cli 1.40.1-rc1 → 1.41.1-rc1
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/package.json +68 -93
- package/dist/src/acp/commands/restore.test.d.ts +6 -0
- package/dist/src/acp/commands/restore.test.js +179 -0
- package/dist/src/acp/commands/restore.test.js.map +1 -0
- package/dist/src/commands/extensions/examples/custom-commands/gemini-extension.json +2 -2
- package/dist/src/commands/extensions/examples/exclude-tools/gemini-extension.json +3 -3
- package/dist/src/commands/extensions/examples/hooks/gemini-extension.json +2 -2
- package/dist/src/commands/extensions/examples/hooks/hooks/hooks.json +11 -11
- package/dist/src/commands/extensions/examples/mcp-server/gemini-extension.json +8 -8
- package/dist/src/commands/extensions/examples/mcp-server/package.json +9 -9
- package/dist/src/commands/extensions/examples/policies/gemini-extension.json +3 -3
- package/dist/src/commands/extensions/examples/skills/gemini-extension.json +2 -2
- package/dist/src/commands/extensions/examples/themes-example/gemini-extension.json +27 -27
- package/dist/src/commands/mcp/list.js +14 -4
- package/dist/src/commands/mcp/list.js.map +1 -1
- package/dist/src/commands/mcp/list.test.js +48 -0
- package/dist/src/commands/mcp/list.test.js.map +1 -1
- package/dist/src/config/config.d.ts +1 -0
- package/dist/src/config/config.js +41 -7
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +126 -71
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/settings-validation.js +24 -6
- package/dist/src/config/settings-validation.js.map +1 -1
- package/dist/src/config/settings-validation.test.js +96 -0
- package/dist/src/config/settings-validation.test.js.map +1 -1
- package/dist/src/config/settings.js +30 -60
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +78 -0
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +101 -0
- package/dist/src/config/settingsSchema.js +98 -0
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/gemini.d.ts +1 -1
- package/dist/src/gemini.js +24 -17
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +42 -4
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/gemini_cleanup.test.js +103 -1
- package/dist/src/gemini_cleanup.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/services/BuiltinCommandLoader.js +2 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +2 -0
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/services/prompt-processors/shellProcessor.test.js +1 -0
- package/dist/src/services/prompt-processors/shellProcessor.test.js.map +1 -1
- package/dist/src/test-utils/mockConfig.js +1 -0
- package/dist/src/test-utils/mockConfig.js.map +1 -1
- package/dist/src/test-utils/render.js +3 -0
- package/dist/src/test-utils/render.js.map +1 -1
- package/dist/src/ui/AppContainer.js +19 -0
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +2 -1
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/commands/voiceCommand.d.ts +7 -0
- package/dist/src/ui/commands/voiceCommand.js +29 -0
- package/dist/src/ui/commands/voiceCommand.js.map +1 -0
- package/dist/src/ui/components/AppHeader.js +19 -1
- package/dist/src/ui/components/AppHeader.js.map +1 -1
- package/dist/src/ui/components/AsciiArt.d.ts +6 -6
- package/dist/src/ui/components/AsciiArt.js +6 -6
- package/dist/src/ui/components/CodiMascot.js +2 -25
- package/dist/src/ui/components/CodiMascot.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +4 -0
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +34 -13
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +289 -0
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +17 -5
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.test.js +1 -0
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
- package/dist/src/ui/components/SessionBrowser.test.js +1 -0
- package/dist/src/ui/components/SessionBrowser.test.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.test.js +22 -0
- package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/VoiceModelDialog.d.ts +11 -0
- package/dist/src/ui/components/VoiceModelDialog.js +118 -0
- package/dist/src/ui/components/VoiceModelDialog.js.map +1 -0
- package/dist/src/ui/components/messages/HintMessage.js +2 -1
- package/dist/src/ui/components/messages/HintMessage.js.map +1 -1
- package/dist/src/ui/components/messages/HintMessage.test.d.ts +6 -0
- package/dist/src/ui/components/messages/HintMessage.test.js +42 -0
- package/dist/src/ui/components/messages/HintMessage.test.js.map +1 -0
- package/dist/src/ui/components/messages/UserMessage.js +2 -1
- package/dist/src/ui/components/messages/UserMessage.js.map +1 -1
- package/dist/src/ui/components/messages/UserMessage.test.js +24 -0
- package/dist/src/ui/components/messages/UserMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/UserShellMessage.js +2 -1
- package/dist/src/ui/components/messages/UserShellMessage.js.map +1 -1
- package/dist/src/ui/components/messages/UserShellMessage.test.d.ts +6 -0
- package/dist/src/ui/components/messages/UserShellMessage.test.js +40 -0
- package/dist/src/ui/components/messages/UserShellMessage.test.js.map +1 -0
- package/dist/src/ui/components/shared/BaseSettingsDialog.js +1 -1
- package/dist/src/ui/components/shared/BaseSettingsDialog.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +5 -3
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +3 -0
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +2 -0
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +2 -0
- package/dist/src/ui/hooks/slashCommandProcessor.js +4 -0
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +2 -0
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.js +15 -11
- package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.test.js +40 -0
- package/dist/src/ui/hooks/useSlashCompletion.test.js.map +1 -1
- package/dist/src/ui/hooks/useVoiceMode.d.ts +28 -0
- package/dist/src/ui/hooks/useVoiceMode.js +333 -0
- package/dist/src/ui/hooks/useVoiceMode.js.map +1 -0
- package/dist/src/ui/hooks/useVoiceModelCommand.d.ts +12 -0
- package/dist/src/ui/hooks/useVoiceModelCommand.js +21 -0
- package/dist/src/ui/hooks/useVoiceModelCommand.js.map +1 -0
- package/dist/src/ui/key/keyBindings.d.ts +1 -0
- package/dist/src/ui/key/keyBindings.js +7 -3
- package/dist/src/ui/key/keyBindings.js.map +1 -1
- package/dist/src/ui/noninteractive/nonInteractiveUi.js +1 -0
- package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -1
- package/dist/src/utils/activityLogger.js +19 -9
- package/dist/src/utils/activityLogger.js.map +1 -1
- package/dist/src/utils/activityLogger.test.js +76 -1
- package/dist/src/utils/activityLogger.test.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.js +4 -3
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +8 -6
- package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
- package/dist/src/utils/sandbox.js +23 -10
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/sandbox.test.js +46 -0
- package/dist/src/utils/sandbox.test.js.map +1 -1
- package/dist/src/utils/sessionCleanup.test.js +1 -0
- package/dist/src/utils/sessionCleanup.test.js.map +1 -1
- package/dist/src/utils/sessionUtils.d.ts +4 -0
- package/dist/src/utils/sessionUtils.js +24 -0
- package/dist/src/utils/sessionUtils.js.map +1 -1
- package/dist/src/utils/sessionUtils.test.js +27 -0
- package/dist/src/utils/sessionUtils.test.js.map +1 -1
- package/dist/src/utils/userStartupWarnings.test.js +14 -0
- package/dist/src/utils/userStartupWarnings.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
package/dist/package.json
CHANGED
|
@@ -1,94 +1,69 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
"
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
"
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
"
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
"tar": "^7.5.8",
|
|
71
|
-
"tinygradient": "^1.1.5",
|
|
72
|
-
"undici": "^7.10.0",
|
|
73
|
-
"ws": "^8.16.0",
|
|
74
|
-
"yargs": "^17.7.2",
|
|
75
|
-
"zod": "^3.23.8"
|
|
76
|
-
},
|
|
77
|
-
"devDependencies": {
|
|
78
|
-
"@google/gemini-cli-test-utils": "file:../test-utils",
|
|
79
|
-
"@types/command-exists": "^1.2.3",
|
|
80
|
-
"@types/hast": "^3.0.4",
|
|
81
|
-
"@types/node": "^20.11.24",
|
|
82
|
-
"@types/react": "^19.2.0",
|
|
83
|
-
"@types/semver": "^7.7.0",
|
|
84
|
-
"@types/shell-quote": "^1.7.5",
|
|
85
|
-
"@types/ws": "^8.5.10",
|
|
86
|
-
"@types/yargs": "^17.0.32",
|
|
87
|
-
"@xterm/headless": "^5.5.0",
|
|
88
|
-
"typescript": "^5.3.3",
|
|
89
|
-
"vitest": "^3.1.1"
|
|
90
|
-
},
|
|
91
|
-
"engines": {
|
|
92
|
-
"node": ">=20"
|
|
93
|
-
}
|
|
94
|
-
}
|
|
2
|
+
"name": "@machina.ai/cell-cli",
|
|
3
|
+
"version": "1.41.1-rc1",
|
|
4
|
+
"description": "Cell CLI",
|
|
5
|
+
"repository": {
|
|
6
|
+
"type": "git",
|
|
7
|
+
"url": "git+https://github.com/machina-ai/cell-cli.git"
|
|
8
|
+
},
|
|
9
|
+
"type": "module",
|
|
10
|
+
"main": "index.js",
|
|
11
|
+
"bin": {
|
|
12
|
+
"cell-cli": "index.js"
|
|
13
|
+
},
|
|
14
|
+
"files": [
|
|
15
|
+
""
|
|
16
|
+
],
|
|
17
|
+
"config": {
|
|
18
|
+
"sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.41.1"
|
|
19
|
+
},
|
|
20
|
+
"dependencies": {
|
|
21
|
+
"@agentclientprotocol/sdk": "^0.16.1",
|
|
22
|
+
"@google/gemini-cli-core": "npm:@machina.ai/cell-cli-core@1.41.1-rc1",
|
|
23
|
+
"@google/genai": "1.30.0",
|
|
24
|
+
"@iarna/toml": "^2.2.5",
|
|
25
|
+
"@machina.ai/api-proxy": "1.18.4-rc0",
|
|
26
|
+
"@machina.ai/auth-keycloak": "1.19.4-rc0",
|
|
27
|
+
"@machina.ai/config-yaml": "1.11.0-rc0",
|
|
28
|
+
"@modelcontextprotocol/sdk": "^1.23.0",
|
|
29
|
+
"ansi-escapes": "^7.3.0",
|
|
30
|
+
"ansi-regex": "^6.2.2",
|
|
31
|
+
"chalk": "^4.1.2",
|
|
32
|
+
"cli-spinners": "^2.9.2",
|
|
33
|
+
"clipboardy": "~5.2.0",
|
|
34
|
+
"color-convert": "^2.0.1",
|
|
35
|
+
"command-exists": "^1.2.9",
|
|
36
|
+
"comment-json": "^4.2.5",
|
|
37
|
+
"diff": "^8.0.3",
|
|
38
|
+
"dotenv": "^17.1.0",
|
|
39
|
+
"extract-zip": "^2.0.1",
|
|
40
|
+
"fzf": "^0.5.2",
|
|
41
|
+
"glob": "^12.0.0",
|
|
42
|
+
"highlight.js": "^11.11.1",
|
|
43
|
+
"ink": "npm:@jrichman/ink@6.6.9",
|
|
44
|
+
"ink-gradient": "^3.0.0",
|
|
45
|
+
"ink-spinner": "^5.0.0",
|
|
46
|
+
"ink-text-input": "^6.0.0",
|
|
47
|
+
"latest-version": "^9.0.0",
|
|
48
|
+
"lowlight": "^3.3.0",
|
|
49
|
+
"mnemonist": "^0.40.3",
|
|
50
|
+
"open": "^10.1.2",
|
|
51
|
+
"prompts": "^2.4.2",
|
|
52
|
+
"proper-lockfile": "^4.1.2",
|
|
53
|
+
"react": "^19.2.0",
|
|
54
|
+
"shell-quote": "^1.8.3",
|
|
55
|
+
"simple-git": "^3.28.0",
|
|
56
|
+
"string-width": "^8.1.0",
|
|
57
|
+
"strip-ansi": "^7.1.0",
|
|
58
|
+
"strip-json-comments": "^3.1.1",
|
|
59
|
+
"tar": "^7.5.8",
|
|
60
|
+
"tinygradient": "^1.1.5",
|
|
61
|
+
"undici": "^7.10.0",
|
|
62
|
+
"ws": "^8.16.0",
|
|
63
|
+
"yargs": "^17.7.2",
|
|
64
|
+
"zod": "^3.23.8"
|
|
65
|
+
},
|
|
66
|
+
"engines": {
|
|
67
|
+
"node": ">=20"
|
|
68
|
+
}
|
|
69
|
+
}
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
7
|
+
import { RestoreCommand, ListCheckpointsCommand } from './restore.js';
|
|
8
|
+
import * as fs from 'node:fs/promises';
|
|
9
|
+
import { getCheckpointInfoList, getToolCallDataSchema, isNodeError, performRestore, } from '@google/gemini-cli-core';
|
|
10
|
+
vi.mock('node:fs/promises');
|
|
11
|
+
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
12
|
+
const actual = await importOriginal();
|
|
13
|
+
return {
|
|
14
|
+
...actual,
|
|
15
|
+
getCheckpointInfoList: vi.fn(),
|
|
16
|
+
getToolCallDataSchema: vi.fn(),
|
|
17
|
+
isNodeError: vi.fn(),
|
|
18
|
+
performRestore: vi.fn(),
|
|
19
|
+
};
|
|
20
|
+
});
|
|
21
|
+
describe('RestoreCommand', () => {
|
|
22
|
+
let context;
|
|
23
|
+
let restoreCommand;
|
|
24
|
+
beforeEach(() => {
|
|
25
|
+
vi.resetAllMocks();
|
|
26
|
+
restoreCommand = new RestoreCommand();
|
|
27
|
+
context = {
|
|
28
|
+
agentContext: {
|
|
29
|
+
config: {
|
|
30
|
+
getCheckpointingEnabled: vi.fn().mockReturnValue(true),
|
|
31
|
+
storage: {
|
|
32
|
+
getProjectTempCheckpointsDir: vi
|
|
33
|
+
.fn()
|
|
34
|
+
.mockReturnValue('/tmp/checkpoints'),
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
git: {},
|
|
39
|
+
sendMessage: vi.fn(),
|
|
40
|
+
};
|
|
41
|
+
});
|
|
42
|
+
it('delegates to list behavior when invoked without args', async () => {
|
|
43
|
+
const listExecuteSpy = vi
|
|
44
|
+
.spyOn(ListCheckpointsCommand.prototype, 'execute')
|
|
45
|
+
.mockResolvedValue({
|
|
46
|
+
name: 'restore list',
|
|
47
|
+
data: 'list data',
|
|
48
|
+
});
|
|
49
|
+
const response = await restoreCommand.execute(context, []);
|
|
50
|
+
expect(listExecuteSpy).toHaveBeenCalledWith(context);
|
|
51
|
+
expect(response).toEqual({
|
|
52
|
+
name: 'restore list',
|
|
53
|
+
data: 'list data',
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
it('returns checkpointing-disabled message when disabled', async () => {
|
|
57
|
+
context.agentContext.config.getCheckpointingEnabled.mockReturnValue(false);
|
|
58
|
+
const response = await restoreCommand.execute(context, ['checkpoint1']);
|
|
59
|
+
expect(response.data).toContain('Checkpointing is not enabled');
|
|
60
|
+
});
|
|
61
|
+
it('returns file-not-found message for missing checkpoint', async () => {
|
|
62
|
+
const error = new Error('ENOENT');
|
|
63
|
+
error.code = 'ENOENT';
|
|
64
|
+
vi.mocked(fs.readFile).mockRejectedValue(error);
|
|
65
|
+
vi.mocked(isNodeError).mockReturnValue(true);
|
|
66
|
+
const response = await restoreCommand.execute(context, ['missing']);
|
|
67
|
+
expect(response.data).toBe('File not found: missing.json');
|
|
68
|
+
});
|
|
69
|
+
it('handles checkpoint filename already ending in .json', async () => {
|
|
70
|
+
const error = new Error('ENOENT');
|
|
71
|
+
error.code = 'ENOENT';
|
|
72
|
+
vi.mocked(fs.readFile).mockRejectedValue(error);
|
|
73
|
+
vi.mocked(isNodeError).mockReturnValue(true);
|
|
74
|
+
const response = await restoreCommand.execute(context, ['existing.json']);
|
|
75
|
+
expect(response.data).toBe('File not found: existing.json');
|
|
76
|
+
expect(fs.readFile).toHaveBeenCalledWith(expect.stringContaining('existing.json'), 'utf-8');
|
|
77
|
+
});
|
|
78
|
+
it('returns invalid/corrupt checkpoint message when schema parse fails', async () => {
|
|
79
|
+
vi.mocked(fs.readFile).mockResolvedValue('{"invalid": "data"}');
|
|
80
|
+
vi.mocked(getToolCallDataSchema).mockReturnValue({
|
|
81
|
+
safeParse: vi.fn().mockReturnValue({ success: false }),
|
|
82
|
+
});
|
|
83
|
+
const response = await restoreCommand.execute(context, ['invalid']);
|
|
84
|
+
expect(response.data).toBe('Checkpoint file is invalid or corrupted.');
|
|
85
|
+
});
|
|
86
|
+
it('formats streamed restore results correctly', async () => {
|
|
87
|
+
vi.mocked(fs.readFile).mockResolvedValue('{"valid": "data"}');
|
|
88
|
+
vi.mocked(getToolCallDataSchema).mockReturnValue({
|
|
89
|
+
safeParse: vi
|
|
90
|
+
.fn()
|
|
91
|
+
.mockReturnValue({ success: true, data: { some: 'data' } }),
|
|
92
|
+
});
|
|
93
|
+
async function* mockRestoreGenerator() {
|
|
94
|
+
yield { type: 'message', messageType: 'info', content: 'Restoring...' };
|
|
95
|
+
yield { type: 'load_history', clientHistory: [{}, {}] };
|
|
96
|
+
yield { type: 'other', some: 'other' };
|
|
97
|
+
}
|
|
98
|
+
vi.mocked(performRestore).mockReturnValue(mockRestoreGenerator());
|
|
99
|
+
const response = await restoreCommand.execute(context, ['valid']);
|
|
100
|
+
expect(response.data).toContain('[INFO] Restoring...');
|
|
101
|
+
expect(response.data).toContain('Loaded history with 2 messages.');
|
|
102
|
+
expect(response.data).toContain('Restored: {"type":"other","some":"other"}');
|
|
103
|
+
});
|
|
104
|
+
it('returns generic unexpected error message for non-ENOENT failures', async () => {
|
|
105
|
+
vi.mocked(fs.readFile).mockRejectedValue(new Error('Random error'));
|
|
106
|
+
vi.mocked(isNodeError).mockReturnValue(false);
|
|
107
|
+
const response = await restoreCommand.execute(context, ['error']);
|
|
108
|
+
expect(response.data).toContain('An unexpected error occurred during restore: Error: Random error');
|
|
109
|
+
});
|
|
110
|
+
});
|
|
111
|
+
describe('ListCheckpointsCommand', () => {
|
|
112
|
+
let context;
|
|
113
|
+
let listCommand;
|
|
114
|
+
beforeEach(() => {
|
|
115
|
+
vi.resetAllMocks();
|
|
116
|
+
listCommand = new ListCheckpointsCommand();
|
|
117
|
+
context = {
|
|
118
|
+
agentContext: {
|
|
119
|
+
config: {
|
|
120
|
+
getCheckpointingEnabled: vi.fn().mockReturnValue(true),
|
|
121
|
+
storage: {
|
|
122
|
+
getProjectTempCheckpointsDir: vi
|
|
123
|
+
.fn()
|
|
124
|
+
.mockReturnValue('/tmp/checkpoints'),
|
|
125
|
+
},
|
|
126
|
+
},
|
|
127
|
+
},
|
|
128
|
+
};
|
|
129
|
+
});
|
|
130
|
+
it('returns checkpointing-disabled message when disabled', async () => {
|
|
131
|
+
context.agentContext.config.getCheckpointingEnabled.mockReturnValue(false);
|
|
132
|
+
const response = await listCommand.execute(context);
|
|
133
|
+
expect(response.data).toContain('Checkpointing is not enabled');
|
|
134
|
+
});
|
|
135
|
+
it('returns "No checkpoints found." when no .json checkpoints exist', async () => {
|
|
136
|
+
vi.mocked(fs.readdir).mockResolvedValue([
|
|
137
|
+
'not-a-checkpoint.txt',
|
|
138
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
139
|
+
]);
|
|
140
|
+
const response = await listCommand.execute(context);
|
|
141
|
+
expect(response.data).toBe('No checkpoints found.');
|
|
142
|
+
});
|
|
143
|
+
it('ignores error when mkdir fails', async () => {
|
|
144
|
+
vi.mocked(fs.mkdir).mockRejectedValue(new Error('mkdir fail'));
|
|
145
|
+
vi.mocked(fs.readdir).mockResolvedValue([]);
|
|
146
|
+
const response = await listCommand.execute(context);
|
|
147
|
+
expect(response.data).toBe('No checkpoints found.');
|
|
148
|
+
expect(fs.mkdir).toHaveBeenCalled();
|
|
149
|
+
});
|
|
150
|
+
it('formats checkpoint summary output from checkpoint metadata', async () => {
|
|
151
|
+
vi.mocked(fs.readdir).mockResolvedValue([
|
|
152
|
+
'cp1.json',
|
|
153
|
+
'cp2.json',
|
|
154
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
155
|
+
]);
|
|
156
|
+
vi.mocked(getCheckpointInfoList).mockReturnValue([
|
|
157
|
+
{ messageId: 'id1', checkpoint: 'cp1' },
|
|
158
|
+
{ messageId: 'id2', checkpoint: 'cp2' },
|
|
159
|
+
]);
|
|
160
|
+
const response = await listCommand.execute(context);
|
|
161
|
+
expect(response.data).toContain('Available Checkpoints:');
|
|
162
|
+
// Note: The current implementation of ListCheckpointsCommand incorrectly accesses
|
|
163
|
+
// fileName, toolName, etc. which don't exist on CheckpointInfo, resulting in 'Unknown'.
|
|
164
|
+
expect(response.data).toContain('- **Unknown**: Unknown (Status: Unknown)');
|
|
165
|
+
});
|
|
166
|
+
it('handles empty checkpoint info list', async () => {
|
|
167
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
168
|
+
vi.mocked(fs.readdir).mockResolvedValue(['some.json']);
|
|
169
|
+
vi.mocked(getCheckpointInfoList).mockReturnValue([]);
|
|
170
|
+
const response = await listCommand.execute(context);
|
|
171
|
+
expect(response.data).toBe('Available Checkpoints:\n');
|
|
172
|
+
});
|
|
173
|
+
it('returns generic unexpected error message on failures', async () => {
|
|
174
|
+
vi.mocked(fs.readdir).mockRejectedValue(new Error('Readdir fail'));
|
|
175
|
+
const response = await listCommand.execute(context);
|
|
176
|
+
expect(response.data).toBe('An unexpected error occurred while listing checkpoints.');
|
|
177
|
+
});
|
|
178
|
+
});
|
|
179
|
+
//# sourceMappingURL=restore.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"restore.test.js","sourceRoot":"","sources":["../../../../src/acp/commands/restore.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
]
|
|
11
|
-
}
|
|
2
|
+
"hooks": {
|
|
3
|
+
"SessionStart": [
|
|
4
|
+
{
|
|
5
|
+
"hooks": [
|
|
6
|
+
{
|
|
7
|
+
"type": "command",
|
|
8
|
+
"command": "node ${extensionPath}/scripts/on-start.js"
|
|
9
|
+
}
|
|
12
10
|
]
|
|
13
|
-
|
|
11
|
+
}
|
|
12
|
+
]
|
|
13
|
+
}
|
|
14
14
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
}
|
|
2
|
+
"name": "mcp-server-example",
|
|
3
|
+
"version": "1.0.0",
|
|
4
|
+
"mcpServers": {
|
|
5
|
+
"nodeServer": {
|
|
6
|
+
"command": "node",
|
|
7
|
+
"args": ["${extensionPath}${/}example.js"],
|
|
8
|
+
"cwd": "${extensionPath}"
|
|
10
9
|
}
|
|
10
|
+
}
|
|
11
11
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
2
|
+
"name": "mcp-server-example",
|
|
3
|
+
"version": "1.0.0",
|
|
4
|
+
"description": "Example MCP Server for Cell CLI Extension",
|
|
5
|
+
"type": "module",
|
|
6
|
+
"main": "example.js",
|
|
7
|
+
"dependencies": {
|
|
8
|
+
"@modelcontextprotocol/sdk": "^1.23.0",
|
|
9
|
+
"zod": "^3.22.4"
|
|
10
|
+
}
|
|
11
11
|
}
|
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
2
|
+
"name": "themes-example",
|
|
3
|
+
"version": "1.0.0",
|
|
4
|
+
"themes": [
|
|
5
|
+
{
|
|
6
|
+
"name": "shades-of-green",
|
|
7
|
+
"type": "custom",
|
|
8
|
+
"background": {
|
|
9
|
+
"primary": "#1a362a"
|
|
10
|
+
},
|
|
11
|
+
"text": {
|
|
12
|
+
"primary": "#a6e3a1",
|
|
13
|
+
"secondary": "#6e8e7a",
|
|
14
|
+
"link": "#89e689"
|
|
15
|
+
},
|
|
16
|
+
"status": {
|
|
17
|
+
"success": "#76c076",
|
|
18
|
+
"warning": "#d9e689",
|
|
19
|
+
"error": "#b34e4e"
|
|
20
|
+
},
|
|
21
|
+
"border": {
|
|
22
|
+
"default": "#4a6c5a"
|
|
23
|
+
},
|
|
24
|
+
"ui": {
|
|
25
|
+
"comment": "#6e8e7a"
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
]
|
|
29
29
|
}
|
|
@@ -40,6 +40,7 @@ export async function getMcpServersFromConfig(settings) {
|
|
|
40
40
|
const filteredResult = applyAdminAllowlist(mcpServers, adminAllowlist);
|
|
41
41
|
return filteredResult;
|
|
42
42
|
}
|
|
43
|
+
const MCP_LIST_DEFAULT_TIMEOUT_MSEC = 5000;
|
|
43
44
|
async function testMCPConnection(serverName, config, isTrusted, activeSettings) {
|
|
44
45
|
// SECURITY: Only test connection if workspace is trusted or if it's a remote server.
|
|
45
46
|
// stdio servers execute local commands and must never run in untrusted workspaces.
|
|
@@ -81,10 +82,19 @@ async function testMCPConnection(serverName, config, isTrusted, activeSettings)
|
|
|
81
82
|
return MCPServerStatus.DISCONNECTED;
|
|
82
83
|
}
|
|
83
84
|
try {
|
|
84
|
-
// Attempt actual MCP connection with
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
await client.
|
|
85
|
+
// Attempt actual MCP connection with timeout from config or default to 5s.
|
|
86
|
+
// We use a short default for the list command to keep it responsive.
|
|
87
|
+
const timeout = config.timeout ?? MCP_LIST_DEFAULT_TIMEOUT_MSEC;
|
|
88
|
+
await client.connect(transport, { timeout });
|
|
89
|
+
// Test basic MCP protocol by pinging the server.
|
|
90
|
+
// Ping is optional per MCP spec - some servers (e.g. Google first-party)
|
|
91
|
+
// don't implement it. A successful connect() is sufficient proof of connectivity.
|
|
92
|
+
try {
|
|
93
|
+
await client.ping({ timeout });
|
|
94
|
+
}
|
|
95
|
+
catch (e) {
|
|
96
|
+
debugLogger.debug(`MCP ping failed for ${serverName}, but connect succeeded:`, e);
|
|
97
|
+
}
|
|
88
98
|
await client.close();
|
|
89
99
|
return MCPServerStatus.CONNECTED;
|
|
90
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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"}
|