@google/gemini-cli 0.31.0 → 0.32.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 (327) hide show
  1. package/dist/package.json +2 -2
  2. package/dist/src/commands/extensions/examples/policies/README.md +41 -0
  3. package/dist/src/commands/extensions/examples/policies/gemini-extension.json +5 -0
  4. package/dist/src/commands/extensions/examples/policies/policies/policies.toml +28 -0
  5. package/dist/src/commands/extensions/link.test.js +5 -21
  6. package/dist/src/commands/extensions/link.test.js.map +1 -1
  7. package/dist/src/commands/extensions/list.test.js +10 -24
  8. package/dist/src/commands/extensions/list.test.js.map +1 -1
  9. package/dist/src/commands/mcp/list.js +32 -14
  10. package/dist/src/commands/mcp/list.js.map +1 -1
  11. package/dist/src/commands/mcp/list.test.js +22 -1
  12. package/dist/src/commands/mcp/list.test.js.map +1 -1
  13. package/dist/src/commands/skills/disable.test.js +4 -7
  14. package/dist/src/commands/skills/disable.test.js.map +1 -1
  15. package/dist/src/commands/skills/enable.test.js +4 -7
  16. package/dist/src/commands/skills/enable.test.js.map +1 -1
  17. package/dist/src/commands/skills/install.test.js +12 -9
  18. package/dist/src/commands/skills/install.test.js.map +1 -1
  19. package/dist/src/commands/skills/link.test.js +5 -2
  20. package/dist/src/commands/skills/link.test.js.map +1 -1
  21. package/dist/src/commands/skills/list.test.js +16 -29
  22. package/dist/src/commands/skills/list.test.js.map +1 -1
  23. package/dist/src/commands/skills/uninstall.test.js +9 -6
  24. package/dist/src/commands/skills/uninstall.test.js.map +1 -1
  25. package/dist/src/config/config.js +3 -0
  26. package/dist/src/config/config.js.map +1 -1
  27. package/dist/src/config/config.test.js +55 -0
  28. package/dist/src/config/config.test.js.map +1 -1
  29. package/dist/src/config/extension-manager.d.ts +8 -1
  30. package/dist/src/config/extension-manager.js +88 -23
  31. package/dist/src/config/extension-manager.js.map +1 -1
  32. package/dist/src/config/extension-manager.test.d.ts +6 -0
  33. package/dist/src/config/extension-manager.test.js +138 -0
  34. package/dist/src/config/extension-manager.test.js.map +1 -0
  35. package/dist/src/config/extension.test.js +93 -4
  36. package/dist/src/config/extension.test.js.map +1 -1
  37. package/dist/src/config/extensions/consent.test.js +35 -43
  38. package/dist/src/config/extensions/consent.test.js.map +1 -1
  39. package/dist/src/config/keyBindings.js +1 -1
  40. package/dist/src/config/keyBindings.js.map +1 -1
  41. package/dist/src/config/policy-engine.integration.test.js +12 -12
  42. package/dist/src/config/settingsSchema.d.ts +98 -3
  43. package/dist/src/config/settingsSchema.js +92 -1
  44. package/dist/src/config/settingsSchema.js.map +1 -1
  45. package/dist/src/config/settingsSchema.test.js +49 -0
  46. package/dist/src/config/settingsSchema.test.js.map +1 -1
  47. package/dist/src/gemini.js +7 -8
  48. package/dist/src/gemini.js.map +1 -1
  49. package/dist/src/gemini.test.js +5 -1
  50. package/dist/src/gemini.test.js.map +1 -1
  51. package/dist/src/generated/git-commit.d.ts +2 -2
  52. package/dist/src/generated/git-commit.js +2 -2
  53. package/dist/src/test-utils/AppRig.d.ts +26 -0
  54. package/dist/src/test-utils/AppRig.js +128 -6
  55. package/dist/src/test-utils/AppRig.js.map +1 -1
  56. package/dist/src/test-utils/customMatchers.d.ts +25 -5
  57. package/dist/src/test-utils/customMatchers.js +46 -0
  58. package/dist/src/test-utils/customMatchers.js.map +1 -1
  59. package/dist/src/test-utils/mockConfig.js +4 -0
  60. package/dist/src/test-utils/mockConfig.js.map +1 -1
  61. package/dist/src/test-utils/mockDebugLogger.d.ts +35 -0
  62. package/dist/src/test-utils/mockDebugLogger.js +67 -0
  63. package/dist/src/test-utils/mockDebugLogger.js.map +1 -0
  64. package/dist/src/test-utils/render.d.ts +13 -0
  65. package/dist/src/test-utils/render.js +48 -8
  66. package/dist/src/test-utils/render.js.map +1 -1
  67. package/dist/src/test-utils/svg.d.ts +7 -0
  68. package/dist/src/test-utils/svg.js +163 -0
  69. package/dist/src/test-utils/svg.js.map +1 -0
  70. package/dist/src/ui/AppContainer.js +48 -66
  71. package/dist/src/ui/AppContainer.js.map +1 -1
  72. package/dist/src/ui/AppContainer.test.js +89 -0
  73. package/dist/src/ui/AppContainer.test.js.map +1 -1
  74. package/dist/src/ui/commands/mcpCommand.js +17 -3
  75. package/dist/src/ui/commands/mcpCommand.js.map +1 -1
  76. package/dist/src/ui/commands/mcpCommand.test.js +10 -3
  77. package/dist/src/ui/commands/mcpCommand.test.js.map +1 -1
  78. package/dist/src/ui/commands/setupGithubCommand.js +2 -0
  79. package/dist/src/ui/commands/setupGithubCommand.js.map +1 -1
  80. package/dist/src/ui/commands/statsCommand.js +10 -4
  81. package/dist/src/ui/commands/statsCommand.js.map +1 -1
  82. package/dist/src/ui/commands/statsCommand.test.js +12 -3
  83. package/dist/src/ui/commands/statsCommand.test.js.map +1 -1
  84. package/dist/src/ui/components/AnsiOutput.test.js +3 -3
  85. package/dist/src/ui/components/AnsiOutput.test.js.map +1 -1
  86. package/dist/src/ui/components/AskUserDialog.d.ts +4 -0
  87. package/dist/src/ui/components/AskUserDialog.js +5 -5
  88. package/dist/src/ui/components/AskUserDialog.js.map +1 -1
  89. package/dist/src/ui/components/AskUserDialog.test.js +6 -7
  90. package/dist/src/ui/components/AskUserDialog.test.js.map +1 -1
  91. package/dist/src/ui/components/Composer.js +17 -6
  92. package/dist/src/ui/components/Composer.js.map +1 -1
  93. package/dist/src/ui/components/Composer.test.js +47 -6
  94. package/dist/src/ui/components/Composer.test.js.map +1 -1
  95. package/dist/src/ui/components/ConfigInitDisplay.js +1 -1
  96. package/dist/src/ui/components/ConfigInitDisplay.js.map +1 -1
  97. package/dist/src/ui/components/ConfigInitDisplay.test.js +6 -6
  98. package/dist/src/ui/components/ConfigInitDisplay.test.js.map +1 -1
  99. package/dist/src/ui/components/DetailedMessagesDisplay.js +6 -1
  100. package/dist/src/ui/components/DetailedMessagesDisplay.js.map +1 -1
  101. package/dist/src/ui/components/DetailedMessagesDisplay.test.js +43 -4
  102. package/dist/src/ui/components/DetailedMessagesDisplay.test.js.map +1 -1
  103. package/dist/src/ui/components/DialogManager.js +9 -1
  104. package/dist/src/ui/components/DialogManager.js.map +1 -1
  105. package/dist/src/ui/components/DialogManager.test.js +4 -0
  106. package/dist/src/ui/components/DialogManager.test.js.map +1 -1
  107. package/dist/src/ui/components/EmptyWalletDialog.d.ts +22 -0
  108. package/dist/src/ui/components/EmptyWalletDialog.js +33 -0
  109. package/dist/src/ui/components/EmptyWalletDialog.js.map +1 -0
  110. package/dist/src/ui/components/EmptyWalletDialog.test.d.ts +6 -0
  111. package/dist/src/ui/components/EmptyWalletDialog.test.js +127 -0
  112. package/dist/src/ui/components/EmptyWalletDialog.test.js.map +1 -0
  113. package/dist/src/ui/components/ExitPlanModeDialog.d.ts +2 -1
  114. package/dist/src/ui/components/ExitPlanModeDialog.js +34 -7
  115. package/dist/src/ui/components/ExitPlanModeDialog.js.map +1 -1
  116. package/dist/src/ui/components/ExitPlanModeDialog.test.js +31 -2
  117. package/dist/src/ui/components/ExitPlanModeDialog.test.js.map +1 -1
  118. package/dist/src/ui/components/FolderTrustDialog.test.js +1 -1
  119. package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
  120. package/dist/src/ui/components/Footer.js +3 -1
  121. package/dist/src/ui/components/Footer.js.map +1 -1
  122. package/dist/src/ui/components/Footer.test.js +63 -1
  123. package/dist/src/ui/components/Footer.test.js.map +1 -1
  124. package/dist/src/ui/components/GeminiRespondingSpinner.d.ts +0 -5
  125. package/dist/src/ui/components/GeminiRespondingSpinner.js +1 -32
  126. package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
  127. package/dist/src/ui/components/GeminiRespondingSpinner.test.js +5 -10
  128. package/dist/src/ui/components/GeminiRespondingSpinner.test.js.map +1 -1
  129. package/dist/src/ui/components/GeminiSpinner.d.ts +13 -0
  130. package/dist/src/ui/components/GeminiSpinner.js +35 -0
  131. package/dist/src/ui/components/GeminiSpinner.js.map +1 -0
  132. package/dist/src/ui/components/HistoryItemDisplay.js +1 -1
  133. package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
  134. package/dist/src/ui/components/InputPrompt.js +31 -3
  135. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  136. package/dist/src/ui/components/InputPrompt.test.js +82 -18
  137. package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
  138. package/dist/src/ui/components/OverageMenuDialog.d.ts +22 -0
  139. package/dist/src/ui/components/OverageMenuDialog.js +32 -0
  140. package/dist/src/ui/components/OverageMenuDialog.js.map +1 -0
  141. package/dist/src/ui/components/OverageMenuDialog.test.d.ts +6 -0
  142. package/dist/src/ui/components/OverageMenuDialog.test.js +129 -0
  143. package/dist/src/ui/components/OverageMenuDialog.test.js.map +1 -0
  144. package/dist/src/ui/components/ProQuotaDialog.d.ts +3 -1
  145. package/dist/src/ui/components/ProQuotaDialog.js +11 -6
  146. package/dist/src/ui/components/ProQuotaDialog.js.map +1 -1
  147. package/dist/src/ui/components/ProQuotaDialog.test.js +27 -14
  148. package/dist/src/ui/components/ProQuotaDialog.test.js.map +1 -1
  149. package/dist/src/ui/components/SettingsDialog.test.js +9 -11
  150. package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
  151. package/dist/src/ui/components/StatsDisplay.d.ts +1 -0
  152. package/dist/src/ui/components/StatsDisplay.js +2 -2
  153. package/dist/src/ui/components/StatsDisplay.js.map +1 -1
  154. package/dist/src/ui/components/Table.test.js +23 -4
  155. package/dist/src/ui/components/Table.test.js.map +1 -1
  156. package/dist/src/ui/components/ToastDisplay.js +1 -1
  157. package/dist/src/ui/components/ToastDisplay.js.map +1 -1
  158. package/dist/src/ui/components/ToastDisplay.test.js +2 -2
  159. package/dist/src/ui/components/ToastDisplay.test.js.map +1 -1
  160. package/dist/src/ui/components/ToolConfirmationQueue.js +3 -1
  161. package/dist/src/ui/components/ToolConfirmationQueue.js.map +1 -1
  162. package/dist/src/ui/components/ToolConfirmationQueue.test.js +3 -2
  163. package/dist/src/ui/components/ToolConfirmationQueue.test.js.map +1 -1
  164. package/dist/src/ui/components/messages/RedirectionConfirmation.test.js +1 -1
  165. package/dist/src/ui/components/messages/RedirectionConfirmation.test.js.map +1 -1
  166. package/dist/src/ui/components/messages/ToolConfirmationMessage.d.ts +2 -1
  167. package/dist/src/ui/components/messages/ToolConfirmationMessage.js +3 -2
  168. package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
  169. package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +17 -17
  170. package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
  171. package/dist/src/ui/components/messages/ToolGroupMessage.js +17 -7
  172. package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
  173. package/dist/src/ui/components/messages/ToolGroupMessage.test.js +88 -5
  174. package/dist/src/ui/components/messages/ToolGroupMessage.test.js.map +1 -1
  175. package/dist/src/ui/components/messages/ToolOverflowConsistencyChecks.test.js +1 -1
  176. package/dist/src/ui/components/messages/ToolOverflowConsistencyChecks.test.js.map +1 -1
  177. package/dist/src/ui/components/messages/ToolResultDisplayOverflow.test.js +11 -4
  178. package/dist/src/ui/components/messages/ToolResultDisplayOverflow.test.js.map +1 -1
  179. package/dist/src/ui/components/shared/DialogFooter.d.ts +2 -0
  180. package/dist/src/ui/components/shared/DialogFooter.js +2 -1
  181. package/dist/src/ui/components/shared/DialogFooter.js.map +1 -1
  182. package/dist/src/ui/components/shared/ExpandableText.test.js +21 -16
  183. package/dist/src/ui/components/shared/ExpandableText.test.js.map +1 -1
  184. package/dist/src/ui/components/shared/MaxSizedBox.js +10 -1
  185. package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
  186. package/dist/src/ui/components/shared/MaxSizedBox.test.js +8 -8
  187. package/dist/src/ui/components/shared/MaxSizedBox.test.js.map +1 -1
  188. package/dist/src/ui/components/shared/Scrollable.d.ts +1 -1
  189. package/dist/src/ui/components/shared/Scrollable.js +76 -43
  190. package/dist/src/ui/components/shared/Scrollable.js.map +1 -1
  191. package/dist/src/ui/components/shared/Scrollable.test.js +15 -20
  192. package/dist/src/ui/components/shared/Scrollable.test.js.map +1 -1
  193. package/dist/src/ui/components/shared/ScrollableList.js +14 -9
  194. package/dist/src/ui/components/shared/ScrollableList.js.map +1 -1
  195. package/dist/src/ui/components/shared/ScrollableList.test.js +153 -0
  196. package/dist/src/ui/components/shared/ScrollableList.test.js.map +1 -1
  197. package/dist/src/ui/components/shared/VirtualizedList.js +133 -88
  198. package/dist/src/ui/components/shared/VirtualizedList.js.map +1 -1
  199. package/dist/src/ui/components/shared/VirtualizedList.test.js +6 -3
  200. package/dist/src/ui/components/shared/VirtualizedList.test.js.map +1 -1
  201. package/dist/src/ui/components/shared/text-buffer.js +3 -30
  202. package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
  203. package/dist/src/ui/components/views/McpStatus.d.ts +1 -0
  204. package/dist/src/ui/components/views/McpStatus.js +2 -2
  205. package/dist/src/ui/components/views/McpStatus.js.map +1 -1
  206. package/dist/src/ui/components/views/McpStatus.test.js +7 -0
  207. package/dist/src/ui/components/views/McpStatus.test.js.map +1 -1
  208. package/dist/src/ui/contexts/UIActionsContext.d.ts +3 -0
  209. package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
  210. package/dist/src/ui/contexts/UIStateContext.d.ts +24 -1
  211. package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
  212. package/dist/src/ui/hooks/atCommandProcessor.js +4 -0
  213. package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
  214. package/dist/src/ui/hooks/creditsFlowHandler.d.ts +35 -0
  215. package/dist/src/ui/hooks/creditsFlowHandler.js +144 -0
  216. package/dist/src/ui/hooks/creditsFlowHandler.js.map +1 -0
  217. package/dist/src/ui/hooks/creditsFlowHandler.test.d.ts +6 -0
  218. package/dist/src/ui/hooks/creditsFlowHandler.test.js +180 -0
  219. package/dist/src/ui/hooks/creditsFlowHandler.test.js.map +1 -0
  220. package/dist/src/ui/hooks/shell-completions/gitProvider.d.ts +7 -0
  221. package/dist/src/ui/hooks/shell-completions/gitProvider.js +73 -0
  222. package/dist/src/ui/hooks/shell-completions/gitProvider.js.map +1 -0
  223. package/dist/src/ui/hooks/shell-completions/gitProvider.test.d.ts +6 -0
  224. package/dist/src/ui/hooks/shell-completions/gitProvider.test.js +73 -0
  225. package/dist/src/ui/hooks/shell-completions/gitProvider.test.js.map +1 -0
  226. package/dist/src/ui/hooks/shell-completions/index.d.ts +7 -0
  227. package/dist/src/ui/hooks/shell-completions/index.js +16 -0
  228. package/dist/src/ui/hooks/shell-completions/index.js.map +1 -0
  229. package/dist/src/ui/hooks/shell-completions/npmProvider.d.ts +7 -0
  230. package/dist/src/ui/hooks/shell-completions/npmProvider.js +67 -0
  231. package/dist/src/ui/hooks/shell-completions/npmProvider.js.map +1 -0
  232. package/dist/src/ui/hooks/shell-completions/npmProvider.test.d.ts +6 -0
  233. package/dist/src/ui/hooks/shell-completions/npmProvider.test.js +69 -0
  234. package/dist/src/ui/hooks/shell-completions/npmProvider.test.js.map +1 -0
  235. package/dist/src/ui/hooks/shell-completions/types.d.ts +16 -0
  236. package/dist/src/ui/hooks/shell-completions/types.js +7 -0
  237. package/dist/src/ui/hooks/shell-completions/types.js.map +1 -0
  238. package/dist/src/ui/hooks/shellCommandProcessor.js +1 -0
  239. package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
  240. package/dist/src/ui/hooks/slashCommandProcessor.js +1 -0
  241. package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
  242. package/dist/src/ui/hooks/toolMapping.js +1 -0
  243. package/dist/src/ui/hooks/toolMapping.js.map +1 -1
  244. package/dist/src/ui/hooks/toolMapping.test.js +25 -0
  245. package/dist/src/ui/hooks/toolMapping.test.js.map +1 -1
  246. package/dist/src/ui/hooks/useAlternateBuffer.d.ts +2 -2
  247. package/dist/src/ui/hooks/useAlternateBuffer.js +5 -4
  248. package/dist/src/ui/hooks/useAlternateBuffer.js.map +1 -1
  249. package/dist/src/ui/hooks/useAlternateBuffer.test.d.ts +6 -0
  250. package/dist/src/ui/hooks/useAlternateBuffer.test.js +57 -0
  251. package/dist/src/ui/hooks/useAlternateBuffer.test.js.map +1 -0
  252. package/dist/src/ui/hooks/useCommandCompletion.d.ts +2 -1
  253. package/dist/src/ui/hooks/useCommandCompletion.js +37 -5
  254. package/dist/src/ui/hooks/useCommandCompletion.js.map +1 -1
  255. package/dist/src/ui/hooks/useCommandCompletion.test.js +23 -1
  256. package/dist/src/ui/hooks/useCommandCompletion.test.js.map +1 -1
  257. package/dist/src/ui/hooks/useGeminiStream.js +83 -5
  258. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  259. package/dist/src/ui/hooks/useGeminiStream.test.js +110 -4
  260. package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
  261. package/dist/src/ui/hooks/useLoadingIndicator.d.ts +2 -1
  262. package/dist/src/ui/hooks/useLoadingIndicator.js +7 -2
  263. package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
  264. package/dist/src/ui/hooks/useLoadingIndicator.test.js +25 -4
  265. package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
  266. package/dist/src/ui/hooks/usePhraseCycler.test.js.map +1 -1
  267. package/dist/src/ui/hooks/usePrivacySettings.js +9 -3
  268. package/dist/src/ui/hooks/usePrivacySettings.js.map +1 -1
  269. package/dist/src/ui/hooks/useQuotaAndFallback.d.ts +11 -3
  270. package/dist/src/ui/hooks/useQuotaAndFallback.js +84 -12
  271. package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
  272. package/dist/src/ui/hooks/useQuotaAndFallback.test.js +278 -16
  273. package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
  274. package/dist/src/ui/hooks/useShellCompletion.d.ts +49 -0
  275. package/dist/src/ui/hooks/useShellCompletion.js +489 -0
  276. package/dist/src/ui/hooks/useShellCompletion.js.map +1 -0
  277. package/dist/src/ui/hooks/useShellCompletion.test.d.ts +6 -0
  278. package/dist/src/ui/hooks/useShellCompletion.test.js +354 -0
  279. package/dist/src/ui/hooks/useShellCompletion.test.js.map +1 -0
  280. package/dist/src/ui/hooks/useTimedMessage.d.ts +1 -1
  281. package/dist/src/ui/hooks/useTimedMessage.js +5 -3
  282. package/dist/src/ui/hooks/useTimedMessage.js.map +1 -1
  283. package/dist/src/ui/hooks/useToolScheduler.js +5 -0
  284. package/dist/src/ui/hooks/useToolScheduler.js.map +1 -1
  285. package/dist/src/ui/hooks/useToolScheduler.test.js +28 -19
  286. package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
  287. package/dist/src/ui/types.d.ts +3 -0
  288. package/dist/src/ui/types.js.map +1 -1
  289. package/dist/src/ui/utils/InlineMarkdownRenderer.js +4 -86
  290. package/dist/src/ui/utils/InlineMarkdownRenderer.js.map +1 -1
  291. package/dist/src/ui/utils/MarkdownDisplay.test.js +2 -2
  292. package/dist/src/ui/utils/MarkdownDisplay.test.js.map +1 -1
  293. package/dist/src/ui/utils/TableRenderer.js +18 -12
  294. package/dist/src/ui/utils/TableRenderer.js.map +1 -1
  295. package/dist/src/ui/utils/TableRenderer.test.js +152 -22
  296. package/dist/src/ui/utils/TableRenderer.test.js.map +1 -1
  297. package/dist/src/ui/utils/borderStyles.js +4 -1
  298. package/dist/src/ui/utils/borderStyles.js.map +1 -1
  299. package/dist/src/ui/utils/borderStyles.test.d.ts +6 -0
  300. package/dist/src/ui/utils/borderStyles.test.js +141 -0
  301. package/dist/src/ui/utils/borderStyles.test.js.map +1 -0
  302. package/dist/src/ui/utils/editorUtils.d.ts +17 -0
  303. package/dist/src/ui/utils/editorUtils.js +104 -0
  304. package/dist/src/ui/utils/editorUtils.js.map +1 -0
  305. package/dist/src/ui/utils/markdownParsingUtils.d.ts +10 -0
  306. package/dist/src/ui/utils/markdownParsingUtils.js +150 -0
  307. package/dist/src/ui/utils/markdownParsingUtils.js.map +1 -0
  308. package/dist/src/ui/utils/markdownParsingUtils.test.d.ts +6 -0
  309. package/dist/src/ui/utils/markdownParsingUtils.test.js +163 -0
  310. package/dist/src/ui/utils/markdownParsingUtils.test.js.map +1 -0
  311. package/dist/src/ui/utils/ui-sizing.d.ts +2 -2
  312. package/dist/src/ui/utils/ui-sizing.js +2 -3
  313. package/dist/src/ui/utils/ui-sizing.js.map +1 -1
  314. package/dist/src/ui/utils/ui-sizing.test.js +5 -19
  315. package/dist/src/ui/utils/ui-sizing.test.js.map +1 -1
  316. package/dist/src/utils/cleanup.d.ts +2 -0
  317. package/dist/src/utils/cleanup.js +51 -1
  318. package/dist/src/utils/cleanup.js.map +1 -1
  319. package/dist/src/utils/cleanup.test.js +130 -2
  320. package/dist/src/utils/cleanup.test.js.map +1 -1
  321. package/dist/src/zed-integration/zedIntegration.d.ts +2 -1
  322. package/dist/src/zed-integration/zedIntegration.js +35 -11
  323. package/dist/src/zed-integration/zedIntegration.js.map +1 -1
  324. package/dist/src/zed-integration/zedIntegration.test.js +17 -1
  325. package/dist/src/zed-integration/zedIntegration.test.js.map +1 -1
  326. package/dist/tsconfig.tsbuildinfo +1 -1
  327. package/package.json +3 -3
