@google/gemini-cli-core 0.1.17 → 0.1.18-nightly.250810.c632ec8b

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 (251) hide show
  1. package/README.md +11 -1
  2. package/dist/google-gemini-cli-core-0.1.18.tgz +0 -0
  3. package/dist/src/code_assist/converter.d.ts +2 -1
  4. package/dist/src/code_assist/converter.js +1 -1
  5. package/dist/src/code_assist/converter.js.map +1 -1
  6. package/dist/src/code_assist/converter.test.js +48 -1
  7. package/dist/src/code_assist/converter.test.js.map +1 -1
  8. package/dist/src/code_assist/oauth2.js +1 -1
  9. package/dist/src/code_assist/oauth2.js.map +1 -1
  10. package/dist/src/code_assist/server.test.js +4 -1
  11. package/dist/src/code_assist/server.test.js.map +1 -1
  12. package/dist/src/config/config.d.ts +24 -4
  13. package/dist/src/config/config.js +53 -8
  14. package/dist/src/config/config.js.map +1 -1
  15. package/dist/src/config/config.test.js +8 -2
  16. package/dist/src/config/config.test.js.map +1 -1
  17. package/dist/src/config/flashFallback.test.js +0 -4
  18. package/dist/src/config/flashFallback.test.js.map +1 -1
  19. package/dist/src/core/client.d.ts +0 -2
  20. package/dist/src/core/client.js +9 -84
  21. package/dist/src/core/client.js.map +1 -1
  22. package/dist/src/core/client.test.js +7 -2
  23. package/dist/src/core/client.test.js.map +1 -1
  24. package/dist/src/core/contentGenerator.js +3 -2
  25. package/dist/src/core/contentGenerator.js.map +1 -1
  26. package/dist/src/core/contentGenerator.test.js +3 -2
  27. package/dist/src/core/contentGenerator.test.js.map +1 -1
  28. package/dist/src/core/coreToolScheduler.d.ts +23 -8
  29. package/dist/src/core/coreToolScheduler.js +173 -62
  30. package/dist/src/core/coreToolScheduler.js.map +1 -1
  31. package/dist/src/core/coreToolScheduler.test.js +185 -37
  32. package/dist/src/core/coreToolScheduler.test.js.map +1 -1
  33. package/dist/src/core/geminiChat.d.ts +7 -6
  34. package/dist/src/core/geminiChat.js +43 -43
  35. package/dist/src/core/geminiChat.js.map +1 -1
  36. package/dist/src/core/logger.d.ts +1 -0
  37. package/dist/src/core/logger.js +18 -0
  38. package/dist/src/core/logger.js.map +1 -1
  39. package/dist/src/core/logger.test.js +29 -0
  40. package/dist/src/core/logger.test.js.map +1 -1
  41. package/dist/src/core/loggingContentGenerator.d.ts +24 -0
  42. package/dist/src/core/loggingContentGenerator.js +89 -0
  43. package/dist/src/core/loggingContentGenerator.js.map +1 -0
  44. package/dist/src/core/nonInteractiveToolExecutor.js +20 -1
  45. package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
  46. package/dist/src/core/nonInteractiveToolExecutor.test.js +7 -31
  47. package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
  48. package/dist/src/core/subagent.d.ts +230 -0
  49. package/dist/src/core/subagent.js +447 -0
  50. package/dist/src/core/subagent.js.map +1 -0
  51. package/dist/src/core/subagent.test.d.ts +6 -0
  52. package/dist/src/core/subagent.test.js +515 -0
  53. package/dist/src/core/subagent.test.js.map +1 -0
  54. package/dist/src/core/turn.js +1 -0
  55. package/dist/src/core/turn.js.map +1 -1
  56. package/dist/src/core/turn.test.js +4 -0
  57. package/dist/src/core/turn.test.js.map +1 -1
  58. package/dist/src/ide/ide-client.d.ts +27 -11
  59. package/dist/src/ide/ide-client.js +178 -62
  60. package/dist/src/ide/ide-client.js.map +1 -1
  61. package/dist/src/ide/ideContext.d.ts +95 -0
  62. package/dist/src/ide/ideContext.js +45 -0
  63. package/dist/src/ide/ideContext.js.map +1 -1
  64. package/dist/src/index.d.ts +1 -0
  65. package/dist/src/index.js +1 -0
  66. package/dist/src/index.js.map +1 -1
  67. package/dist/src/mcp/oauth-provider.d.ts +1 -0
  68. package/dist/src/mcp/oauth-provider.js +14 -1
  69. package/dist/src/mcp/oauth-provider.js.map +1 -1
  70. package/dist/src/mcp/oauth-provider.test.js +87 -6
  71. package/dist/src/mcp/oauth-provider.test.js.map +1 -1
  72. package/dist/src/prompts/prompt-registry.d.ts +8 -0
  73. package/dist/src/prompts/prompt-registry.js +16 -0
  74. package/dist/src/prompts/prompt-registry.js.map +1 -1
  75. package/dist/src/services/loopDetectionService.js +10 -6
  76. package/dist/src/services/loopDetectionService.js.map +1 -1
  77. package/dist/src/services/loopDetectionService.test.js +139 -0
  78. package/dist/src/services/loopDetectionService.test.js.map +1 -1
  79. package/dist/src/services/shellExecutionService.js +29 -9
  80. package/dist/src/services/shellExecutionService.js.map +1 -1
  81. package/dist/src/services/shellExecutionService.test.js +8 -0
  82. package/dist/src/services/shellExecutionService.test.js.map +1 -1
  83. package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +28 -3
  84. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +184 -51
  85. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
  86. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.d.ts +6 -0
  87. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +186 -0
  88. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -0
  89. package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +6 -1
  90. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +13 -0
  91. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
  92. package/dist/src/telemetry/constants.d.ts +1 -0
  93. package/dist/src/telemetry/constants.js +1 -0
  94. package/dist/src/telemetry/constants.js.map +1 -1
  95. package/dist/src/telemetry/loggers.d.ts +2 -1
  96. package/dist/src/telemetry/loggers.js +17 -1
  97. package/dist/src/telemetry/loggers.js.map +1 -1
  98. package/dist/src/telemetry/loggers.test.circular.js +7 -2
  99. package/dist/src/telemetry/loggers.test.circular.js.map +1 -1
  100. package/dist/src/telemetry/loggers.test.js +7 -2
  101. package/dist/src/telemetry/loggers.test.js.map +1 -1
  102. package/dist/src/telemetry/metrics.d.ts +3 -2
  103. package/dist/src/telemetry/metrics.js +7 -1
  104. package/dist/src/telemetry/metrics.js.map +1 -1
  105. package/dist/src/telemetry/metrics.test.js +50 -0
  106. package/dist/src/telemetry/metrics.test.js.map +1 -1
  107. package/dist/src/telemetry/telemetry.test.js +0 -2
  108. package/dist/src/telemetry/telemetry.test.js.map +1 -1
  109. package/dist/src/telemetry/tool-call-decision.d.ts +13 -0
  110. package/dist/src/telemetry/tool-call-decision.js +29 -0
  111. package/dist/src/telemetry/tool-call-decision.js.map +1 -0
  112. package/dist/src/telemetry/types.d.ts +15 -8
  113. package/dist/src/telemetry/types.js +32 -21
  114. package/dist/src/telemetry/types.js.map +1 -1
  115. package/dist/src/telemetry/uiTelemetry.d.ts +4 -1
  116. package/dist/src/telemetry/uiTelemetry.js +3 -1
  117. package/dist/src/telemetry/uiTelemetry.js.map +1 -1
  118. package/dist/src/telemetry/uiTelemetry.test.js +13 -2
  119. package/dist/src/telemetry/uiTelemetry.test.js.map +1 -1
  120. package/dist/src/test-utils/tools.d.ts +23 -0
  121. package/dist/src/test-utils/tools.js +41 -0
  122. package/dist/src/test-utils/tools.js.map +1 -0
  123. package/dist/src/tools/diffOptions.d.ts +2 -0
  124. package/dist/src/tools/diffOptions.js +28 -0
  125. package/dist/src/tools/diffOptions.js.map +1 -1
  126. package/dist/src/tools/diffOptions.test.d.ts +6 -0
  127. package/dist/src/tools/diffOptions.test.js +119 -0
  128. package/dist/src/tools/diffOptions.test.js.map +1 -0
  129. package/dist/src/tools/edit.d.ts +9 -33
  130. package/dist/src/tools/edit.js +143 -131
  131. package/dist/src/tools/edit.js.map +1 -1
  132. package/dist/src/tools/edit.test.js +117 -51
  133. package/dist/src/tools/edit.test.js.map +1 -1
  134. package/dist/src/tools/glob.d.ts +3 -10
  135. package/dist/src/tools/glob.js +85 -88
  136. package/dist/src/tools/glob.js.map +1 -1
  137. package/dist/src/tools/glob.test.js +22 -12
  138. package/dist/src/tools/glob.test.js.map +1 -1
  139. package/dist/src/tools/grep.d.ts +3 -35
  140. package/dist/src/tools/grep.js +111 -82
  141. package/dist/src/tools/grep.js.map +1 -1
  142. package/dist/src/tools/grep.test.js +40 -23
  143. package/dist/src/tools/grep.test.js.map +1 -1
  144. package/dist/src/tools/mcp-client.d.ts +14 -3
  145. package/dist/src/tools/mcp-client.js +85 -6
  146. package/dist/src/tools/mcp-client.js.map +1 -1
  147. package/dist/src/tools/mcp-client.test.js +372 -11
  148. package/dist/src/tools/mcp-client.test.js.map +1 -1
  149. package/dist/src/tools/mcp-tool.js +104 -45
  150. package/dist/src/tools/mcp-tool.js.map +1 -1
  151. package/dist/src/tools/mcp-tool.test.js +280 -2
  152. package/dist/src/tools/mcp-tool.test.js.map +1 -1
  153. package/dist/src/tools/memoryTool.d.ts +2 -2
  154. package/dist/src/tools/memoryTool.js +1 -0
  155. package/dist/src/tools/memoryTool.js.map +1 -1
  156. package/dist/src/tools/modifiable-tool.d.ts +9 -6
  157. package/dist/src/tools/modifiable-tool.js +6 -3
  158. package/dist/src/tools/modifiable-tool.js.map +1 -1
  159. package/dist/src/tools/modifiable-tool.test.js +12 -12
  160. package/dist/src/tools/modifiable-tool.test.js.map +1 -1
  161. package/dist/src/tools/read-file.d.ts +4 -6
  162. package/dist/src/tools/read-file.js +87 -39
  163. package/dist/src/tools/read-file.js.map +1 -1
  164. package/dist/src/tools/read-file.test.js +192 -130
  165. package/dist/src/tools/read-file.test.js.map +1 -1
  166. package/dist/src/tools/read-many-files.js +84 -34
  167. package/dist/src/tools/read-many-files.js.map +1 -1
  168. package/dist/src/tools/read-many-files.test.js +107 -0
  169. package/dist/src/tools/read-many-files.test.js.map +1 -1
  170. package/dist/src/tools/shell.js +6 -1
  171. package/dist/src/tools/shell.js.map +1 -1
  172. package/dist/src/tools/shell.test.js +21 -0
  173. package/dist/src/tools/shell.test.js.map +1 -1
  174. package/dist/src/tools/tool-error.d.ts +4 -0
  175. package/dist/src/tools/tool-error.js +4 -0
  176. package/dist/src/tools/tool-error.js.map +1 -1
  177. package/dist/src/tools/tool-registry.d.ts +12 -5
  178. package/dist/src/tools/tool-registry.js +31 -14
  179. package/dist/src/tools/tool-registry.js.map +1 -1
  180. package/dist/src/tools/tool-registry.test.js +7 -22
  181. package/dist/src/tools/tool-registry.test.js.map +1 -1
  182. package/dist/src/tools/tools.d.ts +140 -39
  183. package/dist/src/tools/tools.js +180 -10
  184. package/dist/src/tools/tools.js.map +1 -1
  185. package/dist/src/tools/tools.test.d.ts +6 -0
  186. package/dist/src/tools/tools.test.js +117 -0
  187. package/dist/src/tools/tools.test.js.map +1 -0
  188. package/dist/src/tools/write-file.d.ts +6 -2
  189. package/dist/src/tools/write-file.js +81 -15
  190. package/dist/src/tools/write-file.js.map +1 -1
  191. package/dist/src/tools/write-file.test.js +113 -8
  192. package/dist/src/tools/write-file.test.js.map +1 -1
  193. package/dist/src/utils/bfsFileSearch.test.js +28 -56
  194. package/dist/src/utils/bfsFileSearch.test.js.map +1 -1
  195. package/dist/src/utils/editor.d.ts +1 -1
  196. package/dist/src/utils/editor.js +13 -5
  197. package/dist/src/utils/editor.js.map +1 -1
  198. package/dist/src/utils/editor.test.js +38 -6
  199. package/dist/src/utils/editor.test.js.map +1 -1
  200. package/dist/src/utils/environmentContext.d.ts +21 -0
  201. package/dist/src/utils/environmentContext.js +90 -0
  202. package/dist/src/utils/environmentContext.js.map +1 -0
  203. package/dist/src/utils/environmentContext.test.d.ts +6 -0
  204. package/dist/src/utils/environmentContext.test.js +139 -0
  205. package/dist/src/utils/environmentContext.test.js.map +1 -0
  206. package/dist/src/utils/fileUtils.d.ts +7 -0
  207. package/dist/src/utils/fileUtils.js +16 -13
  208. package/dist/src/utils/fileUtils.js.map +1 -1
  209. package/dist/src/utils/fileUtils.test.js +18 -4
  210. package/dist/src/utils/fileUtils.test.js.map +1 -1
  211. package/dist/src/utils/filesearch/crawlCache.d.ts +25 -0
  212. package/dist/src/utils/filesearch/crawlCache.js +57 -0
  213. package/dist/src/utils/filesearch/crawlCache.js.map +1 -0
  214. package/dist/src/utils/filesearch/crawlCache.test.d.ts +6 -0
  215. package/dist/src/utils/filesearch/crawlCache.test.js +103 -0
  216. package/dist/src/utils/filesearch/crawlCache.test.js.map +1 -0
  217. package/dist/src/utils/filesearch/fileSearch.d.ts +81 -0
  218. package/dist/src/utils/filesearch/fileSearch.js +241 -0
  219. package/dist/src/utils/filesearch/fileSearch.js.map +1 -0
  220. package/dist/src/utils/filesearch/fileSearch.test.d.ts +6 -0
  221. package/dist/src/utils/filesearch/fileSearch.test.js +654 -0
  222. package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -0
  223. package/dist/src/utils/filesearch/ignore.d.ts +35 -0
  224. package/dist/src/utils/filesearch/ignore.js +81 -0
  225. package/dist/src/utils/filesearch/ignore.js.map +1 -0
  226. package/dist/src/utils/filesearch/ignore.test.d.ts +6 -0
  227. package/dist/src/utils/filesearch/ignore.test.js +57 -0
  228. package/dist/src/utils/filesearch/ignore.test.js.map +1 -0
  229. package/dist/src/utils/filesearch/result-cache.d.ts +34 -0
  230. package/dist/src/utils/filesearch/result-cache.js +61 -0
  231. package/dist/src/utils/filesearch/result-cache.js.map +1 -0
  232. package/dist/src/utils/filesearch/result-cache.test.d.ts +6 -0
  233. package/dist/src/utils/filesearch/result-cache.test.js +47 -0
  234. package/dist/src/utils/filesearch/result-cache.test.js.map +1 -0
  235. package/dist/src/utils/flashFallback.integration.test.js +0 -2
  236. package/dist/src/utils/flashFallback.integration.test.js.map +1 -1
  237. package/dist/src/utils/memoryDiscovery.d.ts +1 -1
  238. package/dist/src/utils/memoryDiscovery.js +22 -7
  239. package/dist/src/utils/memoryDiscovery.js.map +1 -1
  240. package/dist/src/utils/memoryDiscovery.test.js +30 -71
  241. package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
  242. package/dist/src/utils/nextSpeakerChecker.js +2 -2
  243. package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
  244. package/dist/src/utils/nextSpeakerChecker.test.js +2 -2
  245. package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
  246. package/dist/src/utils/workspaceContext.d.ts +4 -0
  247. package/dist/src/utils/workspaceContext.js +33 -0
  248. package/dist/src/utils/workspaceContext.js.map +1 -1
  249. package/dist/tsconfig.tsbuildinfo +1 -1
  250. package/package.json +7 -1
  251. package/dist/google-gemini-cli-core-0.1.16.tgz +0 -0
