@machina.ai/cell-cli 1.8.2-rc1 → 1.10.0-rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (253) hide show
  1. package/dist/package.json +4 -3
  2. package/dist/src/commands/extensions/examples/context/GEMINI.md +9 -3
  3. package/dist/src/commands/extensions/install.d.ts +1 -0
  4. package/dist/src/commands/extensions/install.js +9 -3
  5. package/dist/src/commands/extensions/install.js.map +1 -1
  6. package/dist/src/commands/extensions/install.test.js +9 -9
  7. package/dist/src/commands/extensions/install.test.js.map +1 -1
  8. package/dist/src/commands/extensions/link.js +2 -2
  9. package/dist/src/commands/extensions/link.js.map +1 -1
  10. package/dist/src/commands/extensions/uninstall.js +1 -1
  11. package/dist/src/commands/extensions/uninstall.js.map +1 -1
  12. package/dist/src/commands/extensions/update.js +2 -6
  13. package/dist/src/commands/extensions/update.js.map +1 -1
  14. package/dist/src/commands/mcp/list.js +2 -2
  15. package/dist/src/commands/mcp/list.js.map +1 -1
  16. package/dist/src/config/config.d.ts +3 -3
  17. package/dist/src/config/config.js +49 -10
  18. package/dist/src/config/config.js.map +1 -1
  19. package/dist/src/config/extension.d.ts +20 -18
  20. package/dist/src/config/extension.js +75 -52
  21. package/dist/src/config/extension.js.map +1 -1
  22. package/dist/src/config/extensions/extensionEnablement.d.ts +2 -2
  23. package/dist/src/config/extensions/extensionEnablement.js +1 -2
  24. package/dist/src/config/extensions/extensionEnablement.js.map +1 -1
  25. package/dist/src/config/extensions/extensionEnablement.test.js +6 -5
  26. package/dist/src/config/extensions/extensionEnablement.test.js.map +1 -1
  27. package/dist/src/config/extensions/github.d.ts +8 -1
  28. package/dist/src/config/extensions/github.js +40 -66
  29. package/dist/src/config/extensions/github.js.map +1 -1
  30. package/dist/src/config/extensions/github.test.js +56 -12
  31. package/dist/src/config/extensions/github.test.js.map +1 -1
  32. package/dist/src/config/extensions/github_fetch.d.ts +7 -0
  33. package/dist/src/config/extensions/github_fetch.js +34 -0
  34. package/dist/src/config/extensions/github_fetch.js.map +1 -0
  35. package/dist/src/config/extensions/update.d.ts +1 -1
  36. package/dist/src/config/extensions/update.js +15 -12
  37. package/dist/src/config/extensions/update.js.map +1 -1
  38. package/dist/src/config/extensions/update.test.js +5 -5
  39. package/dist/src/config/extensions/update.test.js.map +1 -1
  40. package/dist/src/config/keyBindings.js +1 -1
  41. package/dist/src/config/keyBindings.js.map +1 -1
  42. package/dist/src/config/policy.js +2 -2
  43. package/dist/src/config/policy.js.map +1 -1
  44. package/dist/src/config/settings.d.ts +10 -1
  45. package/dist/src/config/settings.js +17 -6
  46. package/dist/src/config/settings.js.map +1 -1
  47. package/dist/src/config/settingsSchema.d.ts +124 -3
  48. package/dist/src/config/settingsSchema.js +125 -4
  49. package/dist/src/config/settingsSchema.js.map +1 -1
  50. package/dist/src/config/trustedFolders.d.ts +0 -1
  51. package/dist/src/config/trustedFolders.js +2 -3
  52. package/dist/src/config/trustedFolders.js.map +1 -1
  53. package/dist/src/gemini.js +24 -17
  54. package/dist/src/gemini.js.map +1 -1
  55. package/dist/src/gemini.test.js +20 -8
  56. package/dist/src/gemini.test.js.map +1 -1
  57. package/dist/src/generated/git-commit.d.ts +2 -2
  58. package/dist/src/generated/git-commit.js +2 -2
  59. package/dist/src/generated/git-commit.js.map +1 -1
  60. package/dist/src/nonInteractiveCli.js +14 -1
  61. package/dist/src/nonInteractiveCli.js.map +1 -1
  62. package/dist/src/nonInteractiveCliCommands.js +1 -2
  63. package/dist/src/nonInteractiveCliCommands.js.map +1 -1
  64. package/dist/src/services/BuiltinCommandLoader.js +3 -0
  65. package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
  66. package/dist/src/services/BuiltinCommandLoader.test.js +37 -0
  67. package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
  68. package/dist/src/services/FileCommandLoader.d.ts +1 -1
  69. package/dist/src/services/FileCommandLoader.js +4 -4
  70. package/dist/src/services/FileCommandLoader.js.map +1 -1
  71. package/dist/src/services/prompt-processors/shellProcessor.js +1 -1
  72. package/dist/src/services/prompt-processors/shellProcessor.js.map +1 -1
  73. package/dist/src/test-utils/render.d.ts +11 -4
  74. package/dist/src/test-utils/render.js +53 -2
  75. package/dist/src/test-utils/render.js.map +1 -1
  76. package/dist/src/ui/App.js +1 -17
  77. package/dist/src/ui/App.js.map +1 -1
  78. package/dist/src/ui/AppContainer.js +22 -7
  79. package/dist/src/ui/AppContainer.js.map +1 -1
  80. package/dist/src/ui/auth/AuthInProgress.js +2 -2
  81. package/dist/src/ui/auth/AuthInProgress.js.map +1 -1
  82. package/dist/src/ui/commands/chatCommand.js +7 -24
  83. package/dist/src/ui/commands/chatCommand.js.map +1 -1
  84. package/dist/src/ui/commands/extensionsCommand.js +30 -32
  85. package/dist/src/ui/commands/extensionsCommand.js.map +1 -1
  86. package/dist/src/ui/commands/memoryCommand.js +23 -5
  87. package/dist/src/ui/commands/memoryCommand.js.map +1 -1
  88. package/dist/src/ui/commands/profileCommand.d.ts +7 -0
  89. package/dist/src/ui/commands/profileCommand.js +23 -0
  90. package/dist/src/ui/commands/profileCommand.js.map +1 -0
  91. package/dist/src/ui/commands/setupGithubCommand.test.js +2 -1
  92. package/dist/src/ui/commands/setupGithubCommand.test.js.map +1 -1
  93. package/dist/src/ui/commands/types.d.ts +1 -0
  94. package/dist/src/ui/commands/types.js.map +1 -1
  95. package/dist/src/ui/components/AnsiOutput.d.ts +1 -0
  96. package/dist/src/ui/components/AnsiOutput.js +5 -5
  97. package/dist/src/ui/components/AnsiOutput.js.map +1 -1
  98. package/dist/src/ui/components/AnsiOutput.test.js +6 -6
  99. package/dist/src/ui/components/AnsiOutput.test.js.map +1 -1
  100. package/dist/src/ui/components/AsciiArt.d.ts +3 -3
  101. package/dist/src/ui/components/AsciiArt.js +3 -3
  102. package/dist/src/ui/components/CliSpinner.d.ts +10 -0
  103. package/dist/src/ui/components/CliSpinner.js +20 -0
  104. package/dist/src/ui/components/CliSpinner.js.map +1 -0
  105. package/dist/src/ui/components/Composer.js +4 -7
  106. package/dist/src/ui/components/Composer.js.map +1 -1
  107. package/dist/src/ui/components/ContextSummaryDisplay.js +2 -2
  108. package/dist/src/ui/components/ContextSummaryDisplay.js.map +1 -1
  109. package/dist/src/ui/components/DebugProfiler.d.ts +18 -0
  110. package/dist/src/ui/components/DebugProfiler.js +158 -12
  111. package/dist/src/ui/components/DebugProfiler.js.map +1 -1
  112. package/dist/src/ui/components/DebugProfiler.test.d.ts +6 -0
  113. package/dist/src/ui/components/DebugProfiler.test.js +140 -0
  114. package/dist/src/ui/components/DebugProfiler.test.js.map +1 -0
  115. package/dist/src/ui/components/FolderTrustDialog.js +9 -5
  116. package/dist/src/ui/components/FolderTrustDialog.js.map +1 -1
  117. package/dist/src/ui/components/FolderTrustDialog.test.js +7 -11
  118. package/dist/src/ui/components/FolderTrustDialog.test.js.map +1 -1
  119. package/dist/src/ui/components/Footer.js +7 -6
  120. package/dist/src/ui/components/Footer.js.map +1 -1
  121. package/dist/src/ui/components/GeminiRespondingSpinner.js +2 -2
  122. package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
  123. package/dist/src/ui/components/Help.js +1 -1
  124. package/dist/src/ui/components/Help.js.map +1 -1
  125. package/dist/src/ui/components/HistoryItemDisplay.js +2 -1
  126. package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
  127. package/dist/src/ui/components/InputPrompt.d.ts +7 -1
  128. package/dist/src/ui/components/InputPrompt.js +50 -25
  129. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  130. package/dist/src/ui/components/MainContent.js +1 -1
  131. package/dist/src/ui/components/MainContent.js.map +1 -1
  132. package/dist/src/ui/components/Notifications.js +12 -4
  133. package/dist/src/ui/components/Notifications.js.map +1 -1
  134. package/dist/src/ui/components/SettingsDialog.js +1 -1
  135. package/dist/src/ui/components/SettingsDialog.test.js +1 -1
  136. package/dist/src/ui/components/SettingsDialog.test.js.map +1 -1
  137. package/dist/src/ui/components/WorkspaceMigrationDialog.d.ts +2 -2
  138. package/dist/src/ui/components/WorkspaceMigrationDialog.js +2 -2
  139. package/dist/src/ui/components/WorkspaceMigrationDialog.js.map +1 -1
  140. package/dist/src/ui/components/messages/CompressionMessage.js +3 -3
  141. package/dist/src/ui/components/messages/CompressionMessage.js.map +1 -1
  142. package/dist/src/ui/components/messages/ToolConfirmationMessage.js +1 -1
  143. package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
  144. package/dist/src/ui/components/messages/ToolGroupMessage.js +1 -1
  145. package/dist/src/ui/components/messages/ToolGroupMessage.js.map +1 -1
  146. package/dist/src/ui/components/messages/ToolMessage.js +2 -2
  147. package/dist/src/ui/components/messages/ToolMessage.js.map +1 -1
  148. package/dist/src/ui/components/views/ChatList.d.ts +12 -0
  149. package/dist/src/ui/components/views/ChatList.js +17 -0
  150. package/dist/src/ui/components/views/ChatList.js.map +1 -0
  151. package/dist/src/ui/components/views/ChatList.test.d.ts +6 -0
  152. package/dist/src/ui/components/views/ChatList.test.js +42 -0
  153. package/dist/src/ui/components/views/ChatList.test.js.map +1 -0
  154. package/dist/src/ui/contexts/KeypressContext.js +43 -3
  155. package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
  156. package/dist/src/ui/contexts/KeypressContext.test.js +127 -0
  157. package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
  158. package/dist/src/ui/contexts/UIStateContext.d.ts +3 -1
  159. package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
  160. package/dist/src/ui/hooks/shellCommandProcessor.js +5 -6
  161. package/dist/src/ui/hooks/shellCommandProcessor.js.map +1 -1
  162. package/dist/src/ui/hooks/shellCommandProcessor.test.js +19 -32
  163. package/dist/src/ui/hooks/shellCommandProcessor.test.js.map +1 -1
  164. package/dist/src/ui/hooks/slashCommandProcessor.d.ts +2 -1
  165. package/dist/src/ui/hooks/slashCommandProcessor.js +9 -7
  166. package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
  167. package/dist/src/ui/hooks/useExtensionUpdates.js +68 -18
  168. package/dist/src/ui/hooks/useExtensionUpdates.js.map +1 -1
  169. package/dist/src/ui/hooks/useExtensionUpdates.test.js +7 -4
  170. package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
  171. package/dist/src/ui/hooks/useFlickerDetector.d.ts +14 -0
  172. package/dist/src/ui/hooks/useFlickerDetector.js +37 -0
  173. package/dist/src/ui/hooks/useFlickerDetector.js.map +1 -0
  174. package/dist/src/ui/hooks/useFlickerDetector.test.d.ts +6 -0
  175. package/dist/src/ui/hooks/useFlickerDetector.test.js +102 -0
  176. package/dist/src/ui/hooks/useFlickerDetector.test.js.map +1 -0
  177. package/dist/src/ui/hooks/useFolderTrust.d.ts +2 -1
  178. package/dist/src/ui/hooks/useFolderTrust.js +12 -3
  179. package/dist/src/ui/hooks/useFolderTrust.js.map +1 -1
  180. package/dist/src/ui/hooks/useGeminiStream.js +33 -2
  181. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  182. package/dist/src/ui/hooks/useHistoryManager.js +3 -3
  183. package/dist/src/ui/hooks/useHistoryManager.js.map +1 -1
  184. package/dist/src/ui/hooks/usePhraseCycler.js +1 -0
  185. package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
  186. package/dist/src/ui/hooks/useSelectionList.js +50 -23
  187. package/dist/src/ui/hooks/useSelectionList.js.map +1 -1
  188. package/dist/src/ui/hooks/useSelectionList.test.js +24 -0
  189. package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
  190. package/dist/src/ui/hooks/useShellHistory.test.js +16 -10
  191. package/dist/src/ui/hooks/useShellHistory.test.js.map +1 -1
  192. package/dist/src/ui/hooks/useTerminalSize.js +2 -3
  193. package/dist/src/ui/hooks/useTerminalSize.js.map +1 -1
  194. package/dist/src/ui/hooks/useWorkspaceMigration.d.ts +2 -2
  195. package/dist/src/ui/hooks/useWorkspaceMigration.js +13 -8
  196. package/dist/src/ui/hooks/useWorkspaceMigration.js.map +1 -1
  197. package/dist/src/ui/layouts/DefaultAppLayout.d.ts +1 -3
  198. package/dist/src/ui/layouts/DefaultAppLayout.js +5 -2
  199. package/dist/src/ui/layouts/DefaultAppLayout.js.map +1 -1
  200. package/dist/src/ui/layouts/ScreenReaderAppLayout.js +4 -1
  201. package/dist/src/ui/layouts/ScreenReaderAppLayout.js.map +1 -1
  202. package/dist/src/ui/noninteractive/nonInteractiveUi.js +1 -0
  203. package/dist/src/ui/noninteractive/nonInteractiveUi.js.map +1 -1
  204. package/dist/src/ui/state/extensions.d.ts +22 -3
  205. package/dist/src/ui/state/extensions.js +26 -4
  206. package/dist/src/ui/state/extensions.js.map +1 -1
  207. package/dist/src/ui/types.d.ts +11 -2
  208. package/dist/src/ui/types.js +1 -0
  209. package/dist/src/ui/types.js.map +1 -1
  210. package/dist/src/ui/utils/ui-sizing.d.ts +7 -0
  211. package/dist/src/ui/utils/ui-sizing.js +23 -0
  212. package/dist/src/ui/utils/ui-sizing.js.map +1 -0
  213. package/dist/src/utils/commentJson.js +95 -13
  214. package/dist/src/utils/commentJson.js.map +1 -1
  215. package/dist/src/utils/commentJson.test.js +161 -0
  216. package/dist/src/utils/commentJson.test.js.map +1 -1
  217. package/dist/src/utils/errors.d.ts +8 -3
  218. package/dist/src/utils/errors.js +23 -13
  219. package/dist/src/utils/errors.js.map +1 -1
  220. package/dist/src/utils/errors.test.js +40 -46
  221. package/dist/src/utils/errors.test.js.map +1 -1
  222. package/dist/src/utils/events.d.ts +2 -1
  223. package/dist/src/utils/events.js +1 -0
  224. package/dist/src/utils/events.js.map +1 -1
  225. package/dist/src/utils/handleAutoUpdate.js +4 -1
  226. package/dist/src/utils/handleAutoUpdate.js.map +1 -1
  227. package/dist/src/utils/installationInfo.d.ts +1 -0
  228. package/dist/src/utils/installationInfo.js +2 -0
  229. package/dist/src/utils/installationInfo.js.map +1 -1
  230. package/dist/src/utils/sandbox.js +8 -8
  231. package/dist/src/utils/sandbox.js.map +1 -1
  232. package/dist/src/utils/sessionCleanup.d.ts +22 -0
  233. package/dist/src/utils/sessionCleanup.integration.test.d.ts +6 -0
  234. package/dist/src/utils/sessionCleanup.integration.test.js +182 -0
  235. package/dist/src/utils/sessionCleanup.integration.test.js.map +1 -0
  236. package/dist/src/utils/sessionCleanup.js +214 -0
  237. package/dist/src/utils/sessionCleanup.js.map +1 -0
  238. package/dist/src/utils/sessionCleanup.test.d.ts +6 -0
  239. package/dist/src/utils/sessionCleanup.test.js +1232 -0
  240. package/dist/src/utils/sessionCleanup.test.js.map +1 -0
  241. package/dist/src/utils/sessionUtils.d.ts +37 -0
  242. package/dist/src/utils/sessionUtils.js +71 -0
  243. package/dist/src/utils/sessionUtils.js.map +1 -0
  244. package/dist/src/validateNonInterActiveAuth.js +6 -7
  245. package/dist/src/validateNonInterActiveAuth.js.map +1 -1
  246. package/dist/src/zed-integration/acp.js +1 -2
  247. package/dist/src/zed-integration/acp.js.map +1 -1
  248. package/dist/src/zed-integration/schema.d.ts +176 -176
  249. package/dist/src/zed-integration/zedIntegration.d.ts +2 -3
  250. package/dist/src/zed-integration/zedIntegration.js +7 -26
  251. package/dist/src/zed-integration/zedIntegration.js.map +1 -1
  252. package/dist/tsconfig.tsbuildinfo +1 -1
  253. package/package.json +4 -3
