@cloudcli-ai/cloudcli 1.36.0 → 1.36.1

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 (217) hide show
  1. package/README.de.md +17 -18
  2. package/README.ja.md +16 -17
  3. package/README.ko.md +17 -18
  4. package/README.md +19 -20
  5. package/README.ru.md +17 -18
  6. package/README.tr.md +17 -18
  7. package/README.zh-CN.md +17 -18
  8. package/README.zh-TW.md +17 -18
  9. package/dist/api-docs.html +2 -3
  10. package/dist/assets/{index-S6cIy7hj.js → index-Bz9vXV2m.js} +264 -259
  11. package/dist/assets/index-DLmhQ15L.css +32 -0
  12. package/dist/assets/{vendor-xterm-CJZjLICi.js → vendor-xterm-CS4rQ5Mr.js} +12 -12
  13. package/dist/index.html +3 -3
  14. package/dist-server/server/claude-sdk.js +37 -90
  15. package/dist-server/server/claude-sdk.js.map +1 -1
  16. package/dist-server/server/cli.js +1 -4
  17. package/dist-server/server/cli.js.map +1 -1
  18. package/dist-server/server/cursor-cli.js +12 -11
  19. package/dist-server/server/cursor-cli.js.map +1 -1
  20. package/dist-server/server/index.js +10 -141
  21. package/dist-server/server/index.js.map +1 -1
  22. package/dist-server/server/modules/assets/assets.routes.js +89 -0
  23. package/dist-server/server/modules/assets/assets.routes.js.map +1 -0
  24. package/dist-server/server/modules/assets/index.js +4 -0
  25. package/dist-server/server/modules/assets/index.js.map +1 -0
  26. package/dist-server/server/modules/assets/services/image-assets.service.js +57 -0
  27. package/dist-server/server/modules/assets/services/image-assets.service.js.map +1 -0
  28. package/dist-server/server/modules/assets/tests/image-assets.service.test.js +36 -0
  29. package/dist-server/server/modules/assets/tests/image-assets.service.test.js.map +1 -0
  30. package/dist-server/server/modules/browser-use/browser-use.service.js +6 -3
  31. package/dist-server/server/modules/browser-use/browser-use.service.js.map +1 -1
  32. package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js +2 -2
  33. package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js.map +1 -1
  34. package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js +0 -1
  35. package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js.map +1 -1
  36. package/dist-server/server/modules/projects/services/project-clone.service.js +2 -1
  37. package/dist-server/server/modules/projects/services/project-clone.service.js.map +1 -1
  38. package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js +28 -0
  39. package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js.map +1 -1
  40. package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js +54 -1
  41. package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js.map +1 -1
  42. package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js +36 -1
  43. package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js.map +1 -1
  44. package/dist-server/server/modules/providers/list/cursor/cursor-models.provider.js +3 -17
  45. package/dist-server/server/modules/providers/list/cursor/cursor-models.provider.js.map +1 -1
  46. package/dist-server/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.js +7 -1
  47. package/dist-server/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.js.map +1 -1
  48. package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js +49 -13
  49. package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js.map +1 -1
  50. package/dist-server/server/modules/providers/list/opencode/opencode-auth.provider.js +0 -1
  51. package/dist-server/server/modules/providers/list/opencode/opencode-auth.provider.js.map +1 -1
  52. package/dist-server/server/modules/providers/list/opencode/opencode-models.provider.js +8 -14
  53. package/dist-server/server/modules/providers/list/opencode/opencode-models.provider.js.map +1 -1
  54. package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js +24 -5
  55. package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js.map +1 -1
  56. package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js +10 -21
  57. package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js.map +1 -1
  58. package/dist-server/server/modules/providers/provider.registry.js +0 -2
  59. package/dist-server/server/modules/providers/provider.registry.js.map +1 -1
  60. package/dist-server/server/modules/providers/provider.routes.js +0 -1
  61. package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
  62. package/dist-server/server/modules/providers/services/provider-capabilities.service.js +7 -14
  63. package/dist-server/server/modules/providers/services/provider-capabilities.service.js.map +1 -1
  64. package/dist-server/server/modules/providers/services/provider-models.service.js +1 -1
  65. package/dist-server/server/modules/providers/services/provider-models.service.js.map +1 -1
  66. package/dist-server/server/modules/providers/services/session-conversations-search.service.js +3 -77
  67. package/dist-server/server/modules/providers/services/session-conversations-search.service.js.map +1 -1
  68. package/dist-server/server/modules/providers/services/session-synchronizer.service.js +0 -1
  69. package/dist-server/server/modules/providers/services/session-synchronizer.service.js.map +1 -1
  70. package/dist-server/server/modules/providers/services/sessions-watcher.service.js +0 -13
  71. package/dist-server/server/modules/providers/services/sessions-watcher.service.js.map +1 -1
  72. package/dist-server/server/modules/providers/tests/codex-sessions.test.js +96 -0
  73. package/dist-server/server/modules/providers/tests/codex-sessions.test.js.map +1 -0
  74. package/dist-server/server/modules/providers/tests/mcp.test.js +3 -29
  75. package/dist-server/server/modules/providers/tests/mcp.test.js.map +1 -1
  76. package/dist-server/server/modules/providers/tests/opencode-models.test.js +7 -0
  77. package/dist-server/server/modules/providers/tests/opencode-models.test.js.map +1 -1
  78. package/dist-server/server/modules/providers/tests/opencode-sessions.test.js +117 -0
  79. package/dist-server/server/modules/providers/tests/opencode-sessions.test.js.map +1 -1
  80. package/dist-server/server/modules/providers/tests/provider-image-history.test.js +147 -0
  81. package/dist-server/server/modules/providers/tests/provider-image-history.test.js.map +1 -0
  82. package/dist-server/server/modules/providers/tests/provider-models.service.test.js +8 -8
  83. package/dist-server/server/modules/providers/tests/skills.test.js +3 -26
  84. package/dist-server/server/modules/providers/tests/skills.test.js.map +1 -1
  85. package/dist-server/server/modules/websocket/services/chat-run-registry.service.js +14 -0
  86. package/dist-server/server/modules/websocket/services/chat-run-registry.service.js.map +1 -1
  87. package/dist-server/server/modules/websocket/services/chat-websocket.service.js +36 -2
  88. package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map +1 -1
  89. package/dist-server/server/modules/websocket/services/shell-websocket.service.js +3 -12
  90. package/dist-server/server/modules/websocket/services/shell-websocket.service.js.map +1 -1
  91. package/dist-server/server/modules/websocket/tests/chat-image-filter.test.js +33 -0
  92. package/dist-server/server/modules/websocket/tests/chat-image-filter.test.js.map +1 -0
  93. package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js +37 -4
  94. package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js.map +1 -1
  95. package/dist-server/server/openai-codex.js +8 -2
  96. package/dist-server/server/openai-codex.js.map +1 -1
  97. package/dist-server/server/opencode-cli.js +43 -6
  98. package/dist-server/server/opencode-cli.js.map +1 -1
  99. package/dist-server/server/opencode-cli.test.js +103 -3
  100. package/dist-server/server/opencode-cli.test.js.map +1 -1
  101. package/dist-server/server/routes/agent.js +9 -19
  102. package/dist-server/server/routes/agent.js.map +1 -1
  103. package/dist-server/server/routes/commands.js +1 -2
  104. package/dist-server/server/routes/commands.js.map +1 -1
  105. package/dist-server/server/routes/git.js +179 -53
  106. package/dist-server/server/routes/git.js.map +1 -1
  107. package/dist-server/server/routes/git.test.js +80 -0
  108. package/dist-server/server/routes/git.test.js.map +1 -0
  109. package/dist-server/server/routes/taskmaster.js +3 -1
  110. package/dist-server/server/routes/taskmaster.js.map +1 -1
  111. package/dist-server/server/routes/user.js +2 -1
  112. package/dist-server/server/routes/user.js.map +1 -1
  113. package/dist-server/server/shared/image-attachments.js +270 -0
  114. package/dist-server/server/shared/image-attachments.js.map +1 -0
  115. package/dist-server/server/shared/tests/image-attachments.test.js +220 -0
  116. package/dist-server/server/shared/tests/image-attachments.test.js.map +1 -0
  117. package/dist-server/server/shared/utils.js +43 -0
  118. package/dist-server/server/shared/utils.js.map +1 -1
  119. package/dist-server/server/utils/gitConfig.js +2 -1
  120. package/dist-server/server/utils/gitConfig.js.map +1 -1
  121. package/dist-server/server/utils/plugin-process-manager.js +2 -1
  122. package/dist-server/server/utils/plugin-process-manager.js.map +1 -1
  123. package/electron/launcher/launcher.js +1 -1
  124. package/package.json +3 -3
  125. package/public/api-docs.html +2 -3
  126. package/server/claude-sdk.js +37 -105
  127. package/server/cli.js +1 -4
  128. package/server/cursor-cli.js +13 -12
  129. package/server/index.js +11 -159
  130. package/server/modules/assets/assets.routes.ts +103 -0
  131. package/server/modules/assets/index.ts +3 -0
  132. package/server/modules/assets/services/image-assets.service.ts +82 -0
  133. package/server/modules/assets/tests/image-assets.service.test.ts +46 -0
  134. package/server/modules/browser-use/browser-use.service.ts +7 -3
  135. package/server/modules/database/tests/sessions-provider-mapping.test.ts +2 -2
  136. package/server/modules/notifications/services/notification-orchestrator.service.js +0 -1
  137. package/server/modules/projects/services/project-clone.service.ts +3 -1
  138. package/server/modules/providers/README.md +1 -7
  139. package/server/modules/providers/list/claude/claude-sessions.provider.ts +30 -0
  140. package/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts +60 -1
  141. package/server/modules/providers/list/codex/codex-sessions.provider.ts +41 -1
  142. package/server/modules/providers/list/cursor/cursor-models.provider.ts +3 -17
  143. package/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.ts +7 -1
  144. package/server/modules/providers/list/cursor/cursor-sessions.provider.ts +56 -15
  145. package/server/modules/providers/list/opencode/opencode-auth.provider.ts +0 -1
  146. package/server/modules/providers/list/opencode/opencode-models.provider.ts +15 -19
  147. package/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.ts +25 -4
  148. package/server/modules/providers/list/opencode/opencode-sessions.provider.ts +10 -21
  149. package/server/modules/providers/provider.registry.ts +0 -2
  150. package/server/modules/providers/provider.routes.ts +0 -1
  151. package/server/modules/providers/services/provider-capabilities.service.ts +7 -14
  152. package/server/modules/providers/services/provider-models.service.ts +1 -1
  153. package/server/modules/providers/services/session-conversations-search.service.ts +3 -93
  154. package/server/modules/providers/services/session-synchronizer.service.ts +0 -1
  155. package/server/modules/providers/services/sessions-watcher.service.ts +0 -14
  156. package/server/modules/providers/tests/codex-sessions.test.ts +111 -0
  157. package/server/modules/providers/tests/mcp.test.ts +3 -34
  158. package/server/modules/providers/tests/opencode-models.test.ts +7 -0
  159. package/server/modules/providers/tests/opencode-sessions.test.ts +139 -0
  160. package/server/modules/providers/tests/provider-image-history.test.ts +180 -0
  161. package/server/modules/providers/tests/provider-models.service.test.ts +8 -8
  162. package/server/modules/providers/tests/skills.test.ts +3 -42
  163. package/server/modules/websocket/services/chat-run-registry.service.ts +16 -0
  164. package/server/modules/websocket/services/chat-websocket.service.ts +41 -2
  165. package/server/modules/websocket/services/shell-websocket.service.ts +1 -11
  166. package/server/modules/websocket/tests/chat-image-filter.test.ts +44 -0
  167. package/server/modules/websocket/tests/chat-run-registry.test.ts +42 -4
  168. package/server/openai-codex.js +9 -1
  169. package/server/opencode-cli.js +44 -6
  170. package/server/opencode-cli.test.js +112 -3
  171. package/server/routes/agent.js +9 -19
  172. package/server/routes/commands.js +1 -2
  173. package/server/routes/git.js +201 -60
  174. package/server/routes/git.test.js +106 -0
  175. package/server/routes/taskmaster.js +3 -1
  176. package/server/routes/user.js +2 -1
  177. package/server/shared/image-attachments.ts +341 -0
  178. package/server/shared/tests/image-attachments.test.ts +298 -0
  179. package/server/shared/types.ts +1 -1
  180. package/server/shared/utils.ts +45 -0
  181. package/server/utils/gitConfig.js +2 -1
  182. package/server/utils/plugin-process-manager.js +3 -1
  183. package/dist/assets/index-uLUE6Qt1.css +0 -32
  184. package/dist/icons/gemini-ai-icon.svg +0 -1
  185. package/dist-server/server/gemini-cli.js +0 -551
  186. package/dist-server/server/gemini-cli.js.map +0 -1
  187. package/dist-server/server/gemini-response-handler.js +0 -106
  188. package/dist-server/server/gemini-response-handler.js.map +0 -1
  189. package/dist-server/server/modules/providers/list/gemini/gemini-auth.provider.js +0 -254
  190. package/dist-server/server/modules/providers/list/gemini/gemini-auth.provider.js.map +0 -1
  191. package/dist-server/server/modules/providers/list/gemini/gemini-mcp.provider.js +0 -82
  192. package/dist-server/server/modules/providers/list/gemini/gemini-mcp.provider.js.map +0 -1
  193. package/dist-server/server/modules/providers/list/gemini/gemini-models.provider.js +0 -24
  194. package/dist-server/server/modules/providers/list/gemini/gemini-models.provider.js.map +0 -1
  195. package/dist-server/server/modules/providers/list/gemini/gemini-session-synchronizer.provider.js +0 -312
  196. package/dist-server/server/modules/providers/list/gemini/gemini-session-synchronizer.provider.js.map +0 -1
  197. package/dist-server/server/modules/providers/list/gemini/gemini-sessions.provider.js +0 -474
  198. package/dist-server/server/modules/providers/list/gemini/gemini-sessions.provider.js.map +0 -1
  199. package/dist-server/server/modules/providers/list/gemini/gemini-skills.provider.js +0 -40
  200. package/dist-server/server/modules/providers/list/gemini/gemini-skills.provider.js.map +0 -1
  201. package/dist-server/server/modules/providers/list/gemini/gemini.provider.js +0 -19
  202. package/dist-server/server/modules/providers/list/gemini/gemini.provider.js.map +0 -1
  203. package/dist-server/server/routes/gemini.js +0 -21
  204. package/dist-server/server/routes/gemini.js.map +0 -1
  205. package/dist-server/server/sessionManager.js +0 -194
  206. package/dist-server/server/sessionManager.js.map +0 -1
  207. package/server/gemini-cli.js +0 -638
  208. package/server/gemini-response-handler.js +0 -117
  209. package/server/modules/providers/list/gemini/gemini-auth.provider.ts +0 -307
  210. package/server/modules/providers/list/gemini/gemini-mcp.provider.ts +0 -110
  211. package/server/modules/providers/list/gemini/gemini-models.provider.ts +0 -39
  212. package/server/modules/providers/list/gemini/gemini-session-synchronizer.provider.ts +0 -405
  213. package/server/modules/providers/list/gemini/gemini-sessions.provider.ts +0 -540
  214. package/server/modules/providers/list/gemini/gemini-skills.provider.ts +0 -44
  215. package/server/modules/providers/list/gemini/gemini.provider.ts +0 -27
  216. package/server/routes/gemini.js +0 -25
  217. package/server/sessionManager.js +0 -226