@@ -8,11 +8,13 @@ import { Turn, GeminiEventType, } from './turn.js';
8
8
  import { reportError } from '../utils/errorReporting.js';
9
9
  const mockSendMessageStream = vi.fn();
10
10
  const mockGetHistory = vi.fn();
11
+ const mockMaybeIncludeSchemaDepthContext = vi.fn();
11
12
  vi.mock('@google/genai', async (importOriginal) => {
12
13
  const actual = await importOriginal();
13
14
  const MockChat = vi.fn().mockImplementation(() => ({
14
15
  sendMessageStream: mockSendMessageStream,
15
16
  getHistory: mockGetHistory,
17
+ maybeIncludeSchemaDepthContext: mockMaybeIncludeSchemaDepthContext,
16
18
  }));
17
19
  return {
18
20
  ...actual,
@@ -34,6 +36,7 @@ describe('Turn', () => {
34
36
  mockChatInstance = {
35
37
  sendMessageStream: mockSendMessageStream,
36
38
  getHistory: mockGetHistory,
39
+ maybeIncludeSchemaDepthContext: mockMaybeIncludeSchemaDepthContext,
37
40
  };
38
41
  turn = new Turn(mockChatInstance, 'prompt-id-1');
39
42
  mockGetHistory.mockReturnValue([]);
@@ -152,6 +155,7 @@ describe('Turn', () => {
152
155
  { role: 'model', parts: [{ text: 'Previous history' }] },
153
156
  ];
154
157
  mockGetHistory.mockReturnValue(historyContent);
158
+ mockMaybeIncludeSchemaDepthContext.mockResolvedValue(undefined);
155
159
  const events = [];
156
160
  for await (const event of turn.run(reqParts, new AbortController().signal)) {
157
161
  events.push(event);
@@ -1 +1 @@
1
- {"version":3,"file":"turn.test.js","sourceRoot":"","sources":["../../../src/core/turn.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"turn.test.js","sourceRoot":"","sources":["../../../src/core/turn.test.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
6
  import { DetectedIde } from '../ide/detect-ide.js';
7
- import { Client } from '@modelcontextprotocol/sdk/client/index.js';
7
+ import { DiffUpdateResult } from '../ide/ideContext.js';
8
8
  export type IDEConnectionState = {
9
9
  status: IDEConnectionStatus;
10
10
  details?: string;
@@ -18,23 +18,39 @@ export declare enum IDEConnectionStatus {
18
18
  * Manages the connection to and interaction with the IDE server.
19
19
  */
20
20
  export declare class IdeClient {
21
- client: Client | undefined;
22
- private state;
23
21
  private static instance;
22
+ private client;
23
+ private state;
24
24
  private readonly currentIde;
25
25
  private readonly currentIdeDisplayName;
26
- constructor(ideMode: boolean);
27
- static getInstance(ideMode: boolean): IdeClient;
26
+ private diffResponses;
27
+ private constructor();
28
+ static getInstance(): IdeClient;
29
+ connect(): Promise<void>;
30
+ /**
31
+ * A diff is accepted with any modifications if the user performs one of the
32
+ * following actions:
33
+ * - Clicks the checkbox icon in the IDE to accept
34
+ * - Runs `command+shift+p` > "Gemini CLI: Accept Diff in IDE" to accept
35
+ * - Selects "accept" in the CLI UI
36
+ * - Saves the file via `ctrl/command+s`
37
+ *
38
+ * A diff is rejected if the user performs one of the following actions:
39
+ * - Clicks the "x" icon in the IDE
40
+ * - Runs "Gemini CLI: Close Diff in IDE"
41
+ * - Selects "no" in the CLI UI
42
+ * - Closes the file
43
+ */
44
+ openDiff(filePath: string, newContent?: string): Promise<DiffUpdateResult>;
45
+ closeDiff(filePath: string): Promise<string | undefined>;
46
+ resolveDiffFromCli(filePath: string, outcome: 'accepted' | 'rejected'): Promise<void>;
47
+ disconnect(): Promise<void>;
28
48
  getCurrentIde(): DetectedIde | undefined;
29
49
  getConnectionStatus(): IDEConnectionState;
50
+ getDetectedIdeDisplayName(): string | undefined;
30
51
  private setState;
31
- private getPortFromEnv;
32
52
  private validateWorkspacePath;
53
+ private getPortFromEnv;
33
54
  private registerClientHandlers;
34
- reconnect(ideMode: boolean): Promise<void>;
35
55
  private establishConnection;
36
- init(): Promise<void>;
37
- dispose(): void;
38
- getDetectedIdeDisplayName(): string | undefined;
39
- setDisconnected(): void;
40
56
  }
@@ -3,13 +3,16 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import { detectIde, getIdeDisplayName, } from '../ide/detect-ide.js';
7
- import { ideContext, IdeContextNotificationSchema } from '../ide/ideContext.js';
6
+ import * as fs from 'node:fs';
7
+ import { detectIde, DetectedIde, getIdeDisplayName, } from '../ide/detect-ide.js';
8
+ import { ideContext, IdeContextNotificationSchema, IdeDiffAcceptedNotificationSchema, IdeDiffClosedNotificationSchema, CloseDiffResponseSchema, } from '../ide/ideContext.js';
8
9
  import { Client } from '@modelcontextprotocol/sdk/client/index.js';
9
10
  import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
10
11
  const logger = {
11
12
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
12
13
  debug: (...args) => console.debug('[DEBUG] [IDEClient]', ...args),
14
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
15
+ error: (...args) => console.error('[ERROR] [IDEClient]', ...args),
13
16
  };
14
17
  export var IDEConnectionStatus;
15
18
  (function (IDEConnectionStatus) {
@@ -17,34 +20,132 @@ export var IDEConnectionStatus;
17
20
  IDEConnectionStatus["Disconnected"] = "disconnected";
18
21
  IDEConnectionStatus["Connecting"] = "connecting";
19
22
  })(IDEConnectionStatus || (IDEConnectionStatus = {}));
23
+ function getRealPath(path) {
24
+ try {
25
+ return fs.realpathSync(path);
26
+ }
27
+ catch (_e) {
28
+ // If realpathSync fails, it might be because the path doesn't exist.
29
+ // In that case, we can fall back to the original path.
30
+ return path;
31
+ }
32
+ }
20
33
  /**
21
34
  * Manages the connection to and interaction with the IDE server.
22
35
  */
23
36
  export class IdeClient {
37
+ static instance;
24
38
  client = undefined;
25
39
  state = {
26
40
  status: IDEConnectionStatus.Disconnected,
41
+ details: 'IDE integration is currently disabled. To enable it, run /ide enable.',
27
42
  };
28
- static instance;
29
43
  currentIde;
30
44
  currentIdeDisplayName;
31
- constructor(ideMode) {
45
+ diffResponses = new Map();
46
+ constructor() {
32
47
  this.currentIde = detectIde();
33
48
  if (this.currentIde) {
34
49
  this.currentIdeDisplayName = getIdeDisplayName(this.currentIde);
35
50
  }
36
- if (!ideMode) {
51
+ }
52
+ static getInstance() {
53
+ if (!IdeClient.instance) {
54
+ IdeClient.instance = new IdeClient();
55
+ }
56
+ return IdeClient.instance;
57
+ }
58
+ async connect() {
59
+ this.setState(IDEConnectionStatus.Connecting);
60
+ if (!this.currentIde || !this.currentIdeDisplayName) {
61
+ this.setState(IDEConnectionStatus.Disconnected, `IDE integration is not supported in your current environment. To use this feature, run Gemini CLI in one of these supported IDEs: ${Object.values(DetectedIde)
62
+ .map((ide) => getIdeDisplayName(ide))
63
+ .join(', ')}`, true);
64
+ return;
65
+ }
66
+ if (!this.validateWorkspacePath()) {
37
67
  return;
38
68
  }
39
- this.init().catch((err) => {
40
- logger.debug('Failed to initialize IdeClient:', err);
69
+ const port = this.getPortFromEnv();
70
+ if (!port) {
71
+ return;
72
+ }
73
+ await this.establishConnection(port);
74
+ }
75
+ /**
76
+ * A diff is accepted with any modifications if the user performs one of the
77
+ * following actions:
78
+ * - Clicks the checkbox icon in the IDE to accept
79
+ * - Runs `command+shift+p` > "Gemini CLI: Accept Diff in IDE" to accept
80
+ * - Selects "accept" in the CLI UI
81
+ * - Saves the file via `ctrl/command+s`
82
+ *
83
+ * A diff is rejected if the user performs one of the following actions:
84
+ * - Clicks the "x" icon in the IDE
85
+ * - Runs "Gemini CLI: Close Diff in IDE"
86
+ * - Selects "no" in the CLI UI
87
+ * - Closes the file
88
+ */
89
+ async openDiff(filePath, newContent) {
90
+ return new Promise((resolve, reject) => {
91
+ this.diffResponses.set(filePath, resolve);
92
+ this.client
93
+ ?.callTool({
94
+ name: `openDiff`,
95
+ arguments: {
96
+ filePath,
97
+ newContent,
98
+ },
99
+ })
100
+ .catch((err) => {
101
+ logger.debug(`callTool for ${filePath} failed:`, err);
102
+ reject(err);
103
+ });
41
104
  });
42
105
  }
43
- static getInstance(ideMode) {
44
- if (!IdeClient.instance) {
45
- IdeClient.instance = new IdeClient(ideMode);
106
+ async closeDiff(filePath) {
107
+ try {
108
+ const result = await this.client?.callTool({
109
+ name: `closeDiff`,
110
+ arguments: {
111
+ filePath,
112
+ },
113
+ });
114
+ if (result) {
115
+ const parsed = CloseDiffResponseSchema.parse(result);
116
+ return parsed.content;
117
+ }
46
118
  }
47
- return IdeClient.instance;
119
+ catch (err) {
120
+ logger.debug(`callTool for ${filePath} failed:`, err);
121
+ }
122
+ return;
123
+ }
124
+ // Closes the diff. Instead of waiting for a notification,
125
+ // manually resolves the diff resolver as the desired outcome.
126
+ async resolveDiffFromCli(filePath, outcome) {
127
+ const content = await this.closeDiff(filePath);
128
+ const resolver = this.diffResponses.get(filePath);
129
+ if (resolver) {
130
+ if (outcome === 'accepted') {
131
+ resolver({ status: 'accepted', content });
132
+ }
133
+ else {
134
+ resolver({ status: 'rejected', content: undefined });
135
+ }
136
+ this.diffResponses.delete(filePath);
137
+ }
138
+ }
139
+ async disconnect() {
140
+ if (this.state.status === IDEConnectionStatus.Disconnected) {
141
+ return;
142
+ }
143
+ for (const filePath of this.diffResponses.keys()) {
144
+ await this.closeDiff(filePath);
145
+ }
146
+ this.diffResponses.clear();
147
+ this.setState(IDEConnectionStatus.Disconnected, 'IDE integration disabled. To enable it again, run /ide enable.');
148
+ this.client?.close();
48
149
  }
49
150
  getCurrentIde() {
50
151
  return this.currentIde;
@@ -52,33 +153,49 @@ export class IdeClient {
52
153
  getConnectionStatus() {
53
154
  return this.state;
54
155
  }
55
- setState(status, details) {
56
- this.state = { status, details };
156
+ getDetectedIdeDisplayName() {
157
+ return this.currentIdeDisplayName;
158
+ }
159
+ setState(status, details, logToConsole = false) {
160
+ const isAlreadyDisconnected = this.state.status === IDEConnectionStatus.Disconnected &&
161
+ status === IDEConnectionStatus.Disconnected;
162
+ // Only update details & log to console if the state wasn't already
163
+ // disconnected, so that the first detail message is preserved.
164
+ if (!isAlreadyDisconnected) {
165
+ this.state = { status, details };
166
+ if (logToConsole) {
167
+ logger.error(details);
168
+ }
169
+ }
57
170
  if (status === IDEConnectionStatus.Disconnected) {
58
- logger.debug('IDE integration is disconnected. ', details);
171
+ logger.debug(details);
59
172
  ideContext.clearIdeContext();
60
173
  }
61
174
  }
62
- getPortFromEnv() {
63
- const port = process.env['GEMINI_CLI_IDE_SERVER_PORT'];
64
- if (!port) {
65
- this.setState(IDEConnectionStatus.Disconnected, 'Gemini CLI Companion extension not found. Install via /ide install and restart the CLI in a fresh terminal window.');
66
- return undefined;
67
- }
68
- return port;
69
- }
70
175
  validateWorkspacePath() {
71
176
  const ideWorkspacePath = process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'];
72
- if (!ideWorkspacePath) {
73
- this.setState(IDEConnectionStatus.Disconnected, 'IDE integration requires a single workspace folder to be open in the IDE. Please ensure one folder is open and try again.');
177
+ if (ideWorkspacePath === undefined) {
178
+ this.setState(IDEConnectionStatus.Disconnected, `Failed to connect to IDE companion extension for ${this.currentIdeDisplayName}. Please ensure the extension is running and try refreshing your terminal. To install the extension, run /ide install.`, true);
74
179
  return false;
75
180
  }
76
- if (ideWorkspacePath !== process.cwd()) {
77
- this.setState(IDEConnectionStatus.Disconnected, `Gemini CLI is running in a different directory (${process.cwd()}) from the IDE's open workspace (${ideWorkspacePath}). Please run Gemini CLI in the same directory.`);
181
+ if (ideWorkspacePath === '') {
182
+ this.setState(IDEConnectionStatus.Disconnected, `To use this feature, please open a single workspace folder in ${this.currentIdeDisplayName} and try again.`, true);
183
+ return false;
184
+ }
185
+ if (getRealPath(ideWorkspacePath) !== getRealPath(process.cwd())) {
186
+ this.setState(IDEConnectionStatus.Disconnected, `Directory mismatch. Gemini CLI is running in a different location than the open workspace in ${this.currentIdeDisplayName}. Please run the CLI from the same directory as your project's root folder.`, true);
78
187
  return false;
79
188
  }
80
189
  return true;
81
190
  }
191
+ getPortFromEnv() {
192
+ const port = process.env['GEMINI_CLI_IDE_SERVER_PORT'];
193
+ if (!port) {
194
+ this.setState(IDEConnectionStatus.Disconnected, `Failed to connect to IDE companion extension for ${this.currentIdeDisplayName}. Please ensure the extension is running and try refreshing your terminal. To install the extension, run /ide install.`, true);
195
+ return undefined;
196
+ }
197
+ return port;
198
+ }
82
199
  registerClientHandlers() {
83
200
  if (!this.client) {
84
201
  return;
@@ -87,14 +204,33 @@ export class IdeClient {
87
204
  ideContext.setIdeContext(notification.params);
88
205
  });
89
206
  this.client.onerror = (_error) => {
90
- this.setState(IDEConnectionStatus.Disconnected, 'Client error.');
207
+ this.setState(IDEConnectionStatus.Disconnected, `IDE connection error. The connection was lost unexpectedly. Please try reconnecting by running /ide enable`, true);
91
208
  };
92
209
  this.client.onclose = () => {
93
- this.setState(IDEConnectionStatus.Disconnected, 'Connection closed.');
210
+ this.setState(IDEConnectionStatus.Disconnected, `IDE connection error. The connection was lost unexpectedly. Please try reconnecting by running /ide enable`, true);
94
211
  };
95
- }
96
- async reconnect(ideMode) {
97
- IdeClient.instance = new IdeClient(ideMode);
212
+ this.client.setNotificationHandler(IdeDiffAcceptedNotificationSchema, (notification) => {
213
+ const { filePath, content } = notification.params;
214
+ const resolver = this.diffResponses.get(filePath);
215
+ if (resolver) {
216
+ resolver({ status: 'accepted', content });
217
+ this.diffResponses.delete(filePath);
218
+ }
219
+ else {
220
+ logger.debug(`No resolver found for ${filePath}`);
221
+ }
222
+ });
223
+ this.client.setNotificationHandler(IdeDiffClosedNotificationSchema, (notification) => {
224
+ const { filePath } = notification.params;
225
+ const resolver = this.diffResponses.get(filePath);
226
+ if (resolver) {
227
+ resolver({ status: 'rejected', content: undefined });
228
+ this.diffResponses.delete(filePath);
229
+ }
230
+ else {
231
+ logger.debug(`No resolver found for ${filePath}`);
232
+ }
233
+ });
98
234
  }
99
235
  async establishConnection(port) {
100
236
  let transport;
@@ -104,13 +240,13 @@ export class IdeClient {
104
240
  // TODO(#3487): use the CLI version here.
105
241
  version: '1.0.0',
106
242
  });
107
- transport = new StreamableHTTPClientTransport(new URL(`http://localhost:${port}/mcp`));
108
- this.registerClientHandlers();
243
+ transport = new StreamableHTTPClientTransport(new URL(`http://${getIdeServerHost()}:${port}/mcp`));
109
244
  await this.client.connect(transport);
245
+ this.registerClientHandlers();
110
246
  this.setState(IDEConnectionStatus.Connected);
111
247
  }
112
- catch (error) {
113
- this.setState(IDEConnectionStatus.Disconnected, `Failed to connect to IDE server: ${error}`);
248
+ catch (_error) {
249
+ this.setState(IDEConnectionStatus.Disconnected, `Failed to connect to IDE companion extension for ${this.currentIdeDisplayName}. Please ensure the extension is running and try refreshing your terminal. To install the extension, run /ide install.`, true);
114
250
  if (transport) {
115
251
  try {
116
252
  await transport.close();
@@ -121,32 +257,12 @@ export class IdeClient {
121
257
  }
122
258
  }
123
259
  }
124
- async init() {
125
- if (this.state.status === IDEConnectionStatus.Connected) {
126
- return;
127
- }
128
- if (!this.currentIde) {
129
- this.setState(IDEConnectionStatus.Disconnected, 'Not running in a supported IDE, skipping connection.');
130
- return;
131
- }
132
- this.setState(IDEConnectionStatus.Connecting);
133
- if (!this.validateWorkspacePath()) {
134
- return;
135
- }
136
- const port = this.getPortFromEnv();
137
- if (!port) {
138
- return;
139
- }
140
- await this.establishConnection(port);
141
- }
142
- dispose() {
143
- this.client?.close();
144
- }
145
- getDetectedIdeDisplayName() {
146
- return this.currentIdeDisplayName;
147
- }
148
- setDisconnected() {
149
- this.setState(IDEConnectionStatus.Disconnected);
150
- }
260
+ }
261
+ function getIdeServerHost() {
262
+ const isInContainer = fs.existsSync('/.dockerenv') ||
263
+ fs.existsSync('/run/.containerenv') ||
264
+ !!process.env.SANDBOX ||
265
+ !!process.env.container;
266
+ return isInContainer ? 'host.docker.internal' : 'localhost';
151
267
  }
152
268
  //# sourceMappingURL=ide-client.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ide-client.js","sourceRoot":"","sources":["../../../src/ide/ide-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ide-client.js","sourceRoot":"","sources":["../../../src/ide/ide-client.ts"],"names":[],"mappings":"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"}
@@ -133,6 +133,7 @@ export type IdeContext = z.infer<typeof IdeContextSchema>;
133
133
  * Zod schema for validating the 'ide/contextUpdate' notification from the IDE.
134
134
  */
135
135
  export declare const IdeContextNotificationSchema: z.ZodObject<{
136
+ jsonrpc: z.ZodLiteral<"2.0">;
136
137
  method: z.ZodLiteral<"ide/contextUpdate">;
137
138
  params: z.ZodObject<{
138
139
  workspaceState: z.ZodOptional<z.ZodObject<{
@@ -236,6 +237,7 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
236
237
  }[] | undefined;
237
238
  } | undefined;
238
239
  };
240
+ jsonrpc: "2.0";
239
241
  }, {
240
242
  method: "ide/contextUpdate";
241
243
  params: {
@@ -252,7 +254,100 @@ export declare const IdeContextNotificationSchema: z.ZodObject<{
252
254
  }[] | undefined;
253
255
  } | undefined;
254
256
  };
257
+ jsonrpc: "2.0";
255
258
  }>;
259
+ export declare const IdeDiffAcceptedNotificationSchema: z.ZodObject<{
260
+ jsonrpc: z.ZodLiteral<"2.0">;
261
+ method: z.ZodLiteral<"ide/diffAccepted">;
262
+ params: z.ZodObject<{
263
+ filePath: z.ZodString;
264
+ content: z.ZodString;
265
+ }, "strip", z.ZodTypeAny, {
266
+ filePath: string;
267
+ content: string;
268
+ }, {
269
+ filePath: string;
270
+ content: string;
271
+ }>;
272
+ }, "strip", z.ZodTypeAny, {
273
+ method: "ide/diffAccepted";
274
+ params: {
275
+ filePath: string;
276
+ content: string;
277
+ };
278
+ jsonrpc: "2.0";
279
+ }, {
280
+ method: "ide/diffAccepted";
281
+ params: {
282
+ filePath: string;
283
+ content: string;
284
+ };
285
+ jsonrpc: "2.0";
286
+ }>;
287
+ export declare const IdeDiffClosedNotificationSchema: z.ZodObject<{
288
+ jsonrpc: z.ZodLiteral<"2.0">;
289
+ method: z.ZodLiteral<"ide/diffClosed">;
290
+ params: z.ZodObject<{
291
+ filePath: z.ZodString;
292
+ content: z.ZodOptional<z.ZodString>;
293
+ }, "strip", z.ZodTypeAny, {
294
+ filePath: string;
295
+ content?: string | undefined;
296
+ }, {
297
+ filePath: string;
298
+ content?: string | undefined;
299
+ }>;
300
+ }, "strip", z.ZodTypeAny, {
301
+ method: "ide/diffClosed";
302
+ params: {
303
+ filePath: string;
304
+ content?: string | undefined;
305
+ };
306
+ jsonrpc: "2.0";
307
+ }, {
308
+ method: "ide/diffClosed";
309
+ params: {
310
+ filePath: string;
311
+ content?: string | undefined;
312
+ };
313
+ jsonrpc: "2.0";
314
+ }>;
315
+ export declare const CloseDiffResponseSchema: z.ZodEffects<z.ZodObject<{
316
+ content: z.ZodArray<z.ZodObject<{
317
+ text: z.ZodString;
318
+ type: z.ZodLiteral<"text">;
319
+ }, "strip", z.ZodTypeAny, {
320
+ text: string;
321
+ type: "text";
322
+ }, {
323
+ text: string;
324
+ type: "text";
325
+ }>, "many">;
326
+ }, "strip", z.ZodTypeAny, {
327
+ content: {
328
+ text: string;
329
+ type: "text";
330
+ }[];
331
+ }, {
332
+ content: {
333
+ text: string;
334
+ type: "text";
335
+ }[];
336
+ }>, {
337
+ content?: string | undefined;
338
+ }, {
339
+ content: {
340
+ text: string;
341
+ type: "text";
342
+ }[];
343
+ }>;
344
+ export type DiffUpdateResult = {
345
+ status: 'accepted';
346
+ content?: string;
347
+ } | {
348
+ status: 'rejected';
349
+ content: undefined;
350
+ };
256
351
  type IdeContextSubscriber = (ideContext: IdeContext | undefined) => void;
257
352
  /**
258
353
  * Creates a new store for managing the IDE's context.