@@ -5,23 +5,169 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
5
5
  * SPDX-License-Identifier: Apache-2.0
6
6
  */
7
7
  import { Text } from 'ink';
8
- import { useEffect, useRef, useState } from 'react';
8
+ import { useEffect, useState } from 'react';
9
+ import { FixedDeque } from 'mnemonist';
9
10
  import { theme } from '../semantic-colors.js';
10
- import { useKeypress } from '../hooks/useKeypress.js';
11
+ import { useUIState } from '../contexts/UIStateContext.js';
12
+ import { debugNumSpinners } from './CliSpinner.js';
13
+ import { appEvents, AppEvent } from '../../utils/events.js';
14
+ // Frames that render at least this far before or after an action are considered
15
+ // idle frames.
16
+ const MIN_TIME_FROM_ACTION_TO_BE_IDLE = 500;
17
+ export const ACTION_TIMESTAMP_CAPACITY = 2048;
18
+ export const FRAME_TIMESTAMP_CAPACITY = 2048;
19
+ // Exported for testing purposes.
20
+ export const profiler = {
21
+ numFrames: 0,
22
+ totalIdleFrames: 0,
23
+ totalFlickerFrames: 0,
24
+ hasLoggedFirstFlicker: false,
25
+ lastFrameStartTime: 0,
26
+ openedDebugConsole: false,
27
+ lastActionTimestamp: 0,
28
+ possiblyIdleFrameTimestamps: new FixedDeque(Array, FRAME_TIMESTAMP_CAPACITY),
29
+ actionTimestamps: new FixedDeque(Array, ACTION_TIMESTAMP_CAPACITY),
30
+ reportAction() {
31
+ const now = Date.now();
32
+ if (now - this.lastActionTimestamp > 16) {
33
+ if (this.actionTimestamps.size >= ACTION_TIMESTAMP_CAPACITY) {
34
+ this.actionTimestamps.shift();
35
+ }
36
+ this.actionTimestamps.push(now);
37
+ this.lastActionTimestamp = now;
38
+ }
39
+ },
40
+ reportFrameRendered() {
41
+ const now = Date.now();
42
+ // Simple frame detection logic (a write after at least 16ms is a new frame)
43
+ if (now - this.lastFrameStartTime > 16) {
44
+ this.lastFrameStartTime = now;
45
+ this.numFrames++;
46
+ if (debugNumSpinners === 0) {
47
+ if (this.possiblyIdleFrameTimestamps.size >= FRAME_TIMESTAMP_CAPACITY) {
48
+ this.possiblyIdleFrameTimestamps.shift();
49
+ }
50
+ this.possiblyIdleFrameTimestamps.push(now);
51
+ }
52
+ else {
53
+ // If a spinner is present, consider this an action that both prevents
54
+ // this frame from being idle and also should prevent a follow on frame
55
+ // from being considered idle.
56
+ if (this.actionTimestamps.size >= ACTION_TIMESTAMP_CAPACITY) {
57
+ this.actionTimestamps.shift();
58
+ }
59
+ this.actionTimestamps.push(now);
60
+ }
61
+ }
62
+ },
63
+ checkForIdleFrames() {
64
+ const now = Date.now();
65
+ const judgementCutoff = now - MIN_TIME_FROM_ACTION_TO_BE_IDLE;
66
+ const oneSecondIntervalFromJudgementCutoff = judgementCutoff - 1000;
67
+ let idleInPastSecond = 0;
68
+ while (this.possiblyIdleFrameTimestamps.size > 0 &&
69
+ this.possiblyIdleFrameTimestamps.peekFirst() <= judgementCutoff) {
70
+ const frameTime = this.possiblyIdleFrameTimestamps.shift();
71
+ const start = frameTime - MIN_TIME_FROM_ACTION_TO_BE_IDLE;
72
+ const end = frameTime + MIN_TIME_FROM_ACTION_TO_BE_IDLE;
73
+ while (this.actionTimestamps.size > 0 &&
74
+ this.actionTimestamps.peekFirst() < start) {
75
+ this.actionTimestamps.shift();
76
+ }
77
+ const hasAction = this.actionTimestamps.size > 0 &&
78
+ this.actionTimestamps.peekFirst() <= end;
79
+ if (!hasAction) {
80
+ if (frameTime >= oneSecondIntervalFromJudgementCutoff) {
81
+ idleInPastSecond++;
82
+ }
83
+ this.totalIdleFrames++;
84
+ }
85
+ }
86
+ if (idleInPastSecond >= 5) {
87
+ if (this.openedDebugConsole === false) {
88
+ this.openedDebugConsole = true;
89
+ appEvents.emit(AppEvent.OpenDebugConsole);
90
+ }
91
+ appEvents.emit(AppEvent.LogError, `${idleInPastSecond} frames rendered while the app was ` +
92
+ `idle in the past second. This likely indicates severe infinite loop ` +
93
+ `React state management bugs.`);
94
+ }
95
+ },
96
+ registerFlickerHandler(constrainHeight) {
97
+ const flickerHandler = () => {
98
+ // If we are not constraining the height, we are intentionally
99
+ // overflowing the screen.
100
+ if (!constrainHeight) {
101
+ return;
102
+ }
103
+ this.totalFlickerFrames++;
104
+ this.reportAction();
105
+ if (!this.hasLoggedFirstFlicker) {
106
+ this.hasLoggedFirstFlicker = true;
107
+ appEvents.emit(AppEvent.LogError, 'A flicker frame was detected. This will cause UI instability. Type `/profile` for more info.');
108
+ }
109
+ };
110
+ appEvents.on(AppEvent.Flicker, flickerHandler);
111
+ return () => {
112
+ appEvents.off(AppEvent.Flicker, flickerHandler);
113
+ };
114
+ },
115
+ };
11
116
  export const DebugProfiler = () => {
12
- const numRenders = useRef(0);
13
- const [showNumRenders, setShowNumRenders] = useState(false);
117
+ const { showDebugProfiler, constrainHeight } = useUIState();
118
+ const [forceRefresh, setForceRefresh] = useState(0);
119
+ // Effect for listening to stdin for keypresses and stdout for resize events.
120
+ useEffect(() => {
121
+ const stdin = process.stdin;
122
+ const stdout = process.stdout;
123
+ const handler = () => {
124
+ profiler.reportAction();
125
+ };
126
+ stdin.on('data', handler);
127
+ stdout.on('resize', handler);
128
+ return () => {
129
+ stdin.off('data', handler);
130
+ stdout.off('resize', handler);
131
+ };
132
+ }, []);
133
+ // Effect for patching stdout to count frames and detect idle ones
134
+ useEffect(() => {
135
+ const originalWrite = process.stdout.write;
136
+ const boundOriginalWrite = originalWrite.bind(process.stdout);
137
+ process.stdout.write = (chunk, encodingOrCb, cb) => {
138
+ profiler.reportFrameRendered();
139
+ if (typeof encodingOrCb === 'function') {
140
+ return boundOriginalWrite(chunk, encodingOrCb);
141
+ }
142
+ return boundOriginalWrite(chunk, encodingOrCb, cb);
143
+ };
144
+ return () => {
145
+ process.stdout.write = originalWrite;
146
+ };
147
+ }, []);
148
+ useEffect(() => {
149
+ const updateInterval = setInterval(() => {
150
+ profiler.checkForIdleFrames();
151
+ }, 1000);
152
+ return () => clearInterval(updateInterval);
153
+ }, []);
154
+ useEffect(() => profiler.registerFlickerHandler(constrainHeight), [constrainHeight]);
155
+ // Effect for updating stats
14
156
  useEffect(() => {
15
- numRenders.current++;
16
- });
17
- useKeypress((key) => {
18
- if (key.ctrl && key.name === 'b') {
19
- setShowNumRenders((prev) => !prev);
157
+ if (!showDebugProfiler) {
158
+ return;
20
159
  }
21
- }, { isActive: true });
22
- if (!showNumRenders) {
160
+ // Only update the UX infrequently as updating the UX itself will cause
161
+ // frames to run so can disturb what we are measuing.
162
+ const forceRefreshInterval = setInterval(() => {
163
+ setForceRefresh((f) => f + 1);
164
+ profiler.reportAction();
165
+ }, 4000);
166
+ return () => clearInterval(forceRefreshInterval);
167
+ }, [showDebugProfiler]);
168
+ if (!showDebugProfiler) {
23
169
  return null;
24
170
  }
25
- return (_jsxs(Text, { color: theme.status.warning, children: ["Renders: ", numRenders.current, " "] }));
171
+ return (_jsxs(Text, { color: theme.status.warning, children: ["Renders: ", profiler.numFrames, " (total),", ' ', _jsxs(Text, { color: theme.status.error, children: [profiler.totalIdleFrames, " (idle)"] }), ",", ' ', _jsxs(Text, { color: theme.status.error, children: [profiler.totalFlickerFrames, " (flicker)"] })] }, forceRefresh));
26
172
  };
