@google/adk 1.2.0 → 1.4.0

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 (294) hide show
  1. package/dist/cjs/agents/active_streaming_tool.js +6 -1
  2. package/dist/cjs/agents/base_agent.js +19 -1
  3. package/dist/cjs/agents/context.js +1 -11
  4. package/dist/cjs/agents/functions.js +35 -16
  5. package/dist/cjs/agents/instructions.js +99 -33
  6. package/dist/cjs/agents/invocation_context.js +2 -6
  7. package/dist/cjs/agents/llm_agent.js +60 -11
  8. package/dist/cjs/agents/processors/agent_transfer_llm_request_processor.js +7 -0
  9. package/dist/cjs/agents/processors/basic_llm_request_processor.js +8 -1
  10. package/dist/cjs/agents/processors/code_execution_request_processor.js +0 -3
  11. package/dist/cjs/agents/processors/content_processor_utils.js +51 -25
  12. package/dist/cjs/agents/processors/content_request_processor.js +7 -0
  13. package/dist/cjs/agents/processors/context_compactor_request_processor.js +16 -2
  14. package/dist/cjs/agents/processors/identity_llm_request_processor.js +7 -0
  15. package/dist/cjs/agents/processors/instructions_llm_request_processor.js +5 -0
  16. package/dist/cjs/agents/processors/interactions_request_processor.js +63 -0
  17. package/dist/cjs/agents/processors/request_confirmation_llm_request_processor.js +9 -1
  18. package/dist/cjs/agents/processors/tool_filter_request_processor.js +7 -1
  19. package/dist/cjs/apps/app.js +79 -0
  20. package/dist/cjs/apps/resumability_config.js +44 -0
  21. package/dist/cjs/artifacts/file_artifact_service.js +14 -1
  22. package/dist/cjs/artifacts/gcs_artifact_service.js +57 -15
  23. package/dist/cjs/artifacts/in_memory_artifact_service.js +5 -1
  24. package/dist/cjs/artifacts/scoped_artifact_service.js +101 -0
  25. package/dist/cjs/artifacts/session_artifact_service.js +27 -0
  26. package/dist/cjs/auth/auth_preprocessor.js +12 -10
  27. package/dist/cjs/auth/oauth2/oauth2_discovery.js +17 -5
  28. package/dist/cjs/auth/oauth2/oauth2_utils.js +12 -1
  29. package/dist/cjs/code_executors/code_executor_context.js +7 -7
  30. package/dist/cjs/common.js +86 -0
  31. package/dist/cjs/context/agent_controlled_context_compactor.js +109 -0
  32. package/dist/cjs/context/summarizers/llm_summarizer.js +11 -0
  33. package/dist/cjs/context/token_based_context_compactor.js +43 -11
  34. package/dist/cjs/context/trajectory_thought_pruning_compactor.js +71 -0
  35. package/dist/cjs/events/event.js +25 -1
  36. package/dist/cjs/integrations/agent_registry/agent_registry_mcp_toolset.js +21 -2
  37. package/dist/cjs/models/gemini_llm_connection.js +62 -19
  38. package/dist/cjs/models/google_llm.js +51 -18
  39. package/dist/cjs/models/interactions_utils.js +732 -0
  40. package/dist/cjs/plugins/base_plugin.js +1 -0
  41. package/dist/cjs/plugins/security_plugin.js +16 -0
  42. package/dist/cjs/runner/in_memory_runner.js +13 -2
  43. package/dist/cjs/runner/runner.js +93 -72
  44. package/dist/cjs/sessions/base_session_service.js +19 -3
  45. package/dist/cjs/sessions/database_session_service.js +26 -9
  46. package/dist/cjs/sessions/db/schema.js +45 -10
  47. package/dist/cjs/sessions/in_memory_session_service.js +2 -1
  48. package/dist/cjs/sessions/vertex_ai_session_service.js +21 -5
  49. package/dist/cjs/skills/gcp_skill_registry.js +104 -0
  50. package/dist/cjs/skills/loader.js +67 -2
  51. package/dist/cjs/skills/skill_registry.js +27 -0
  52. package/dist/cjs/tools/base_toolset.js +1 -1
  53. package/dist/cjs/tools/consolidate_context_tool.js +79 -0
  54. package/dist/cjs/tools/forwarding_artifact_service.js +16 -28
  55. package/dist/cjs/tools/openapi_tool/openapi_spec_parser/openapi_spec_parser.js +232 -0
  56. package/dist/cjs/tools/openapi_tool/openapi_spec_parser/operation_parser.js +224 -0
  57. package/dist/cjs/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.js +117 -0
  58. package/dist/cjs/tools/openapi_tool/openapi_toolset.js +133 -0
  59. package/dist/cjs/tools/openapi_tool/rest_api_tool.js +256 -0
  60. package/dist/cjs/tools/skill/load_skill_resource_tool.js +25 -3
  61. package/dist/cjs/tools/skill/load_skill_tool.js +12 -1
  62. package/dist/cjs/tools/skill/run_skill_script_tool.js +12 -1
  63. package/dist/cjs/tools/skill/search_skills_tool.js +108 -0
  64. package/dist/cjs/tools/skill/skill_toolset.js +40 -5
  65. package/dist/cjs/utils/async_hooks_shim.js +52 -0
  66. package/dist/cjs/utils/async_queue.js +88 -0
  67. package/dist/cjs/utils/case_utils.js +53 -0
  68. package/dist/cjs/utils/client_labels.js +41 -3
  69. package/dist/cjs/utils/env_aware_utils.js +14 -1
  70. package/dist/cjs/utils/live_connection_utils.js +284 -0
  71. package/dist/cjs/utils/model_name.js +9 -0
  72. package/dist/cjs/utils/streaming_utils.js +18 -11
  73. package/dist/cjs/utils/task.js +62 -0
  74. package/dist/cjs/version.js +1 -1
  75. package/dist/esm/agents/active_streaming_tool.js +6 -1
  76. package/dist/esm/agents/base_agent.js +19 -1
  77. package/dist/esm/agents/context.js +1 -11
  78. package/dist/esm/agents/functions.js +36 -15
  79. package/dist/esm/agents/instructions.js +99 -33
  80. package/dist/esm/agents/invocation_context.js +2 -6
  81. package/dist/esm/agents/llm_agent.js +61 -11
  82. package/dist/esm/agents/processors/agent_transfer_llm_request_processor.js +7 -0
  83. package/dist/esm/agents/processors/basic_llm_request_processor.js +8 -1
  84. package/dist/esm/agents/processors/code_execution_request_processor.js +0 -3
  85. package/dist/esm/agents/processors/content_processor_utils.js +48 -24
  86. package/dist/esm/agents/processors/content_request_processor.js +7 -0
  87. package/dist/esm/agents/processors/context_compactor_request_processor.js +16 -2
  88. package/dist/esm/agents/processors/identity_llm_request_processor.js +7 -0
  89. package/dist/esm/agents/processors/instructions_llm_request_processor.js +5 -0
  90. package/dist/esm/agents/processors/interactions_request_processor.js +34 -0
  91. package/dist/esm/agents/processors/request_confirmation_llm_request_processor.js +9 -1
  92. package/dist/esm/agents/processors/tool_filter_request_processor.js +7 -1
  93. package/dist/esm/apps/app.js +49 -0
  94. package/dist/esm/apps/resumability_config.js +16 -0
  95. package/dist/esm/artifacts/file_artifact_service.js +14 -1
  96. package/dist/esm/artifacts/gcs_artifact_service.js +57 -15
  97. package/dist/esm/artifacts/in_memory_artifact_service.js +5 -1
  98. package/dist/esm/artifacts/scoped_artifact_service.js +73 -0
  99. package/dist/esm/artifacts/session_artifact_service.js +7 -0
  100. package/dist/esm/auth/auth_preprocessor.js +12 -10
  101. package/dist/esm/auth/oauth2/oauth2_discovery.js +14 -4
  102. package/dist/esm/auth/oauth2/oauth2_utils.js +12 -1
  103. package/dist/esm/code_executors/code_executor_context.js +7 -7
  104. package/dist/esm/common.js +75 -3
  105. package/dist/esm/context/agent_controlled_context_compactor.js +81 -0
  106. package/dist/esm/context/summarizers/llm_summarizer.js +11 -0
  107. package/dist/esm/context/token_based_context_compactor.js +43 -11
  108. package/dist/esm/context/trajectory_thought_pruning_compactor.js +43 -0
  109. package/dist/esm/events/event.js +23 -1
  110. package/dist/esm/integrations/agent_registry/agent_registry_mcp_toolset.js +21 -2
  111. package/dist/esm/models/gemini_llm_connection.js +62 -19
  112. package/dist/esm/models/google_llm.js +49 -17
  113. package/dist/esm/models/interactions_utils.js +697 -0
  114. package/dist/esm/plugins/base_plugin.js +1 -0
  115. package/dist/esm/plugins/security_plugin.js +16 -0
  116. package/dist/esm/runner/in_memory_runner.js +13 -2
  117. package/dist/esm/runner/runner.js +91 -73
  118. package/dist/esm/sessions/base_session_service.js +17 -2
  119. package/dist/esm/sessions/database_session_service.js +26 -9
  120. package/dist/esm/sessions/db/schema.js +44 -10
  121. package/dist/esm/sessions/in_memory_session_service.js +4 -2
  122. package/dist/esm/sessions/vertex_ai_session_service.js +21 -5
  123. package/dist/esm/skills/gcp_skill_registry.js +78 -0
  124. package/dist/esm/skills/loader.js +66 -2
  125. package/dist/esm/skills/skill_registry.js +7 -0
  126. package/dist/esm/tools/base_toolset.js +1 -1
  127. package/dist/esm/tools/consolidate_context_tool.js +51 -0
  128. package/dist/esm/tools/forwarding_artifact_service.js +16 -28
  129. package/dist/esm/tools/openapi_tool/openapi_spec_parser/openapi_spec_parser.js +206 -0
  130. package/dist/esm/tools/openapi_tool/openapi_spec_parser/operation_parser.js +198 -0
  131. package/dist/esm/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.js +91 -0
  132. package/dist/esm/tools/openapi_tool/openapi_toolset.js +97 -0
  133. package/dist/esm/tools/openapi_tool/rest_api_tool.js +229 -0
  134. package/dist/esm/tools/skill/load_skill_resource_tool.js +25 -3
  135. package/dist/esm/tools/skill/load_skill_tool.js +12 -1
  136. package/dist/esm/tools/skill/run_skill_script_tool.js +12 -1
  137. package/dist/esm/tools/skill/search_skills_tool.js +82 -0
  138. package/dist/esm/tools/skill/skill_toolset.js +40 -5
  139. package/dist/esm/utils/async_hooks_shim.js +24 -0
  140. package/dist/esm/utils/async_queue.js +60 -0
  141. package/dist/esm/utils/case_utils.js +25 -0
  142. package/dist/esm/utils/client_labels.js +38 -2
  143. package/dist/esm/utils/env_aware_utils.js +14 -1
  144. package/dist/esm/utils/live_connection_utils.js +256 -0
  145. package/dist/esm/utils/model_name.js +8 -0
  146. package/dist/esm/utils/streaming_utils.js +18 -11
  147. package/dist/esm/utils/task.js +34 -0
  148. package/dist/esm/version.js +1 -1
  149. package/dist/types/a2a/a2a_remote_agent_utils.d.ts +29 -4
  150. package/dist/types/a2a/event_converter_utils.d.ts +14 -1
  151. package/dist/types/a2a/metadata_converter_utils.d.ts +18 -0
  152. package/dist/types/a2a/part_converter_utils.d.ts +51 -6
  153. package/dist/types/agents/active_streaming_tool.d.ts +3 -4
  154. package/dist/types/agents/functions.d.ts +12 -9
  155. package/dist/types/agents/invocation_context.d.ts +7 -12
  156. package/dist/types/agents/llm_agent.d.ts +14 -0
  157. package/dist/types/agents/processors/agent_transfer_llm_request_processor.d.ts +14 -0
  158. package/dist/types/agents/processors/basic_llm_request_processor.d.ts +7 -0
  159. package/dist/types/agents/processors/content_processor_utils.d.ts +34 -0
  160. package/dist/types/agents/processors/content_request_processor.d.ts +16 -0
  161. package/dist/types/agents/processors/context_compactor_request_processor.d.ts +12 -0
  162. package/dist/types/agents/processors/identity_llm_request_processor.d.ts +7 -0
  163. package/dist/types/agents/processors/interactions_request_processor.d.ts +17 -0
  164. package/dist/types/agents/processors/request_confirmation_llm_request_processor.d.ts +9 -1
  165. package/dist/types/agents/processors/tool_filter_request_processor.d.ts +12 -1
  166. package/dist/types/apps/app.d.ts +52 -0
  167. package/dist/types/apps/resumability_config.d.ts +27 -0
  168. package/dist/types/artifacts/base_artifact_service.d.ts +6 -36
  169. package/dist/types/artifacts/gcs_artifact_service.d.ts +2 -1
  170. package/dist/types/artifacts/scoped_artifact_service.d.ts +25 -0
  171. package/dist/types/artifacts/session_artifact_service.d.ts +25 -0
  172. package/dist/types/auth/oauth2/oauth2_discovery.d.ts +11 -0
  173. package/dist/types/common.d.ts +35 -4
  174. package/dist/types/context/agent_controlled_context_compactor.d.ts +24 -0
  175. package/dist/types/context/base_context_compactor.d.ts +3 -0
  176. package/dist/types/context/summarizers/llm_summarizer.d.ts +17 -0
  177. package/dist/types/context/token_based_context_compactor.d.ts +6 -1
  178. package/dist/types/context/trajectory_thought_pruning_compactor.d.ts +27 -0
  179. package/dist/types/events/event.d.ts +8 -0
  180. package/dist/types/events/event_actions.d.ts +1 -2
  181. package/dist/types/integrations/agent_registry/agent_registry_mcp_toolset.d.ts +21 -2
  182. package/dist/types/models/base_llm_connection.d.ts +10 -0
  183. package/dist/types/models/gemini_llm_connection.d.ts +15 -4
  184. package/dist/types/models/google_llm.d.ts +15 -1
  185. package/dist/types/models/interactions_utils.d.ts +92 -0
  186. package/dist/types/models/llm_request.d.ts +4 -0
  187. package/dist/types/models/llm_response.d.ts +14 -1
  188. package/dist/types/plugins/base_plugin.d.ts +2 -1
  189. package/dist/types/plugins/security_plugin.d.ts +30 -0
  190. package/dist/types/runner/in_memory_runner.d.ts +7 -1
  191. package/dist/types/runner/runner.d.ts +43 -9
  192. package/dist/types/sessions/base_session_service.d.ts +7 -16
  193. package/dist/types/sessions/db/schema.d.ts +1 -0
  194. package/dist/types/sessions/session.d.ts +11 -0
  195. package/dist/types/sessions/vertex_ai_session_service.d.ts +9 -1
  196. package/dist/types/skills/gcp_skill_registry.d.ts +24 -0
  197. package/dist/types/skills/loader.d.ts +7 -0
  198. package/dist/types/skills/skill.d.ts +1 -1
  199. package/dist/types/skills/skill_registry.d.ts +29 -0
  200. package/dist/types/tools/consolidate_context_tool.d.ts +19 -0
  201. package/dist/types/tools/forwarding_artifact_service.d.ts +3 -2
  202. package/dist/types/tools/openapi_tool/openapi_spec_parser/openapi_spec_parser.d.ts +34 -0
  203. package/dist/types/tools/openapi_tool/openapi_spec_parser/operation_parser.d.ts +59 -0
  204. package/dist/types/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.d.ts +23 -0
  205. package/dist/types/tools/openapi_tool/openapi_toolset.d.ts +27 -0
  206. package/dist/types/tools/openapi_tool/rest_api_tool.d.ts +50 -0
  207. package/dist/types/tools/skill/load_skill_resource_tool.d.ts +1 -1
  208. package/dist/types/tools/skill/search_skills_tool.d.ts +14 -0
  209. package/dist/types/tools/skill/skill_toolset.d.ts +5 -0
  210. package/dist/types/utils/async_hooks_shim.d.ts +10 -0
  211. package/dist/types/utils/async_queue.d.ts +18 -0
  212. package/dist/types/utils/case_utils.d.ts +12 -0
  213. package/dist/types/utils/client_labels.d.ts +10 -0
  214. package/dist/types/utils/env_aware_utils.d.ts +3 -3
  215. package/dist/types/utils/live_connection_utils.d.ts +30 -0
  216. package/dist/types/utils/model_name.d.ts +7 -0
  217. package/dist/types/utils/streaming_utils.d.ts +0 -1
  218. package/dist/types/utils/task.d.ts +24 -0
  219. package/dist/types/version.d.ts +1 -1
  220. package/dist/web/agents/active_streaming_tool.js +6 -1
  221. package/dist/web/agents/base_agent.js +31 -1
  222. package/dist/web/agents/context.js +1 -11
  223. package/dist/web/agents/functions.js +36 -15
  224. package/dist/web/agents/instructions.js +99 -33
  225. package/dist/web/agents/invocation_context.js +2 -6
  226. package/dist/web/agents/llm_agent.js +61 -11
  227. package/dist/web/agents/processors/agent_transfer_llm_request_processor.js +7 -0
  228. package/dist/web/agents/processors/basic_llm_request_processor.js +8 -1
  229. package/dist/web/agents/processors/code_execution_request_processor.js +0 -3
  230. package/dist/web/agents/processors/content_processor_utils.js +66 -24
  231. package/dist/web/agents/processors/content_request_processor.js +7 -0
  232. package/dist/web/agents/processors/context_compactor_request_processor.js +16 -2
  233. package/dist/web/agents/processors/identity_llm_request_processor.js +7 -0
  234. package/dist/web/agents/processors/instructions_llm_request_processor.js +5 -0
  235. package/dist/web/agents/processors/interactions_request_processor.js +52 -0
  236. package/dist/web/agents/processors/request_confirmation_llm_request_processor.js +9 -1
  237. package/dist/web/agents/processors/tool_filter_request_processor.js +7 -1
  238. package/dist/web/apps/app.js +49 -0
  239. package/dist/web/apps/resumability_config.js +31 -0
  240. package/dist/web/artifacts/file_artifact_service.js +14 -1
  241. package/dist/web/artifacts/gcs_artifact_service.js +55 -15
  242. package/dist/web/artifacts/in_memory_artifact_service.js +5 -1
  243. package/dist/web/artifacts/scoped_artifact_service.js +86 -0
  244. package/dist/web/artifacts/session_artifact_service.js +7 -0
  245. package/dist/web/auth/auth_preprocessor.js +12 -10
  246. package/dist/web/auth/oauth2/oauth2_discovery.js +14 -4
  247. package/dist/web/auth/oauth2/oauth2_utils.js +12 -1
  248. package/dist/web/code_executors/code_executor_context.js +7 -7
  249. package/dist/web/common.js +75 -3
  250. package/dist/web/context/agent_controlled_context_compactor.js +81 -0
  251. package/dist/web/context/summarizers/llm_summarizer.js +11 -0
  252. package/dist/web/context/token_based_context_compactor.js +43 -11
  253. package/dist/web/context/trajectory_thought_pruning_compactor.js +43 -0
  254. package/dist/web/events/event.js +21 -1
  255. package/dist/web/integrations/agent_registry/agent_registry_mcp_toolset.js +21 -2
  256. package/dist/web/models/gemini_llm_connection.js +75 -19
  257. package/dist/web/models/google_llm.js +80 -17
  258. package/dist/web/models/interactions_utils.js +728 -0
  259. package/dist/web/plugins/base_plugin.js +1 -0
  260. package/dist/web/plugins/security_plugin.js +16 -0
  261. package/dist/web/runner/in_memory_runner.js +13 -2
  262. package/dist/web/runner/runner.js +111 -75
  263. package/dist/web/sessions/base_session_service.js +17 -2
  264. package/dist/web/sessions/database_session_service.js +26 -9
  265. package/dist/web/sessions/db/schema.js +44 -10
  266. package/dist/web/sessions/in_memory_session_service.js +4 -2
  267. package/dist/web/sessions/vertex_ai_session_service.js +21 -5
  268. package/dist/web/skills/gcp_skill_registry.js +78 -0
  269. package/dist/web/skills/loader.js +66 -2
  270. package/dist/web/skills/skill_registry.js +7 -0
  271. package/dist/web/tools/base_toolset.js +1 -1
  272. package/dist/web/tools/consolidate_context_tool.js +51 -0
  273. package/dist/web/tools/forwarding_artifact_service.js +16 -28
  274. package/dist/web/tools/openapi_tool/openapi_spec_parser/openapi_spec_parser.js +221 -0
  275. package/dist/web/tools/openapi_tool/openapi_spec_parser/operation_parser.js +198 -0
  276. package/dist/web/tools/openapi_tool/openapi_spec_parser/tool_auth_handler.js +91 -0
  277. package/dist/web/tools/openapi_tool/openapi_toolset.js +97 -0
  278. package/dist/web/tools/openapi_tool/rest_api_tool.js +229 -0
  279. package/dist/web/tools/skill/load_skill_resource_tool.js +25 -3
  280. package/dist/web/tools/skill/load_skill_tool.js +12 -1
  281. package/dist/web/tools/skill/run_skill_script_tool.js +12 -1
  282. package/dist/web/tools/skill/search_skills_tool.js +82 -0
  283. package/dist/web/tools/skill/skill_toolset.js +40 -5
  284. package/dist/web/utils/async_hooks_shim.js +24 -0
  285. package/dist/web/utils/async_queue.js +60 -0
  286. package/dist/web/utils/case_utils.js +25 -0
  287. package/dist/web/utils/client_labels.js +38 -2
  288. package/dist/web/utils/env_aware_utils.js +14 -1
  289. package/dist/web/utils/live_connection_utils.js +254 -0
  290. package/dist/web/utils/model_name.js +8 -0
  291. package/dist/web/utils/streaming_utils.js +18 -11
  292. package/dist/web/utils/task.js +34 -0
  293. package/dist/web/version.js +1 -1
  294. package/package.json +4 -2
