@google/gemini-cli-core 0.28.0-preview.5 → 0.29.0-nightly.20260206.4ffc349c1

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.
Files changed (128) hide show
  1. package/dist/docs/changelogs/index.md +16 -0
  2. package/dist/docs/changelogs/latest.md +424 -315
  3. package/dist/docs/changelogs/preview.md +289 -419
  4. package/dist/docs/cli/cli-reference.md +15 -0
  5. package/dist/docs/cli/commands.md +2 -2
  6. package/dist/docs/cli/keyboard-shortcuts.md +10 -11
  7. package/dist/docs/cli/skills.md +16 -1
  8. package/dist/docs/cli/telemetry.md +22 -0
  9. package/dist/docs/core/subagents.md +2 -2
  10. package/dist/docs/get-started/configuration.md +5 -1
  11. package/dist/docs/index.md +2 -4
  12. package/dist/docs/sidebar.json +8 -8
  13. package/dist/google-gemini-cli-core-0.29.0-nightly.20260203.71f46f116.tgz +0 -0
  14. package/dist/src/agents/agentLoader.d.ts +1 -1
  15. package/dist/src/agents/agentLoader.js +3 -2
  16. package/dist/src/agents/agentLoader.js.map +1 -1
  17. package/dist/src/agents/agentLoader.test.js +3 -1
  18. package/dist/src/agents/agentLoader.test.js.map +1 -1
  19. package/dist/src/agents/codebase-investigator.js +4 -1
  20. package/dist/src/agents/codebase-investigator.js.map +1 -1
  21. package/dist/src/agents/codebase-investigator.test.js +23 -2
  22. package/dist/src/agents/codebase-investigator.test.js.map +1 -1
  23. package/dist/src/agents/local-executor.js +9 -9
  24. package/dist/src/agents/local-executor.js.map +1 -1
  25. package/dist/src/agents/subagent-tool.js +0 -4
  26. package/dist/src/agents/subagent-tool.js.map +1 -1
  27. package/dist/src/agents/subagent-tool.test.d.ts +6 -0
  28. package/dist/src/agents/subagent-tool.test.js +97 -0
  29. package/dist/src/agents/subagent-tool.test.js.map +1 -0
  30. package/dist/src/agents/types.d.ts +17 -3
  31. package/dist/src/agents/types.js +8 -0
  32. package/dist/src/agents/types.js.map +1 -1
  33. package/dist/src/config/config.d.ts +7 -0
  34. package/dist/src/config/config.js +42 -2
  35. package/dist/src/config/config.js.map +1 -1
  36. package/dist/src/config/config.test.js +80 -2
  37. package/dist/src/config/config.test.js.map +1 -1
  38. package/dist/src/core/geminiChat.js +8 -2
  39. package/dist/src/core/geminiChat.js.map +1 -1
  40. package/dist/src/core/geminiChat_network_retry.test.js +125 -0
  41. package/dist/src/core/geminiChat_network_retry.test.js.map +1 -1
  42. package/dist/src/core/prompts-substitution.test.js +1 -0
  43. package/dist/src/core/prompts-substitution.test.js.map +1 -1
  44. package/dist/src/core/prompts.test.js +94 -2
  45. package/dist/src/core/prompts.test.js.map +1 -1
  46. package/dist/src/generated/git-commit.d.ts +2 -2
  47. package/dist/src/generated/git-commit.js +2 -2
  48. package/dist/src/generated/git-commit.js.map +1 -1
  49. package/dist/src/hooks/hookRegistry.js +1 -1
  50. package/dist/src/hooks/hookRegistry.js.map +1 -1
  51. package/dist/src/hooks/hookRegistry.test.js +1 -1
  52. package/dist/src/hooks/hookRegistry.test.js.map +1 -1
  53. package/dist/src/policy/config.test.js +3 -1
  54. package/dist/src/policy/config.test.js.map +1 -1
  55. package/dist/src/policy/policies/plan.toml +2 -2
  56. package/dist/src/prompts/promptProvider.js +29 -11
  57. package/dist/src/prompts/promptProvider.js.map +1 -1
  58. package/dist/src/prompts/snippets.d.ts +9 -3
  59. package/dist/src/prompts/snippets.js +55 -18
  60. package/dist/src/prompts/snippets.js.map +1 -1
  61. package/dist/src/scheduler/confirmation.d.ts +1 -1
  62. package/dist/src/scheduler/confirmation.js +16 -4
  63. package/dist/src/scheduler/confirmation.js.map +1 -1
  64. package/dist/src/skills/skillLoader.js +6 -2
  65. package/dist/src/skills/skillLoader.js.map +1 -1
  66. package/dist/src/skills/skillLoader.test.js +11 -0
  67. package/dist/src/skills/skillLoader.test.js.map +1 -1
  68. package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +4 -2
  69. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +11 -0
  70. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
  71. package/dist/src/telemetry/loggers.d.ts +2 -1
  72. package/dist/src/telemetry/loggers.js +13 -1
  73. package/dist/src/telemetry/loggers.js.map +1 -1
  74. package/dist/src/telemetry/loggers.test.js +1 -1
  75. package/dist/src/telemetry/loggers.test.js.map +1 -1
  76. package/dist/src/telemetry/metrics.d.ts +13 -0
  77. package/dist/src/telemetry/metrics.js +19 -0
  78. package/dist/src/telemetry/metrics.js.map +1 -1
  79. package/dist/src/telemetry/metrics.test.js +22 -0
  80. package/dist/src/telemetry/metrics.test.js.map +1 -1
  81. package/dist/src/telemetry/types.d.ts +13 -1
  82. package/dist/src/telemetry/types.js +31 -2
  83. package/dist/src/telemetry/types.js.map +1 -1
  84. package/dist/src/tools/ask-user.js +2 -2
  85. package/dist/src/tools/ask-user.test.js +1 -1
  86. package/dist/src/tools/enter-plan-mode.d.ts +24 -0
  87. package/dist/src/tools/enter-plan-mode.js +72 -0
  88. package/dist/src/tools/enter-plan-mode.js.map +1 -0
  89. package/dist/src/tools/enter-plan-mode.test.d.ts +6 -0
  90. package/dist/src/tools/enter-plan-mode.test.js +102 -0
  91. package/dist/src/tools/enter-plan-mode.test.js.map +1 -0
  92. package/dist/src/tools/exit-plan-mode.js +4 -0
  93. package/dist/src/tools/exit-plan-mode.js.map +1 -1
  94. package/dist/src/tools/exit-plan-mode.test.js +22 -0
  95. package/dist/src/tools/exit-plan-mode.test.js.map +1 -1
  96. package/dist/src/tools/mcp-client.d.ts +5 -2
  97. package/dist/src/tools/mcp-client.js +56 -15
  98. package/dist/src/tools/mcp-client.js.map +1 -1
  99. package/dist/src/tools/mcp-client.test.js +119 -6
  100. package/dist/src/tools/mcp-client.test.js.map +1 -1
  101. package/dist/src/tools/mcp-tool.d.ts +2 -1
  102. package/dist/src/tools/mcp-tool.js +4 -2
  103. package/dist/src/tools/mcp-tool.js.map +1 -1
  104. package/dist/src/tools/mcp-tool.test.js +5 -5
  105. package/dist/src/tools/mcp-tool.test.js.map +1 -1
  106. package/dist/src/tools/memoryTool.d.ts +1 -7
  107. package/dist/src/tools/memoryTool.js +50 -50
  108. package/dist/src/tools/memoryTool.js.map +1 -1
  109. package/dist/src/tools/memoryTool.test.js +61 -113
  110. package/dist/src/tools/memoryTool.test.js.map +1 -1
  111. package/dist/src/tools/tool-names.d.ts +1 -0
  112. package/dist/src/tools/tool-names.js +1 -0
  113. package/dist/src/tools/tool-names.js.map +1 -1
  114. package/dist/src/utils/editor.d.ts +14 -1
  115. package/dist/src/utils/editor.js +55 -10
  116. package/dist/src/utils/editor.js.map +1 -1
  117. package/dist/src/utils/editor.test.js +127 -9
  118. package/dist/src/utils/editor.test.js.map +1 -1
  119. package/dist/src/utils/events.d.ts +12 -1
  120. package/dist/src/utils/events.js +2 -0
  121. package/dist/src/utils/events.js.map +1 -1
  122. package/dist/src/utils/retry.js +20 -2
  123. package/dist/src/utils/retry.js.map +1 -1
  124. package/dist/src/utils/retry.test.js +67 -0
  125. package/dist/src/utils/retry.test.js.map +1 -1
  126. package/dist/tsconfig.tsbuildinfo +1 -1
  127. package/package.json +1 -1
  128. package/dist/google-gemini-cli-core-0.28.0-preview.4.tgz +0 -0