27
173
  //# sourceMappingURL=DebugProfiler.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"DebugProfiler.js","sourceRoot":"","sources":["../../../../src/ui/components/DebugProfiler.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,EAAE;IAChC,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5D,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,WAAW,CACT,CAAC,GAAG,EAAE,EAAE;QACN,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;YACjC,iBAAiB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,EACD,EAAE,QAAQ,EAAE,IAAI,EAAE,CACnB,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,MAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,0BAAY,UAAU,CAAC,OAAO,SAAS,CACzE,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"DebugProfiler.js","sourceRoot":"","sources":["../../../../src/ui/components/DebugProfiler.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ export {};
@@ -0,0 +1,140 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2025 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
7
+ import { appEvents, AppEvent } from '../../utils/events.js';
8
+ import { profiler, ACTION_TIMESTAMP_CAPACITY, FRAME_TIMESTAMP_CAPACITY, } from './DebugProfiler.js';
9
+ import { FixedDeque } from 'mnemonist';
10
+ describe('DebugProfiler', () => {
11
+ beforeEach(() => {
12
+ vi.useFakeTimers();
13
+ profiler.numFrames = 0;
14
+ profiler.totalIdleFrames = 0;
15
+ profiler.lastFrameStartTime = 0;
16
+ profiler.openedDebugConsole = false;
17
+ profiler.lastActionTimestamp = 0;
18
+ profiler.possiblyIdleFrameTimestamps = new FixedDeque(Array, FRAME_TIMESTAMP_CAPACITY);
19
+ profiler.actionTimestamps = new FixedDeque(Array, ACTION_TIMESTAMP_CAPACITY);
20
+ });
21
+ afterEach(() => {
22
+ vi.restoreAllMocks();
23
+ profiler.actionTimestamps.clear();
24
+ profiler.possiblyIdleFrameTimestamps.clear();
25
+ });
26
+ it('should not exceed action timestamp capacity', () => {
27
+ for (let i = 0; i < ACTION_TIMESTAMP_CAPACITY + 10; i++) {
28
+ profiler.reportAction();
29
+ // To ensure we don't trigger the debounce
30
+ profiler.lastActionTimestamp = 0;
31
+ }
32
+ expect(profiler.actionTimestamps.size).toBe(ACTION_TIMESTAMP_CAPACITY);
33
+ });
34
+ it('should not exceed frame timestamp capacity', () => {
35
+ for (let i = 0; i < FRAME_TIMESTAMP_CAPACITY + 10; i++) {
36
+ profiler.reportFrameRendered();
37
+ // To ensure we don't trigger the debounce
38
+ profiler.lastFrameStartTime = 0;
39
+ }
40
+ expect(profiler.possiblyIdleFrameTimestamps.size).toBe(FRAME_TIMESTAMP_CAPACITY);
41
+ });
42
+ it('should drop oldest action timestamps when capacity is reached', () => {
43
+ for (let i = 0; i < ACTION_TIMESTAMP_CAPACITY; i++) {
44
+ profiler.actionTimestamps.push(i);
45
+ }
46
+ profiler.lastActionTimestamp = 0;
47
+ profiler.reportAction();
48
+ expect(profiler.actionTimestamps.size).toBe(ACTION_TIMESTAMP_CAPACITY);
49
+ expect(profiler.actionTimestamps.peekFirst()).toBe(1);
50
+ });
51
+ it('should drop oldest frame timestamps when capacity is reached', () => {
52
+ for (let i = 0; i < FRAME_TIMESTAMP_CAPACITY; i++) {
53
+ profiler.possiblyIdleFrameTimestamps.push(i);
54
+ }
55
+ profiler.lastFrameStartTime = 0;
56
+ profiler.reportFrameRendered();
57
+ expect(profiler.possiblyIdleFrameTimestamps.size).toBe(FRAME_TIMESTAMP_CAPACITY);
58
+ expect(profiler.possiblyIdleFrameTimestamps.peekFirst()).toBe(1);
59
+ });
60
+ it('should not report frames as idle if an action happens shortly after', async () => {
61
+ const startTime = Date.now();
62
+ vi.setSystemTime(startTime);
63
+ for (let i = 0; i < 5; i++) {
64
+ profiler.reportFrameRendered();
65
+ vi.advanceTimersByTime(20);
66
+ }
67
+ vi.setSystemTime(startTime + 400);
68
+ profiler.reportAction();
69
+ vi.advanceTimersByTime(600);
70
+ profiler.checkForIdleFrames();
71
+ expect(profiler.totalIdleFrames).toBe(0);
72
+ });
73
+ it('should report frames as idle if no action happens nearby', async () => {
74
+ const startTime = Date.now();
75
+ vi.setSystemTime(startTime);
76
+ for (let i = 0; i < 5; i++) {
77
+ profiler.reportFrameRendered();
78
+ vi.advanceTimersByTime(20);
79
+ }
80
+ vi.advanceTimersByTime(1000);
81
+ profiler.checkForIdleFrames();
82
+ expect(profiler.totalIdleFrames).toBe(5);
83
+ });
84
+ it('should not report frames as idle if an action happens shortly before', async () => {
85
+ const startTime = Date.now();
86
+ vi.setSystemTime(startTime);
87
+ profiler.reportAction();
88
+ vi.advanceTimersByTime(400);
89
+ for (let i = 0; i < 5; i++) {
90
+ profiler.reportFrameRendered();
91
+ vi.advanceTimersByTime(20);
92
+ }
93
+ vi.advanceTimersByTime(600);
94
+ profiler.checkForIdleFrames();
95
+ expect(profiler.totalIdleFrames).toBe(0);
96
+ });
97
+ it('should correctly identify mixed idle and non-idle frames', async () => {
98
+ const startTime = Date.now();
99
+ vi.setSystemTime(startTime);
100
+ for (let i = 0; i < 3; i++) {
101
+ profiler.reportFrameRendered();
102
+ vi.advanceTimersByTime(20);
103
+ }
104
+ vi.advanceTimersByTime(1000);
105
+ profiler.reportAction();
106
+ vi.advanceTimersByTime(100);
107
+ for (let i = 0; i < 3; i++) {
108
+ profiler.reportFrameRendered();
109
+ vi.advanceTimersByTime(20);
110
+ }
111
+ vi.advanceTimersByTime(600);
112
+ profiler.checkForIdleFrames();
113
+ expect(profiler.totalIdleFrames).toBe(3);
114
+ });
115
+ it('should report flicker frames', () => {
116
+ const reportActionSpy = vi.spyOn(profiler, 'reportAction');
117
+ const cleanup = profiler.registerFlickerHandler(true);
118
+ appEvents.emit(AppEvent.Flicker);
119
+ expect(profiler.totalFlickerFrames).toBe(1);
120
+ expect(reportActionSpy).toHaveBeenCalled();
121
+ cleanup();
122
+ });
123
+ it('should not report idle frames when actions are interleaved', async () => {
124
+ const startTime = Date.now();
125
+ vi.setSystemTime(startTime);
126
+ profiler.reportFrameRendered();
127
+ vi.advanceTimersByTime(20);
128
+ profiler.reportFrameRendered();
129
+ vi.advanceTimersByTime(200);
130
+ profiler.reportAction();
131
+ vi.advanceTimersByTime(200);
132
+ profiler.reportFrameRendered();
133
+ vi.advanceTimersByTime(20);
134
+ profiler.reportFrameRendered();
135
+ vi.advanceTimersByTime(600);
136
+ profiler.checkForIdleFrames();
137
+ expect(profiler.totalIdleFrames).toBe(0);
138
+ });
139
+ });
140
+ //# sourceMappingURL=DebugProfiler.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DebugProfiler.test.js","sourceRoot":"","sources":["../../../../src/ui/components/DebugProfiler.test.tsx"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
5
5
  * SPDX-License-Identifier: Apache-2.0