@@ -3,6 +3,9 @@ import { useCallback, useEffect, useId, useRef, useState } from 'react';
3
3
  import { Box, Text, ResizeObserver } from 'ink';
4
4
  import { theme } from '../../semantic-colors.js';
5
5
  import { useOverflowActions } from '../../contexts/OverflowContext.js';
6
+ import { isNarrowWidth } from '../../utils/isNarrowWidth.js';
7
+ import { Command } from '../../../config/keyBindings.js';
8
+ import { formatCommand } from '../../utils/keybindingUtils.js';
6
9
  /**
7
10
  * Minimum height for the MaxSizedBox component.
8
11
  * This ensures there is room for at least one line of content as well as the
@@ -47,6 +50,8 @@ export const MaxSizedBox = ({ children, maxWidth, maxHeight, overflowDirection =
47
50
  ? Math.max(0, contentHeight - visibleContentHeight)
48
51
  : 0;
49
52
  const totalHiddenLines = hiddenLinesCount + additionalHiddenLinesCount;
53
+ const isNarrow = maxWidth !== undefined && isNarrowWidth(maxWidth);
54
+ const showMoreKey = formatCommand(Command.SHOW_MORE_LINES);
50
55
  useEffect(() => {
51
56
  if (totalHiddenLines > 0) {
52
57
  addOverflowingId?.(id);
@@ -62,6 +67,10 @@ export const MaxSizedBox = ({ children, maxWidth, maxHeight, overflowDirection =
62
67
  return (_jsx(Box, { flexDirection: "column", width: maxWidth, children: children }));
63
68
  }
64
69
  const offset = hiddenLinesCount > 0 && overflowDirection === 'top' ? -hiddenLinesCount : 0;
65
- return (_jsxs(Box, { flexDirection: "column", width: maxWidth, maxHeight: effectiveMaxHeight, flexShrink: 0, children: [totalHiddenLines > 0 && overflowDirection === 'top' && (_jsxs(Text, { color: theme.text.secondary, wrap: "truncate", children: ["... first ", totalHiddenLines, " line", totalHiddenLines === 1 ? '' : 's', ' ', "hidden ..."] })), _jsx(Box, { flexDirection: "column", overflow: "hidden", flexGrow: 0, maxHeight: isOverflowing ? visibleContentHeight : undefined, children: _jsx(Box, { flexDirection: "column", ref: onRefChange, flexShrink: 0, marginTop: offset, children: children }) }), totalHiddenLines > 0 && overflowDirection === 'bottom' && (_jsxs(Text, { color: theme.text.secondary, wrap: "truncate", children: ["... last ", totalHiddenLines, " line", totalHiddenLines === 1 ? '' : 's', ' ', "hidden ..."] }))] }));
70
+ return (_jsxs(Box, { flexDirection: "column", width: maxWidth, maxHeight: effectiveMaxHeight, flexShrink: 0, children: [totalHiddenLines > 0 && overflowDirection === 'top' && (_jsx(Text, { color: theme.text.secondary, wrap: "truncate", children: isNarrow
71
+ ? `... ${totalHiddenLines} hidden (${showMoreKey}) ...`
72
+ : `... first ${totalHiddenLines} line${totalHiddenLines === 1 ? '' : 's'} hidden (${showMoreKey} to show) ...` })), _jsx(Box, { flexDirection: "column", overflow: "hidden", flexGrow: 0, maxHeight: isOverflowing ? visibleContentHeight : undefined, children: _jsx(Box, { flexDirection: "column", ref: onRefChange, flexShrink: 0, marginTop: offset, children: children }) }), totalHiddenLines > 0 && overflowDirection === 'bottom' && (_jsx(Text, { color: theme.text.secondary, wrap: "truncate", children: isNarrow
73
+ ? `... ${totalHiddenLines} hidden (${showMoreKey}) ...`
74
+ : `... last ${totalHiddenLines} line${totalHiddenLines === 1 ? '' : 's'} hidden (${showMoreKey} to show) ...` }))] }));
66
75
  };
67
76
  //# sourceMappingURL=MaxSizedBox.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"MaxSizedBox.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/MaxSizedBox.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MaxSizedBox.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/MaxSizedBox.tsx"],"names":[],"mappings":"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"}
@@ -21,35 +21,35 @@ describe('<MaxSizedBox />', () => {
21
21
  it('hides lines when content exceeds maxHeight', async () => {
22
22
  const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" })] }) }) }));
23
23
  await waitUntilReady();
24
- expect(lastFrame()).toContain('... first 2 lines hidden ...');
24
+ expect(lastFrame()).toContain('... first 2 lines hidden (Ctrl+O to show) ...');
25
25
  expect(lastFrame()).toMatchSnapshot();
26
26
  unmount();
27
27
  });
28
28
  it('hides lines at the end when content exceeds maxHeight and overflowDirection is bottom', async () => {
29
29
  const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, overflowDirection: "bottom", children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" })] }) }) }));
30
30
  await waitUntilReady();
31
- expect(lastFrame()).toContain('... last 2 lines hidden ...');
31
+ expect(lastFrame()).toContain('... last 2 lines hidden (Ctrl+O to show) ...');
32
32
  expect(lastFrame()).toMatchSnapshot();
33
33
  unmount();
34
34
  });
35
35
  it('shows plural "lines" when more than one line is hidden', async () => {
36
36
  const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" })] }) }) }));
37
37
  await waitUntilReady();
38
- expect(lastFrame()).toContain('... first 2 lines hidden ...');
38
+ expect(lastFrame()).toContain('... first 2 lines hidden (Ctrl+O to show) ...');
39
39
  expect(lastFrame()).toMatchSnapshot();
40
40
  unmount();
41
41
  });
42
42
  it('shows singular "line" when exactly one line is hidden', async () => {
43
43
  const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, additionalHiddenLinesCount: 1, children: _jsx(Box, { flexDirection: "column", children: _jsx(Text, { children: "Line 1" }) }) }) }));
44
44
  await waitUntilReady();
45
- expect(lastFrame()).toContain('... first 1 line hidden ...');
45
+ expect(lastFrame()).toContain('... first 1 line hidden (Ctrl+O to show) ...');
46
46
  expect(lastFrame()).toMatchSnapshot();
47
47
  unmount();
48
48
  });
49
49
  it('accounts for additionalHiddenLinesCount', async () => {
50
50
  const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 2, additionalHiddenLinesCount: 5, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" })] }) }) }));
51
51
  await waitUntilReady();
52
- expect(lastFrame()).toContain('... first 7 lines hidden ...');
52
+ expect(lastFrame()).toContain('... first 7 lines hidden (Ctrl+O to show) ...');
53
53
  expect(lastFrame()).toMatchSnapshot();
54
54
  unmount();
55
55
  });
@@ -84,7 +84,7 @@ describe('<MaxSizedBox />', () => {
84
84
  const THIRTY_LINES = Array.from({ length: 30 }, (_, i) => `Line ${i + 1}`).join('\n');
85
85
  const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 10, overflowDirection: "top", children: _jsx(Box, { children: _jsx(Text, { children: THIRTY_LINES }) }) }) }));
86
86
  await waitUntilReady();
87
- expect(lastFrame()).toContain('... first 21 lines hidden ...');
87
+ expect(lastFrame()).toContain('... first 21 lines hidden (Ctrl+O to show) ...');
88
88
  expect(lastFrame()).toMatchSnapshot();
89
89
  unmount();
90
90
  });
@@ -92,7 +92,7 @@ describe('<MaxSizedBox />', () => {
92
92
  const THIRTY_LINES = Array.from({ length: 30 }, (_, i) => `Line ${i + 1}`).join('\n');
93
93
  const { lastFrame, waitUntilReady, unmount } = render(_jsx(OverflowProvider, { children: _jsx(MaxSizedBox, { maxWidth: 80, maxHeight: 10, overflowDirection: "bottom", children: _jsx(Box, { children: _jsx(Text, { children: THIRTY_LINES }) }) }) }));
94
94
  await waitUntilReady();
95
- expect(lastFrame()).toContain('... last 21 lines hidden ...');
95
+ expect(lastFrame()).toContain('... last 21 lines hidden (Ctrl+O to show) ...');
96
96
  expect(lastFrame()).toMatchSnapshot();
97
97
  unmount();
98
98
  });
@@ -105,7 +105,7 @@ describe('<MaxSizedBox />', () => {
105
105
  const lines = frame.trim().split('\n');
106
106
  const lastLine = lines[lines.length - 1];
107
107
  // The last line should only contain the hidden indicator, no leaked content
108
- expect(lastLine).toMatch(/^\.\.\. last \d+ lines? hidden \.\.\.$/);
108
+ expect(lastLine).toMatch(/^\.\.\. last \d+ lines? hidden \(Ctrl\+O to show\) \.\.\.$/);
109
109
  expect(lastFrame()).toMatchSnapshot();
110
110
  unmount();
111
111
  });
@@ -1 +1 @@
1
- {"version":3,"file":"MaxSizedBox.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/MaxSizedBox.test.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MaxSizedBox.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/MaxSizedBox.test.tsx"],"names":[],"mappings":"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"}
@@ -3,7 +3,7 @@
3
3
  * Copyright 2025 Google LLC
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- import React from 'react';
6
+ import type React from 'react';
7
7
  interface ScrollableProps {
8
8
  children?: React.ReactNode;
9
9
  width?: number;
@@ -1,11 +1,6 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
- /**
3
- * @license
4
- * Copyright 2025 Google LLC
5
- * SPDX-License-Identifier: Apache-2.0
6
- */
7
- import React, { useState, useEffect, useRef, useLayoutEffect, useCallback, useMemo, } from 'react';
8
- import { Box, getInnerHeight, getScrollHeight } from 'ink';
2
+ import { useState, useRef, useCallback, useMemo, useLayoutEffect } from 'react';
3
+ import { Box, ResizeObserver } from 'ink';
9
4
  import { useKeypress } from '../../hooks/useKeypress.js';