@@ -0,0 +1,6 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2026 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ export {};
@@ -0,0 +1,102 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2026 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
7
+ import { EnterPlanModeTool } from './enter-plan-mode.js';
8
+ import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
9
+ import { ToolConfirmationOutcome } from './tools.js';
10
+ import { ApprovalMode } from '../policy/types.js';
11
+ describe('EnterPlanModeTool', () => {
12
+ let tool;
13
+ let mockMessageBus;
14
+ let mockConfig;
15
+ beforeEach(() => {
16
+ mockMessageBus = createMockMessageBus();
17
+ vi.mocked(mockMessageBus.publish).mockResolvedValue(undefined);
18
+ mockConfig = {
19
+ setApprovalMode: vi.fn(),
20
+ storage: {
21
+ getProjectTempPlansDir: vi.fn().mockReturnValue('/mock/plans/dir'),
22
+ },
23
+ };
24
+ tool = new EnterPlanModeTool(mockConfig, mockMessageBus);
25
+ });
26
+ afterEach(() => {
27
+ vi.restoreAllMocks();
28
+ });
29
+ describe('shouldConfirmExecute', () => {
30
+ it('should return info confirmation details when policy says ASK_USER', async () => {
31
+ const invocation = tool.build({});
32
+ // Mock getMessageBusDecision to return ASK_USER
33
+ vi.spyOn(invocation, 'getMessageBusDecision').mockResolvedValue('ASK_USER');
34
+ const result = await invocation.shouldConfirmExecute(new AbortController().signal);
35
+ expect(result).not.toBe(false);
36
+ if (result === false)
37
+ return;
38
+ expect(result.type).toBe('info');
39
+ expect(result.title).toBe('Enter Plan Mode');
40
+ if (result.type === 'info') {
41
+ expect(result.prompt).toBe('This will restrict the agent to read-only tools to allow for safe planning.');
42
+ }
43
+ });
44
+ it('should return false when policy decision is ALLOW', async () => {
45
+ const invocation = tool.build({});
46
+ // Mock getMessageBusDecision to return ALLOW
47
+ vi.spyOn(invocation, 'getMessageBusDecision').mockResolvedValue('ALLOW');
48
+ const result = await invocation.shouldConfirmExecute(new AbortController().signal);
49
+ expect(result).toBe(false);
50
+ });
51
+ it('should throw error when policy decision is DENY', async () => {
52
+ const invocation = tool.build({});
53
+ // Mock getMessageBusDecision to return DENY
54
+ vi.spyOn(invocation, 'getMessageBusDecision').mockResolvedValue('DENY');
55
+ await expect(invocation.shouldConfirmExecute(new AbortController().signal)).rejects.toThrow(/denied by policy/);
56
+ });
57
+ });
58
+ describe('execute', () => {
59
+ it('should set approval mode to PLAN and return message', async () => {
60
+ const invocation = tool.build({});
61
+ const result = await invocation.execute(new AbortController().signal);
62
+ expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.PLAN);
63
+ expect(result.llmContent).toContain('Switching to Plan mode');
64
+ expect(result.returnDisplay).toBe('Switching to Plan mode');
65
+ });
66
+ it('should include optional reason in output display but not in llmContent', async () => {
67
+ const reason = 'Design new database schema';
68
+ const invocation = tool.build({ reason });
69
+ const result = await invocation.execute(new AbortController().signal);
70
+ expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.PLAN);
71
+ expect(result.llmContent).toBe('Switching to Plan mode.');
72
+ expect(result.llmContent).not.toContain(reason);
73
+ expect(result.returnDisplay).toContain(reason);
74
+ });
75
+ it('should not enter plan mode if cancelled', async () => {
76
+ const invocation = tool.build({});
77
+ // Simulate getting confirmation details
78
+ vi.spyOn(invocation, 'getMessageBusDecision').mockResolvedValue('ASK_USER');
79
+ const details = await invocation.shouldConfirmExecute(new AbortController().signal);
80
+ expect(details).not.toBe(false);
81
+ if (details) {
82
+ // Simulate user cancelling
83
+ await details.onConfirm(ToolConfirmationOutcome.Cancel);
84
+ }
85
+ const result = await invocation.execute(new AbortController().signal);
86
+ expect(mockConfig.setApprovalMode).not.toHaveBeenCalled();
87
+ expect(result.returnDisplay).toBe('Cancelled');
88
+ expect(result.llmContent).toContain('User cancelled');
89
+ });
90
+ });
91
+ describe('validateToolParams', () => {
92
+ it('should allow empty params', () => {
93
+ const result = tool.validateToolParams({});
94
+ expect(result).toBeNull();
95
+ });
96
+ it('should allow reason param', () => {
97
+ const result = tool.validateToolParams({ reason: 'test' });
98
+ expect(result).toBeNull();
99
+ });
100
+ });
101
+ });
102
+ //# sourceMappingURL=enter-plan-mode.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"enter-plan-mode.test.js","sourceRoot":"","sources":["../../../src/tools/enter-plan-mode.test.ts"],"names":[],"mappings":"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"}
@@ -10,6 +10,8 @@ import { validatePlanPath, validatePlanContent } from '../utils/planUtils.js';
10
10
  import { ApprovalMode } from '../policy/types.js';
