@machina.ai/cell-cli 1.60.0-rc1 → 1.64.0-rc2
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/index.js +7 -0
- package/dist/index.js.map +1 -1
- package/dist/package.json +3 -3
- package/dist/src/acp/acpResume.test.js +50 -0
- package/dist/src/acp/acpResume.test.js.map +1 -1
- package/dist/src/acp/acpRpcDispatcher.d.ts +1 -1
- package/dist/src/acp/acpRpcDispatcher.js +2 -2
- package/dist/src/acp/acpRpcDispatcher.js.map +1 -1
- package/dist/src/acp/acpRpcDispatcher.test.js +9 -0
- package/dist/src/acp/acpRpcDispatcher.test.js.map +1 -1
- package/dist/src/acp/acpSession.d.ts +1 -1
- package/dist/src/acp/acpSession.js +90 -80
- package/dist/src/acp/acpSession.js.map +1 -1
- package/dist/src/acp/acpSession.test.js +279 -2
- package/dist/src/acp/acpSession.test.js.map +1 -1
- package/dist/src/acp/acpSessionManager.d.ts +2 -2
- package/dist/src/acp/acpSessionManager.js +165 -73
- package/dist/src/acp/acpSessionManager.js.map +1 -1
- package/dist/src/acp/acpSessionManager.test.js +204 -1
- package/dist/src/acp/acpSessionManager.test.js.map +1 -1
- package/dist/src/acp/acpUtils.js +5 -3
- package/dist/src/acp/acpUtils.js.map +1 -1
- package/dist/src/config/config.js +1 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension-manager.js +8 -5
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension-manager.test.js +27 -0
- package/dist/src/config/extension-manager.test.js.map +1 -1
- package/dist/src/config/extensions/update.js +7 -2
- package/dist/src/config/extensions/update.js.map +1 -1
- package/dist/src/config/extensions/update.test.js +21 -0
- package/dist/src/config/extensions/update.test.js.map +1 -1
- package/dist/src/config/mcp/mcpServerEnablement.d.ts +5 -0
- package/dist/src/config/mcp/mcpServerEnablement.js +26 -3
- package/dist/src/config/mcp/mcpServerEnablement.js.map +1 -1
- package/dist/src/config/mcp/mcpServerEnablement.test.js +27 -0
- package/dist/src/config/mcp/mcpServerEnablement.test.js.map +1 -1
- package/dist/src/config/settings.test.js +22 -0
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +10 -1
- package/dist/src/config/settingsSchema.js +38 -2
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/core/auth.test.js +1 -1
- package/dist/src/core/auth.test.js.map +1 -1
- package/dist/src/gemini.js +110 -18
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini_uncaught.test.d.ts +6 -0
- package/dist/src/gemini_uncaught.test.js +91 -0
- package/dist/src/gemini_uncaught.test.js.map +1 -0
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/patches/http-proxy-agent.d.ts +4 -1
- package/dist/src/patches/http-proxy-agent.js +38 -2
- package/dist/src/patches/http-proxy-agent.js.map +1 -1
- package/dist/src/patches/https-proxy-agent.d.ts +4 -1
- package/dist/src/patches/https-proxy-agent.js +38 -2
- package/dist/src/patches/https-proxy-agent.js.map +1 -1
- package/dist/src/services/FileCommandLoader.js +3 -5
- package/dist/src/services/FileCommandLoader.js.map +1 -1
- package/dist/src/services/FileCommandLoader.test.js +68 -6
- package/dist/src/services/FileCommandLoader.test.js.map +1 -1
- package/dist/src/ui/AppContainer.js +42 -39
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +30 -0
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.js +11 -3
- package/dist/src/ui/auth/AuthDialog.js.map +1 -1
- package/dist/src/ui/auth/useAuth.test.js +1 -1
- package/dist/src/ui/auth/useAuth.test.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.js +3 -3
- package/dist/src/ui/commands/bugCommand.js.map +1 -1
- package/dist/src/ui/commands/bugCommand.test.js +44 -0
- package/dist/src/ui/commands/bugCommand.test.js.map +1 -1
- package/dist/src/ui/commands/bugMemoryCommand.js +2 -2
- package/dist/src/ui/commands/bugMemoryCommand.js.map +1 -1
- package/dist/src/ui/commands/bugMemoryCommand.test.js +12 -0
- package/dist/src/ui/commands/bugMemoryCommand.test.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/AskUserDialog.js +7 -2
- package/dist/src/ui/components/AskUserDialog.js.map +1 -1
- package/dist/src/ui/components/AskUserDialog.test.js +33 -0
- package/dist/src/ui/components/AskUserDialog.test.js.map +1 -1
- package/dist/src/ui/components/Composer.js +4 -4
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +50 -2
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +17 -11
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +103 -7
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.d.ts +1 -0
- package/dist/src/ui/components/LoadingIndicator.js +13 -11
- package/dist/src/ui/components/LoadingIndicator.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.test.js +29 -0
- package/dist/src/ui/components/LoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +79 -14
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/MainContent.test.js +218 -5
- package/dist/src/ui/components/MainContent.test.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +1 -2
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.test.js +4 -3
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
- package/dist/src/ui/components/ProgressBar.js +4 -3
- package/dist/src/ui/components/ProgressBar.js.map +1 -1
- package/dist/src/ui/components/ProgressBar.test.js +12 -0
- package/dist/src/ui/components/ProgressBar.test.js.map +1 -1
- package/dist/src/ui/components/RewindViewer.js +2 -1
- package/dist/src/ui/components/RewindViewer.js.map +1 -1
- package/dist/src/ui/components/RewindViewer.test.js +38 -0
- package/dist/src/ui/components/RewindViewer.test.js.map +1 -1
- package/dist/src/ui/components/StatusRow.d.ts +2 -0
- package/dist/src/ui/components/StatusRow.js +11 -6
- package/dist/src/ui/components/StatusRow.js.map +1 -1
- package/dist/src/ui/components/StatusRow.test.js +158 -0
- package/dist/src/ui/components/StatusRow.test.js.map +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.js +4 -2
- package/dist/src/ui/components/ToolConfirmationQueue.js.map +1 -1
- package/dist/src/ui/components/ToolConfirmationQueue.test.js +30 -0
- package/dist/src/ui/components/ToolConfirmationQueue.test.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.js +5 -5
- package/dist/src/ui/components/messages/DenseToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.test.js +13 -0
- package/dist/src/ui/components/messages/DenseToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.d.ts +1 -0
- package/dist/src/ui/components/messages/DiffRenderer.js +16 -8
- package/dist/src/ui/components/messages/DiffRenderer.js.map +1 -1
- package/dist/src/ui/components/messages/DiffRenderer.test.js +42 -0
- package/dist/src/ui/components/messages/DiffRenderer.test.js.map +1 -1
- package/dist/src/ui/components/messages/ShellToolMessage.js +4 -3
- package/dist/src/ui/components/messages/ShellToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +74 -16
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +80 -7
- package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolGroupMessage.js +6 -5
- package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolMessage.js +2 -1
- package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.js +11 -8
- package/dist/src/ui/components/messages/ToolResultDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/ToolShared.js +5 -4
- package/dist/src/ui/components/messages/ToolShared.js.map +1 -1
- package/dist/src/ui/components/shared/HalfLinePaddedBox.js +4 -2
- package/dist/src/ui/components/shared/HalfLinePaddedBox.js.map +1 -1
- package/dist/src/ui/components/shared/HalfLinePaddedBox.test.js +8 -0
- package/dist/src/ui/components/shared/HalfLinePaddedBox.test.js.map +1 -1
- package/dist/src/ui/components/shared/SearchableList.js +1 -1
- package/dist/src/ui/components/shared/SearchableList.js.map +1 -1
- package/dist/src/ui/components/shared/SearchableList.test.js +13 -0
- package/dist/src/ui/components/shared/SearchableList.test.js.map +1 -1
- package/dist/src/ui/components/shared/TextInput.js +2 -2
- package/dist/src/ui/components/shared/TextInput.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionRegistryView.test.js +2 -0
- package/dist/src/ui/components/views/ExtensionRegistryView.test.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.js +20 -2
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +24 -0
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +1 -0
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/emergency-stop.test.d.ts +6 -0
- package/dist/src/ui/emergency-stop.test.js +116 -0
- package/dist/src/ui/emergency-stop.test.js.map +1 -0
- package/dist/src/ui/hooks/atCommandProcessor.d.ts +8 -5
- package/dist/src/ui/hooks/atCommandProcessor.js +47 -16
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.js +160 -0
- package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useComposerStatus.d.ts +1 -0
- package/dist/src/ui/hooks/useComposerStatus.js +1 -0
- package/dist/src/ui/hooks/useComposerStatus.js.map +1 -1
- package/dist/src/ui/hooks/useFocus.js +1 -0
- package/dist/src/ui/hooks/useFocus.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.js +16 -16
- package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
- package/dist/src/ui/hooks/useFolderTrust.test.js +186 -3
- package/dist/src/ui/hooks/useFolderTrust.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +4 -12
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +134 -2
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.d.ts +1 -0
- package/dist/src/ui/hooks/useLoadingIndicator.js +1 -0
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +2 -0
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js +2 -2
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.js +24 -1
- package/dist/src/ui/hooks/useSelectionList.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.test.js +63 -1
- package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
- package/dist/src/ui/hooks/useVoiceMode.js +2 -2
- package/dist/src/ui/hooks/useVoiceMode.js.map +1 -1
- package/dist/src/ui/utils/CodeColorizer.d.ts +1 -0
- package/dist/src/ui/utils/CodeColorizer.js +13 -7
- package/dist/src/ui/utils/CodeColorizer.js.map +1 -1
- package/dist/src/ui/utils/TableRenderer.js +3 -2
- package/dist/src/ui/utils/TableRenderer.js.map +1 -1
- package/dist/src/ui/utils/borderStyles.d.ts +1 -0
- package/dist/src/ui/utils/borderStyles.js +1 -0
- package/dist/src/ui/utils/borderStyles.js.map +1 -1
- package/dist/src/ui/utils/fileUtils.d.ts +4 -0
- package/dist/src/ui/utils/fileUtils.js +13 -0
- package/dist/src/ui/utils/fileUtils.js.map +1 -1
- package/dist/src/ui/utils/renderBorder.d.ts +27 -0
- package/dist/src/ui/utils/renderBorder.js +46 -0
- package/dist/src/ui/utils/renderBorder.js.map +1 -0
- package/dist/src/ui/utils/renderBorder.test.d.ts +6 -0
- package/dist/src/ui/utils/renderBorder.test.js +74 -0
- package/dist/src/ui/utils/renderBorder.test.js.map +1 -0
- package/dist/src/ui/utils/rewindFileOps.d.ts +9 -0
- package/dist/src/ui/utils/rewindFileOps.js +25 -1
- package/dist/src/ui/utils/rewindFileOps.js.map +1 -1
- package/dist/src/ui/utils/rewindFileOps.test.js +94 -1
- package/dist/src/ui/utils/rewindFileOps.test.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.js +7 -0
- package/dist/src/ui/utils/terminalCapabilityManager.js.map +1 -1
- package/dist/src/ui/utils/terminalCapabilityManager.stdin-flow.test.d.ts +6 -0
- package/dist/src/ui/utils/terminalCapabilityManager.stdin-flow.test.js +105 -0
- package/dist/src/ui/utils/terminalCapabilityManager.stdin-flow.test.js.map +1 -0
- package/dist/src/utils/commentJson.js +66 -5
- package/dist/src/utils/commentJson.js.map +1 -1
- package/dist/src/utils/commentJson.test.js +21 -0
- package/dist/src/utils/commentJson.test.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +2 -2
- package/dist/src/utils/persistentState.js +84 -15
- package/dist/src/utils/persistentState.js.map +1 -1
- package/dist/src/utils/persistentState.test.js +66 -9
- package/dist/src/utils/persistentState.test.js.map +1 -1
- package/dist/src/utils/persistentStateRecovery.test.d.ts +6 -0
- package/dist/src/utils/persistentStateRecovery.test.js +84 -0
- package/dist/src/utils/persistentStateRecovery.test.js.map +1 -0
- package/dist/src/utils/processUtils.d.ts +3 -1
- package/dist/src/utils/processUtils.js +26 -1
- package/dist/src/utils/processUtils.js.map +1 -1
- package/dist/src/utils/processUtils.test.js +58 -1
- package/dist/src/utils/processUtils.test.js.map +1 -1
- package/dist/src/utils/relaunch.js +7 -0
- package/dist/src/utils/relaunch.js.map +1 -1
- package/dist/src/utils/relaunch.test.js +16 -0
- package/dist/src/utils/relaunch.test.js.map +1 -1
- package/dist/src/utils/retry.d.ts +22 -0
- package/dist/src/utils/retry.js +54 -0
- package/dist/src/utils/retry.js.map +1 -0
- package/dist/src/utils/retry.test.d.ts +6 -0
- package/dist/src/utils/retry.test.js +141 -0
- package/dist/src/utils/retry.test.js.map +1 -0
- package/dist/src/utils/sandbox-macos-permissive-open.sb +36 -1
- package/dist/src/utils/sandbox-macos-permissive-proxied.sb +36 -1
- package/dist/src/utils/sandbox-macos-profiles.test.js +93 -0
- package/dist/src/utils/sandbox-macos-profiles.test.js.map +1 -1
- package/dist/src/utils/sandbox-macos-restrictive-open.sb +39 -1
- package/dist/src/utils/sandbox-macos-restrictive-proxied.sb +40 -1
- package/dist/src/utils/sandbox-macos-strict-open.sb +38 -2
- package/dist/src/utils/sandbox-macos-strict-proxied.sb +38 -2
- package/dist/src/utils/sandbox.js +120 -47
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/sandbox.test.js +312 -5
- package/dist/src/utils/sandbox.test.js.map +1 -1
- package/dist/src/utils/sandboxBuiltinProfiles.js +198 -8
- package/dist/src/utils/sandboxBuiltinProfiles.js.map +1 -1
- package/dist/src/utils/sandboxUtils.d.ts +11 -0
- package/dist/src/utils/sandboxUtils.js +150 -2
- package/dist/src/utils/sandboxUtils.js.map +1 -1
- package/dist/src/utils/sandboxUtils.test.js +257 -3
- package/dist/src/utils/sandboxUtils.test.js.map +1 -1
- package/dist/src/utils/sessionUtils.d.ts +21 -1
- package/dist/src/utils/sessionUtils.js +66 -2
- package/dist/src/utils/sessionUtils.js.map +1 -1
- package/dist/src/utils/sessionUtils.test.js +143 -0
- package/dist/src/utils/sessionUtils.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -77,6 +77,9 @@ async function run() {
|
|
|
77
77
|
stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
|
|
78
78
|
env: newEnv,
|
|
79
79
|
});
|
|
80
|
+
// Clear one-time auth override from supervisor environment after passing to child
|
|
81
|
+
delete process.env['CELL_CLI_AUTH_OVERRIDE'];
|
|
82
|
+
delete newEnv['CELL_CLI_AUTH_OVERRIDE'];
|
|
80
83
|
if (latestAdminSettings) {
|
|
81
84
|
child.send({ type: 'admin-settings', settings: latestAdminSettings });
|
|
82
85
|
}
|
|
@@ -84,6 +87,10 @@ async function run() {
|
|
|
84
87
|
if (msg.type === 'admin-settings-update' && msg.settings) {
|
|
85
88
|
latestAdminSettings = msg.settings;
|
|
86
89
|
}
|
|
90
|
+
if (msg.type === 'auth-selected-type' && msg.authType) {
|
|
91
|
+
process.env['CELL_CLI_AUTH_OVERRIDE'] = msg.authType;
|
|
92
|
+
newEnv['CELL_CLI_AUTH_OVERRIDE'] = msg.authType;
|
|
93
|
+
}
|
|
87
94
|
});
|
|
88
95
|
return new Promise((resolve) => {
|
|
89
96
|
child.on('error', (err) => {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@machina.ai/cell-cli",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.64.0-rc2",
|
|
4
4
|
"description": "Cell CLI",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -15,11 +15,11 @@
|
|
|
15
15
|
""
|
|
16
16
|
],
|
|
17
17
|
"config": {
|
|
18
|
-
"sandboxImageUri": "machinaai/cell-cli-sandbox:1.
|
|
18
|
+
"sandboxImageUri": "machinaai/cell-cli-sandbox:1.64.0-rc2"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@agentclientprotocol/sdk": "0.16.1",
|
|
22
|
-
"@google/gemini-cli-core": "npm:@machina.ai/cell-cli-core@1.
|
|
22
|
+
"@google/gemini-cli-core": "npm:@machina.ai/cell-cli-core@1.64.0-rc2",
|
|
23
23
|
"@google/genai": "1.30.0",
|
|
24
24
|
"@machina.ai/api-proxy": "1.45.1-rc2",
|
|
25
25
|
"@machina.ai/auth-keycloak": "1.19.4-rc1",
|
|
@@ -256,5 +256,55 @@ describe('GeminiAgent Session Resume', () => {
|
|
|
256
256
|
}));
|
|
257
257
|
});
|
|
258
258
|
});
|
|
259
|
+
it('should resolve session before initializing config or fresh chat recording', async () => {
|
|
260
|
+
const callOrder = [];
|
|
261
|
+
const resolveSessionMock = vi.fn().mockImplementation(async () => {
|
|
262
|
+
callOrder.push('resolveSession');
|
|
263
|
+
return {
|
|
264
|
+
sessionData: {
|
|
265
|
+
sessionId: 'same-minute-session-id',
|
|
266
|
+
messages: [{ type: 'user', content: [{ text: 'Hello' }] }],
|
|
267
|
+
},
|
|
268
|
+
sessionPath: '/path/to/session.jsonl',
|
|
269
|
+
};
|
|
270
|
+
});
|
|
271
|
+
SessionSelector.mockImplementation(() => ({
|
|
272
|
+
resolveSession: resolveSessionMock,
|
|
273
|
+
}));
|
|
274
|
+
mockConfig.initialize.mockImplementation(async () => {
|
|
275
|
+
callOrder.push('config.initialize');
|
|
276
|
+
});
|
|
277
|
+
vi.mocked(mockConfig.getGeminiClient().resumeChat).mockImplementation(async () => {
|
|
278
|
+
callOrder.push('geminiClient.resumeChat');
|
|
279
|
+
});
|
|
280
|
+
convertSessionToClientHistory.mockReturnValue([
|
|
281
|
+
{ role: 'user', parts: [{ text: 'Hello' }] },
|
|
282
|
+
]);
|
|
283
|
+
await agent.loadSession({
|
|
284
|
+
sessionId: 'same-minute-session-id',
|
|
285
|
+
cwd: '/tmp',
|
|
286
|
+
mcpServers: [],
|
|
287
|
+
});
|
|
288
|
+
expect(callOrder).toEqual([
|
|
289
|
+
'resolveSession',
|
|
290
|
+
'config.initialize',
|
|
291
|
+
'geminiClient.resumeChat',
|
|
292
|
+
]);
|
|
293
|
+
expect(mockConfig.getGeminiClient().initialize).not.toHaveBeenCalled();
|
|
294
|
+
});
|
|
295
|
+
it('should not initialize config if session resolution fails', async () => {
|
|
296
|
+
SessionSelector.mockImplementation(() => ({
|
|
297
|
+
resolveSession: vi
|
|
298
|
+
.fn()
|
|
299
|
+
.mockRejectedValue(new Error('No previous sessions found for this project.')),
|
|
300
|
+
}));
|
|
301
|
+
await expect(agent.loadSession({
|
|
302
|
+
sessionId: 'missing-session-id',
|
|
303
|
+
cwd: '/tmp',
|
|
304
|
+
mcpServers: [],
|
|
305
|
+
})).rejects.toThrow('No previous sessions found for this project.');
|
|
306
|
+
expect(mockConfig.initialize).not.toHaveBeenCalled();
|
|
307
|
+
expect(mockConfig.getGeminiClient().resumeChat).not.toHaveBeenCalled();
|
|
308
|
+
});
|
|
259
309
|
});
|
|
260
310
|
//# sourceMappingURL=acpResume.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acpResume.test.js","sourceRoot":"","sources":["../../../src/acp/acpResume.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EACR,EAAE,EACF,MAAM,EACN,EAAE,EACF,UAAU,GAGX,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EACL,YAAY,EACZ,QAAQ,EAER,kBAAkB,GACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EACL,eAAe,EACf,8BAA8B,GAC/B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,CAAC;IACpC,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;CACvB,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC3D,MAAM,MAAM,GACV,MAAM,cAAc,EAA6C,CAAC;IACpE,OAAO;QACL,GAAG,MAAM;QACT,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;QACxB,8BAA8B,EAAE,EAAE,CAAC,EAAE,EAAE;KACxC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,MAAM,GACV,MAAM,cAAc,EAA4C,CAAC;IACnE,OAAO;QACL,GAAG,MAAM;QACT,kBAAkB,EAAE;YAClB,UAAU,EAAE,YAAY;YACxB,SAAS,EAAE,WAAW;YACtB,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,SAAS;YAClB,SAAS,EAAE,WAAW;YACtB,SAAS,EAAE,WAAW;YACtB,gBAAgB,EAAE,mBAAmB;SACtC;QACD,OAAO,EAAE;YACP,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,UAAU;YACpB,YAAY,EAAE,cAAc;YAC5B,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,QAAQ;YAChB,IAAI,EAAE,MAAM;SACb;QACD,6BAA6B,EAAE,EAAE,CAAC,EAAE,EAAE;KACvC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,IAAI,UAA0B,CAAC;IAC/B,IAAI,YAAoC,CAAC;IACzC,IAAI,QAAiB,CAAC;IACtB,IAAI,cAA+C,CAAC;IACpD,IAAI,KAAkB,CAAC;IAEvB,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,GAAG;YACX,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;YACjD,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;YAChD,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;YAC7B,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE;YAC7B,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;gBACvC,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;gBAChD,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;gBAChD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC;aACrC,CAAC;YACF,OAAO,EAAE;gBACP,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC;aAC3D;YACD,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;gBACvC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;aACjB,CAAC;YACF,UAAU,EAAE;gBACV,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;gBAClB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;aACrB;YACD,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;gBACrC,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;gBAClB,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;aACrB,CAAC;YACF,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;YACnD,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;YACnD,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC;YAC5C,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC;YAC/C,0BAA0B,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;YAC1D,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;YACvD,uBAAuB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;YACvD,YAAY,EAAE;gBACZ,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;aACnD;YACD,IAAI,MAAM;gBACR,OAAO,IAAI,CAAC;YACd,CAAC;SAC2B,CAAC;QAC/B,YAAY,GAAG;YACb,MAAM,EAAE;gBACN,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,QAAQ,CAAC,iBAAiB,EAAE,EAAE;gBAChE,UAAU,EAAE,EAAE;aACf;YACD,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE;SACmB,CAAC;QACvC,QAAQ,GAAG,EAAwB,CAAC;QACpC,cAAc,GAAG;YACf,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;SACN,CAAC;QAE/C,aAAsB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAEtD,KAAK,GAAG,IAAI,WAAW,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC;YACtC,eAAe,EAAE,GAAG,CAAC,gBAAgB;SACtC,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,MAAM,SAAS,GAAG,qBAAqB,CAAC;QACxC,MAAM,WAAW,GAAG;YAClB,SAAS;YACT,QAAQ,EAAE;gBACR,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;gBAC9C;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;oBAC/B,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;oBAClE,SAAS,EAAE;wBACT;4BACE,EAAE,EAAE,QAAQ;4BACZ,IAAI,EAAE,WAAW;4BACjB,WAAW,EAAE,WAAW;4BACxB,MAAM,EAAE,kBAAkB,CAAC,OAAO;4BAClC,aAAa,EAAE,aAAa;yBAC7B;qBACF;iBACF;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAC;oBACrC,SAAS,EAAE;wBACT;4BACE,EAAE,EAAE,QAAQ;4BACZ,IAAI,EAAE,YAAY;4BAClB,WAAW,EAAE,YAAY;4BACzB,MAAM,EAAE,kBAAkB,CAAC,KAAK;4BAChC,aAAa,EAAE,mBAAmB;yBACnC;qBACF;iBACF;aACF;SACF,CAAC;QAED,eAAmC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC;YAC7D,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;gBACxC,WAAW;gBACX,WAAW,EAAE,uBAAuB;aACrC,CAAC;SACH,CAAC,CAAC,CAAC;QAEJ,MAAM,iBAAiB,GAAG;YACxB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE;YAC5C,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE;SACjD,CAAC;QACD,8BAAkD,CAAC,eAAe,CAAC;YAClE,SAAS,EAAE,EAAE;SACd,CAAC,CAAC;QACF,6BAAiD,CAAC,eAAe,CAChE,iBAAiB,CAClB,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC;YACvC,SAAS;YACT,GAAG,EAAE,MAAM;YACX,UAAU,EAAE,EAAE;SACf,CAAC,CAAC;QAEH,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;YACvB,KAAK,EAAE;gBACL,cAAc,EAAE;oBACd;wBACE,EAAE,EAAE,YAAY,CAAC,OAAO;wBACxB,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,sBAAsB;qBACpC;oBACD;wBACE,EAAE,EAAE,YAAY,CAAC,SAAS;wBAC1B,IAAI,EAAE,WAAW;wBACjB,WAAW,EAAE,0BAA0B;qBACxC;oBACD;wBACE,EAAE,EAAE,YAAY,CAAC,IAAI;wBACrB,IAAI,EAAE,MAAM;wBACZ,WAAW,EAAE,yBAAyB;qBACvC;oBACD;wBACE,EAAE,EAAE,YAAY,CAAC,IAAI;wBACrB,IAAI,EAAE,MAAM;wBACZ,WAAW,EAAE,gBAAgB;qBAC9B;iBACF;gBACD,aAAa,EAAE,YAAY,CAAC,OAAO;aACpC;YACD,MAAM,EAAE;gBACN,eAAe,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAY;gBAC7C,cAAc,EAAE,YAAY;aAC7B;SACF,CAAC,CAAC;QAEH,mDAAmD;QACnD,MAAM,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAClE,iBAAiB,EACjB,MAAM,CAAC,gBAAgB,CAAC;YACtB,YAAY,EAAE,WAAW;YACzB,QAAQ,EAAE,uBAAuB;SAClC,CAAC,CACH,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,eAAe;YACf,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,oBAAoB;oBACnC,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;iBACpD,CAAC;aACH,CAAC,CACH,CAAC;YAEF,gBAAgB;YAChB,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,qBAAqB;oBACpC,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC;wBAC/B,IAAI,EAAE,8BAA8B;qBACrC,CAAC;iBACH,CAAC;aACH,CAAC,CACH,CAAC;YAEF,gBAAgB;YAChB,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,qBAAqB;oBACpC,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;iBACvD,CAAC;aACH,CAAC,CACH,CAAC;YAEF,qCAAqC;YACrC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,WAAW;oBAC1B,UAAU,EAAE,QAAQ;oBACpB,MAAM,EAAE,WAAW;oBACnB,KAAK,EAAE,WAAW;oBAClB,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE;wBACP;4BACE,IAAI,EAAE,SAAS;4BACf,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;yBAC/C;qBACF;iBACF,CAAC;aACH,CAAC,CACH,CAAC;YAEF,8BAA8B;YAC9B,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,oBAAoB,CACvD,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC;oBAC9B,aAAa,EAAE,WAAW;oBAC1B,UAAU,EAAE,QAAQ;oBACpB,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,YAAY;oBACnB,IAAI,EAAE,MAAM;iBACb,CAAC;aACH,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"acpResume.test.js","sourceRoot":"","sources":["../../../src/acp/acpResume.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export declare class GeminiAgent {
|
|
|
15
15
|
private customHeaders;
|
|
16
16
|
private sessionManager;
|
|
17
17
|
constructor(context: AgentLoopContext, settings: LoadedSettings, argv: CliArgs, connection: acp.AgentSideConnection);
|
|
18
|
-
dispose(): void
|
|
18
|
+
dispose(): Promise<void>;
|
|
19
19
|
initialize(args: acp.InitializeRequest): Promise<acp.InitializeResponse>;
|
|
20
20
|
authenticate(req: acp.AuthenticateRequest): Promise<void>;
|
|
21
21
|
private getAuthDetails;
|
|
@@ -22,8 +22,8 @@ export class GeminiAgent {
|
|
|
22
22
|
this.settings = settings;
|
|
23
23
|
this.sessionManager = new AcpSessionManager(settings, argv, connection);
|
|
24
24
|
}
|
|
25
|
-
dispose() {
|
|
26
|
-
this.sessionManager.dispose();
|
|
25
|
+
async dispose() {
|
|
26
|
+
await this.sessionManager.dispose();
|
|
27
27
|
}
|
|
28
28
|
async initialize(args) {
|
|
29
29
|
if (args.clientCapabilities) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acpRpcDispatcher.js","sourceRoot":"","sources":["../../../src/acp/acpRpcDispatcher.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAEL,QAAQ,EACR,yBAAyB,EACzB,UAAU,GACX,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,GAAG,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAuB,MAAM,uBAAuB,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAoB,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,MAAM,OAAO,WAAW;IAOZ;IACA;IAPF,MAAM,CAAqB;IAC3B,OAAO,CAAqB;IAC5B,aAAa,CAAqC;IAClD,cAAc,CAAoB;IAE1C,YACU,OAAyB,EACzB,QAAwB,EAChC,IAAa,EACb,UAAmC;QAH3B,YAAO,GAAP,OAAO,CAAkB;QACzB,aAAQ,GAAR,QAAQ,CAAgB;QAIhC,IAAI,CAAC,cAAc,GAAG,IAAI,iBAAiB,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO;
|
|
1
|
+
{"version":3,"file":"acpRpcDispatcher.js","sourceRoot":"","sources":["../../../src/acp/acpRpcDispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -234,5 +234,14 @@ describe('GeminiAgent - RPC Dispatcher', () => {
|
|
|
234
234
|
modelId: 'gemini-2.0-pro-exp',
|
|
235
235
|
})).rejects.toThrow('Session not found: unknown');
|
|
236
236
|
});
|
|
237
|
+
it('should delegate dispose to sessionManager', async () => {
|
|
238
|
+
const disposeMock = vi.fn().mockResolvedValue(undefined);
|
|
239
|
+
agent.sessionManager =
|
|
240
|
+
{
|
|
241
|
+
dispose: disposeMock,
|
|
242
|
+
};
|
|
243
|
+
await agent.dispose();
|
|
244
|
+
expect(disposeMock).toHaveBeenCalledTimes(1);
|
|
245
|
+
});
|
|
237
246
|
});
|
|
238
247
|
//# sourceMappingURL=acpRpcDispatcher.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acpRpcDispatcher.test.js","sourceRoot":"","sources":["../../../src/acp/acpRpcDispatcher.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"acpRpcDispatcher.test.js","sourceRoot":"","sources":["../../../src/acp/acpRpcDispatcher.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export declare class Session {
|
|
|
21
21
|
constructor(id: string, chat: GeminiChat, context: AgentLoopContext, connection: acp.AgentSideConnection, settings: LoadedSettings);
|
|
22
22
|
private handleToolConfirmationRequest;
|
|
23
23
|
private handleApprovalModeChanged;
|
|
24
|
-
dispose(): void
|
|
24
|
+
dispose(): Promise<void>;
|
|
25
25
|
cancelPendingPrompt(): Promise<void>;
|
|
26
26
|
setMode(modeId: acp.SessionModeId): acp.SetSessionModeResponse;
|
|
27
27
|
private getAvailableCommands;
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2026 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { CoreToolCallStatus, coreEvents, CoreEvent, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, getErrorStatus, DiscoveredMCPTool, ToolCallEvent, debugLogger, ReadManyFilesTool, partListUnionToString, updatePolicy, getErrorMessage, isTextPart, GeminiEventType, isWithinRoot, processSingleFileContent, isNodeError, REFERENCE_CONTENT_START, InvalidStreamError, MessageBusType, PolicyDecision, resolveAtCommandPath, } from '@google/gemini-cli-core';
|
|
6
|
+
import { CoreToolCallStatus, coreEvents, CoreEvent, logToolCall, convertToFunctionResponse, ToolConfirmationOutcome, getErrorStatus, DiscoveredMCPTool, ToolCallEvent, debugLogger, ReadManyFilesTool, partListUnionToString, updatePolicy, getErrorMessage, isTextPart, GeminiEventType, isWithinRoot, processSingleFileContent, isNodeError, REFERENCE_CONTENT_START, InvalidStreamError, MessageBusType, PolicyDecision, resolveAtCommandPath, tokenLimit, } from '@google/gemini-cli-core';
|
|
7
7
|
import * as acp from '@agentclientprotocol/sdk';
|
|
8
8
|
import * as fs from 'node:fs/promises';
|
|
9
9
|
import * as path from 'node:path';
|
|
@@ -112,9 +112,17 @@ export class Session {
|
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
114
|
};
|
|
115
|
-
dispose() {
|
|
115
|
+
async dispose() {
|
|
116
116
|
coreEvents.off(CoreEvent.ApprovalModeChanged, this.handleApprovalModeChanged);
|
|
117
117
|
this.disposeController.abort();
|
|
118
|
+
if (this.context.config?.dispose) {
|
|
119
|
+
try {
|
|
120
|
+
await this.context.config.dispose();
|
|
121
|
+
}
|
|
122
|
+
catch (err) {
|
|
123
|
+
debugLogger.error(`Error disposing config: ${err}`);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
118
126
|
}
|
|
119
127
|
async cancelPendingPrompt() {
|
|
120
128
|
if (!this.pendingPrompt) {
|
|
@@ -248,6 +256,11 @@ export class Session {
|
|
|
248
256
|
if (handled) {
|
|
249
257
|
return {
|
|
250
258
|
stopReason: 'end_turn',
|
|
259
|
+
usage: {
|
|
260
|
+
inputTokens: 0,
|
|
261
|
+
outputTokens: 0,
|
|
262
|
+
totalTokens: 0,
|
|
263
|
+
},
|
|
251
264
|
_meta: {
|
|
252
265
|
quota: {
|
|
253
266
|
token_count: { input_tokens: 0, output_tokens: 0 },
|
|
@@ -259,31 +272,41 @@ export class Session {
|
|
|
259
272
|
}
|
|
260
273
|
let totalInputTokens = 0;
|
|
261
274
|
let totalOutputTokens = 0;
|
|
275
|
+
let totalCachedTokens = 0;
|
|
276
|
+
let totalThoughtTokens = 0;
|
|
262
277
|
const modelUsageMap = new Map();
|
|
278
|
+
const buildPromptResponse = (stopReason) => ({
|
|
279
|
+
stopReason,
|
|
280
|
+
usage: {
|
|
281
|
+
inputTokens: totalInputTokens,
|
|
282
|
+
outputTokens: totalOutputTokens,
|
|
283
|
+
cachedReadTokens: totalCachedTokens || undefined,
|
|
284
|
+
thoughtTokens: totalThoughtTokens || undefined,
|
|
285
|
+
totalTokens: totalInputTokens + totalOutputTokens,
|
|
286
|
+
},
|
|
287
|
+
_meta: {
|
|
288
|
+
quota: {
|
|
289
|
+
token_count: {
|
|
290
|
+
input_tokens: totalInputTokens,
|
|
291
|
+
output_tokens: totalOutputTokens,
|
|
292
|
+
},
|
|
293
|
+
model_usage: Array.from(modelUsageMap.entries()).map(([modelName, counts]) => ({
|
|
294
|
+
model: modelName,
|
|
295
|
+
token_count: {
|
|
296
|
+
input_tokens: counts.input,
|
|
297
|
+
output_tokens: counts.output,
|
|
298
|
+
},
|
|
299
|
+
})),
|
|
300
|
+
},
|
|
301
|
+
},
|
|
302
|
+
});
|
|
263
303
|
let currentParts = parts;
|
|
264
304
|
let turnCount = 0;
|
|
265
305
|
const maxTurns = this.context.config.getMaxSessionTurns();
|
|
266
306
|
while (true) {
|
|
267
307
|
turnCount++;
|
|
268
308
|
if (maxTurns >= 0 && turnCount > maxTurns) {
|
|
269
|
-
return
|
|
270
|
-
stopReason: 'max_turn_requests',
|
|
271
|
-
_meta: {
|
|
272
|
-
quota: {
|
|
273
|
-
token_count: {
|
|
274
|
-
input_tokens: totalInputTokens,
|
|
275
|
-
output_tokens: totalOutputTokens,
|
|
276
|
-
},
|
|
277
|
-
model_usage: Array.from(modelUsageMap.entries()).map(([modelName, counts]) => ({
|
|
278
|
-
model: modelName,
|
|
279
|
-
token_count: {
|
|
280
|
-
input_tokens: counts.input,
|
|
281
|
-
output_tokens: counts.output,
|
|
282
|
-
},
|
|
283
|
-
})),
|
|
284
|
-
},
|
|
285
|
-
},
|
|
286
|
-
};
|
|
309
|
+
return buildPromptResponse('max_turn_requests');
|
|
287
310
|
}
|
|
288
311
|
if (pendingSend.signal.aborted) {
|
|
289
312
|
return { stopReason: 'cancelled' };
|
|
@@ -293,6 +316,8 @@ export class Session {
|
|
|
293
316
|
let turnModelId = this.context.config.getModel();
|
|
294
317
|
let turnInputTokens = 0;
|
|
295
318
|
let turnOutputTokens = 0;
|
|
319
|
+
let turnCachedTokens = 0;
|
|
320
|
+
let turnThoughtTokens = 0;
|
|
296
321
|
try {
|
|
297
322
|
const responseStream = this.context.geminiClient.sendMessageStream(currentParts, pendingSend.signal, promptId);
|
|
298
323
|
for await (const event of responseStream) {
|
|
@@ -328,6 +353,15 @@ export class Session {
|
|
|
328
353
|
turnInputTokens = usage.promptTokenCount ?? turnInputTokens;
|
|
329
354
|
turnOutputTokens =
|
|
330
355
|
usage.candidatesTokenCount ?? turnOutputTokens;
|
|
356
|
+
turnCachedTokens =
|
|
357
|
+
usage.cachedContentTokenCount ?? turnCachedTokens;
|
|
358
|
+
turnThoughtTokens =
|
|
359
|
+
usage.thoughtsTokenCount ?? turnThoughtTokens;
|
|
360
|
+
await this.sendUpdate({
|
|
361
|
+
sessionUpdate: 'usage_update',
|
|
362
|
+
used: turnInputTokens + turnOutputTokens,
|
|
363
|
+
size: tokenLimit(turnModelId || this.context.config.getModel()),
|
|
364
|
+
});
|
|
331
365
|
}
|
|
332
366
|
break;
|
|
333
367
|
}
|
|
@@ -379,29 +413,14 @@ export class Session {
|
|
|
379
413
|
error.type === 'THINKING_ONLY_RESPONSE'))) {
|
|
380
414
|
// The stream ended with an empty response or malformed tool call.
|
|
381
415
|
// Treat this as a graceful end to the model's turn rather than a crash.
|
|
382
|
-
return
|
|
383
|
-
stopReason: 'end_turn',
|
|
384
|
-
_meta: {
|
|
385
|
-
quota: {
|
|
386
|
-
token_count: {
|
|
387
|
-
input_tokens: totalInputTokens,
|
|
388
|
-
output_tokens: totalOutputTokens,
|
|
389
|
-
},
|
|
390
|
-
model_usage: Array.from(modelUsageMap.entries()).map(([modelName, counts]) => ({
|
|
391
|
-
model: modelName,
|
|
392
|
-
token_count: {
|
|
393
|
-
input_tokens: counts.input,
|
|
394
|
-
output_tokens: counts.output,
|
|
395
|
-
},
|
|
396
|
-
})),
|
|
397
|
-
},
|
|
398
|
-
},
|
|
399
|
-
};
|
|
416
|
+
return buildPromptResponse('end_turn');
|
|
400
417
|
}
|
|
401
418
|
throw new acp.RequestError(getErrorStatus(error) || 500, getAcpErrorMessage(error));
|
|
402
419
|
}
|
|
403
420
|
totalInputTokens += turnInputTokens;
|
|
404
421
|
totalOutputTokens += turnOutputTokens;
|
|
422
|
+
totalCachedTokens += turnCachedTokens;
|
|
423
|
+
totalThoughtTokens += turnThoughtTokens;
|
|
405
424
|
if (turnInputTokens > 0 || turnOutputTokens > 0) {
|
|
406
425
|
const existing = modelUsageMap.get(turnModelId) ?? {
|
|
407
426
|
input: 0,
|
|
@@ -412,24 +431,7 @@ export class Session {
|
|
|
412
431
|
modelUsageMap.set(turnModelId, existing);
|
|
413
432
|
}
|
|
414
433
|
if (stopReason !== 'end_turn') {
|
|
415
|
-
return
|
|
416
|
-
stopReason,
|
|
417
|
-
_meta: {
|
|
418
|
-
quota: {
|
|
419
|
-
token_count: {
|
|
420
|
-
input_tokens: totalInputTokens,
|
|
421
|
-
output_tokens: totalOutputTokens,
|
|
422
|
-
},
|
|
423
|
-
model_usage: Array.from(modelUsageMap.entries()).map(([modelName, counts]) => ({
|
|
424
|
-
model: modelName,
|
|
425
|
-
token_count: {
|
|
426
|
-
input_tokens: counts.input,
|
|
427
|
-
output_tokens: counts.output,
|
|
428
|
-
},
|
|
429
|
-
})),
|
|
430
|
-
},
|
|
431
|
-
},
|
|
432
|
-
};
|
|
434
|
+
return buildPromptResponse(stopReason);
|
|
433
435
|
}
|
|
434
436
|
if (toolCallRequests.length === 0) {
|
|
435
437
|
break;
|
|
@@ -446,25 +448,7 @@ export class Session {
|
|
|
446
448
|
}
|
|
447
449
|
currentParts = toolResponseParts;
|
|
448
450
|
}
|
|
449
|
-
|
|
450
|
-
model: modelName,
|
|
451
|
-
token_count: {
|
|
452
|
-
input_tokens: counts.input,
|
|
453
|
-
output_tokens: counts.output,
|
|
454
|
-
},
|
|
455
|
-
}));
|
|
456
|
-
return {
|
|
457
|
-
stopReason: 'end_turn',
|
|
458
|
-
_meta: {
|
|
459
|
-
quota: {
|
|
460
|
-
token_count: {
|
|
461
|
-
input_tokens: totalInputTokens,
|
|
462
|
-
output_tokens: totalOutputTokens,
|
|
463
|
-
},
|
|
464
|
-
model_usage: modelUsageArray,
|
|
465
|
-
},
|
|
466
|
-
},
|
|
467
|
-
};
|
|
451
|
+
return buildPromptResponse('end_turn');
|
|
468
452
|
}
|
|
469
453
|
async handleCommand(commandText,
|
|
470
454
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
@@ -543,12 +527,21 @@ export class Session {
|
|
|
543
527
|
},
|
|
544
528
|
});
|
|
545
529
|
}
|
|
546
|
-
if (
|
|
530
|
+
if (explanation) {
|
|
547
531
|
content.push({
|
|
548
532
|
type: 'content',
|
|
549
533
|
content: { type: 'text', text: explanation },
|
|
550
534
|
});
|
|
551
535
|
}
|
|
536
|
+
await this.sendUpdate({
|
|
537
|
+
sessionUpdate: 'tool_call',
|
|
538
|
+
toolCallId: callId,
|
|
539
|
+
status: 'pending',
|
|
540
|
+
title: displayTitle,
|
|
541
|
+
content,
|
|
542
|
+
locations: invocation.toolLocations(),
|
|
543
|
+
kind: toAcpToolKind(tool.kind),
|
|
544
|
+
});
|
|
552
545
|
const params = {
|
|
553
546
|
sessionId: this.id,
|
|
554
547
|
options: toPermissionOptions(confirmationDetails, this.context.config, this.settings.merged.security.enablePermanentToolApproval),
|
|
@@ -571,8 +564,22 @@ export class Session {
|
|
|
571
564
|
// Update policy to enable Always Allow persistence
|
|
572
565
|
await updatePolicy(tool, outcome, confirmationDetails, this.context, this.context.messageBus, invocation);
|
|
573
566
|
switch (outcome) {
|
|
574
|
-
case ToolConfirmationOutcome.Cancel:
|
|
575
|
-
|
|
567
|
+
case ToolConfirmationOutcome.Cancel: {
|
|
568
|
+
const cancelError = new Error(`Tool "${fc.name}" was canceled by the user.`);
|
|
569
|
+
await this.sendUpdate({
|
|
570
|
+
sessionUpdate: 'tool_call_update',
|
|
571
|
+
toolCallId: callId,
|
|
572
|
+
status: 'failed',
|
|
573
|
+
content: [
|
|
574
|
+
{
|
|
575
|
+
type: 'content',
|
|
576
|
+
content: { type: 'text', text: cancelError.message },
|
|
577
|
+
},
|
|
578
|
+
],
|
|
579
|
+
kind: toAcpToolKind(tool.kind),
|
|
580
|
+
});
|
|
581
|
+
return errorResponse(cancelError);
|
|
582
|
+
}
|
|
576
583
|
case ToolConfirmationOutcome.ProceedOnce:
|
|
577
584
|
case ToolConfirmationOutcome.ProceedAlways:
|
|
578
585
|
case ToolConfirmationOutcome.ProceedAlwaysAndSave:
|
|
@@ -1043,11 +1050,14 @@ export class Session {
|
|
|
1043
1050
|
const callId = this.generateCallId(readManyFilesTool.name);
|
|
1044
1051
|
try {
|
|
1045
1052
|
const invocation = readManyFilesTool.build(toolArgs);
|
|
1053
|
+
const displayTitle = typeof invocation.getDisplayTitle === 'function'
|
|
1054
|
+
? invocation.getDisplayTitle()
|
|
1055
|
+
: invocation.getDescription();
|
|
1046
1056
|
await this.sendUpdate({
|
|
1047
1057
|
sessionUpdate: 'tool_call',
|
|
1048
1058
|
toolCallId: callId,
|
|
1049
1059
|
status: 'in_progress',
|
|
1050
|
-
title:
|
|
1060
|
+
title: displayTitle,
|
|
1051
1061
|
content: [],
|
|
1052
1062
|
locations: invocation.toolLocations(),
|
|
1053
1063
|
kind: toAcpToolKind(readManyFilesTool.kind),
|
|
@@ -1064,7 +1074,7 @@ export class Session {
|
|
|
1064
1074
|
sessionUpdate: 'tool_call_update',
|
|
1065
1075
|
toolCallId: callId,
|
|
1066
1076
|
status: 'completed',
|
|
1067
|
-
title:
|
|
1077
|
+
title: displayTitle,
|
|
1068
1078
|
content: content ? [content] : [],
|
|
1069
1079
|
locations: invocation.toolLocations(),
|
|
1070
1080
|
kind: toAcpToolKind(readManyFilesTool.kind),
|