10
5
  import { useScrollable } from '../../contexts/ScrollProvider.js';
11
6
  import { useAnimatedScrollbar } from '../../hooks/useAnimatedScrollbar.js';
@@ -13,55 +8,90 @@ import { useBatchedScroll } from '../../hooks/useBatchedScroll.js';
13
8
  import { keyMatchers, Command } from '../../keyMatchers.js';
14
9
  export const Scrollable = ({ children, width, height, maxWidth, maxHeight, hasFocus, scrollToBottom, flexGrow, }) => {
15
10
  const [scrollTop, setScrollTop] = useState(0);
16
- const ref = useRef(null);
11
+ const viewportRef = useRef(null);
12
+ const contentRef = useRef(null);
17
13
  const [size, setSize] = useState({
18
- innerHeight: 0,
14
+ innerHeight: typeof height === 'number' ? height : 0,
19
15
  scrollHeight: 0,
20
16
  });
21
17
  const sizeRef = useRef(size);
22
- useEffect(() => {
18
+ const scrollTopRef = useRef(scrollTop);
19
+ useLayoutEffect(() => {
23
20
  sizeRef.current = size;
24
21
  }, [size]);
25
- const childrenCountRef = useRef(0);
26
- // This effect needs to run on every render to correctly measure the container
27
- // and scroll to the bottom if new children are added.
28
- // eslint-disable-next-line react-hooks/exhaustive-deps
29
22
  useLayoutEffect(() => {
30
- if (!ref.current) {
31
- return;
32
- }
33
- const innerHeight = Math.round(getInnerHeight(ref.current));
34
- const scrollHeight = Math.round(getScrollHeight(ref.current));
35
- const isAtBottom = scrollHeight > innerHeight && scrollTop >= scrollHeight - innerHeight - 1;
36
- if (size.innerHeight !== innerHeight ||
37
- size.scrollHeight !== scrollHeight) {
38
- setSize({ innerHeight, scrollHeight });
39
- if (isAtBottom) {
40
- setScrollTop(Math.max(0, scrollHeight - innerHeight));
41
- }
23
+ scrollTopRef.current = scrollTop;
24
+ }, [scrollTop]);
25
+ const viewportObserverRef = useRef(null);
26
+ const contentObserverRef = useRef(null);
27
+ const viewportRefCallback = useCallback((node) => {
28
+ viewportObserverRef.current?.disconnect();
29
+ viewportRef.current = node;
30
+ if (node) {
31
+ const observer = new ResizeObserver((entries) => {
32
+ const entry = entries[0];
33
+ if (entry) {
34
+ const innerHeight = Math.round(entry.contentRect.height);
35
+ setSize((prev) => {
36
+ const scrollHeight = prev.scrollHeight;
37
+ const isAtBottom = scrollHeight > prev.innerHeight &&
38
+ scrollTopRef.current >= scrollHeight - prev.innerHeight - 1;
39
+ if (isAtBottom) {
40
+ setScrollTop(Number.MAX_SAFE_INTEGER);
41
+ }
42
+ return { ...prev, innerHeight };
43
+ });
44
+ }
45
+ });
46
+ observer.observe(node);
47
+ viewportObserverRef.current = observer;
42
48
  }
43
- const childCountCurrent = React.Children.count(children);
44
- if (scrollToBottom && childrenCountRef.current !== childCountCurrent) {
45
- setScrollTop(Math.max(0, scrollHeight - innerHeight));
49
+ }, []);
50
+ const contentRefCallback = useCallback((node) => {
51
+ contentObserverRef.current?.disconnect();
52
+ contentRef.current = node;
53
+ if (node) {
54
+ const observer = new ResizeObserver((entries) => {
55
+ const entry = entries[0];
56
+ if (entry) {
57
+ const scrollHeight = Math.round(entry.contentRect.height);
58
+ setSize((prev) => {
59
+ const innerHeight = prev.innerHeight;
60
+ const isAtBottom = prev.scrollHeight > innerHeight &&
61
+ scrollTopRef.current >= prev.scrollHeight - innerHeight - 1;
62
+ if (isAtBottom ||
63
+ (scrollToBottom && scrollHeight > prev.scrollHeight)) {
64
+ setScrollTop(Number.MAX_SAFE_INTEGER);
65
+ }
66
+ return { ...prev, scrollHeight };
67
+ });
68
+ }
69
+ });
70
+ observer.observe(node);
71
+ contentObserverRef.current = observer;
46
72
  }
47
- childrenCountRef.current = childCountCurrent;
48
- });
73
+ }, [scrollToBottom]);
49
74
  const { getScrollTop, setPendingScrollTop } = useBatchedScroll(scrollTop);
50
75
  const scrollBy = useCallback((delta) => {
51
76
  const { scrollHeight, innerHeight } = sizeRef.current;
52
- const current = getScrollTop();
53
- const next = Math.min(Math.max(0, current + delta), Math.max(0, scrollHeight - innerHeight));
77
+ const maxScroll = Math.max(0, scrollHeight - innerHeight);
78
+ const current = Math.min(getScrollTop(), maxScroll);
79
+ let next = Math.max(0, current + delta);
80
+ if (next >= maxScroll) {
81
+ next = Number.MAX_SAFE_INTEGER;
82
+ }
54
83
  setPendingScrollTop(next);
55
84
  setScrollTop(next);
56
- }, [sizeRef, getScrollTop, setPendingScrollTop]);
85
+ }, [getScrollTop, setPendingScrollTop]);
57
86
  const { scrollbarColor, flashScrollbar, scrollByWithAnimation } = useAnimatedScrollbar(hasFocus, scrollBy);
58
87
  useKeypress((key) => {
59
88
  const { scrollHeight, innerHeight } = sizeRef.current;
60
89
  const scrollTop = getScrollTop();
61
90
  const maxScroll = Math.max(0, scrollHeight - innerHeight);
91
+ const actualScrollTop = Math.min(scrollTop, maxScroll);
62
92
  // Only capture scroll-up events if there's room;
63
93
  // otherwise allow events to bubble.
64
- if (scrollTop > 0) {
94
+ if (actualScrollTop > 0) {
65
95
  if (keyMatchers[Command.PAGE_UP](key)) {
66
96
  scrollByWithAnimation(-innerHeight);
67
97
  return true;
@@ -73,7 +103,7 @@ export const Scrollable = ({ children, width, height, maxWidth, maxHeight, hasFo
73
103
  }
74
104
  // Only capture scroll-down events if there's room;
75
105
  // otherwise allow events to bubble.
76
- if (scrollTop < maxScroll) {
106
+ if (actualScrollTop < maxScroll) {
77
107
  if (keyMatchers[Command.PAGE_DOWN](key)) {
78
108
  scrollByWithAnimation(innerHeight);
79
109
  return true;
@@ -86,21 +116,24 @@ export const Scrollable = ({ children, width, height, maxWidth, maxHeight, hasFo
86
116
  // bubble keypress
87
117
  return false;
88
118
  }, { isActive: hasFocus });
89
- const getScrollState = useCallback(() => ({
90
- scrollTop: getScrollTop(),
91
- scrollHeight: size.scrollHeight,
92
- innerHeight: size.innerHeight,
93
- }), [getScrollTop, size.scrollHeight, size.innerHeight]);
119
+ const getScrollState = useCallback(() => {
120
+ const maxScroll = Math.max(0, size.scrollHeight - size.innerHeight);
121
+ return {
122
+ scrollTop: Math.min(getScrollTop(), maxScroll),
123
+ scrollHeight: size.scrollHeight,
124
+ innerHeight: size.innerHeight,
125
+ };
126
+ }, [getScrollTop, size.scrollHeight, size.innerHeight]);
94
127
  const hasFocusCallback = useCallback(() => hasFocus, [hasFocus]);
95
128
  const scrollableEntry = useMemo(() => ({
96
129
  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
97
- ref: ref,
130
+ ref: viewportRef,
98
131
  getScrollState,
99
132
  scrollBy: scrollByWithAnimation,
100
133
  hasFocus: hasFocusCallback,
101
134
  flashScrollbar,
102
135
  }), [getScrollState, scrollByWithAnimation, hasFocusCallback, flashScrollbar]);
103
136
  useScrollable(scrollableEntry, true);
104
- return (_jsx(Box, { ref: ref, maxHeight: maxHeight, width: width ?? maxWidth, height: height, flexDirection: "column", overflowY: "scroll", overflowX: "hidden", scrollTop: scrollTop, flexGrow: flexGrow, scrollbarThumbColor: scrollbarColor, children: _jsx(Box, { flexShrink: 0, paddingRight: 1, flexDirection: "column", children: children }) }));
137
+ return (_jsx(Box, { ref: viewportRefCallback, maxHeight: maxHeight, width: width ?? maxWidth, height: height, flexDirection: "column", overflowY: "scroll", overflowX: "hidden", scrollTop: scrollTop, flexGrow: flexGrow, scrollbarThumbColor: scrollbarColor, children: _jsx(Box, { ref: contentRefCallback, flexShrink: 0, paddingRight: 1, flexDirection: "column", children: children }) }));
105
138
  };
106
139
  //# sourceMappingURL=Scrollable.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Scrollable.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/Scrollable.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Scrollable.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/Scrollable.tsx"],"names":[],"mappings":"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"}
@@ -6,19 +6,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
6
6
  */
7
7
  import { renderWithProviders } from '../../../test-utils/render.js';
8
8
  import { Scrollable } from './Scrollable.js';
9
- import { Text } from 'ink';
9
+ import { Text, Box } from 'ink';
10
10
  import { describe, it, expect, vi, beforeEach } from 'vitest';
11
11
  import * as ScrollProviderModule from '../../contexts/ScrollProvider.js';
12
12
  import { act } from 'react';
13
- vi.mock('ink', async (importOriginal) => {
14
- const actual = await importOriginal();
15
- return {
16
- ...actual,
17
- getInnerHeight: vi.fn(() => 5),
18
- getScrollHeight: vi.fn(() => 10),
19
- getBoundingBox: vi.fn(() => ({ x: 0, y: 0, width: 10, height: 5 })),
20
- };
21
- });
13
+ import { waitFor } from '../../../test-utils/async.js';
22
14
  vi.mock('../../hooks/useAnimatedScrollbar.js', () => ({
23
15
  useAnimatedScrollbar: (hasFocus, scrollBy) => ({
24
16
  scrollbarColor: 'white',
@@ -69,18 +61,24 @@ describe('<Scrollable />', () => {
69
61
  unmount();
70
62
  const { waitUntilReady: waitUntilReady2, unmount: unmount2 } = renderWithProviders(_jsxs(Scrollable, { hasFocus: true, height: 5, scrollToBottom: true, children: [_jsx(Text, { children: "Line 1" }), _jsx(Text, { children: "Line 2" }), _jsx(Text, { children: "Line 3" }), _jsx(Text, { children: "Line 4" }), _jsx(Text, { children: "Line 5" }), _jsx(Text, { children: "Line 6" }), _jsx(Text, { children: "Line 7" }), _jsx(Text, { children: "Line 8" }), _jsx(Text, { children: "Line 9" }), _jsx(Text, { children: "Line 10" })] }));
71
63
  await waitUntilReady2();
72
- expect(capturedEntry.getScrollState().scrollTop).toBe(5);
64
+ await waitFor(() => {
65
+ expect(capturedEntry?.getScrollState().scrollTop).toBe(5);
66
+ });
73
67
  // Call scrollBy multiple times (upwards) in the same tick
74
68
  await act(async () => {
75
- capturedEntry.scrollBy(-1);
76
- capturedEntry.scrollBy(-1);
69
+ capturedEntry?.scrollBy(-1);
70
+ capturedEntry?.scrollBy(-1);
77
71
  });
78
72
  // Should have moved up by 2 (5 -> 3)
79
- expect(capturedEntry.getScrollState().scrollTop).toBe(3);
73
+ await waitFor(() => {
74
+ expect(capturedEntry?.getScrollState().scrollTop).toBe(3);
75
+ });
80
76
  await act(async () => {
81
- capturedEntry.scrollBy(-2);
77
+ capturedEntry?.scrollBy(-2);
78
+ });
79
+ await waitFor(() => {
80
+ expect(capturedEntry?.getScrollState().scrollTop).toBe(1);
82
81
  });
83
- expect(capturedEntry.getScrollState().scrollTop).toBe(1);
84
82
  unmount2();
85
83
  });
86
84
  describe('keypress handling', () => {
@@ -121,16 +119,13 @@ describe('<Scrollable />', () => {
121
119
  expectedScrollTop: 0,
122
120
  },
123
121
  ])('$name', async ({ initialScrollTop, scrollHeight, keySequence, expectedScrollTop, }) => {
124
- // Dynamically import ink to mock getScrollHeight
125
- const ink = await import('ink');
126
- vi.mocked(ink.getScrollHeight).mockReturnValue(scrollHeight);
127
122
  let capturedEntry;
128
123
  vi.spyOn(ScrollProviderModule, 'useScrollable').mockImplementation(async (entry, isActive) => {
129
124
  if (isActive) {
130
125
  capturedEntry = entry;
131
126
  }
132
127
  });
133
- const { stdin, waitUntilReady, unmount } = renderWithProviders(_jsx(Scrollable, { hasFocus: true, height: 5, children: _jsx(Text, { children: "Content" }) }));
128
+ const { stdin, waitUntilReady, unmount } = renderWithProviders(_jsx(Scrollable, { hasFocus: true, height: 5, children: _jsx(Box, { height: scrollHeight, children: _jsx(Text, { children: "Content" }) }) }));
134
129
  await waitUntilReady();
135
130
  // Ensure initial state using existing scrollBy method
136
131
  await act(async () => {
@@ -1 +1 @@
1
- {"version":3,"file":"Scrollable.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/Scrollable.test.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Scrollable.test.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/Scrollable.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,oBAAoB,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,EAAE,CAAC,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE,CAAC,CAAC;IACpD,oBAAoB,EAAE,CACpB,QAAiB,EACjB,QAAiC,EACjC,EAAE,CAAC,CAAC;QACJ,cAAc,EAAE,OAAO;QACvB,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;QACvB,qBAAqB,EAAE,QAAQ;KAChC,CAAC;CACH,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,KAAC,UAAU,IAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,YACpC,KAAC,IAAI,8BAAmB,GACb,CACd,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAC7C,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,MAAC,UAAU,IAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,aACpC,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,IACR,CACd,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAChC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAChE,MAAC,UAAU,IAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,aACpC,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,IACR,CACd,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QACvB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2FAA2F,EAAE,KAAK,IAAI,EAAE;QACzG,IAAI,aAA+D,CAAC;QACpE,EAAE,CAAC,KAAK,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC,kBAAkB,CAChE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACxB,IAAI,QAAQ,EAAE,CAAC;gBACb,aAAa,GAAG,KAA6C,CAAC;YAChE,CAAC;QACH,CAAC,CACF,CAAC;QAEF,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CACrD,MAAC,UAAU,IAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,aACnC,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,0BAAe,IACT,CACd,CAAC;QACF,MAAM,cAAc,EAAE,CAAC;QAEvB,MAAM,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QAEpC,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC;QAED,2CAA2C;QAC3C,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAEzD,2CAA2C;QAC3C,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,OAAO,EAAE,QAAQ,EAAE,GAC1D,mBAAmB,CACjB,MAAC,UAAU,IAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,cAAc,EAAE,IAAI,aACzD,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,yBAAc,EACnB,KAAC,IAAI,0BAAe,IACT,CACd,CAAC;QACJ,MAAM,eAAe,EAAE,CAAC;QACxB,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,0DAA0D;QAC1D,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5B,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,qCAAqC;QACrC,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,aAAa,EAAE,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QACH,QAAQ,EAAE,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,IAAI,CAAC;YACN;gBACE,IAAI,EAAE,qDAAqD;gBAC3D,gBAAgB,EAAE,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,aAAa,EAAE,aAAa;gBACzC,iBAAiB,EAAE,CAAC;aACrB;YACD;gBACE,IAAI,EAAE,gDAAgD;gBACtD,gBAAgB,EAAE,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,aAAa,EAAE,WAAW;gBACvC,iBAAiB,EAAE,CAAC;aACrB;YACD;gBACE,IAAI,EAAE,yDAAyD;gBAC/D,gBAAgB,EAAE,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,aAAa,EAAE,WAAW;gBACvC,iBAAiB,EAAE,CAAC;aACrB;YACD;gBACE,IAAI,EAAE,8DAA8D;gBACpE,gBAAgB,EAAE,CAAC,EAAE,yBAAyB;gBAC9C,YAAY,EAAE,EAAE;gBAChB,WAAW,EAAE,aAAa,EAAE,aAAa;gBACzC,iBAAiB,EAAE,CAAC;aACrB;YACD;gBACE,IAAI,EAAE,4DAA4D;gBAClE,gBAAgB,EAAE,CAAC;gBACnB,YAAY,EAAE,CAAC,EAAE,0BAA0B;gBAC3C,WAAW,EAAE,aAAa,EAAE,aAAa;gBACzC,iBAAiB,EAAE,CAAC;aACrB;SACF,CAAC,CACA,OAAO,EACP,KAAK,EAAE,EACL,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,iBAAiB,GAClB,EAAE,EAAE;YACH,IAAI,aAA+D,CAAC;YACpE,EAAE,CAAC,KAAK,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC,kBAAkB,CAChE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;gBACxB,IAAI,QAAQ,EAAE,CAAC;oBACb,aAAa,GAAG,KAA6C,CAAC;gBAChE,CAAC;YACH,CAAC,CACF,CAAC;YAEF,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,mBAAmB,CAC5D,KAAC,UAAU,IAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,YACnC,KAAC,GAAG,IAAC,MAAM,EAAE,YAAY,YACvB,KAAC,IAAI,0BAAe,GAChB,GACK,CACd,CAAC;YACF,MAAM,cAAc,EAAE,CAAC;YAEvB,sDAAsD;YACtD,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;gBACnB,4DAA4D;gBAC5D,aAAc,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC9B,IAAI,gBAAgB,GAAG,CAAC,EAAE,CAAC;oBACzB,aAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,aAAc,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CACpD,gBAAgB,CACjB,CAAC;YAEF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;gBACnB,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,MAAM,cAAc,EAAE,CAAC;YAEvB,MAAM,CAAC,aAAc,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,CAAC,IAAI,CACpD,iBAAiB,CAClB,CAAC;YACF,OAAO,EAAE,CAAC;QACZ,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -4,7 +4,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
4
4
  * Copyright 2025 Google LLC
5
5
  * SPDX-License-Identifier: Apache-2.0
6
6
  */
7
- import { useRef, forwardRef, useImperativeHandle, useCallback, useMemo, useEffect, } from 'react';
7
+ import { useRef, forwardRef, useImperativeHandle, useCallback, useMemo, useLayoutEffect, } from 'react';
8
8
  import { VirtualizedList, SCROLL_TO_ITEM_END, } from './VirtualizedList.js';
9
9
  import { useScrollable } from '../../contexts/ScrollProvider.js';
10
10
  import { Box } from 'ink';
@@ -46,7 +46,7 @@ function ScrollableList(props, ref) {
46
46
  }
47
47
  smoothScrollState.current.active = false;
48
48
  }, []);
49
- useEffect(() => stopSmoothScroll, [stopSmoothScroll]);
49
+ useLayoutEffect(() => stopSmoothScroll, [stopSmoothScroll]);
50
50
  const smoothScrollTo = useCallback((targetScrollTop, duration = process.env['NODE_ENV'] === 'test' ? 0 : 200) => {
51
51
  stopSmoothScroll();
52
52
  const scrollState = virtualizedListRef.current?.getScrollState() ?? {
@@ -54,16 +54,19 @@ function ScrollableList(props, ref) {
54
54
  scrollHeight: 0,
55
55
  innerHeight: 0,
56
56
  };
57
- const { scrollTop: startScrollTop, scrollHeight, innerHeight, } = scrollState;
57
+ const { scrollTop: rawStartScrollTop, scrollHeight, innerHeight, } = scrollState;
58
58
  const maxScrollTop = Math.max(0, scrollHeight - innerHeight);
59
+ const startScrollTop = Math.min(rawStartScrollTop, maxScrollTop);
59
60
  let effectiveTarget = targetScrollTop;
60
- if (targetScrollTop === SCROLL_TO_ITEM_END) {
61
+ if (targetScrollTop === SCROLL_TO_ITEM_END ||
62
+ targetScrollTop >= maxScrollTop) {
61
63
  effectiveTarget = maxScrollTop;
62
64
  }
63
65
  const clampedTarget = Math.max(0, Math.min(maxScrollTop, effectiveTarget));
64
66
  if (duration === 0) {
65
- if (targetScrollTop === SCROLL_TO_ITEM_END) {
66
- virtualizedListRef.current?.scrollTo(SCROLL_TO_ITEM_END);
67
+ if (targetScrollTop === SCROLL_TO_ITEM_END ||
68
+ targetScrollTop >= maxScrollTop) {
69
+ virtualizedListRef.current?.scrollTo(Number.MAX_SAFE_INTEGER);
67
70
  }
68
71
  else {
69
72
  virtualizedListRef.current?.scrollTo(Math.round(clampedTarget));
@@ -88,8 +91,9 @@ function ScrollableList(props, ref) {
88
91
  (smoothScrollState.current.to - smoothScrollState.current.from) *
89
92
  ease;
90
93
  if (progress >= 1) {
91
- if (targetScrollTop === SCROLL_TO_ITEM_END) {
92
- virtualizedListRef.current?.scrollTo(SCROLL_TO_ITEM_END);
94
+ if (targetScrollTop === SCROLL_TO_ITEM_END ||
95
+ targetScrollTop >= maxScrollTop) {
96
+ virtualizedListRef.current?.scrollTo(Number.MAX_SAFE_INTEGER);
93
97
  }
94
98
  else {
95
99
  virtualizedListRef.current?.scrollTo(Math.round(current));
@@ -118,9 +122,10 @@ function ScrollableList(props, ref) {
118
122
  keyMatchers[Command.PAGE_DOWN](key)) {
119
123
  const direction = keyMatchers[Command.PAGE_UP](key) ? -1 : 1;
120
124
  const scrollState = getScrollState();
125
+ const maxScroll = Math.max(0, scrollState.scrollHeight - scrollState.innerHeight);
121
126
  const current = smoothScrollState.current.active
122
127
  ? smoothScrollState.current.to
123
- : scrollState.scrollTop;
128
+ : Math.min(scrollState.scrollTop, maxScroll);
124
129
  const innerHeight = scrollState.innerHeight;
125
130
  smoothScrollTo(current + direction * innerHeight);
126
131
  return true;
@@ -1 +1 @@
1
- {"version":3,"file":"ScrollableList.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/ScrollableList.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ScrollableList.js","sourceRoot":"","sources":["../../../../../src/ui/components/shared/ScrollableList.tsx"],"names":[],"mappings":"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"}