@@ -24,6 +24,13 @@ var __asyncGenerator = (__this, __arguments, generator) => {
24
24
  import { appendInstructions } from "../../models/llm_request.js";
25
25
  import { BaseLlmRequestProcessor } from "./base_llm_processor.js";
26
26
  class IdentityLlmRequestProcessor extends BaseLlmRequestProcessor {
27
+ /**
28
+ * Appends agent name and description as identity instructions to the system
29
+ * prompt of the request.
30
+ *
31
+ * @param invocationContext - The current invocation context.
32
+ * @param llmRequest - The request object to append instructions to.
33
+ */
27
34
  // eslint-disable-next-line require-yield
28
35
  runAsync(invocationContext, llmRequest) {
29
36
  return __asyncGenerator(this, null, function* () {
@@ -64,6 +64,11 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
64
64
  }
65
65
  appendInstructions(llmRequest, [instructionWithState]);
66
66
  }
67
+ if (agent.outputSchema && agent.tools && agent.tools.length > 0) {
68
+ appendInstructions(llmRequest, [
69
+ 'To output the final result, you must call the "set_model_response" function with the appropriate values. Do not output anything else.'
70
+ ]);
71
+ }
67
72
  });
68
73
  }
69
74
  }
@@ -0,0 +1,52 @@
1
+ import {createRequire as topLevelCreateRequire} from 'module';
2
+ const require = topLevelCreateRequire(import.meta.url);
3
+ var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
4
+ var __await = function(promise, isYieldStar) {
5
+ this[0] = promise;
6
+ this[1] = isYieldStar;
7
+ };
8
+ var __asyncGenerator = (__this, __arguments, generator) => {
9
+ var resume = (k, v, yes, no) => {
10
+ try {
11
+ var x = generator[k](v), isAwait = (v = x.value) instanceof __await, done = x.done;
12
+ Promise.resolve(isAwait ? v[0] : v).then((y) => isAwait ? resume(k === "return" ? k : "next", v[1] ? { done: y.done, value: y.value } : y, yes, no) : yes({ value: y, done })).catch((e) => resume("throw", e, yes, no));
13
+ } catch (e) {
14
+ no(e);
15
+ }
16
+ }, method = (k) => it[k] = (x) => new Promise((yes, no) => resume(k, x, yes, no)), it = {};
17
+ return generator = generator.apply(__this, __arguments), it[__knownSymbol("asyncIterator")] = () => it, method("next"), method("throw"), method("return"), it;
18
+ };
19
+ /**
20
+ * @license
21
+ * Copyright 2026 Google LLC
22
+ * SPDX-License-Identifier: Apache-2.0
23
+ */
24
+ import { isGemini } from "../../models/google_llm.js";
25
+ import { isLlmAgent } from "../llm_agent.js";
26
+ class InteractionsRequestProcessor {
27
+ // eslint-disable-next-line require-yield
28
+ runAsync(invocationContext, llmRequest) {
29
+ return __asyncGenerator(this, null, function* () {
30
+ const agent = invocationContext.agent;
31
+ if (!agent || !isLlmAgent(agent)) {
32
+ return;
33
+ }
34
+ const model = agent.canonicalModel;
35
+ if (isGemini(model) && model.useInteractionsApi) {
36
+ const events = invocationContext.session.events;
37
+ for (let i = events.length - 1; i >= 0; i--) {
38
+ const event = events[i];
39
+ if (event.branch === invocationContext.branch && event.author === agent.name && event.interactionId) {
40
+ llmRequest.previousInteractionId = event.interactionId;
41
+ break;
42
+ }
43
+ }
44
+ }
45
+ });
46
+ }
47
+ }
48
+ const INTERACTIONS_REQUEST_PROCESSOR = new InteractionsRequestProcessor();
49
+ export {
50
+ INTERACTIONS_REQUEST_PROCESSOR,
51
+ InteractionsRequestProcessor
52
+ };
@@ -34,7 +34,15 @@ import { isLlmAgent } from "../llm_agent.js";
34
34
  import { ReadonlyContext } from "../readonly_context.js";