@@ -1,638 +0,0 @@
1
- import { spawn } from 'child_process';
2
- import { promises as fs } from 'fs';
3
- import os from 'os';
4
- import path from 'path';
5
-
6
- import crossSpawn from 'cross-spawn';
7
-
8
- import sessionManager from './sessionManager.js';
9
- import GeminiResponseHandler from './gemini-response-handler.js';
10
- import { notifyRunFailed, notifyRunStopped } from './services/notification-orchestrator.js';
11
- import { providerAuthService } from './modules/providers/services/provider-auth.service.js';
12
- import { providerModelsService } from './modules/providers/services/provider-models.service.js';
13
- import { createCompleteMessage, createNormalizedMessage } from './shared/utils.js';
14
-
15
- // Use cross-spawn on Windows for correct .cmd resolution (same pattern as cursor-cli.js)
16
- const spawnFunction = process.platform === 'win32' ? crossSpawn : spawn;
17
-
18
- let activeGeminiProcesses = new Map(); // Track active processes by session ID
19
-
20
- function mapGeminiExitCodeToMessage(exitCode) {
21
- switch (exitCode) {
22
- case 42:
23
- return 'Gemini rejected the request input (exit code 42).';
24
- case 44:
25
- return 'Gemini sandbox error (exit code 44). Check local sandbox/container settings.';
26
- case 52:
27
- return 'Gemini configuration error (exit code 52). Check your Gemini settings files for invalid JSON/config.';
28
- case 53:
29
- return 'Gemini conversation turn limit reached (exit code 53). Start a new Gemini session.';
30
- default:
31
- return null;
32
- }
33
- }
34
-
35
- const GEMINI_AUTH_ENV_KEYS = [
36
- 'GEMINI_API_KEY',
37
- 'GOOGLE_API_KEY',
38
- 'GOOGLE_CLOUD_PROJECT',
39
- 'GOOGLE_CLOUD_PROJECT_ID',
40
- 'GOOGLE_CLOUD_LOCATION',
41
- 'GOOGLE_APPLICATION_CREDENTIALS'
42
- ];
43
-
44
- function parseEnvFileContent(content) {
45
- const parsed = {};
46
-
47
- for (const rawLine of content.split(/\r?\n/)) {
48
- const line = rawLine.trim();
49
- if (!line || line.startsWith('#')) {
50
- continue;
51
- }
52
-
53
- const exportPrefix = 'export ';
54
- const normalizedLine = line.startsWith(exportPrefix) ? line.slice(exportPrefix.length).trim() : line;
55
- const separatorIndex = normalizedLine.indexOf('=');
56
-
57
- if (separatorIndex <= 0) {
58
- continue;
59
- }
60
-
61
- const key = normalizedLine.slice(0, separatorIndex).trim();
62
- if (!key) {
63
- continue;
64
- }
65
-
66
- let value = normalizedLine.slice(separatorIndex + 1).trim();
67
- const hasDoubleQuotes = value.startsWith('"') && value.endsWith('"');
68
- const hasSingleQuotes = value.startsWith('\'') && value.endsWith('\'');
69
-
70
- if (hasDoubleQuotes || hasSingleQuotes) {
71
- value = value.slice(1, -1);
72
- } else {
73
- // Support inline comments in unquoted values: KEY=value # comment
74
- value = value.replace(/\s+#.*$/, '').trim();
75
- }
76
-
77
- parsed[key] = value;
78
- }
79
-
80
- return parsed;
81
- }
82
-
83
- async function loadGeminiUserLevelEnv() {
84
- const geminiCliHome = (process.env.GEMINI_CLI_HOME || '').trim() || os.homedir();
85
- const envCandidates = [
86
- path.join(geminiCliHome, '.gemini', '.env'),
87
- path.join(geminiCliHome, '.env')
88
- ];
89
-
90
- for (const envPath of envCandidates) {
91
- try {
92
- await fs.access(envPath);
93
- const content = await fs.readFile(envPath, 'utf8');
94
- return parseEnvFileContent(content);
95
- } catch {
96
- // Keep scanning for the next candidate.
97
- }
98
- }
99
-
100
- return {};
101
- }
102
-
103
- async function buildGeminiProcessEnv() {
104
- const processEnv = { ...process.env };
105
- if (processEnv.GEMINI_API_KEY || processEnv.GOOGLE_API_KEY || processEnv.GOOGLE_APPLICATION_CREDENTIALS) {
106
- return processEnv;
107
- }
108
-
109
- // Gemini CLI docs recommend ~/.gemini/.env for persistent headless auth settings.
110
- // When the server process was launched without shell profile variables, we still
111
- // want the spawned CLI process to inherit those user-level credentials.
112
- const userEnv = await loadGeminiUserLevelEnv();
113
- for (const key of GEMINI_AUTH_ENV_KEYS) {
114
- if (!processEnv[key] && userEnv[key]) {
115
- processEnv[key] = userEnv[key];
116
- }
117
- }
118
-
119
- return processEnv;
120
- }
121
-
122
- async function spawnGemini(command, options = {}, ws) {
123
- const { sessionId, projectPath, cwd, toolsSettings, permissionMode, images, sessionSummary } = options;
124
- const resolvedModel = await providerModelsService.resolveResumeModel(
125
- 'gemini',
126
- sessionId,
127
- options.model
128
- );
129
- let capturedSessionId = sessionId; // Track session ID throughout the process
130
- let sessionCreatedSent = false; // Track if we've already sent session-created event
131
- let assistantBlocks = []; // Accumulate the full response blocks including tools
132
- // Unified lifecycle contract: exactly one terminal `complete` per run
133
- // (close and error handlers can both fire for spawn failures).
134
- let completeSent = false;
135
-
136
- // Use tools settings passed from frontend, or defaults
137
- const settings = toolsSettings || {
138
- allowedTools: [],
139
- disallowedTools: [],
140
- skipPermissions: false
141
- };
142
-
143
- // Build Gemini CLI command - start with print/resume flags first
144
- const args = [];
145
-
146
- // Add prompt flag with command if we have a command
147
- if (command && command.trim()) {
148
- args.push('--prompt', command);
149
- }
150
-
151
- // If we have a sessionId, we want to resume
152
- if (sessionId) {
153
- const session = sessionManager.getSession(sessionId);
154
- if (session && session.cliSessionId) {
155
- args.push('--resume', session.cliSessionId);
156
- }
157
- }
158
-
159
- // Use cwd (actual project directory) instead of projectPath (Gemini's metadata directory)
160
- // Clean the path by removing any non-printable characters
161
- const cleanPath = (cwd || projectPath || process.cwd()).replace(/[^\x20-\x7E]/g, '').trim();
162
- const workingDir = cleanPath;
163
-
164
- // Handle images by saving them to temporary files and passing paths to Gemini
165
- const tempImagePaths = [];
166
- let tempDir = null;
167
- if (images && images.length > 0) {
168
- try {
169
- // Create temp directory in the project directory so Gemini can access it
170
- tempDir = path.join(workingDir, '.tmp', 'images', Date.now().toString());
171
- await fs.mkdir(tempDir, { recursive: true });
172
-
173
- // Save each image to a temp file
174
- for (const [index, image] of images.entries()) {
175
- // Extract base64 data and mime type
176
- const matches = image.data.match(/^data:([^;]+);base64,(.+)$/);
177
- if (!matches) {
178
- continue;
179
- }
180
-
181
- const [, mimeType, base64Data] = matches;
182
- const extension = mimeType.split('/')[1] || 'png';
183
- const filename = `image_${index}.${extension}`;
184
- const filepath = path.join(tempDir, filename);
185
-
186
- // Write base64 data to file
187
- await fs.writeFile(filepath, Buffer.from(base64Data, 'base64'));
188
- tempImagePaths.push(filepath);
189
- }
190
-
191
- // Include the full image paths in the prompt for Gemini to reference
192
- // Gemini CLI can read images from file paths in the prompt
193
- if (tempImagePaths.length > 0 && command && command.trim()) {
194
- const imageNote = `\n\n[Images given: ${tempImagePaths.length} images are located at the following paths:]\n${tempImagePaths.map((p, i) => `${i + 1}. ${p}`).join('\n')}`;
195
- const modifiedCommand = command + imageNote;
196
-
197
- // Update the command in args
198
- const promptIndex = args.indexOf('--prompt');
199
- if (promptIndex !== -1 && args[promptIndex + 1] === command) {
200
- args[promptIndex + 1] = modifiedCommand;
201
- } else if (promptIndex !== -1) {
202
- // If we're using context, update the full prompt
203
- args[promptIndex + 1] = args[promptIndex + 1] + imageNote;
204
- }
205
- }
206
- } catch (error) {
207
- console.error('Error processing images for Gemini:', error);
208
- }
209
- }
210
-
211
- // Add basic flags for Gemini
212
- if (options.debug) {
213
- args.push('--debug');
214
- }
215
-
216
- // This integration runs Gemini in headless mode and cannot answer trust prompts.
217
- // Skip folder-trust interactivity so authenticated runs don't fail with
218
- // FatalUntrustedWorkspaceError in previously unseen directories.
219
- args.push('--skip-trust');
220
-
221
- // Add MCP config flag only if MCP servers are configured
222
- try {
223
- const geminiConfigPath = path.join(os.homedir(), '.gemini.json');
224
- let hasMcpServers = false;
225
-
226
- try {
227
- await fs.access(geminiConfigPath);
228
- const geminiConfigRaw = await fs.readFile(geminiConfigPath, 'utf8');
229
- const geminiConfig = JSON.parse(geminiConfigRaw);
230
-
231
- // Check global MCP servers
232
- if (geminiConfig.mcpServers && Object.keys(geminiConfig.mcpServers).length > 0) {
233
- hasMcpServers = true;
234
- }
235
-
236
- // Check project-specific MCP servers
237
- if (!hasMcpServers && geminiConfig.geminiProjects) {
238
- const currentProjectPath = process.cwd();
239
- const projectConfig = geminiConfig.geminiProjects[currentProjectPath];
240
- if (projectConfig && projectConfig.mcpServers && Object.keys(projectConfig.mcpServers).length > 0) {
241
- hasMcpServers = true;
242
- }
243
- }
244
- } catch (e) {
245
- // Ignore if file doesn't exist or isn't parsable
246
- }
247
-
248
- if (hasMcpServers) {
249
- args.push('--mcp-config', geminiConfigPath);
250
- }
251
- } catch (error) {
252
- // Ignore outer errors
253
- }
254
-
255
- // Add model for all sessions (both new and resumed)
256
- let modelToUse = resolvedModel || 'gemini-2.5-flash';
257
- args.push('--model', modelToUse);
258
- args.push('--output-format', 'stream-json');
259
-
260
- // Handle approval modes and allowed tools
261
- if (settings.skipPermissions || options.skipPermissions || permissionMode === 'yolo') {
262
- args.push('--yolo');
263
- } else if (permissionMode === 'auto_edit') {
264
- args.push('--approval-mode', 'auto_edit');
265
- } else if (permissionMode === 'plan') {
266
- args.push('--approval-mode', 'plan');
267
- }
268
-
269
- if (settings.allowedTools && settings.allowedTools.length > 0) {
270
- args.push('--allowed-tools', settings.allowedTools.join(','));
271
- }
272
-
273
- // Try to find gemini in PATH first, then fall back to environment variable
274
- const geminiPath = process.env.GEMINI_PATH || 'gemini';
275
- let spawnCmd = geminiPath;
276
- let spawnArgs = args;
277
-
278
- // On non-Windows platforms, wrap the execution in a shell to avoid ENOEXEC
279
- // which happens when the target is a script lacking a shebang.
280
- if (os.platform() !== 'win32') {
281
- spawnCmd = 'sh';
282
- // Use exec to replace the shell process, ensuring signals hit gemini directly
283
- spawnArgs = ['-c', 'exec "$0" "$@"', geminiPath, ...args];
284
- }
285
-
286
- const spawnEnv = await buildGeminiProcessEnv();
287
-
288
- return new Promise((resolve, reject) => {
289
- const geminiProcess = spawnFunction(spawnCmd, spawnArgs, {
290
- cwd: workingDir,
291
- stdio: ['pipe', 'pipe', 'pipe'],
292
- env: spawnEnv
293
- });
294
- let terminalNotificationSent = false;
295
- let terminalFailureReason = null;
296
-
297
- const notifyTerminalState = ({ code = null, error = null } = {}) => {
298
- if (terminalNotificationSent) {
299
- return;
300
- }
301
-
302
- terminalNotificationSent = true;
303
-
304
- const finalSessionId = capturedSessionId || sessionId || processKey;
305
- if (code === 0 && !error) {
306
- notifyRunStopped({
307
- userId: ws?.userId || null,
308
- provider: 'gemini',
309
- sessionId: finalSessionId,
310
- sessionName: sessionSummary,
311
- stopReason: 'completed'
312
- });
313
- return;
314
- }
315
-
316
- notifyRunFailed({
317
- userId: ws?.userId || null,
318
- provider: 'gemini',
319
- sessionId: finalSessionId,
320
- sessionName: sessionSummary,
321
- error: error || terminalFailureReason || `Gemini CLI exited with code ${code}`
322
- });
323
- };
324
-
325
- // Attach temp file info to process for cleanup later
326
- geminiProcess.tempImagePaths = tempImagePaths;
327
- geminiProcess.tempDir = tempDir;
328
-
329
- // Store process reference for potential abort
330
- const processKey = capturedSessionId || sessionId || Date.now().toString();
331
- activeGeminiProcesses.set(processKey, geminiProcess);
332
-
333
- // Store sessionId on the process object for debugging
334
- geminiProcess.sessionId = processKey;
335
-
336
- // Close stdin to signal we're done sending input
337
- geminiProcess.stdin.end();
338
-
339
- // Add timeout handler
340
- const timeoutMs = 120000; // 120 seconds for slower models
341
- let timeout;
342
-
343
- const startTimeout = () => {
344
- if (timeout) clearTimeout(timeout);
345
- timeout = setTimeout(() => {
346
- const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : (capturedSessionId || sessionId || processKey);
347
- terminalFailureReason = `Gemini CLI timeout - no response received for ${timeoutMs / 1000} seconds`;
348
- ws.send(createNormalizedMessage({ kind: 'error', content: terminalFailureReason, sessionId: socketSessionId, provider: 'gemini' }));
349
- try {
350
- geminiProcess.kill('SIGTERM');
351
- } catch (e) { }
352
- }, timeoutMs);
353
- };
354
-
355
- startTimeout();
356
-
357
- // Save user message to session when starting
358
- if (command && capturedSessionId) {
359
- sessionManager.addMessage(capturedSessionId, 'user', command);
360
- }
361
-
362
- // Create response handler for NDJSON buffering
363
- let responseHandler;
364
- if (ws) {
365
- responseHandler = new GeminiResponseHandler(ws, {
366
- onContentFragment: (content) => {
367
- if (assistantBlocks.length > 0 && assistantBlocks[assistantBlocks.length - 1].type === 'text') {
368
- assistantBlocks[assistantBlocks.length - 1].text += content;
369
- } else {
370
- assistantBlocks.push({ type: 'text', text: content });
371
- }
372
- },
373
- onToolUse: (event) => {
374
- assistantBlocks.push({
375
- type: 'tool_use',
376
- id: event.tool_id,
377
- name: event.tool_name,
378
- input: event.parameters
379
- });
380
- },
381
- onToolResult: (event) => {
382
- if (capturedSessionId) {
383
- if (assistantBlocks.length > 0) {
384
- sessionManager.addMessage(capturedSessionId, 'assistant', [...assistantBlocks]);
385
- assistantBlocks = [];
386
- }
387
- sessionManager.addMessage(capturedSessionId, 'user', [{
388
- type: 'tool_result',
389
- tool_use_id: event.tool_id,
390
- content: event.output === undefined ? null : event.output,
391
- is_error: event.status === 'error'
392
- }]);
393
- }
394
- },
395
- onInit: (event) => {
396
- const discoveredSessionId = event?.session_id;
397
- if (!discoveredSessionId) {
398
- return;
399
- }
400
-
401
- // New Gemini sessions announce their canonical ID asynchronously via the
402
- // initial `init` stream event. Avoid synthetic IDs and only register
403
- // the session once that real ID is known (same model used by Claude/Codex).
404
- if (!capturedSessionId) {
405
- capturedSessionId = discoveredSessionId;
406
-
407
- sessionManager.createSession(capturedSessionId, cwd || process.cwd());
408
- if (command) {
409
- sessionManager.addMessage(capturedSessionId, 'user', command);
410
- }
411
-
412
- if (processKey !== capturedSessionId) {
413
- activeGeminiProcesses.delete(processKey);
414
- activeGeminiProcesses.set(capturedSessionId, geminiProcess);
415
- }
416
-
417
- geminiProcess.sessionId = capturedSessionId;
418
-
419
- if (ws.setSessionId && typeof ws.setSessionId === 'function') {
420
- ws.setSessionId(capturedSessionId);
421
- }
422
-
423
- if (!sessionId && !sessionCreatedSent) {
424
- sessionCreatedSent = true;
425
- ws.send(createNormalizedMessage({ kind: 'session_created', newSessionId: capturedSessionId, sessionId: capturedSessionId, provider: 'gemini' }));
426
- }
427
- }
428
-
429
- const sess = sessionManager.getSession(capturedSessionId);
430
- if (sess && !sess.cliSessionId) {
431
- sess.cliSessionId = discoveredSessionId;
432
- sessionManager.saveSession(capturedSessionId);
433
- }
434
- }
435
- });
436
- }
437
-
438
- // Handle stdout
439
- geminiProcess.stdout.on('data', (data) => {
440
- const rawOutput = data.toString();
441
- startTimeout(); // Re-arm the timeout
442
-
443
- if (responseHandler) {
444
- responseHandler.processData(rawOutput);
445
- } else if (rawOutput) {
446
- // Fallback to direct sending for raw CLI mode without WS
447
- if (assistantBlocks.length > 0 && assistantBlocks[assistantBlocks.length - 1].type === 'text') {
448
- assistantBlocks[assistantBlocks.length - 1].text += rawOutput;
449
- } else {
450
- assistantBlocks.push({ type: 'text', text: rawOutput });
451
- }
452
- const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : (capturedSessionId || sessionId);
453
- ws.send(createNormalizedMessage({ kind: 'stream_delta', content: rawOutput, sessionId: socketSessionId, provider: 'gemini' }));
454
- }
455
- });
456
-
457
- // Handle stderr
458
- geminiProcess.stderr.on('data', (data) => {
459
- const errorMsg = data.toString();
460
-
461
- // Filter out deprecation warnings and "Loaded cached credentials" message
462
- if (errorMsg.includes('[DEP0040]') ||
463
- errorMsg.includes('DeprecationWarning') ||
464
- errorMsg.includes('--trace-deprecation') ||
465
- errorMsg.includes('Loaded cached credentials')) {
466
- return;
467
- }
468
-
469
- const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : (capturedSessionId || sessionId);
470
- ws.send(createNormalizedMessage({ kind: 'error', content: errorMsg, sessionId: socketSessionId, provider: 'gemini' }));
471
- });
472
-
473
- // Handle process completion
474
- geminiProcess.on('close', async (code) => {
475
- clearTimeout(timeout);
476
-
477
- // Flush any remaining buffered content
478
- if (responseHandler) {
479
- responseHandler.forceFlush();
480
- responseHandler.destroy();
481
- }
482
-
483
- // Clean up process reference
484
- const finalSessionId = capturedSessionId || sessionId || processKey;
485
- activeGeminiProcesses.delete(finalSessionId);
486
-
487
- // Save assistant response to session if we have one
488
- if (finalSessionId && assistantBlocks.length > 0) {
489
- sessionManager.addMessage(finalSessionId, 'assistant', assistantBlocks);
490
- }
491
-
492
- // Terminal complete — skipped for aborted runs (abort-session
493
- // already sent the aborted complete on this run's behalf).
494
- if (!completeSent && !geminiProcess.aborted) {
495
- completeSent = true;
496
- ws.send(createCompleteMessage({ provider: 'gemini', sessionId: finalSessionId, exitCode: code }));
497
- }
498
-
499
- // Clean up temporary image files if any
500
- if (geminiProcess.tempImagePaths && geminiProcess.tempImagePaths.length > 0) {
501
- for (const imagePath of geminiProcess.tempImagePaths) {
502
- await fs.unlink(imagePath).catch(err => { });
503
- }
504
- if (geminiProcess.tempDir) {
505
- await fs.rm(geminiProcess.tempDir, { recursive: true, force: true }).catch(err => { });
506
- }
507
- }
508
-
509
- if (code === 0) {
510
- notifyTerminalState({ code });
511
- resolve();
512
- } else {
513
- const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : finalSessionId;
514
-
515
- // code 127 = shell "command not found" - check installation
516
- if (code === 127) {
517
- const installed = await providerAuthService.isProviderInstalled('gemini');
518
- if (!installed) {
519
- terminalFailureReason = 'Gemini CLI is not installed. Please install it first: https://github.com/google-gemini/gemini-cli';
520
- ws.send(createNormalizedMessage({ kind: 'error', content: terminalFailureReason, sessionId: socketSessionId, provider: 'gemini' }));
521
- }
522
- } else if (code === 41) {
523
- // Gemini CLI documents exit code 41 as FatalAuthenticationError.
524
- // Surface an actionable auth error instead of a generic exit-code message.
525
- let authErrorSuffix = '';
526
- try {
527
- const authStatus = await providerAuthService.getProviderAuthStatus('gemini');
528
- if (!authStatus?.authenticated && authStatus?.error) {
529
- authErrorSuffix = ` Details: ${authStatus.error}`;
530
- }
531
- } catch {
532
- // Keep base remediation text when auth status lookup fails.
533
- }
534
-
535
- terminalFailureReason =
536
- 'Gemini authentication failed (exit code 41). '
537
- + 'Run `gemini` in a terminal to choose an auth method, or configure a valid `GEMINI_API_KEY`.'
538
- + authErrorSuffix;
539
- ws.send(createNormalizedMessage({ kind: 'error', content: terminalFailureReason, sessionId: socketSessionId, provider: 'gemini' }));
540
- } else {
541
- const mappedError = mapGeminiExitCodeToMessage(code);
542
- if (mappedError) {
543
- terminalFailureReason = mappedError;
544
- ws.send(createNormalizedMessage({ kind: 'error', content: terminalFailureReason, sessionId: socketSessionId, provider: 'gemini' }));
545
- }
546
- }
547
-
548
- notifyTerminalState({
549
- code,
550
- error: code === null ? 'Gemini CLI process was terminated or timed out' : null
551
- });
552
- reject(
553
- new Error(
554
- terminalFailureReason
555
- || (code === null
556
- ? 'Gemini CLI process was terminated or timed out'
557
- : `Gemini CLI exited with code ${code}`)
558
- )
559
- );
560
- }
561
- });
562
-
563
- // Handle process errors
564
- geminiProcess.on('error', async (error) => {
565
- // Clean up process reference on error
566
- const finalSessionId = capturedSessionId || sessionId || processKey;
567
- activeGeminiProcesses.delete(finalSessionId);
568
-
569
- // Check if Gemini CLI is installed for a clearer error message
570
- const installed = await providerAuthService.isProviderInstalled('gemini');
571
- const errorContent = !installed
572
- ? 'Gemini CLI is not installed. Please install it first: https://github.com/google-gemini/gemini-cli'
573
- : error.message;
574
-
575
- const errorSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : finalSessionId;
576
- ws.send(createNormalizedMessage({ kind: 'error', content: errorContent, sessionId: errorSessionId, provider: 'gemini' }));
577
- if (!completeSent && !geminiProcess.aborted) {
578
- completeSent = true;
579
- ws.send(createCompleteMessage({ provider: 'gemini', sessionId: errorSessionId, exitCode: 1 }));
580
- }
581
- notifyTerminalState({ error });
582
-
583
- reject(error);
584
- });
585
-
586
- });
587
- }
588
-
589
- function abortGeminiSession(sessionId) {
590
- let geminiProc = activeGeminiProcesses.get(sessionId);
591
- let processKey = sessionId;
592
-
593
- if (!geminiProc) {
594
- for (const [key, proc] of activeGeminiProcesses.entries()) {
595
- if (proc.sessionId === sessionId) {
596
- geminiProc = proc;
597
- processKey = key;
598
- break;
599
- }
600
- }
601
- }
602
-
603
- if (geminiProc) {
604
- try {
605
- // The abort handler sends the terminal complete (aborted: true);
606
- // flag the process so its close handler does not emit a second one.
607
- geminiProc.aborted = true;
608
- geminiProc.kill('SIGTERM');
609
- setTimeout(() => {
610
- if (activeGeminiProcesses.has(processKey)) {
611
- try {
612
- geminiProc.kill('SIGKILL');
613
- } catch (e) { }
614
- }
615
- }, 2000); // Wait 2 seconds before force kill
616
-
617
- return true;
618
- } catch (error) {
619
- return false;
620
- }
621
- }
622
- return false;
623
- }
624
-
625
- function isGeminiSessionActive(sessionId) {
626
- return activeGeminiProcesses.has(sessionId);
627
- }
628
-
629
- function getActiveGeminiSessions() {
630
- return Array.from(activeGeminiProcesses.keys());
631
- }
632
-
633
- export {
634
- spawnGemini,
635
- abortGeminiSession,
636
- isGeminiSessionActive,
637
- getActiveGeminiSessions
638
- };