11
11
  import { checkExhaustive } from '../utils/checks.js';
12
12
  import { resolveToRealPath, isSubpath } from '../utils/paths.js';
13
+ import { logPlanExecution } from '../telemetry/loggers.js';
14
+ import { PlanExecutionEvent } from '../telemetry/types.js';
13
15
  /**
14
16
  * Returns a human-readable description for an approval mode.
15
17
  */
@@ -136,6 +138,8 @@ export class ExitPlanModeInvocation extends BaseToolInvocation {
136
138
  if (payload?.approved) {
137
139
  const newMode = payload.approvalMode ?? ApprovalMode.DEFAULT;
138
140
  this.config.setApprovalMode(newMode);
141
+ this.config.setApprovedPlanPath(resolvedPlanPath);
142
+ logPlanExecution(this.config, new PlanExecutionEvent(newMode));
139
143
  const description = getApprovalModeDescription(newMode);
140
144
  return {
141
145
  llmContent: `Plan approved. Switching to ${description}.
@@ -1 +1 @@
1
- {"version":3,"file":"exit-plan-mode.js","sourceRoot":"","sources":["../../../src/tools/exit-plan-mode.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"exit-plan-mode.js","sourceRoot":"","sources":["../../../src/tools/exit-plan-mode.ts"],"names":[],"mappings":"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"}
@@ -12,6 +12,10 @@ import { ApprovalMode } from '../policy/types.js';
12
12
  import * as fs from 'node:fs';
13
13
  import os from 'node:os';
14
14
  import { validatePlanPath } from '../utils/planUtils.js';
15
+ import * as loggers from '../telemetry/loggers.js';
16
+ vi.mock('../telemetry/loggers.js', () => ({
17
+ logPlanExecution: vi.fn(),
18
+ }));
15
19
  describe('ExitPlanModeTool', () => {
16
20
  let tool;
17
21
  let mockMessageBus;
@@ -29,6 +33,7 @@ describe('ExitPlanModeTool', () => {
29
33
  mockConfig = {
30
34
  getTargetDir: vi.fn().mockReturnValue(tempRootDir),
31
35
  setApprovalMode: vi.fn(),
36
+ setApprovedPlanPath: vi.fn(),
32
37
  storage: {
33
38
  getProjectTempPlansDir: vi.fn().mockReturnValue(mockPlansDir),
34
39
  },
@@ -131,6 +136,7 @@ The approved implementation plan is stored at: ${expectedPath}
131
136
  Read and follow the plan strictly during implementation.`,
132
137
  returnDisplay: `Plan approved: ${expectedPath}`,
133
138
  });
139
+ expect(mockConfig.setApprovedPlanPath).toHaveBeenCalledWith(expectedPath);
134
140
  });
