@machina.ai/cell-cli-core 1.16.0-rc2 → 1.19.4-rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (277) hide show
  1. package/dist/package.json +6 -4
  2. package/dist/src/agents/codebase-investigator.js +1 -1
  3. package/dist/src/agents/executor.js +12 -21
  4. package/dist/src/agents/executor.js.map +1 -1
  5. package/dist/src/agents/executor.test.js +53 -57
  6. package/dist/src/agents/executor.test.js.map +1 -1
  7. package/dist/src/agents/registry.d.ts +4 -0
  8. package/dist/src/agents/registry.js +23 -0
  9. package/dist/src/agents/registry.js.map +1 -1
  10. package/dist/src/agents/registry.test.js +30 -16
  11. package/dist/src/agents/registry.test.js.map +1 -1
  12. package/dist/src/availability/modelAvailabilityService.d.ts +34 -0
  13. package/dist/src/availability/modelAvailabilityService.js +84 -0
  14. package/dist/src/availability/modelAvailabilityService.js.map +1 -0
  15. package/dist/src/availability/modelAvailabilityService.test.d.ts +6 -0
  16. package/dist/src/availability/modelAvailabilityService.test.js +140 -0
  17. package/dist/src/availability/modelAvailabilityService.test.js.map +1 -0
  18. package/dist/src/availability/modelPolicy.d.ts +42 -0
  19. package/dist/src/availability/modelPolicy.js +7 -0
  20. package/dist/src/availability/modelPolicy.js.map +1 -0
  21. package/dist/src/availability/policyCatalog.d.ts +20 -0
  22. package/dist/src/availability/policyCatalog.js +83 -0
  23. package/dist/src/availability/policyCatalog.js.map +1 -0
  24. package/dist/src/availability/policyCatalog.test.d.ts +6 -0
  25. package/dist/src/availability/policyCatalog.test.js +70 -0
  26. package/dist/src/availability/policyCatalog.test.js.map +1 -0
  27. package/dist/src/code_assist/codeAssist.js +1 -1
  28. package/dist/src/code_assist/codeAssist.test.js +3 -3
  29. package/dist/src/code_assist/oauth-credential-storage.test.js +1 -0
  30. package/dist/src/code_assist/oauth-credential-storage.test.js.map +1 -1
  31. package/dist/src/code_assist/oauth2.js +106 -53
  32. package/dist/src/code_assist/oauth2.js.map +1 -1
  33. package/dist/src/code_assist/oauth2.test.js +25 -12
  34. package/dist/src/code_assist/oauth2.test.js.map +1 -1
  35. package/dist/src/config/config.d.ts +18 -5
  36. package/dist/src/config/config.js +51 -19
  37. package/dist/src/config/config.js.map +1 -1
  38. package/dist/src/config/config.test.js +14 -79
  39. package/dist/src/config/config.test.js.map +1 -1
  40. package/dist/src/config/defaultModelConfigs.js +56 -4
  41. package/dist/src/config/defaultModelConfigs.js.map +1 -1
  42. package/dist/src/confirmation-bus/message-bus.d.ts +6 -0
  43. package/dist/src/confirmation-bus/message-bus.js +63 -2
  44. package/dist/src/confirmation-bus/message-bus.js.map +1 -1
  45. package/dist/src/confirmation-bus/types.d.ts +25 -2
  46. package/dist/src/confirmation-bus/types.js +3 -0
  47. package/dist/src/confirmation-bus/types.js.map +1 -1
  48. package/dist/src/core/AuthenticatedContentGenerator.d.ts +20 -0
  49. package/dist/src/core/AuthenticatedContentGenerator.js +115 -0
  50. package/dist/src/core/AuthenticatedContentGenerator.js.map +1 -0
  51. package/dist/src/core/baseLlmClient.d.ts +27 -1
  52. package/dist/src/core/baseLlmClient.js +66 -45
  53. package/dist/src/core/baseLlmClient.js.map +1 -1
  54. package/dist/src/core/baseLlmClient.test.js +94 -6
  55. package/dist/src/core/baseLlmClient.test.js.map +1 -1
  56. package/dist/src/core/client.d.ts +1 -2
  57. package/dist/src/core/client.js +89 -29
  58. package/dist/src/core/client.js.map +1 -1
  59. package/dist/src/core/client.test.js +82 -41
  60. package/dist/src/core/client.test.js.map +1 -1
  61. package/dist/src/core/clientHookTriggers.d.ts +36 -0
  62. package/dist/src/core/clientHookTriggers.js +76 -0
  63. package/dist/src/core/clientHookTriggers.js.map +1 -0
  64. package/dist/src/core/contentGenerator.d.ts +2 -1
  65. package/dist/src/core/contentGenerator.js +12 -5
  66. package/dist/src/core/contentGenerator.js.map +1 -1
  67. package/dist/src/core/contentGenerator.test.js +119 -1
  68. package/dist/src/core/contentGenerator.test.js.map +1 -1
  69. package/dist/src/core/coreToolScheduler.d.ts +0 -2
  70. package/dist/src/core/coreToolScheduler.js +1 -3
  71. package/dist/src/core/coreToolScheduler.js.map +1 -1
  72. package/dist/src/core/coreToolScheduler.test.js +3 -18
  73. package/dist/src/core/coreToolScheduler.test.js.map +1 -1
  74. package/dist/src/core/geminiChat.d.ts +10 -5
  75. package/dist/src/core/geminiChat.js +57 -22
  76. package/dist/src/core/geminiChat.js.map +1 -1
  77. package/dist/src/core/geminiChat.test.js +188 -55
  78. package/dist/src/core/geminiChat.test.js.map +1 -1
  79. package/dist/src/core/logger.test.js +12 -11
  80. package/dist/src/core/logger.test.js.map +1 -1
  81. package/dist/src/core/nonInteractiveToolExecutor.js +6 -2
  82. package/dist/src/core/nonInteractiveToolExecutor.js.map +1 -1
  83. package/dist/src/core/nonInteractiveToolExecutor.test.js +10 -2
  84. package/dist/src/core/nonInteractiveToolExecutor.test.js.map +1 -1
  85. package/dist/src/core/prompts.js +21 -6
  86. package/dist/src/core/prompts.js.map +1 -1
  87. package/dist/src/core/prompts.test.js +79 -93
  88. package/dist/src/core/prompts.test.js.map +1 -1
  89. package/dist/src/core/turn.d.ts +14 -3
  90. package/dist/src/core/turn.js +13 -7
  91. package/dist/src/core/turn.js.map +1 -1
  92. package/dist/src/core/turn.test.js +73 -139
  93. package/dist/src/core/turn.test.js.map +1 -1
  94. package/dist/src/fallback/handler.js +10 -5
  95. package/dist/src/fallback/handler.js.map +1 -1
  96. package/dist/src/fallback/handler.test.js +79 -17
  97. package/dist/src/fallback/handler.test.js.map +1 -1
  98. package/dist/src/generated/git-commit.d.ts +2 -2
  99. package/dist/src/generated/git-commit.js +2 -2
  100. package/dist/src/hooks/hookEventHandler.d.ts +109 -0
  101. package/dist/src/hooks/hookEventHandler.js +486 -0
  102. package/dist/src/hooks/hookEventHandler.js.map +1 -0
  103. package/dist/src/hooks/hookEventHandler.test.d.ts +6 -0
  104. package/dist/src/hooks/hookEventHandler.test.js +384 -0
  105. package/dist/src/hooks/hookEventHandler.test.js.map +1 -0
  106. package/dist/src/hooks/hookSystem.d.ts +48 -0
  107. package/dist/src/hooks/hookSystem.js +83 -0
  108. package/dist/src/hooks/hookSystem.js.map +1 -0
  109. package/dist/src/hooks/hookSystem.test.d.ts +6 -0
  110. package/dist/src/hooks/hookSystem.test.js +213 -0
  111. package/dist/src/hooks/hookSystem.test.js.map +1 -0
  112. package/dist/src/hooks/index.d.ts +15 -0
  113. package/dist/src/hooks/index.js +15 -0
  114. package/dist/src/hooks/index.js.map +1 -0
  115. package/dist/src/index.d.ts +4 -0
  116. package/dist/src/index.js +6 -0
  117. package/dist/src/index.js.map +1 -1
  118. package/dist/src/mcp/oauth-provider.test.js +1 -0
  119. package/dist/src/mcp/oauth-provider.test.js.map +1 -1
  120. package/dist/src/policy/policy-engine.d.ts +17 -1
  121. package/dist/src/policy/policy-engine.js +90 -1
  122. package/dist/src/policy/policy-engine.js.map +1 -1
  123. package/dist/src/policy/policy-engine.test.js +222 -0
  124. package/dist/src/policy/policy-engine.test.js.map +1 -1
  125. package/dist/src/policy/types.d.ts +51 -1
  126. package/dist/src/policy/types.js +21 -0
  127. package/dist/src/policy/types.js.map +1 -1
  128. package/dist/src/prompts/mcp-prompts.test.js +0 -1
  129. package/dist/src/prompts/mcp-prompts.test.js.map +1 -1
  130. package/dist/src/prompts/prompt-registry.test.js +0 -15
  131. package/dist/src/prompts/prompt-registry.test.js.map +1 -1
  132. package/dist/src/routing/modelRouterService.js +1 -1
  133. package/dist/src/routing/modelRouterService.js.map +1 -1
  134. package/dist/src/routing/strategies/classifierStrategy.test.js +4 -3
  135. package/dist/src/routing/strategies/classifierStrategy.test.js.map +1 -1
  136. package/dist/src/services/chatCompressionService.d.ts +2 -1
  137. package/dist/src/services/chatCompressionService.js +23 -7
  138. package/dist/src/services/chatCompressionService.js.map +1 -1
  139. package/dist/src/services/chatCompressionService.test.js +27 -32
  140. package/dist/src/services/chatCompressionService.test.js.map +1 -1
  141. package/dist/src/services/chatRecordingService.d.ts +1 -1
  142. package/dist/src/services/gitService.js +3 -1
  143. package/dist/src/services/gitService.js.map +1 -1
  144. package/dist/src/services/gitService.test.js +10 -0
  145. package/dist/src/services/gitService.test.js.map +1 -1
  146. package/dist/src/services/modelConfig.integration.test.js +34 -0
  147. package/dist/src/services/modelConfig.integration.test.js.map +1 -1
  148. package/dist/src/services/modelConfigService.d.ts +3 -0
  149. package/dist/src/services/modelConfigService.js +12 -3
  150. package/dist/src/services/modelConfigService.js.map +1 -1
  151. package/dist/src/services/modelConfigService.test.js +133 -0
  152. package/dist/src/services/modelConfigService.test.js.map +1 -1
  153. package/dist/src/services/shellExecutionService.d.ts +2 -0
  154. package/dist/src/services/shellExecutionService.js +35 -6
  155. package/dist/src/services/shellExecutionService.js.map +1 -1
  156. package/dist/src/services/shellExecutionService.test.js +78 -1
  157. package/dist/src/services/shellExecutionService.test.js.map +1 -1
  158. package/dist/src/services/test-data/resolved-aliases.golden.json +57 -4
  159. package/dist/src/telemetry/activity-monitor.test.js +4 -1
  160. package/dist/src/telemetry/activity-monitor.test.js.map +1 -1
  161. package/dist/src/telemetry/clearcut-logger/clearcut-logger.d.ts +2 -1
  162. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +97 -51
  163. package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
  164. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js +24 -16
  165. package/dist/src/telemetry/clearcut-logger/clearcut-logger.test.js.map +1 -1
  166. package/dist/src/telemetry/clearcut-logger/event-metadata-key.d.ts +2 -0
  167. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js +5 -1
  168. package/dist/src/telemetry/clearcut-logger/event-metadata-key.js.map +1 -1
  169. package/dist/src/telemetry/loggers.d.ts +2 -1
  170. package/dist/src/telemetry/loggers.js +14 -3
  171. package/dist/src/telemetry/loggers.js.map +1 -1
  172. package/dist/src/telemetry/loggers.test.js +2 -5
  173. package/dist/src/telemetry/loggers.test.js.map +1 -1
  174. package/dist/src/telemetry/metrics.d.ts +26 -8
  175. package/dist/src/telemetry/metrics.js +37 -11
  176. package/dist/src/telemetry/metrics.js.map +1 -1
  177. package/dist/src/telemetry/metrics.test.js +61 -39
  178. package/dist/src/telemetry/metrics.test.js.map +1 -1
  179. package/dist/src/telemetry/sanitize.d.ts +25 -0
  180. package/dist/src/telemetry/sanitize.js +48 -0
  181. package/dist/src/telemetry/sanitize.js.map +1 -0
  182. package/dist/src/telemetry/sanitize.test.d.ts +6 -0
  183. package/dist/src/telemetry/sanitize.test.js +279 -0
  184. package/dist/src/telemetry/sanitize.test.js.map +1 -0
  185. package/dist/src/telemetry/semantic.js +1 -1
  186. package/dist/src/telemetry/semantic.js.map +1 -1
  187. package/dist/src/telemetry/types.d.ts +19 -0
  188. package/dist/src/telemetry/types.js +65 -0
  189. package/dist/src/telemetry/types.js.map +1 -1
  190. package/dist/src/test-utils/config.d.ts +1 -1
  191. package/dist/src/test-utils/config.js +1 -1
  192. package/dist/src/test-utils/mock-message-bus.d.ts +60 -0
  193. package/dist/src/test-utils/mock-message-bus.js +131 -0
  194. package/dist/src/test-utils/mock-message-bus.js.map +1 -0
  195. package/dist/src/test-utils/mock-tool.js +1 -1
  196. package/dist/src/test-utils/mock-tool.js.map +1 -1
  197. package/dist/src/tools/edit.test.js +203 -200
  198. package/dist/src/tools/edit.test.js.map +1 -1
  199. package/dist/src/tools/mcp-client.d.ts +4 -2
  200. package/dist/src/tools/mcp-client.js +226 -114
  201. package/dist/src/tools/mcp-client.js.map +1 -1
  202. package/dist/src/tools/mcp-client.test.js +128 -54
  203. package/dist/src/tools/mcp-client.test.js.map +1 -1
  204. package/dist/src/tools/mcp-tool.test.js +186 -273
  205. package/dist/src/tools/mcp-tool.test.js.map +1 -1
  206. package/dist/src/tools/modifiable-tool.d.ts +1 -1
  207. package/dist/src/tools/modifiable-tool.js +2 -2
  208. package/dist/src/tools/modifiable-tool.js.map +1 -1
  209. package/dist/src/tools/modifiable-tool.test.js +12 -11
  210. package/dist/src/tools/modifiable-tool.test.js.map +1 -1
  211. package/dist/src/tools/ripGrep.test.js +84 -126
  212. package/dist/src/tools/ripGrep.test.js.map +1 -1
  213. package/dist/src/tools/smart-edit.test.js +93 -112
  214. package/dist/src/tools/smart-edit.test.js.map +1 -1
  215. package/dist/src/tools/tool-registry.test.js +59 -90
  216. package/dist/src/tools/tool-registry.test.js.map +1 -1
  217. package/dist/src/tools/web-fetch.test.js +121 -179
  218. package/dist/src/tools/web-fetch.test.js.map +1 -1
  219. package/dist/src/tools/write-file.test.js +105 -116
  220. package/dist/src/tools/write-file.test.js.map +1 -1
  221. package/dist/src/tools/write-todos.d.ts +1 -1
  222. package/dist/src/tools/write-todos.js +1 -1
  223. package/dist/src/utils/customHeaderUtils.d.ts +9 -0
  224. package/dist/src/utils/customHeaderUtils.js +34 -0
  225. package/dist/src/utils/customHeaderUtils.js.map +1 -0
  226. package/dist/src/utils/customHeaderUtils.test.d.ts +6 -0
  227. package/dist/src/utils/customHeaderUtils.test.js +77 -0
  228. package/dist/src/utils/customHeaderUtils.test.js.map +1 -0
  229. package/dist/src/utils/debugLogger.test.js +27 -25
  230. package/dist/src/utils/debugLogger.test.js.map +1 -1
  231. package/dist/src/utils/editor.d.ts +1 -1
  232. package/dist/src/utils/editor.js +3 -2
  233. package/dist/src/utils/editor.js.map +1 -1
  234. package/dist/src/utils/editor.test.js +7 -46
  235. package/dist/src/utils/editor.test.js.map +1 -1
  236. package/dist/src/utils/events.d.ts +33 -3
  237. package/dist/src/utils/events.js +35 -15
  238. package/dist/src/utils/events.js.map +1 -1
  239. package/dist/src/utils/events.test.js +86 -5
  240. package/dist/src/utils/events.test.js.map +1 -1
  241. package/dist/src/utils/filesearch/fileSearch.js +1 -1
  242. package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
  243. package/dist/src/utils/installationManager.test.js +2 -1
  244. package/dist/src/utils/installationManager.test.js.map +1 -1
  245. package/dist/src/utils/llm-edit-fixer.test.js +2 -1
  246. package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
  247. package/dist/src/utils/memoryDiscovery.test.js +3 -2
  248. package/dist/src/utils/memoryDiscovery.test.js.map +1 -1
  249. package/dist/src/utils/memoryImportProcessor.js +1 -1
  250. package/dist/src/utils/memoryImportProcessor.js.map +1 -1
  251. package/dist/src/utils/memoryImportProcessor.test.js +8 -14
  252. package/dist/src/utils/memoryImportProcessor.test.js.map +1 -1
  253. package/dist/src/utils/nextSpeakerChecker.test.js +3 -1
  254. package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
  255. package/dist/src/utils/package.d.ts +14 -0
  256. package/dist/src/utils/package.js +15 -2
  257. package/dist/src/utils/package.js.map +1 -1
  258. package/dist/src/utils/schemaValidator.d.ts +1 -1
  259. package/dist/src/utils/schemaValidator.js +1 -1
  260. package/dist/src/utils/shell-utils.js +1 -1
  261. package/dist/src/utils/stdio.d.ts +32 -0
  262. package/dist/src/utils/stdio.js +85 -0
  263. package/dist/src/utils/stdio.js.map +1 -0
  264. package/dist/src/utils/stdio.test.d.ts +6 -0
  265. package/dist/src/utils/stdio.test.js +47 -0
  266. package/dist/src/utils/stdio.test.js.map +1 -0
  267. package/dist/src/utils/systemEncoding.test.js +2 -1
  268. package/dist/src/utils/systemEncoding.test.js.map +1 -1
  269. package/dist/src/utils/terminal.d.ts +14 -0
  270. package/dist/src/utils/terminal.js +38 -0
  271. package/dist/src/utils/terminal.js.map +1 -0
  272. package/dist/src/utils/userAccountManager.test.js +7 -6
  273. package/dist/src/utils/userAccountManager.test.js.map +1 -1
  274. package/dist/src/utils/workspaceContext.test.js +5 -4
  275. package/dist/src/utils/workspaceContext.test.js.map +1 -1
  276. package/dist/tsconfig.tsbuildinfo +1 -1
  277. package/package.json +6 -4