6
6
  */
7
7
  import { Box, Text } from 'ink';
8
- import { useEffect } from 'react';
8
+ import { useEffect, useState } from 'react';
9
9
  import { theme } from '../semantic-colors.js';
10
10
  import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
11
11
  import { useKeypress } from '../hooks/useKeypress.js';
@@ -19,6 +19,7 @@ export var FolderTrustChoice;
19
19
  FolderTrustChoice["DO_NOT_TRUST"] = "do_not_trust";
20
20
  })(FolderTrustChoice || (FolderTrustChoice = {}));
21
21
  export const FolderTrustDialog = ({ onSelect, isRestarting, }) => {
22
+ const [exiting, setExiting] = useState(false);
22
23
  useEffect(() => {
23
24
  const doRelaunch = async () => {
24
25
  if (isRestarting) {
@@ -31,7 +32,10 @@ export const FolderTrustDialog = ({ onSelect, isRestarting, }) => {
31
32
  }, [isRestarting]);
32
33
  useKeypress((key) => {
33
34
  if (key.name === 'escape') {
34
- onSelect(FolderTrustChoice.DO_NOT_TRUST);
35
+ setExiting(true);
36
+ setTimeout(() => {
37
+ process.exit(1);
38
+ }, 100);
35
39
  }
36
40
  }, { isActive: !isRestarting });
37
41
  const dirName = path.basename(process.cwd());
@@ -48,11 +52,11 @@ export const FolderTrustDialog = ({ onSelect, isRestarting, }) => {
48
52
  key: `Trust parent folder (${parentFolder})`,
49
53
  },
50
54
  {
51
- label: "Don't trust (esc)",
55
+ label: "Don't trust",
52
56
  value: FolderTrustChoice.DO_NOT_TRUST,
53
- key: "Don't trust (esc)",
57
+ key: "Don't trust",
54
58
  },
55
59
  ];
56
- return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.status.warning, padding: 1, width: "100%", marginLeft: 1, children: [_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { bold: true, color: theme.text.primary, children: "Do you trust this folder?" }), _jsx(Text, { color: theme.text.primary, children: "Trusting a folder allows Gemini to execute commands it suggests. This is a security feature to prevent accidental execution in untrusted directories." })] }), _jsx(RadioButtonSelect, { items: options, onSelect: onSelect, isFocused: !isRestarting })] }), isRestarting && (_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { color: theme.status.warning, children: "Gemini CLI is restarting to apply the trust changes..." }) }))] }));
60
+ return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.status.warning, padding: 1, width: "100%", marginLeft: 1, children: [_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { bold: true, color: theme.text.primary, children: "Do you trust this folder?" }), _jsx(Text, { color: theme.text.primary, children: "Trusting a folder allows Gemini to execute commands it suggests. This is a security feature to prevent accidental execution in untrusted directories." })] }), _jsx(RadioButtonSelect, { items: options, onSelect: onSelect, isFocused: !isRestarting })] }), isRestarting && (_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { color: theme.status.warning, children: "Gemini CLI is restarting to apply the trust changes..." }) })), exiting && (_jsx(Box, { marginLeft: 1, marginTop: 1, children: _jsx(Text, { color: theme.status.warning, children: "A folder trust level must be selected to continue. Exiting since escape was pressed." }) }))] }));
57
61
  };