135
141
  it('should return approval message when plan is approved with AUTO_EDIT mode', async () => {
136
142
  const planRelativePath = createPlanFile('test.md', '# Content');
@@ -153,6 +159,7 @@ Read and follow the plan strictly during implementation.`,
153
159
  returnDisplay: `Plan approved: ${expectedPath}`,
154
160
  });
155
161
  expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
162
+ expect(mockConfig.setApprovedPlanPath).toHaveBeenCalledWith(expectedPath);
156
163
  });
157
164
  it('should return feedback message when plan is rejected with feedback', async () => {
158
165
  const planRelativePath = createPlanFile('test.md', '# Content');
@@ -195,6 +202,21 @@ Ask the user for specific feedback on how to improve the plan.`,
195
202
  returnDisplay: 'Rejected (no feedback)',
196
203
  });
197
204
  });
205
+ it('should log plan execution event when plan is approved', async () => {
206
+ const planRelativePath = createPlanFile('test.md', '# Content');
207
+ const invocation = tool.build({ plan_path: planRelativePath });
208
+ const confirmDetails = await invocation.shouldConfirmExecute(new AbortController().signal);
209
+ if (confirmDetails === false)
210
+ return;
211
+ await confirmDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce, {
212
+ approved: true,
213
+ approvalMode: ApprovalMode.AUTO_EDIT,
214
+ });
215
+ await invocation.execute(new AbortController().signal);
216
+ expect(loggers.logPlanExecution).toHaveBeenCalledWith(mockConfig, expect.objectContaining({
217
+ approval_mode: ApprovalMode.AUTO_EDIT,
218
+ }));
219
+ });
198
220
  it('should return cancellation message when cancelled', async () => {
199
221
  const planRelativePath = createPlanFile('test.md', '# Content');
200
222
  const invocation = tool.build({ plan_path: planRelativePath });
@@ -1 +1 @@
1
- {"version":3,"file":"exit-plan-mode.test.js","sourceRoot":"","sources":["../../../src/tools/exit-plan-mode.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"exit-plan-mode.test.js","sourceRoot":"","sources":["../../../src/tools/exit-plan-mode.test.ts"],"names":[],"mappings":"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"}
@@ -229,10 +229,13 @@ export declare function hasNetworkTransport(config: MCPServerConfig): boolean;
229
229
  *
230
230
  * @param mcpServerName The name of the MCP server, used for logging and identification.
231
231
  * @param mcpServerConfig The configuration specifying how to connect to the server.
232
- * @returns A promise that resolves to a connected MCP `Client` instance.
232
+ * @returns A promise that resolves to a connected MCP `Client` instance and its transport.
233
233
  * @throws An error if the connection fails or the configuration is invalid.
234
234
  */
235
- export declare function connectToMcpServer(clientVersion: string, mcpServerName: string, mcpServerConfig: MCPServerConfig, debugMode: boolean, workspaceContext: WorkspaceContext, sanitizationConfig: EnvironmentSanitizationConfig): Promise<Client>;
235
+ export declare function connectToMcpServer(clientVersion: string, mcpServerName: string, mcpServerConfig: MCPServerConfig, debugMode: boolean, workspaceContext: WorkspaceContext, sanitizationConfig: EnvironmentSanitizationConfig): Promise<{
236
+ client: Client;
237
+ transport: Transport;
238
+ }>;
236
239
  /** Visible for Testing */
237
240
  export declare function createTransport(mcpServerName: string, mcpServerConfig: MCPServerConfig, debugMode: boolean, sanitizationConfig: EnvironmentSanitizationConfig): Promise<Transport>;
238
241
  interface NamedTool {
@@ -9,6 +9,7 @@ import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
9
9
  import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
10
10
  import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
11
11
  import { ListResourcesResultSchema, ListRootsRequestSchema, ReadResourceResultSchema, ResourceListChangedNotificationSchema, ToolListChangedNotificationSchema, PromptListChangedNotificationSchema, } from '@modelcontextprotocol/sdk/types.js';
12
+ import { ApprovalMode, PolicyDecision } from '../policy/types.js';
12
13
  import { parse } from 'shell-quote';
13
14
  import { AuthProviderType } from '../config/config.js';
14
15
  import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
@@ -99,10 +100,12 @@ export class McpClient {
99
100
  }
100
101
  this.updateStatus(MCPServerStatus.CONNECTING);
101
102
  try {
102
- this.client = await connectToMcpServer(this.clientVersion, this.serverName, this.serverConfig, this.debugMode, this.workspaceContext, this.cliConfig.sanitizationConfig);
103
+ const { client, transport } = await connectToMcpServer(this.clientVersion, this.serverName, this.serverConfig, this.debugMode, this.workspaceContext, this.cliConfig.sanitizationConfig);
104
+ this.client = client;
105
+ this.transport = transport;
103
106
  this.registerNotificationHandlers();
104
107
  const originalOnError = this.client.onerror;
105
- this.client.onerror = (error) => {
108
+ this.client.onerror = async (error) => {
106
109
  if (this.status !== MCPServerStatus.CONNECTED) {
107
110
  return;
108
111
  }
@@ -110,6 +113,15 @@ export class McpClient {
110
113
  originalOnError(error);
111
114
  coreEvents.emitFeedback('error', `MCP ERROR (${this.serverName})`, error);
112
115
  this.updateStatus(MCPServerStatus.DISCONNECTED);
116
+ // Close transport to prevent memory leaks
117
+ if (this.transport) {
118
+ try {
119
+ await this.transport.close();
120
+ }
121
+ catch {
122
+ // Ignore errors when closing transport on error
123
+ }
124
+ }
113
125
  };
114
126
  this.updateStatus(MCPServerStatus.CONNECTED);
115
127
  }
@@ -634,11 +646,23 @@ export function populateMcpServerCommand(mcpServers, mcpServerCommand) {
634
646
  export async function connectAndDiscover(clientVersion, mcpServerName, mcpServerConfig, toolRegistry, promptRegistry, debugMode, workspaceContext, cliConfig) {
635
647
  updateMCPServerStatus(mcpServerName, MCPServerStatus.CONNECTING);
636
648
  let mcpClient;
649
+ let transport;
637
650
  try {
638
- mcpClient = await connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig, debugMode, workspaceContext, cliConfig.sanitizationConfig);
639
- mcpClient.onerror = (error) => {
651
+ const result = await connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig, debugMode, workspaceContext, cliConfig.sanitizationConfig);
652
+ mcpClient = result.client;
653
+ transport = result.transport;
654
+ mcpClient.onerror = async (error) => {
640
655
  coreEvents.emitFeedback('error', `MCP ERROR (${mcpServerName}):`, error);
641
656
  updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
657
+ // Close transport to prevent memory leaks
658
+ if (transport) {
659
+ try {
660
+ await transport.close();
661
+ }
662
+ catch {
663
+ // Ignore errors when closing transport on error
664
+ }
665
+ }
642
666
  };
643
667
  // Attempt to discover both prompts and tools
644
668
  const prompts = await discoverPrompts(mcpServerName, mcpClient);
@@ -693,7 +717,19 @@ export async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, c
693
717
  continue;
694
718
  }
695
719
  const mcpCallableTool = new McpCallableTool(mcpClient, toolDef, mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC);
696
- const tool = new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolDef.name, toolDef.description ?? '', toolDef.inputSchema ?? { type: 'object', properties: {} }, messageBus, mcpServerConfig.trust, undefined, cliConfig, mcpServerConfig.extension?.name, mcpServerConfig.extension?.id);
720
+ // Extract readOnlyHint from annotations
721
+ const isReadOnly = toolDef.annotations?.readOnlyHint === true;
722
+ const tool = new DiscoveredMCPTool(mcpCallableTool, mcpServerName, toolDef.name, toolDef.description ?? '', toolDef.inputSchema ?? { type: 'object', properties: {} }, messageBus, mcpServerConfig.trust, isReadOnly, undefined, cliConfig, mcpServerConfig.extension?.name, mcpServerConfig.extension?.id);
723
+ // If the tool is read-only, allow it in Plan mode
724
+ if (isReadOnly) {
725
+ cliConfig.getPolicyEngine().addRule({
726
+ toolName: tool.getFullyQualifiedName(),
727
+ decision: PolicyDecision.ASK_USER,
728
+ priority: 50, // Match priority of built-in plan tools
729
+ modes: [ApprovalMode.PLAN],
730
+ source: `MCP Annotation (readOnlyHint) - ${mcpServerName}`,
731
+ });
732
+ }
697
733
  discoveredTools.push(tool);
698
734
  }
699
735
  catch (error) {
@@ -907,12 +943,14 @@ function createSSETransportWithAuth(config, accessToken) {
907
943
  * @param client The MCP client to connect
908
944
  * @param config The MCP server configuration
909
945
  * @param accessToken Optional OAuth access token for authentication
946
+ * @returns The transport used for connection
910
947
  */
911
948
  async function connectWithSSETransport(client, config, accessToken) {
912
949
  const transport = createSSETransportWithAuth(config, accessToken);
913
950
  await client.connect(transport, {
914
951
  timeout: config.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
915
952
  });
953
+ return transport;
916
954
  }
917
955
  /**
918
956
  * Helper function to show authentication required message and throw error.
@@ -938,14 +976,15 @@ async function showAuthRequiredMessage(serverName) {
938
976
  * @param config The MCP server configuration
939
977
  * @param accessToken The OAuth access token to use
940
978
  * @param httpReturned404 Whether the HTTP transport returned 404 (indicating SSE-only server)
979
+ * @returns The transport used for connection
941
980
  */
942
981
  async function retryWithOAuth(client, serverName, config, accessToken, httpReturned404) {
943
982
  if (httpReturned404) {
944
983
  // HTTP returned 404, only try SSE
945
984
  debugLogger.log(`Retrying SSE connection to '${serverName}' with OAuth token...`);
946
- await connectWithSSETransport(client, config, accessToken);
985
+ const transport = await connectWithSSETransport(client, config, accessToken);
947
986
  debugLogger.log(`Successfully connected to '${serverName}' using SSE with OAuth.`);
948
- return;
987
+ return transport;
949
988
  }
950
989
  // HTTP returned 401, try HTTP with OAuth first
951
990
  debugLogger.log(`Retrying connection to '${serverName}' with OAuth token...`);
@@ -958,6 +997,7 @@ async function retryWithOAuth(client, serverName, config, accessToken, httpRetur
958
997
  timeout: config.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
959
998
  });
960
999
  debugLogger.log(`Successfully connected to '${serverName}' using HTTP with OAuth.`);
1000
+ return httpTransport;
961
1001
  }
962
1002
  catch (httpError) {
963
1003
  await httpTransport.close();
@@ -967,8 +1007,9 @@ async function retryWithOAuth(client, serverName, config, accessToken, httpRetur
967
1007
  !config.type &&
968
1008
  !config.httpUrl) {
969
1009
  debugLogger.log(`HTTP with OAuth returned 404, trying SSE with OAuth...`);
970
- await connectWithSSETransport(client, config, accessToken);
1010
+ const sseTransport = await connectWithSSETransport(client, config, accessToken);
971
1011
  debugLogger.log(`Successfully connected to '${serverName}' using SSE with OAuth.`);
1012
+ return sseTransport;
972
1013
  }
973
1014
  else {
974
1015
  throw httpError;
@@ -982,7 +1023,7 @@ async function retryWithOAuth(client, serverName, config, accessToken, httpRetur
982
1023
  *
983
1024
  * @param mcpServerName The name of the MCP server, used for logging and identification.
984
1025
  * @param mcpServerConfig The configuration specifying how to connect to the server.
985
- * @returns A promise that resolves to a connected MCP `Client` instance.
1026
+ * @returns A promise that resolves to a connected MCP `Client` instance and its transport.
986
1027
  * @throws An error if the connection fails or the configuration is invalid.
987
1028
  */
988
1029
  export async function connectToMcpServer(clientVersion, mcpServerName, mcpServerConfig, debugMode, workspaceContext, sanitizationConfig) {
@@ -1043,7 +1084,7 @@ export async function connectToMcpServer(clientVersion, mcpServerName, mcpServer
1043
1084
  await mcpClient.connect(transport, {
1044
1085
  timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
1045
1086
  });
1046
- return mcpClient;
1087
+ return { client: mcpClient, transport };
1047
1088
  }
1048
1089
  catch (error) {
1049
1090
  await transport.close();
@@ -1073,9 +1114,9 @@ export async function connectToMcpServer(clientVersion, mcpServerName, mcpServer
1073
1114
  try {
1074
1115
  // Try SSE with stored OAuth token if available
1075
1116
  // This ensures that SSE fallback works for authenticated servers
1076
- await connectWithSSETransport(mcpClient, mcpServerConfig, await getStoredOAuthToken(mcpServerName));
1117
+ const sseTransport = await connectWithSSETransport(mcpClient, mcpServerConfig, await getStoredOAuthToken(mcpServerName));
1077
1118
  debugLogger.log(`MCP server '${mcpServerName}': Successfully connected using SSE transport.`);
1078
- return mcpClient;
1119
+ return { client: mcpClient, transport: sseTransport };
1079
1120
  }
1080
1121
  catch (sseFallbackError) {
1081
1122
  sseError = sseFallbackError;
@@ -1157,8 +1198,8 @@ export async function connectToMcpServer(clientVersion, mcpServerName, mcpServer
1157
1198
  if (!accessToken) {
1158
1199
  throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
1159
1200
  }
1160
- await retryWithOAuth(mcpClient, mcpServerName, mcpServerConfig, accessToken, httpReturned404);
1161
- return mcpClient;
1201
+ const oauthTransport = await retryWithOAuth(mcpClient, mcpServerName, mcpServerConfig, accessToken, httpReturned404);
1202
+ return { client: mcpClient, transport: oauthTransport };
1162
1203
  }
1163
1204
  else {
1164
1205
  throw new Error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
@@ -1207,7 +1248,7 @@ export async function connectToMcpServer(clientVersion, mcpServerName, mcpServer
1207
1248
  timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
1208
1249
  });
1209
1250
  // Connection successful with OAuth
1210
- return mcpClient;
1251
+ return { client: mcpClient, transport: oauthTransport };
1211
1252
  }
1212
1253
  else {
1213
1254
  throw new Error(`OAuth configuration failed for '${mcpServerName}'. Please authenticate manually with /mcp auth ${mcpServerName}`);