@@ -13,29 +13,53 @@ import { GeminiChat } from './geminiChat.js';
13
13
  import { retryWithBackoff } from '../utils/retry.js';
14
14
  import { getErrorMessage } from '../utils/errors.js';
15
15
  import { tokenLimit } from './tokenLimits.js';
16
- import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL_AUTO, DEFAULT_THINKING_MODE, getEffectiveModel, } from '../config/models.js';
16
+ import { DEFAULT_GEMINI_FLASH_MODEL, getEffectiveModel, } from '../config/models.js';
17
17
  import { LoopDetectionService } from '../services/loopDetectionService.js';
18
18
  import { ChatCompressionService } from '../services/chatCompressionService.js';
19
19
  import { ideContextStore } from '../ide/ideContext.js';
20
20
  import { logContentRetryFailure, logNextSpeakerCheck, } from '../telemetry/loggers.js';
21
+ import { fireBeforeAgentHook, fireAfterAgentHook, } from './clientHookTriggers.js';
21
22
  import { ContentRetryFailureEvent, NextSpeakerCheckEvent, } from '../telemetry/types.js';
22
23
  import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
23
24
  import { handleFallback } from '../fallback/handler.js';
24
25
  import { debugLogger } from '../utils/debugLogger.js';
25
- export function isThinkingSupported(model) {
26
- return (model.startsWith('gemini-2.5') ||
27
- model.startsWith('gemini-3') ||
28
- model === DEFAULT_GEMINI_MODEL_AUTO);
29
- }
30
26
  const MAX_TURNS = 100;