58
62
  //# sourceMappingURL=FolderTrustDialog.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"FolderTrustDialog.js","sourceRoot":"","sources":["../../../../src/ui/components/FolderTrustDialog.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,MAAM,CAAN,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IAC3B,kDAA6B,CAAA;IAC7B,kDAA6B,CAAA;IAC7B,kDAA6B,CAAA;AAC/B,CAAC,EAJW,iBAAiB,KAAjB,iBAAiB,QAI5B;AAOD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,EAClE,QAAQ,EACR,YAAY,GACb,EAAE,EAAE;IACH,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;YAC5B,IAAI,YAAY,EAAE,CAAC;gBACjB,UAAU,CAAC,KAAK,IAAI,EAAE;oBACpB,MAAM,WAAW,EAAE,CAAC;gBACtB,CAAC,EAAE,GAAG,CAAC,CAAC;YACV,CAAC;QACH,CAAC,CAAC;QACF,UAAU,EAAE,CAAC;IACf,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,WAAW,CACT,CAAC,GAAG,EAAE,EAAE;QACN,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,QAAQ,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC,EACD,EAAE,QAAQ,EAAE,CAAC,YAAY,EAAE,CAC5B,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IAEhE,MAAM,OAAO,GAA8C;QACzD;YACE,KAAK,EAAE,iBAAiB,OAAO,GAAG;YAClC,KAAK,EAAE,iBAAiB,CAAC,YAAY;YACrC,GAAG,EAAE,iBAAiB,OAAO,GAAG;SACjC;QACD;YACE,KAAK,EAAE,wBAAwB,YAAY,GAAG;YAC9C,KAAK,EAAE,iBAAiB,CAAC,YAAY;YACrC,GAAG,EAAE,wBAAwB,YAAY,GAAG;SAC7C;QACD;YACE,KAAK,EAAE,mBAAmB;YAC1B,KAAK,EAAE,iBAAiB,CAAC,YAAY;YACrC,GAAG,EAAE,mBAAmB;SACzB;KACF,CAAC;IAEF,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,MAAC,GAAG,IACF,aAAa,EAAC,QAAQ,EACtB,WAAW,EAAC,OAAO,EACnB,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EACjC,OAAO,EAAE,CAAC,EACV,KAAK,EAAC,MAAM,EACZ,UAAU,EAAE,CAAC,aAEb,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,YAAY,EAAE,CAAC,aACzC,KAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,0CAE7B,EACP,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,sKAIxB,IACH,EAEN,KAAC,iBAAiB,IAChB,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,CAAC,YAAY,GACxB,IACE,EACL,YAAY,IAAI,CACf,KAAC,GAAG,IAAC,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,YAC9B,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,uEAE1B,GACH,CACP,IACG,CACP,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"FolderTrustDialog.js","sourceRoot":"","sources":["../../../../src/ui/components/FolderTrustDialog.tsx"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