35
35
  import { BaseLlmRequestProcessor } from "./base_llm_processor.js";
36
36
  class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
37
- /** Handles tool confirmation information to build the LLM request. */
37
+ /**
38
+ * Resumes tool calls that were paused for user confirmation, re-invoking
39
+ * them with the confirmed or denied decision before the next LLM turn.
40
+ *
41
+ * @param invocationContext - The current invocation context, including the
42
+ * session event history used to locate pending confirmation responses.
43
+ * @yields Function response events for tools that have been confirmed and
44
+ * are ready to resume.
45
+ */
38
46
  runAsync(invocationContext) {
39
47
  return __asyncGenerator(this, null, function* () {
40
48
  const agent = invocationContext.agent;
@@ -26,7 +26,13 @@ import { isLlmAgent } from "../llm_agent.js";
26
26
  import { ReadonlyContext } from "../readonly_context.js";
27
27
  import { BaseLlmRequestProcessor } from "./base_llm_processor.js";
28
28
  class ToolFilterRequestProcessor extends BaseLlmRequestProcessor {
29
- /** Filters the set of tools on the request based on plugins. */
29
+ /**
30
+ * Invokes plugin-based tool filtering and updates {@link LlmRequest.allowedTools}
31
+ * with the reduced tool set if any plugin returns a filtered result.
32
+ *
33
+ * @param invocationContext - The current invocation context.
34
+ * @param llmRequest - The request whose allowed tools may be restricted.
35
+ */
30
36
  // eslint-disable-next-line require-yield
31
37
  runAsync(invocationContext, llmRequest) {
32
38
  return __asyncGenerator(this, null, function* () {
@@ -0,0 +1,49 @@
1
+ import {createRequire as topLevelCreateRequire} from 'module';
2
+ const require = topLevelCreateRequire(import.meta.url);
3
+ /**
4
+ * @license
5
+ * Copyright 2026 Google LLC
6
+ * SPDX-License-Identifier: Apache-2.0
7
+ */
8
+ var _a;
9
+ import { isBaseAgent } from "../agents/base_agent.js";
10
+ const VALID_APP_NAME_RE = /^[a-zA-Z][a-zA-Z0-9_-]*$/;
11
+ function validateAppName(name) {
12
+ if (!VALID_APP_NAME_RE.test(name)) {
13
+ throw new Error(
14
+ "Invalid app name '".concat(name, "': must start with a letter and can only consist of letters, digits, underscores, and hyphens.")
15
+ );
16
+ }
17
+ if (name === "user") {
18
+ throw new Error("App name cannot be 'user'; reserved for end-user input.");
19
+ }
20
+ }
21
+ const APP_SIGNATURE_SYMBOL = Symbol.for("google.adk.app");
22
+ function isApp(obj) {
23
+ return typeof obj === "object" && obj !== null && APP_SIGNATURE_SYMBOL in obj && obj[APP_SIGNATURE_SYMBOL] === true;
24
+ }
25
+ _a = APP_SIGNATURE_SYMBOL;
26
+ class App {
27
+ constructor(options) {
28
+ this[_a] = true;
29
+ var _a2, _b, _c, _d;
30
+ validateAppName(options.name);
31
+ if (options.rootAgent === void 0 || options.rootAgent === null) {
32
+ throw new Error("rootAgent must be provided.");
33
+ }
34
+ if (!isBaseAgent(options.rootAgent)) {
35
+ throw new TypeError(
36
+ "rootAgent must be a BaseAgent instance, got ".concat((_c = (_b = (_a2 = options.rootAgent) == null ? void 0 : _a2.constructor) == null ? void 0 : _b.name) != null ? _c : typeof options.rootAgent)
37
+ );
38
+ }
39
+ this.name = options.name;
40
+ this.rootAgent = options.rootAgent;
41
+ this.plugins = (_d = options.plugins) != null ? _d : [];
42
+ this.resumabilityConfig = options.resumabilityConfig;
43
+ }
44
+ }
45
+ export {
46
+ App,
47
+ isApp,
48
+ validateAppName
49
+ };
@@ -0,0 +1,31 @@
1
+ import {createRequire as topLevelCreateRequire} from 'module';
2
+ const require = topLevelCreateRequire(import.meta.url);
3
+ var __defProp = Object.defineProperty;
4
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
7
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
8
+ var __spreadValues = (a, b) => {
9
+ for (var prop in b || (b = {}))
10
+ if (__hasOwnProp.call(b, prop))
11
+ __defNormalProp(a, prop, b[prop]);
12
+ if (__getOwnPropSymbols)
13
+ for (var prop of __getOwnPropSymbols(b)) {
14
+ if (__propIsEnum.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ }
17
+ return a;
18
+ };
19
+ /**
20
+ * @license
21
+ * Copyright 2026 Google LLC
22
+ * SPDX-License-Identifier: Apache-2.0
23
+ */
24
+ function createResumabilityConfig(params = {}) {
25
+ return __spreadValues({
26
+ isResumable: false
27
+ }, params);
28
+ }
29
+ export {
30
+ createResumabilityConfig
31
+ };
@@ -43,7 +43,7 @@ class FileArtifactService {
43
43
  artifact,
44
44
  customMetadata
45
45
  }) {
46
- if (!artifact.inlineData && !artifact.text) {
46
+ if (!artifact.inlineData && !artifact.text && !artifact.fileData) {
47
47
  throw new Error("Artifact must have either inlineData or text content.");
48
48
  }
49
49
  const artifactDir = getArtifactDir(
@@ -61,12 +61,19 @@ class FileArtifactService {
61
61
  const storedFilename = path.basename(artifactDir);
62
62
  const contentPath = path.join(versionDir, storedFilename);
63
63
  let mimeType;
64
+ let fileUri;
64
65
  if (artifact.inlineData) {
65
66
  const data = artifact.inlineData.data || "";
66
67
  await fs.writeFile(contentPath, Buffer.from(data, "base64"));
67
68
  mimeType = artifact.inlineData.mimeType || "application/octet-stream";
68
69
  } else if (artifact.text !== void 0) {
69
70
  await fs.writeFile(contentPath, artifact.text, "utf-8");
71
+ } else {
72
+ fileUri = artifact.fileData.fileUri;
73
+ if (!fileUri) {
74
+ throw new Error("Artifact fileData must have a fileUri.");
75
+ }
76
+ mimeType = artifact.fileData.mimeType;
70
77
  }
71
78
  const canonicalUri = await getCanonicalUri(
72
79
  this.rootDir,
@@ -78,6 +85,7 @@ class FileArtifactService {
78
85
  const metadata = {
79
86
  fileName: filename,
80
87
  mimeType,
88
+ fileUri,
81
89
  version: nextVersion,
82
90
  canonicalUri,
83
91
  customMetadata
@@ -129,6 +137,11 @@ class FileArtifactService {
129
137
  );
130
138
  const metadataPath = path.join(versionDir, "metadata.json");
131
139
  const metadata = await readMetadata(metadataPath);
140
+ if (metadata.fileUri) {
141
+ return {
142
+ fileData: { fileUri: metadata.fileUri, mimeType: metadata.mimeType }
143
+ };
144
+ }
132
145
  const storedFilename = path.basename(artifactDir);
133
146
  let contentPath = path.join(versionDir, storedFilename);
134
147
  if (metadata.canonicalUri) {
@@ -27,12 +27,16 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
27
27
  import { Storage } from "@google-cloud/storage";
28
28
  import { createPartFromBase64, createPartFromText } from "@google/genai";
29
29
  import { logger } from "../utils/logger.js";
30
+ const GCS_FILE_URI_METADATA_KEY = "adkFileUri";
31
+ const GCS_FILE_MIME_TYPE_METADATA_KEY = "adkFileMimeType";
32
+ const GCS_DISPLAY_NAME_METADATA_KEY = "adkDisplayName";
33
+ const GCS_IS_TEXT_METADATA_KEY = "adkIsText";
30
34
  class GcsArtifactService {
31
- constructor(bucket) {
32
- this.bucket = new Storage().bucket(bucket);
35
+ constructor(bucket, options) {
36
+ this.bucket = new Storage(options).bucket(bucket);
33
37
  }
34
38
  async saveArtifact(request) {
35
- if (!request.artifact.inlineData && !request.artifact.text) {
39
+ if (!request.artifact.inlineData && !request.artifact.text && !request.artifact.fileData) {
36
40
  throw new Error("Artifact must have either inlineData or text content.");
37
41
  }
38
42
  const versions = await this.listVersions(request);
@@ -42,24 +46,46 @@ class GcsArtifactService {
42
46
  version
43
47
  }))
44
48
  );
45
- const metadata = request.customMetadata || {};
49
+ const customMetadata = __spreadValues({}, request.customMetadata);
46
50
  if (request.artifact.inlineData) {
51
+ if (request.artifact.inlineData.displayName) {
52
+ customMetadata[GCS_DISPLAY_NAME_METADATA_KEY] = request.artifact.inlineData.displayName;
53
+ }
47
54
  await file.save(
48
55
  Buffer.from(request.artifact.inlineData.data || "", "base64"),
49
56
  {
50
57
  contentType: request.artifact.inlineData.mimeType,
51
- metadata
58
+ metadata: { metadata: customMetadata }
52
59
  }
53
60
  );
54
61
  return version;
62
+ } else if (request.artifact.text !== void 0) {
63
+ await file.save(request.artifact.text, {
64
+ contentType: "text/plain",
65
+ metadata: {
66
+ metadata: __spreadProps(__spreadValues({}, customMetadata), { [GCS_IS_TEXT_METADATA_KEY]: "true" })
67
+ }
68
+ });
69
+ return version;
70
+ } else {
71
+ const fileData = request.artifact.fileData;
72
+ const fileUri = fileData == null ? void 0 : fileData.fileUri;
73
+ if (!fileUri) {
74
+ throw new Error("Artifact fileData must have a fileUri.");
75
+ }
76
+ customMetadata[GCS_FILE_URI_METADATA_KEY] = fileUri;
77
+ if (fileData.mimeType) {
78
+ customMetadata[GCS_FILE_MIME_TYPE_METADATA_KEY] = fileData.mimeType;
79
+ }
80
+ await file.save("", {
81
+ contentType: fileData.mimeType || void 0,
82
+ metadata: { metadata: customMetadata }
83
+ });
84
+ return version;
55
85
  }
56
- await file.save(request.artifact.text, {
57
- contentType: "text/plain",
58
- metadata
59
- });
60
- return version;
61
86
  }
62
87
  async loadArtifact(request) {
88
+ var _a, _b, _c;
63
89
  try {
64
90
  let version = request.version;
65
91
  if (version === void 0) {
@@ -74,11 +100,25 @@ class GcsArtifactService {
74
100
  version
75
101
  }))
76
102
  );
77
- const [[metadata], [rawDataBuffer]] = await Promise.all([
78
- file.getMetadata(),
79
- file.download()
80
- ]);
81
- if (metadata.contentType === "text/plain") {
103
+ const [metadata] = await file.getMetadata();
104
+ const customMeta = (_a = metadata.metadata) != null ? _a : {};
105
+ const fileUri = customMeta[GCS_FILE_URI_METADATA_KEY];
106
+ if (fileUri) {
107
+ const mimeType = (_c = (_b = customMeta[GCS_FILE_MIME_TYPE_METADATA_KEY]) != null ? _b : metadata.contentType) != null ? _c : void 0;
108
+ return { fileData: { fileUri, mimeType } };
109
+ }
110
+ const [rawDataBuffer] = await file.download();
111
+ const displayName = customMeta[GCS_DISPLAY_NAME_METADATA_KEY];
112
+ if (displayName) {
113
+ return {
114
+ inlineData: {
115
+ data: rawDataBuffer.toString("base64"),
116
+ mimeType: metadata.contentType,
117
+ displayName
118
+ }
119
+ };
120
+ }
121
+ if (customMeta[GCS_IS_TEXT_METADATA_KEY] === "true" || metadata.contentType === "text/plain") {
82
122
  return createPartFromText(rawDataBuffer.toString("utf-8"));
83
123
  }
84
124
  return createPartFromBase64(
@@ -20,7 +20,7 @@ class InMemoryArtifactService {
20
20
  artifact,
21
21
  customMetadata
22
22
  }) {
23
- if (!artifact.inlineData && !artifact.text) {
23
+ if (!artifact.inlineData && !artifact.text && !artifact.fileData) {
24
24
  return Promise.reject(
25
25
  new Error("Artifact must have either inlineData or text content.")
26
26
  );
@@ -34,6 +34,10 @@ class InMemoryArtifactService {
34
34
  version,
35
35
  customMetadata
36
36
  };
37
+ if (!artifact.inlineData && artifact.text === void 0) {
38
+ const fileData = artifact.fileData;
39
+ metadata.mimeType = fileData.mimeType;
40
+ }
37
41
  this.artifacts[path].push({ part: artifact, metadata });
38
42
  return Promise.resolve(version);
39
43
  }
@@ -0,0 +1,86 @@
1
+ import {createRequire as topLevelCreateRequire} from 'module';
2
+ const require = topLevelCreateRequire(import.meta.url);
3
+ var __defProp = Object.defineProperty;
4
+ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __propIsEnum = Object.prototype.propertyIsEnumerable;
7
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
8
+ var __spreadValues = (a, b) => {
9
+ for (var prop in b || (b = {}))
10
+ if (__hasOwnProp.call(b, prop))
11
+ __defNormalProp(a, prop, b[prop]);
12
+ if (__getOwnPropSymbols)
13
+ for (var prop of __getOwnPropSymbols(b)) {
14
+ if (__propIsEnum.call(b, prop))
15
+ __defNormalProp(a, prop, b[prop]);
16
+ }
17
+ return a;
18
+ };
19
+ /**
20
+ * @license
21
+ * Copyright 2026 Google LLC
22
+ * SPDX-License-Identifier: Apache-2.0
23
+ */
24
+ class ScopedArtifactService {
25
+ constructor(delegate, appName, userId, sessionId) {
26
+ this.delegate = delegate;
27
+ this.appName = appName;
28
+ this.userId = userId;
29
+ this.sessionId = sessionId;
30
+ }
31
+ async saveArtifact(request) {
32
+ return this.delegate.saveArtifact(__spreadValues({
33
+ appName: this.appName,
34
+ userId: this.userId,
35
+ sessionId: this.sessionId
36
+ }, request));
37
+ }
38
+ async loadArtifact(request) {
39
+ return this.delegate.loadArtifact(__spreadValues({
40
+ appName: this.appName,
41
+ userId: this.userId,
42
+ sessionId: this.sessionId
43
+ }, request));
44
+ }
45
+ async listArtifactKeys() {
46
+ return this.delegate.listArtifactKeys({
47
+ appName: this.appName,
48
+ userId: this.userId,
49
+ sessionId: this.sessionId
50
+ });
51
+ }
52
+ async deleteArtifact(filename) {
53
+ return this.delegate.deleteArtifact({
54
+ appName: this.appName,
55
+ userId: this.userId,
56
+ sessionId: this.sessionId,
57
+ filename
58
+ });
59
+ }
60
+ async listVersions(filename) {
61
+ return this.delegate.listVersions({
62
+ appName: this.appName,
63
+ userId: this.userId,
64
+ sessionId: this.sessionId,
65
+ filename
66
+ });
67
+ }
68
+ async listArtifactVersions(filename) {
69
+ return this.delegate.listArtifactVersions({
70
+ appName: this.appName,
71
+ userId: this.userId,
72
+ sessionId: this.sessionId,
73
+ filename
74
+ });
75
+ }
76
+ async getArtifactVersion(request) {
77
+ return this.delegate.getArtifactVersion(__spreadValues({
78
+ appName: this.appName,
79
+ userId: this.userId,
80
+ sessionId: this.sessionId
81
+ }, request));
82
+ }
83
+ }
84
+ export {
85
+ ScopedArtifactService
86
+ };
@@ -0,0 +1,7 @@
1
+ import {createRequire as topLevelCreateRequire} from 'module';
2
+ const require = topLevelCreateRequire(import.meta.url);
3
+ /**
4
+ * @license
5
+ * Copyright 2026 Google LLC
6
+ * SPDX-License-Identifier: Apache-2.0
7
+ */
@@ -33,6 +33,7 @@ import {
33
33
  getFunctionResponses
34
34
  } from "../events/event.js";
35
35
  import { State } from "../sessions/state.js";
36
+ import { camelCaseKeys } from "../utils/case_utils.js";
36
37
  import { AuthHandler } from "./auth_handler.js";
37
38
  const TOOLSET_AUTH_CREDENTIAL_ID_PREFIX = "_adk_toolset_auth_";
38
39
  async function storeAuthAndCollectResumeTargets(events, authFcIds, authResponses, state) {
@@ -41,17 +42,15 @@ async function storeAuthAndCollectResumeTargets(events, authFcIds, authResponses
41
42
  const eventFunctionCalls = getFunctionCalls(event);
42
43
  for (const functionCall of eventFunctionCalls) {
43
44
  if (functionCall.id && authFcIds.has(functionCall.id) && functionCall.name === REQUEST_EUC_FUNCTION_CALL_NAME) {
44
- const args = functionCall.args;
45
- if (args && args.authConfig) {
46
- requestedAuthConfigById[functionCall.id] = args.authConfig;
45
+ const args = camelCaseKeys(functionCall.args);
46
+ const authConfig = args == null ? void 0 : args.authConfig;
47
+ if (authConfig) {
48
+ requestedAuthConfigById[functionCall.id] = authConfig;
47
49
  }
48
50
  }
49
51
  }
50
52
  }
51
53
  for (const fcId of authFcIds) {
52
- if (!(fcId in authResponses)) {
53
- continue;
54
- }
55
54
  const authConfig = authResponses[fcId];
56
55
  const requestedAuthConfig = requestedAuthConfigById[fcId];
57
56
  if (requestedAuthConfig && requestedAuthConfig.credentialKey) {
@@ -69,12 +68,15 @@ async function storeAuthAndCollectResumeTargets(events, authFcIds, authResponses
69
68
  const eventFunctionCalls = getFunctionCalls(event);
70
69
  for (const functionCall of eventFunctionCalls) {
71
70
  if (functionCall.id === fcId && functionCall.name === REQUEST_EUC_FUNCTION_CALL_NAME) {
72
- const args = functionCall.args;
73
- if (args && args.functionCallId) {
74
- if (args.functionCallId.startsWith(TOOLSET_AUTH_CREDENTIAL_ID_PREFIX)) {
71
+ const args = camelCaseKeys(
72
+ functionCall.args
73
+ );
74
+ const functionCallId = args == null ? void 0 : args.functionCallId;
75
+ if (functionCallId) {
76
+ if (functionCallId.startsWith(TOOLSET_AUTH_CREDENTIAL_ID_PREFIX)) {
75
77
  continue;
76
78
  }
77
- toolsToResume.add(args.functionCallId);
79
+ toolsToResume.add(functionCallId);
78
80
  }
79
81
  }
80
82
  }
@@ -55,7 +55,11 @@ class OAuth2DiscoveryManager {
55
55
  method: "GET",
56
56
  headers: {
57
57
  Accept: "application/json"
58
- }
58
+ },
59
+ // Never follow redirects: validateDiscoveryUrl only checks the
60
+ // initial URL, so following a 3xx would let a validated host
61
+ // redirect discovery to a private/cloud-metadata address (CWE-918).
62
+ redirect: "error"
59
63
  });
60
64
  if (!response.ok) {
61
65
  continue;
@@ -103,7 +107,11 @@ class OAuth2DiscoveryManager {
103
107
  method: "GET",
104
108
  headers: {
105
109
  Accept: "application/json"
106
- }
110
+ },
111
+ // Never follow redirects: validateDiscoveryUrl only checks the
112
+ // initial URL, so following a 3xx would let a validated host
113
+ // redirect discovery to a private/cloud-metadata address (CWE-918).
114
+ redirect: "error"
107
115
  });
108
116
  if (!response.ok) {
109
117
  return void 0;
@@ -143,7 +151,7 @@ function validateDiscoveryUrl(urlStr) {
143
151
  return false;
144
152
  }
145
153
  const host = normaliseHostname(url.hostname.toLowerCase());
146
- if (host === "localhost" || host === "127.0.0.1" || host === "[::1]" || host === "0.0.0.0" || host.startsWith("10.") || host.startsWith("192.168.") || host.startsWith("169.254.")) {
154
+ if (host === "localhost" || host === "metadata.google.internal" || host === "metadata.goog" || host.startsWith("127.") || host === "[::1]" || host === "[::]" || host === "0.0.0.0" || host.startsWith("10.") || host.startsWith("192.168.") || host.startsWith("169.254.")) {
147
155
  logger.warn("Unsafe host for discovery URL: ".concat(host));
148
156
  return false;
149
157
  }
@@ -176,5 +184,7 @@ function validateDiscoveryUrl(urlStr) {
176
184
  export {
177
185
  AuthorizationServerMetadataSchema,
178
186
  OAuth2DiscoveryManager,
179
- ProtectedResourceMetadataSchema
187
+ ProtectedResourceMetadataSchema,
188
+ normaliseHostname,
189
+ validateDiscoveryUrl
180
190
  };
@@ -6,6 +6,7 @@ const require = topLevelCreateRequire(import.meta.url);
6
6
  * SPDX-License-Identifier: Apache-2.0
7
7
  */
8
8
  import { logger } from "../../utils/logger.js";
9
+ import { validateDiscoveryUrl } from "./oauth2_discovery.js";
9
10
  function getTokenEndpoint(authScheme) {
10
11
  if (authScheme.type === "openIdConnect" && authScheme.tokenEndpoint) {
11
12
  return authScheme.tokenEndpoint;
@@ -20,13 +21,23 @@ function getTokenEndpoint(authScheme) {
20
21
  return void 0;
21
22
  }
22
23
  async function fetchOAuth2Tokens(endpoint, body) {
24
+ if (!validateDiscoveryUrl(endpoint)) {
25
+ throw new Error(
26
+ "SSRF protection: OAuth2 token endpoint '".concat(endpoint, "' is not allowed. Must use HTTPS and must not target private/loopback/cloud-metadata addresses.")
27
+ );
28
+ }
23
29
  try {
24
30
  const response = await fetch(endpoint, {
25
31
  method: "POST",
26
32
  headers: {
27
33
  "Content-Type": "application/x-www-form-urlencoded"
28
34
  },
29
- body: body.toString()
35
+ body: body.toString(),
36
+ // Never follow redirects: the SSRF blocklist only validates `endpoint`,
37
+ // so a validated host that responds with a 3xx could otherwise redirect
38
+ // this credential-bearing POST (client_secret/refresh_token) to a
39
+ // private/cloud-metadata address (CWE-918).
40
+ redirect: "error"
30
41
  });
31
42
  if (!response.ok) {
32
43
  throw new Error("Token request failed with status ".concat(response.status));
@@ -70,7 +70,7 @@ class CodeExecutorContext {
70
70
  * @return A list of input files in the code executor context.
71
71
  */
72
72
  getInputFiles() {
73
- if (!(INPUT_FILE_KEY in this.sessionState)) {
73
+ if (!this.sessionState.has(INPUT_FILE_KEY)) {
74
74
  return [];
75
75
  }
76
76
  return this.sessionState.get(INPUT_FILE_KEY);
@@ -80,13 +80,13 @@ class CodeExecutorContext {
80
80
  * @param inputFiles The input files to add to the session state.
81
81
  */
82
82
  addInputFiles(inputFiles) {
83
- if (!(INPUT_FILE_KEY in this.sessionState)) {
83
+ if (!this.sessionState.has(INPUT_FILE_KEY)) {
84
84
  this.sessionState.set(INPUT_FILE_KEY, []);
85
85
  }
86
86
  this.sessionState.get(INPUT_FILE_KEY).push(...inputFiles);
87
87
  }
88
88
  clearInputFiles() {
89
- if (INPUT_FILE_KEY in this.sessionState) {
89
+ if (this.sessionState.has(INPUT_FILE_KEY)) {
90
90
  this.sessionState.set(INPUT_FILE_KEY, []);
91
91
  }
92
92
  if (PROCESSED_FILE_NAMES_KEY in this.context) {
@@ -99,7 +99,7 @@ class CodeExecutorContext {
99
99
  * @return The error count for the given invocation ID.
100
100
  */
101
101
  getErrorCount(invocationId) {
102
- if (!(ERROR_COUNT_KEY in this.sessionState)) {
102
+ if (!this.sessionState.has(ERROR_COUNT_KEY)) {
103
103
  return 0;
104
104
  }
105
105
  return this.sessionState.get(ERROR_COUNT_KEY)[invocationId] || 0;
@@ -109,7 +109,7 @@ class CodeExecutorContext {
109
109
  * @param invocationId The invocation ID to increment the error count for.
110
110
  */
111
111
  incrementErrorCount(invocationId) {
112
- if (!(ERROR_COUNT_KEY in this.sessionState)) {
112
+ if (!this.sessionState.has(ERROR_COUNT_KEY)) {
113
113
  this.sessionState.set(ERROR_COUNT_KEY, {});
114
114
  }
115
115
  this.sessionState.get(ERROR_COUNT_KEY)[invocationId] = this.getErrorCount(invocationId) + 1;
@@ -119,7 +119,7 @@ class CodeExecutorContext {
119
119
  * @param invocationId The invocation ID to reset the error count for.
120
120
  */
121
121
  resetErrorCount(invocationId) {
122
- if (!(ERROR_COUNT_KEY in this.sessionState)) {
122
+ if (!this.sessionState.has(ERROR_COUNT_KEY)) {
123
123
  return;
124
124
  }
125
125
  const errorCounts = this.sessionState.get(ERROR_COUNT_KEY);
@@ -141,7 +141,7 @@ class CodeExecutorContext {
141
141
  resultStdout,
142
142
  resultStderr
143
143
  }) {
144
- if (!(CODE_EXECUTION_RESULTS_KEY in this.sessionState)) {
144
+ if (!this.sessionState.has(CODE_EXECUTION_RESULTS_KEY)) {
145
145
  this.sessionState.set(CODE_EXECUTION_RESULTS_KEY, {});
146
146
  }
147
147
  const codeExecutionResults = this.sessionState.get(