27
+ /**
28
+ * Estimates the character length of text-only parts in a request.
29
+ * Binary data (inline_data, fileData) is excluded from the estimation
30
+ * because Gemini counts these as fixed token values, not based on their size.
31
+ * @param request The request to estimate tokens for
32
+ * @returns Estimated character length of text content
33
+ */
34
+ function estimateTextOnlyLength(request) {
35
+ if (typeof request === 'string') {
36
+ return request.length;
37
+ }
38
+ // Ensure request is an array before iterating
39
+ if (!Array.isArray(request)) {
40
+ return 0;
41
+ }
42
+ let textLength = 0;
43
+ for (const part of request) {
44
+ // Handle string elements in the array
45
+ if (typeof part === 'string') {
46
+ textLength += part.length;
47
+ }
48
+ // Handle object elements with text property
49
+ else if (typeof part === 'object' &&
50
+ part !== null &&
51
+ 'text' in part &&
52
+ part.text) {
53
+ textLength += part.text.length;
54
+ }
55
+ // inlineData, fileData, and other binary parts are ignored
56
+ // as they are counted as fixed tokens by Gemini
57
+ }
58
+ return textLength;
59
+ }
31
60
  export class GeminiClient {
32
61
  config;
33
62
  chat;
34
- generateContentConfig = {
35
- temperature: 1,
36
- topP: 0.95,
37
- topK: 64,
38
- };
39
63
  sessionTurnCount = 0;
40
64
  loopDetector;
41
65
  compressionService;
@@ -122,6 +146,16 @@ export class GeminiClient {
122
146
  parts: [{ text: await getDirectoryContextString(this.config) }],
123
147
  });