7
7
  import { renderWithProviders } from '../../test-utils/render.js';
8
8
  import { waitFor } from '@testing-library/react';
9
9
  import { vi } from 'vitest';
10
- import { FolderTrustDialog, FolderTrustChoice } from './FolderTrustDialog.js';
10
+ import { FolderTrustDialog } from './FolderTrustDialog.js';
11
11
  import * as processUtils from '../../utils/processUtils.js';
12
12
  vi.mock('../../utils/processUtils.js', () => ({
13
13
  relaunchApp: vi.fn(),
@@ -32,21 +32,17 @@ describe('FolderTrustDialog', () => {
32
32
  expect(lastFrame()).toContain('Do you trust this folder?');
33
33
  expect(lastFrame()).toContain('Trusting a folder allows Gemini to execute commands it suggests.');
34
34
  });
35
- it('should call onSelect with DO_NOT_TRUST when escape is pressed and not restarting', async () => {
35
+ it('should display exit message and call process.exit and not call onSelect when escape is pressed', async () => {
36
36
  const onSelect = vi.fn();
37
- const { stdin } = renderWithProviders(_jsx(FolderTrustDialog, { onSelect: onSelect, isRestarting: false }));
37
+ const { lastFrame, stdin } = renderWithProviders(_jsx(FolderTrustDialog, { onSelect: onSelect, isRestarting: false }));
38
38
  stdin.write('\x1b'); // escape key
39
39
  await waitFor(() => {
40
- expect(onSelect).toHaveBeenCalledWith(FolderTrustChoice.DO_NOT_TRUST);
40
+ expect(lastFrame()).toContain('A folder trust level must be selected to continue. Exiting since escape was pressed.');
41
41
  });
42
- });
43
- it('should not call onSelect when escape is pressed and is restarting', async () => {
44
- const onSelect = vi.fn();
45
- const { stdin } = renderWithProviders(_jsx(FolderTrustDialog, { onSelect: onSelect, isRestarting: true }));
46
- stdin.write('\x1b'); // escape key
47
42
  await waitFor(() => {
48
- expect(onSelect).not.toHaveBeenCalled();
43
+ expect(mockedExit).toHaveBeenCalledWith(1);
49
44
  });
45
+ expect(onSelect).not.toHaveBeenCalled();
50
46
  });
51
47
  it('should display restart message when isRestarting is true', () => {
52
48
  const { lastFrame } = renderWithProviders(_jsx(FolderTrustDialog, { onSelect: vi.fn(), isRestarting: true }));
@@ -56,7 +52,7 @@ describe('FolderTrustDialog', () => {
56
52
  vi.useFakeTimers();
57
53
  const relaunchApp = vi.spyOn(processUtils, 'relaunchApp');
58
54
  renderWithProviders(_jsx(FolderTrustDialog, { onSelect: vi.fn(), isRestarting: true }));
59
- await vi.advanceTimersByTimeAsync(1000);
55
+ await vi.advanceTimersByTimeAsync(250);
60
56
  expect(relaunchApp).toHaveBeenCalled();
61
57
  vi.useRealTimers();
62
58
  });
@@ -1 +1 @@
1
- {"version":3,"file":"FolderTrustDialog.test.js","sourceRoot":"","sources":["../../../../src/ui/components/FolderTrustDialog.test.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FolderTrustDialog.test.js","sourceRoot":"","sources":["../../../../src/ui/components/FolderTrustDialog.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,YAAY,MAAM,6BAA6B,CAAC;AAE5D,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE,CAAC,CAAC;IAC5C,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;CACrB,CAAC,CAAC,CAAC;AAEJ,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC7C,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAE5C,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;IACjC,MAAM,MAAM,GACV,MAAM,EAAE,CAAC,YAAY,CAAgC,cAAc,CAAC,CAAC;IACvE,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE,SAAS;KACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,SAAS,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC7D,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,iBAAiB,IAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,GAAI,CACzC,CAAC;QAEF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;QAC3D,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAC3B,kEAAkE,CACnE,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gGAAgG,EAAE,KAAK,IAAI,EAAE;QAC9G,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACzB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,mBAAmB,CAC9C,KAAC,iBAAiB,IAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,GAAI,CAC/D,CAAC;QAEF,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa;QAElC,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAC3B,sFAAsF,CACvF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAClE,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,iBAAiB,IAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,GAAI,CAC7D,CAAC;QAEF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,WAAW,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAC1D,mBAAmB,CACjB,KAAC,iBAAiB,IAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,IAAI,GAAI,CAC7D,CAAC;QACF,MAAM,EAAE,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,CAAC,WAAW,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACvC,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;QAC1F,MAAM,EAAE,KAAK,EAAE,GAAG,mBAAmB,CACnC,KAAC,iBAAiB,IAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,GAAI,CAC9D,CAAC;QAEF,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEjB,MAAM,OAAO,CAAC,GAAG,EAAE;YACjB,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;YACzE,SAAS,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;YAChD,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,iBAAiB,IAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,GAAI,CACzC,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;YAChF,SAAS,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;YAChD,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,iBAAiB,IAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,GAAI,CACzC,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0FAA0F,EAAE,GAAG,EAAE;YAClG,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACtC,MAAM,EAAE,SAAS,EAAE,GAAG,mBAAmB,CACvC,KAAC,iBAAiB,IAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,GAAI,CACzC,CAAC;YACF,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -8,7 +8,7 @@ import Gradient from 'ink-gradient';
8
8
  import { MemoryUsageDisplay } from './MemoryUsageDisplay.js';
9
9
  import { ContextUsageDisplay } from './ContextUsageDisplay.js';
10
10
  import { DebugProfiler } from './DebugProfiler.js';
11
- import { useTerminalSize } from '../hooks/useTerminalSize.js';
11
+ import { isDevelopment } from '../../utils/installationInfo.js';
12
12
  import { useUIState } from '../contexts/UIStateContext.js';
13
13
  import { useConfig } from '../contexts/ConfigContext.js';
14
14
  import { useSettings } from '../contexts/SettingsContext.js';
@@ -18,7 +18,7 @@ export const Footer = () => {
18
18
  const config = useConfig();
19
19
  const settings = useSettings();
20
20
  const { vimEnabled, vimMode } = useVimMode();
21
- const { model, targetDir, debugMode, branchName, debugMessage, corgiMode, errorCount, showErrorDetails, promptTokenCount, nightly, isTrustedFolder, } = {
21
+ const { model, targetDir, debugMode, branchName, debugMessage, corgiMode, errorCount, showErrorDetails, promptTokenCount, nightly, isTrustedFolder, mainAreaWidth, } = {
22
22
  model: config.getModel(),
23
23
  targetDir: config.getTargetDir(),
24
24
  debugMode: config.getDebugMode(),
@@ -30,18 +30,19 @@ export const Footer = () => {
30
30
  promptTokenCount: uiState.sessionStats.lastPromptTokenCount,
31
31
  nightly: uiState.nightly,
32
32
  isTrustedFolder: uiState.isTrustedFolder,
33
+ mainAreaWidth: uiState.mainAreaWidth,
33
34
  };
34
35
  const showMemoryUsage = config.getDebugMode() || settings.merged.ui?.showMemoryUsage || false;
35
36
  const hideCWD = settings.merged.ui?.footer?.hideCWD || false;
36
37
  const hideSandboxStatus = settings.merged.ui?.footer?.hideSandboxStatus || false;
37
38
  const hideModelInfo = settings.merged.ui?.footer?.hideModelInfo || false;
38
- const { columns: terminalWidth } = useTerminalSize();
39
- const pathLength = Math.max(20, Math.floor(terminalWidth * 0.25));
39
+ const pathLength = Math.max(20, Math.floor(mainAreaWidth * 0.25));
40
40
  const displayPath = shortenPath(tildeifyPath(targetDir), pathLength);
41
41
  const justifyContent = hideCWD && hideModelInfo ? 'center' : 'space-between';
42
42
  const displayVimMode = vimEnabled ? vimMode : undefined;
43
- return (_jsxs(Box, { justifyContent: justifyContent, width: "100%", flexDirection: "row", alignItems: "center", children: [(debugMode || displayVimMode || !hideCWD) && (_jsxs(Box, { children: [debugMode && _jsx(DebugProfiler, {}), displayVimMode && (_jsxs(Text, { color: theme.text.secondary, children: ["[", displayVimMode, "] "] })), !hideCWD &&
43
+ const showDebugProfiler = debugMode || isDevelopment;
44
+ return (_jsxs(Box, { justifyContent: justifyContent, width: mainAreaWidth, flexDirection: "row", alignItems: "center", paddingX: 1, children: [(showDebugProfiler || displayVimMode || !hideCWD) && (_jsxs(Box, { children: [showDebugProfiler && _jsx(DebugProfiler, {}), displayVimMode && (_jsxs(Text, { color: theme.text.secondary, children: ["[", displayVimMode, "] "] })), !hideCWD &&
44
45
  (nightly ? (_jsx(Gradient, { colors: theme.ui.gradient, children: _jsxs(Text, { children: [displayPath, branchName && _jsxs(Text, { children: [" (", branchName, "*)"] })] }) })) : (_jsxs(Text, { color: theme.text.link, children: [displayPath, branchName && (_jsxs(Text, { color: theme.text.secondary, children: [" (", branchName, "*)"] }))] }))), debugMode && (_jsx(Text, { color: theme.status.error, children: ' ' + (debugMessage || '--debug') }))] })), !hideSandboxStatus && (_jsx(Box, { flexGrow: 1, alignItems: "center", justifyContent: "center", display: "flex", children: isTrustedFolder === false ? (_jsx(Text, { color: theme.status.warning, children: "untrusted" })) : process.env['SANDBOX'] &&
45
- process.env['SANDBOX'] !== 'sandbox-exec' ? (_jsx(Text, { color: "green", children: process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '') })) : process.env['SANDBOX'] === 'sandbox-exec' ? (_jsxs(Text, { color: theme.status.warning, children: ["macOS Seatbelt", ' ', _jsxs(Text, { color: theme.text.secondary, children: ["(", process.env['SEATBELT_PROFILE'], ")"] })] })) : (_jsxs(Text, { color: theme.status.error, children: ["no sandbox", terminalWidth >= 100 && (_jsx(Text, { color: theme.text.secondary, children: " (see /docs)" }))] })) })), !hideModelInfo && (_jsxs(Box, { alignItems: "center", justifyContent: "flex-end", children: [_jsxs(Box, { alignItems: "center", children: [_jsxs(Text, { color: theme.text.accent, children: [model, ' ', _jsx(ContextUsageDisplay, { promptTokenCount: promptTokenCount, model: model, terminalWidth: terminalWidth })] }), showMemoryUsage && _jsx(MemoryUsageDisplay, {})] }), _jsxs(Box, { alignItems: "center", paddingLeft: 2, children: [corgiMode && (_jsxs(Text, { children: [_jsx(Text, { color: theme.ui.symbol, children: "| " }), _jsx(Text, { color: theme.status.error, children: "\u25BC" }), _jsx(Text, { color: theme.text.primary, children: "(\u00B4" }), _jsx(Text, { color: theme.status.error, children: "\u1D25" }), _jsx(Text, { color: theme.text.primary, children: "`)" }), _jsx(Text, { color: theme.status.error, children: "\u25BC " })] })), !showErrorDetails && errorCount > 0 && (_jsxs(Box, { children: [_jsx(Text, { color: theme.ui.symbol, children: "| " }), _jsx(ConsoleSummaryDisplay, { errorCount: errorCount })] }))] })] }))] }));
46
+ process.env['SANDBOX'] !== 'sandbox-exec' ? (_jsx(Text, { color: "green", children: process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '') })) : process.env['SANDBOX'] === 'sandbox-exec' ? (_jsxs(Text, { color: theme.status.warning, children: ["macOS Seatbelt", ' ', _jsxs(Text, { color: theme.text.secondary, children: ["(", process.env['SEATBELT_PROFILE'], ")"] })] })) : (_jsxs(Text, { color: theme.status.error, children: ["no sandbox", mainAreaWidth >= 100 && (_jsx(Text, { color: theme.text.secondary, children: " (see /docs)" }))] })) })), !hideModelInfo && (_jsxs(Box, { alignItems: "center", justifyContent: "flex-end", children: [_jsxs(Box, { alignItems: "center", children: [_jsxs(Text, { color: theme.text.accent, children: [model, ' ', _jsx(ContextUsageDisplay, { promptTokenCount: promptTokenCount, model: model, terminalWidth: mainAreaWidth })] }), showMemoryUsage && _jsx(MemoryUsageDisplay, {})] }), _jsxs(Box, { alignItems: "center", children: [corgiMode && (_jsx(Box, { paddingLeft: 1, flexDirection: "row", children: _jsxs(Text, { children: [_jsx(Text, { color: theme.ui.symbol, children: "| " }), _jsx(Text, { color: theme.status.error, children: "\u25BC" }), _jsx(Text, { color: theme.text.primary, children: "(\u00B4" }), _jsx(Text, { color: theme.status.error, children: "\u1D25" }), _jsx(Text, { color: theme.text.primary, children: "`)" }), _jsx(Text, { color: theme.status.error, children: "\u25BC" })] }) })), !showErrorDetails && errorCount > 0 && (_jsxs(Box, { paddingLeft: 1, flexDirection: "row", children: [_jsx(Text, { color: theme.ui.symbol, children: "| " }), _jsx(ConsoleSummaryDisplay, { errorCount: errorCount })] }))] })] }))] }));
46
47
  };
47
48
  //# sourceMappingURL=Footer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Footer.js","sourceRoot":"","sources":["../../../../src/ui/components/Footer.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Footer.js","sourceRoot":"","sources":["../../../../src/ui/components/Footer.tsx"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { Text, useIsScreenReaderEnabled } from 'ink';
3
- import Spinner from 'ink-spinner';
3
+ import { CliSpinner } from './CliSpinner.js';
4
4
  import { useStreamingContext } from '../contexts/StreamingContext.js';
5
5
  import { StreamingState } from '../types.js';
6
6
  import { SCREEN_READER_LOADING, SCREEN_READER_RESPONDING, } from '../textConstants.js';
@@ -18,6 +18,6 @@ export const GeminiRespondingSpinner = ({ nonRespondingDisplay, spinnerType = 'd
18
18
  };
19
19
  export const GeminiSpinner = ({ spinnerType = 'dots', altText, }) => {
20
20
  const isScreenReaderEnabled = useIsScreenReaderEnabled();
21
- return isScreenReaderEnabled ? (_jsx(Text, { children: altText })) : (_jsx(Text, { color: theme.text.primary, children: _jsx(Spinner, { type: spinnerType }) }));
21
+ return isScreenReaderEnabled ? (_jsx(Text, { children: altText })) : (_jsx(Text, { color: theme.text.primary, children: _jsx(CliSpinner, { type: spinnerType }) }));
22
22
  };
23
23
  //# sourceMappingURL=GeminiRespondingSpinner.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"GeminiRespondingSpinner.js","sourceRoot":"","sources":["../../../../src/ui/components/GeminiRespondingSpinner.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,wBAAwB,EAAE,MAAM,KAAK,CAAC;AACrD,OAAO,OAAO,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAW9C,MAAM,CAAC,MAAM,uBAAuB,GAEhC,CAAC,EAAE,oBAAoB,EAAE,WAAW,GAAG,MAAM,EAAE,EAAE,EAAE;IACrD,MAAM,cAAc,GAAG,mBAAmB,EAAE,CAAC;IAC7C,MAAM,qBAAqB,GAAG,wBAAwB,EAAE,CAAC;IACzD,IAAI,cAAc,KAAK,cAAc,CAAC,UAAU,EAAE,CAAC;QACjD,OAAO,CACL,KAAC,aAAa,IACZ,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,wBAAwB,GACjC,CACH,CAAC;IACJ,CAAC;SAAM,IAAI,oBAAoB,EAAE,CAAC;QAChC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAC7B,KAAC,IAAI,cAAE,qBAAqB,GAAQ,CACrC,CAAC,CAAC,CAAC,CACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,YAAG,oBAAoB,GAAQ,CAC/D,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,aAAa,GAAiC,CAAC,EAC1D,WAAW,GAAG,MAAM,EACpB,OAAO,GACR,EAAE,EAAE;IACH,MAAM,qBAAqB,GAAG,wBAAwB,EAAE,CAAC;IACzD,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAC7B,KAAC,IAAI,cAAE,OAAO,GAAQ,CACvB,CAAC,CAAC,CAAC,CACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,YAC7B,KAAC,OAAO,IAAC,IAAI,EAAE,WAAW,GAAI,GACzB,CACR,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"GeminiRespondingSpinner.js","sourceRoot":"","sources":["../../../../src/ui/components/GeminiRespondingSpinner.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,IAAI,EAAE,wBAAwB,EAAE,MAAM,KAAK,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAW9C,MAAM,CAAC,MAAM,uBAAuB,GAEhC,CAAC,EAAE,oBAAoB,EAAE,WAAW,GAAG,MAAM,EAAE,EAAE,EAAE;IACrD,MAAM,cAAc,GAAG,mBAAmB,EAAE,CAAC;IAC7C,MAAM,qBAAqB,GAAG,wBAAwB,EAAE,CAAC;IACzD,IAAI,cAAc,KAAK,cAAc,CAAC,UAAU,EAAE,CAAC;QACjD,OAAO,CACL,KAAC,aAAa,IACZ,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,wBAAwB,GACjC,CACH,CAAC;IACJ,CAAC;SAAM,IAAI,oBAAoB,EAAE,CAAC;QAChC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAC7B,KAAC,IAAI,cAAE,qBAAqB,GAAQ,CACrC,CAAC,CAAC,CAAC,CACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,YAAG,oBAAoB,GAAQ,CAC/D,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAOF,MAAM,CAAC,MAAM,aAAa,GAAiC,CAAC,EAC1D,WAAW,GAAG,MAAM,EACpB,OAAO,GACR,EAAE,EAAE;IACH,MAAM,qBAAqB,GAAG,wBAAwB,EAAE,CAAC;IACzD,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAC7B,KAAC,IAAI,cAAE,OAAO,GAAQ,CACvB,CAAC,CAAC,CAAC,CACF,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,YAC7B,KAAC,UAAU,IAAC,IAAI,EAAE,WAAW,GAAI,GAC5B,CACR,CAAC;AACJ,CAAC,CAAC"}
@@ -9,5 +9,5 @@ export const Help = ({ commands }) => (_jsxs(Box, { flexDirection: "column", mar
9
9
  .filter((subCommand) => !subCommand.hidden)
10
10
  .map((subCommand) => (_jsxs(Text, { color: theme.text.primary, children: [_jsxs(Text, { bold: true, color: theme.text.accent, children: [' ', subCommand.name] }), subCommand.description && ' - ' + subCommand.description] }, subCommand.name)))] }, command.name))), _jsxs(Text, { color: theme.text.primary, children: [_jsxs(Text, { bold: true, color: theme.text.accent, children: [' ', "!", ' '] }), "- shell command"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { color: theme.text.secondary, children: "[MCP]" }), " - Model Context Protocol command (from external servers)"] }), _jsx(Box, { height: 1 }), _jsx(Text, { bold: true, color: theme.text.primary, children: "Keyboard Shortcuts:" }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Alt+Left/Right" }), ' ', "- Jump through words in the input"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Ctrl+C" }), ' ', "- Quit application"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: process.platform === 'win32' ? 'Ctrl+Enter' : 'Ctrl+J' }), ' ', process.platform === 'linux'
11
11
  ? '- New line (Alt+Enter works for certain linux distros)'
12
- : '- New line'] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Ctrl+L" }), ' ', "- Clear the screen"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: process.platform === 'darwin' ? 'Ctrl+X / Meta+Enter' : 'Ctrl+X' }), ' ', "- Open input in external editor"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Ctrl+Y" }), ' ', "- Toggle YOLO mode"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Enter" }), ' ', "- Send message"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Esc" }), ' ', "- Cancel operation / Clear input (double press)"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Shift+Tab" }), ' ', "- Toggle auto-accepting edits"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Up/Down" }), ' ', "- Cycle through your prompt history"] }), _jsx(Box, { height: 1 }), _jsxs(Text, { color: theme.text.primary, children: ["For a full list of shortcuts, see", ' ', _jsx(Text, { bold: true, color: theme.text.accent, children: "docs/keyboard-shortcuts.md" })] })] }));
12
+ : '- New line'] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Ctrl+L" }), ' ', "- Clear the screen"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: process.platform === 'darwin' ? 'Ctrl+X / Meta+Enter' : 'Ctrl+X' }), ' ', "- Open input in external editor"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Ctrl+Y" }), ' ', "- Toggle YOLO mode"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Enter" }), ' ', "- Send message"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Esc" }), ' ', "- Cancel operation / Clear input (double press)"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Shift+Tab" }), ' ', "- Toggle auto-accepting edits"] }), _jsxs(Text, { color: theme.text.primary, children: [_jsx(Text, { bold: true, color: theme.text.accent, children: "Up/Down" }), ' ', "- Cycle through your prompt history"] }), _jsx(Box, { height: 1 }), _jsxs(Text, { color: theme.text.primary, children: ["For a full list of shortcuts, see", ' ', _jsx(Text, { bold: true, color: theme.text.accent, children: "docs/cli/keyboard-shortcuts.md" })] })] }));
13
13
  //# sourceMappingURL=Help.js.map