124
148
  }
149
+ async updateSystemInstruction() {
150
+ if (!this.isInitialized()) {
151
+ return;
152
+ }
153
+ const userMemory = this.config.getUserMemory();
154
+ const tools = this.config.getToolRegistry().getFunctionDeclarations();
155
+ console.log('TOOLS:', JSON.stringify(tools.map((t) => t.name), null, 2));
156
+ const systemInstruction = getCoreSystemPrompt(this.config, userMemory);
157
+ this.getChat().setSystemInstruction(systemInstruction);
158
+ }
125
159
  async startChat(extraHistory, resumedSessionData) {
126
160
  this.forceFullIdeContext = true;
127
161
  this.hasFailedCompressionAttempt = false;
@@ -132,19 +166,7 @@ export class GeminiClient {
132
166
  try {
133
167
  const userMemory = this.config.getUserMemory();
134
168
  const systemInstruction = getCoreSystemPrompt(this.config, userMemory);
135
- const model = this.config.getModel();
136
- const config = { ...this.generateContentConfig };
137
- if (isThinkingSupported(model)) {
138
- config.thinkingConfig = {
139
- includeThoughts: true,
140
- thinkingBudget: DEFAULT_THINKING_MODE,
141
- };
142
- }
143
- return new GeminiChat(this.config, {
144
- systemInstruction,
145
- ...config,
146
- tools,
147
- }, history, resumedSessionData);
169
+ return new GeminiChat(this.config, systemInstruction, tools, history, resumedSessionData);
148
170
  }
149
171
  catch (error) {
150
172
  await reportError(error, 'Error initializing Gemini chat session.', history, 'startChat');
@@ -298,6 +320,28 @@ export class GeminiClient {
298
320
  return getEffectiveModel(this.config.isInFallbackMode(), configModel, this.config.getPreviewFeatures());
299
321
  }
300
322
  async *sendMessageStream(request, signal, prompt_id, turns = MAX_TURNS, isInvalidStreamRetry = false) {
323
+ // Fire BeforeAgent hook through MessageBus (only if hooks are enabled)
324
+ const hooksEnabled = this.config.getEnableHooks();
325
+ const messageBus = this.config.getMessageBus();
326
+ if (hooksEnabled && messageBus) {
327
+ const hookOutput = await fireBeforeAgentHook(messageBus, request);
328
+ if (hookOutput?.isBlockingDecision() ||
329
+ hookOutput?.shouldStopExecution()) {
330
+ yield {
331
+ type: GeminiEventType.Error,
332
+ value: {
333
+ error: new Error(`BeforeAgent hook blocked processing: ${hookOutput.getEffectiveReason()}`),
334
+ },
335
+ };
336
+ return new Turn(this.getChat(), prompt_id);
337
+ }
338
+ // Add additional context from hooks to the request
339
+ const additionalContext = hookOutput?.getAdditionalContext();
340
+ if (additionalContext) {
341
+ const requestArray = Array.isArray(request) ? request : [request];
342
+ request = [...requestArray, { text: additionalContext }];
343
+ }
344
+ }
301
345
  if (this.lastPromptId !== prompt_id) {
302
346
  this.loopDetector.reset(prompt_id);
303
347
  this.lastPromptId = prompt_id;
@@ -316,7 +360,10 @@ export class GeminiClient {
316
360
  }
317
361
  // Check for context window overflow
318
362
  const modelForLimitCheck = this._getEffectiveModelForCurrentTurn();
319
- const estimatedRequestTokenCount = Math.floor(JSON.stringify(request).length / 4);
363
+ // Estimate tokens based on text content only.
364
+ // Binary data (PDFs, images) are counted as fixed tokens by Gemini,
365
+ // not based on their base64-encoded size.
366
+ const estimatedRequestTokenCount = Math.floor(estimateTextOnlyLength(request) / 4);
320
367
  const remainingTokenCount = tokenLimit(modelForLimitCheck) - this.getChat().getLastPromptTokenCount();
321
368
  if (estimatedRequestTokenCount > remainingTokenCount * 0.95) {
322
369
  yield {
@@ -374,8 +421,9 @@ export class GeminiClient {
374
421
  modelToUse = decision.model;
375
422
  // Lock the model for the rest of the sequence
376
423
  this.currentSequenceModel = modelToUse;
424
+ yield { type: GeminiEventType.ModelInfo, value: modelToUse };
377
425
  }
378
- const resultStream = turn.run(modelToUse, request, linkedSignal);
426
+ const resultStream = turn.run({ model: modelToUse }, request, linkedSignal);
379
427
  for await (const event of resultStream) {
380
428
  if (this.loopDetector.addAndCheck(event)) {
381
429
  yield { type: GeminiEventType.LoopDetected };
@@ -413,9 +461,21 @@ export class GeminiClient {
413
461
  logNextSpeakerCheck(this.config, new NextSpeakerCheckEvent(prompt_id, turn.finishReason?.toString() || '', nextSpeakerCheck?.next_speaker || ''));
414
462
  if (nextSpeakerCheck?.next_speaker === 'model') {
415
463
  const nextRequest = [{ text: 'Please continue.' }];
416
- // This recursive call's events will be yielded out, but the final
417
- // turn object will be from the top-level call.
418
- yield* this.sendMessageStream(nextRequest, signal, prompt_id, boundedTurns - 1);
464
+ // This recursive call's events will be yielded out, and the final
465
+ // turn object from the recursive call will be returned.
466
+ return yield* this.sendMessageStream(nextRequest, signal, prompt_id, boundedTurns - 1);
467
+ }
468
+ }
469
+ // Fire AfterAgent hook through MessageBus (only if hooks are enabled)
470
+ if (hooksEnabled && messageBus) {
471
+ const responseText = turn.getResponseText() || '[no response text]';
472
+ const hookOutput = await fireAfterAgentHook(messageBus, request, responseText);
473
+ // For AfterAgent hooks, blocking/stop execution should force continuation
474
+ if (hookOutput?.isBlockingDecision() ||
475
+ hookOutput?.shouldStopExecution()) {
476
+ const continueReason = hookOutput.getEffectiveReason();
477
+ const continueRequest = [{ text: continueReason }];
478
+ yield* this.sendMessageStream(continueRequest, signal, prompt_id, boundedTurns - 1);
419
479
  }
420
480
  }
421
481
  return turn;
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/core/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/core/client.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
6
  import { describe, it, expect, vi, beforeEach, afterEach, } from 'vitest';
7
- import { isThinkingSupported, GeminiClient } from './client.js';
7
+ import { GeminiClient } from './client.js';
8
8
  import { AuthType, } from './contentGenerator.js';
9
9
  import {} from './geminiChat.js';
10
10
  import { CompressionStatus, GeminiEventType, Turn, } from './turn.js';
@@ -17,6 +17,7 @@ import { ideContextStore } from '../ide/ideContext.js';
17
17
  import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
18
18
  import { ChatCompressionService } from '../services/chatCompressionService.js';
19
19
  import { ClearcutLogger } from '../telemetry/clearcut-logger/clearcut-logger.js';
20
+ import { HookSystem } from '../hooks/hookSystem.js';
20
21
  vi.mock('../services/chatCompressionService.js');
21
22
  // Mock fs module to prevent actual file system operations during tests
22
23
  const mockFileSystem = new Map();
@@ -85,6 +86,7 @@ vi.mock('../telemetry/uiTelemetry.js', () => ({
85
86
  getLastPromptTokenCount: vi.fn(),
86
87
  },
87
88
  }));
89
+ vi.mock('../hooks/hookSystem.js');
88
90
  /**
89
91
  * Array.fromAsync ponyfill, which will be available in es 2024.
90
92
  *
@@ -97,21 +99,6 @@ async function fromAsync(promise) {
97
99
  }
98
100
  return results;
99
101
  }
100
- describe('isThinkingSupported', () => {
101
- it('should return true for gemini-2.5', () => {
102
- expect(isThinkingSupported('gemini-2.5')).toBe(true);
103
- });
104
- it('should return true for gemini-2.5-pro', () => {
105
- expect(isThinkingSupported('gemini-2.5-pro')).toBe(true);
106
- });
107
- it('should return true for gemini-3-pro', () => {
108
- expect(isThinkingSupported('gemini-3-pro')).toBe(true);
109
- });
110
- it('should return false for other models', () => {
111
- expect(isThinkingSupported('gemini-1.5-flash')).toBe(false);
112
- expect(isThinkingSupported('some-other-model')).toBe(false);
113
- });
114
- });
115
102
  describe('Gemini Client (client.ts)', () => {
116
103
  let mockContentGenerator;
117
104
  let mockConfig;
@@ -183,12 +170,14 @@ describe('Gemini Client (client.ts)', () => {
183
170
  getModelRouterService: vi.fn().mockReturnValue({
184
171
  route: vi.fn().mockResolvedValue({ model: 'default-routed-model' }),
185
172
  }),
173
+ getMessageBus: vi.fn().mockReturnValue(undefined),
174
+ getEnableHooks: vi.fn().mockReturnValue(false),
186
175
  isInFallbackMode: vi.fn().mockReturnValue(false),
187
176
  setFallbackMode: vi.fn(),
188
177
  getChatCompression: vi.fn().mockReturnValue(undefined),
189
178
  getSkipNextSpeakerCheck: vi.fn().mockReturnValue(false),
190
179
  getUseSmartEdit: vi.fn().mockReturnValue(false),
191
- getUseModelRouter: vi.fn().mockReturnValue(false),
180
+ getShowModelInfoInChat: vi.fn().mockReturnValue(false),
192
181
  getContinueOnFailedApiCall: vi.fn(),
193
182
  getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
194
183
  storage: {
@@ -213,7 +202,11 @@ describe('Gemini Client (client.ts)', () => {
213
202
  },
214
203
  },
215
204
  isInteractive: vi.fn().mockReturnValue(false),
205
+ getExperiments: () => { },
216
206
  };
207
+ mockConfig.getHookSystem = vi
208
+ .fn()
209
+ .mockReturnValue(new HookSystem(mockConfig));
217
210
  client = new GeminiClient(mockConfig);
218
211
  await client.initialize();
219
212
  vi.mocked(mockConfig.getGeminiClient).mockReturnValue(client);
@@ -575,11 +568,7 @@ ${JSON.stringify({
575
568
  }
576
569
  // Assert
577
570
  expect(ideContextStore.get).toHaveBeenCalled();
578
- // The `turn.run` method is now called with the model name as the first
579
- // argument. We use `expect.any(String)` because this test is
580
- // concerned with the IDE context logic, not the model routing,
581
- // which is tested in its own dedicated suite.
582
- expect(mockTurnRunFn).toHaveBeenCalledWith(expect.any(String), initialRequest, expect.any(Object));
571
+ expect(mockTurnRunFn).toHaveBeenCalledWith({ model: 'default-routed-model' }, initialRequest, expect.any(AbortSignal));
583
572
  });
584
573
  it('should add context if ideMode is enabled and there is one active file', async () => {
585
574
  // Arrange
@@ -877,7 +866,8 @@ ${JSON.stringify({
877
866
  // A string of length 400 is roughly 100 tokens.
878
867
  const longText = 'a'.repeat(400);
879
868
  const request = [{ text: longText }];
880
- const estimatedRequestTokenCount = Math.floor(JSON.stringify(request).length / 4);
869
+ // estimateTextOnlyLength counts only text content (400 chars), not JSON structure
870
+ const estimatedRequestTokenCount = Math.floor(longText.length / 4);
881
871
  const remainingTokenCount = MOCKED_TOKEN_LIMIT - lastPromptTokenCount;
882
872
  // Mock tryCompressChat to not compress
883
873
  vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
@@ -923,7 +913,8 @@ ${JSON.stringify({
923
913
  // We need a request > 95 tokens.
924
914
  const longText = 'a'.repeat(400);
925
915
  const request = [{ text: longText }];
926
- const estimatedRequestTokenCount = Math.floor(JSON.stringify(request).length / 4);
916
+ // estimateTextOnlyLength counts only text content (400 chars), not JSON structure
917
+ const estimatedRequestTokenCount = Math.floor(longText.length / 4);
927
918
  const remainingTokenCount = STICKY_MODEL_LIMIT - lastPromptTokenCount;
928
919
  vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
929
920
  originalTokenCount: lastPromptTokenCount,
@@ -945,6 +936,51 @@ ${JSON.stringify({
945
936
  expect(tokenLimit).toHaveBeenCalledWith(STICKY_MODEL);
946
937
  expect(mockTurnRunFn).not.toHaveBeenCalled();
947
938
  });
939
+ it('should not trigger overflow warning for requests with large binary data (PDFs/images)', async () => {
940
+ // Arrange
941
+ const MOCKED_TOKEN_LIMIT = 1000000; // 1M tokens
942
+ vi.mocked(tokenLimit).mockReturnValue(MOCKED_TOKEN_LIMIT);
943
+ const lastPromptTokenCount = 10000;
944
+ const mockChat = {
945
+ getLastPromptTokenCount: vi.fn().mockReturnValue(lastPromptTokenCount),
946
+ getHistory: vi.fn().mockReturnValue([]),
947
+ };
948
+ client['chat'] = mockChat;
949
+ // Simulate a PDF file with large base64 data (11MB when encoded)
950
+ // In the old implementation, this would incorrectly estimate ~2.7M tokens
951
+ // In the new implementation, only the text part is counted
952
+ const largePdfBase64 = 'A'.repeat(11 * 1024 * 1024);
953
+ const request = [
954
+ { text: 'Please analyze this PDF document' }, // ~35 chars = ~8 tokens
955
+ {
956
+ inlineData: {
957
+ mimeType: 'application/pdf',
958
+ data: largePdfBase64, // This should be ignored in token estimation
959
+ },
960
+ },
961
+ ];
962
+ // Mock tryCompressChat to not compress
963
+ vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
964
+ originalTokenCount: lastPromptTokenCount,
965
+ newTokenCount: lastPromptTokenCount,
966
+ compressionStatus: CompressionStatus.NOOP,
967
+ });
968
+ // Mock Turn.run to simulate successful processing
969
+ const mockStream = (async function* () {
970
+ yield { type: 'content', value: 'Analysis complete' };
971
+ })();
972
+ mockTurnRunFn.mockReturnValue(mockStream);
973
+ // Act
974
+ const stream = client.sendMessageStream(request, new AbortController().signal, 'prompt-id-pdf-test');
975
+ const events = await fromAsync(stream);
976
+ // Assert
977
+ // Should NOT contain overflow warning
978
+ expect(events).not.toContainEqual(expect.objectContaining({
979
+ type: GeminiEventType.ContextWindowWillOverflow,
980
+ }));
981
+ // Turn.run should be called (processing should continue)
982
+ expect(mockTurnRunFn).toHaveBeenCalled();
983
+ });
948
984
  describe('Model Routing', () => {
949
985
  let mockRouterService;
950
986
  beforeEach(() => {
@@ -969,29 +1005,28 @@ ${JSON.stringify({
969
1005
  await fromAsync(stream); // consume stream
970
1006
  expect(mockConfig.getModelRouterService).toHaveBeenCalled();
971
1007
  expect(mockRouterService.route).toHaveBeenCalled();
972
- expect(mockTurnRunFn).toHaveBeenCalledWith('routed-model', // The model from the router
973
- [{ text: 'Hi' }], expect.any(Object));
1008
+ expect(mockTurnRunFn).toHaveBeenCalledWith({ model: 'routed-model' }, [{ text: 'Hi' }], expect.any(AbortSignal));
974
1009
  });
975
1010
  it('should use the same model for subsequent turns in the same prompt (stickiness)', async () => {
976
1011
  // First turn
977
1012
  let stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-1');
978
1013
  await fromAsync(stream);
979
1014
  expect(mockRouterService.route).toHaveBeenCalledTimes(1);
980
- expect(mockTurnRunFn).toHaveBeenCalledWith('routed-model', [{ text: 'Hi' }], expect.any(Object));
1015
+ expect(mockTurnRunFn).toHaveBeenCalledWith({ model: 'routed-model' }, [{ text: 'Hi' }], expect.any(AbortSignal));
981
1016
  // Second turn
982
1017
  stream = client.sendMessageStream([{ text: 'Continue' }], new AbortController().signal, 'prompt-1');
983
1018
  await fromAsync(stream);
984
1019
  // Router should not be called again
985
1020
  expect(mockRouterService.route).toHaveBeenCalledTimes(1);
986
1021
  // Should stick to the first model
987
- expect(mockTurnRunFn).toHaveBeenCalledWith('routed-model', [{ text: 'Continue' }], expect.any(Object));
1022
+ expect(mockTurnRunFn).toHaveBeenCalledWith({ model: 'routed-model' }, [{ text: 'Continue' }], expect.any(AbortSignal));
988
1023
  });
989
1024
  it('should reset the sticky model and re-route when the prompt_id changes', async () => {
990
1025
  // First prompt
991
1026
  let stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-1');
992
1027
  await fromAsync(stream);
993
1028
  expect(mockRouterService.route).toHaveBeenCalledTimes(1);
994
- expect(mockTurnRunFn).toHaveBeenCalledWith('routed-model', [{ text: 'Hi' }], expect.any(Object));
1029
+ expect(mockTurnRunFn).toHaveBeenCalledWith({ model: 'routed-model' }, [{ text: 'Hi' }], expect.any(AbortSignal));
995
1030
  // New prompt
996
1031
  mockRouterService.route.mockResolvedValue({
997
1032
  model: 'new-routed-model',
@@ -1002,7 +1037,7 @@ ${JSON.stringify({
1002
1037
  // Router should be called again for the new prompt
1003
1038
  expect(mockRouterService.route).toHaveBeenCalledTimes(2);
1004
1039
  // Should use the newly routed model
1005
- expect(mockTurnRunFn).toHaveBeenCalledWith('new-routed-model', [{ text: 'A new topic' }], expect.any(Object));
1040
+ expect(mockTurnRunFn).toHaveBeenCalledWith({ model: 'new-routed-model' }, [{ text: 'A new topic' }], expect.any(AbortSignal));
1006
1041
  });
1007
1042
  it('should use the fallback model and bypass routing when in fallback mode', async () => {
1008
1043
  vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
@@ -1012,7 +1047,7 @@ ${JSON.stringify({
1012
1047
  });
1013
1048
  const stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-1');
1014
1049
  await fromAsync(stream);
1015
- expect(mockTurnRunFn).toHaveBeenCalledWith(DEFAULT_GEMINI_FLASH_MODEL, [{ text: 'Hi' }], expect.any(Object));
1050
+ expect(mockTurnRunFn).toHaveBeenCalledWith({ model: DEFAULT_GEMINI_FLASH_MODEL }, [{ text: 'Hi' }], expect.any(AbortSignal));
1016
1051
  });
1017
1052
  it('should stick to the fallback model for the entire sequence even if fallback mode ends', async () => {
1018
1053
  // Start the sequence in fallback mode
@@ -1024,7 +1059,7 @@ ${JSON.stringify({
1024
1059
  let stream = client.sendMessageStream([{ text: 'Hi' }], new AbortController().signal, 'prompt-fallback-stickiness');
1025
1060
  await fromAsync(stream);
1026
1061
  // First call should use fallback model
1027
- expect(mockTurnRunFn).toHaveBeenCalledWith(DEFAULT_GEMINI_FLASH_MODEL, [{ text: 'Hi' }], expect.any(Object));
1062
+ expect(mockTurnRunFn).toHaveBeenCalledWith({ model: DEFAULT_GEMINI_FLASH_MODEL }, [{ text: 'Hi' }], expect.any(AbortSignal));
1028
1063
  // End fallback mode
1029
1064
  vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(false);
1030
1065
  // Second call in the same sequence
@@ -1032,8 +1067,8 @@ ${JSON.stringify({
1032
1067
  await fromAsync(stream);
1033
1068
  // Router should still not be called, and it should stick to the fallback model
1034
1069
  expect(mockTurnRunFn).toHaveBeenCalledTimes(2); // Ensure it was called again
1035
- expect(mockTurnRunFn).toHaveBeenLastCalledWith(DEFAULT_GEMINI_FLASH_MODEL, // Still the fallback model
1036
- [{ text: 'Continue' }], expect.any(Object));
1070
+ expect(mockTurnRunFn).toHaveBeenLastCalledWith({ model: DEFAULT_GEMINI_FLASH_MODEL }, // Still the fallback model
1071
+ [{ text: 'Continue' }], expect.any(AbortSignal));
1037
1072
  });
1038
1073
  });
1039
1074
  it('should recursively call sendMessageStream with "Please continue." when InvalidStream event is received', async () => {
@@ -1062,15 +1097,16 @@ ${JSON.stringify({
1062
1097
  const events = await fromAsync(stream);
1063
1098
  // Assert
1064
1099
  expect(events).toEqual([
1100
+ { type: GeminiEventType.ModelInfo, value: 'default-routed-model' },
1065
1101
  { type: GeminiEventType.InvalidStream },
1066
1102
  { type: GeminiEventType.Content, value: 'Continued content' },
1067
1103
  ]);
1068
1104
  // Verify that turn.run was called twice
1069
1105
  expect(mockTurnRunFn).toHaveBeenCalledTimes(2);
1070
1106
  // First call with original request
1071
- expect(mockTurnRunFn).toHaveBeenNthCalledWith(1, expect.any(String), initialRequest, expect.any(Object));
1107
+ expect(mockTurnRunFn).toHaveBeenNthCalledWith(1, { model: 'default-routed-model' }, initialRequest, expect.any(AbortSignal));
1072
1108
  // Second call with "Please continue."
1073
- expect(mockTurnRunFn).toHaveBeenNthCalledWith(2, expect.any(String), [{ text: 'System: Please continue.' }], expect.any(Object));
1109
+ expect(mockTurnRunFn).toHaveBeenNthCalledWith(2, { model: 'default-routed-model' }, [{ text: 'System: Please continue.' }], expect.any(AbortSignal));
1074
1110
  });
1075
1111
  it('should not recursively call sendMessageStream with "Please continue." when InvalidStream event is received and flag is false', async () => {
1076
1112
  vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(false);
@@ -1092,7 +1128,10 @@ ${JSON.stringify({
1092
1128
  const stream = client.sendMessageStream(initialRequest, signal, promptId);
1093
1129
  const events = await fromAsync(stream);
1094
1130
  // Assert
1095
- expect(events).toEqual([{ type: GeminiEventType.InvalidStream }]);
1131
+ expect(events).toEqual([
1132
+ { type: GeminiEventType.ModelInfo, value: 'default-routed-model' },
1133
+ { type: GeminiEventType.InvalidStream },
1134
+ ]);
1096
1135
  // Verify that turn.run was called only once
1097
1136
  expect(mockTurnRunFn).toHaveBeenCalledTimes(1);
1098
1137
  });
@@ -1116,9 +1155,11 @@ ${JSON.stringify({
1116
1155
  const stream = client.sendMessageStream(initialRequest, signal, promptId);
1117
1156
  const events = await fromAsync(stream);
1118
1157
  // Assert
1119
- // We expect 2 InvalidStream events (original + 1 retry)
1120
- expect(events.length).toBe(2);
1121
- expect(events.every((e) => e.type === GeminiEventType.InvalidStream)).toBe(true);
1158
+ // We expect 3 events (model_info + original + 1 retry)
1159
+ expect(events.length).toBe(3);
1160
+ expect(events
1161
+ .filter((e) => e.type !== GeminiEventType.ModelInfo)
1162
+ .every((e) => e.type === GeminiEventType.InvalidStream)).toBe(true);
1122
1163
  // Verify that turn.run was called twice
1123
1164
  expect(mockTurnRunFn).toHaveBeenCalledTimes(2);
1124
1165
  });
@@ -1665,7 +1706,7 @@ ${JSON.stringify({
1665
1706
  .mockReturnValueOnce(false)
1666
1707
  .mockReturnValueOnce(true);
1667
1708
  let capturedSignal;
1668
- mockTurnRunFn.mockImplementation((model, request, signal) => {
1709
+ mockTurnRunFn.mockImplementation((_modelConfigKey, _request, signal) => {
1669
1710
  capturedSignal = signal;
1670
1711
  return (async function* () {
1671
1712
  yield { type: 'content', value: 'First event' };