@kabmo-labs/kabmo 0.26.0 → 0.28.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 (354) hide show
  1. package/dist/client/index.html +1 -1
  2. package/dist/client/index.js +502 -474
  3. package/dist/client/static/js/index-81f7berm.css +1 -0
  4. package/dist/client/static/js/{index-95b3n20k.js → index-xzvyrxya.js} +799 -799
  5. package/marketplace/plugins/command-runner/package.json +3 -17
  6. package/marketplace/plugins/command-runner/settings-schema.json +14 -0
  7. package/marketplace/plugins/git-forge/README.md +17 -7
  8. package/marketplace/plugins/git-forge/package.json +4 -30
  9. package/marketplace/plugins/git-forge/panel.css +16 -0
  10. package/marketplace/plugins/git-forge/settings-schema.json +27 -0
  11. package/marketplace/plugins/git-forge/src/panel/Badge.tsx +35 -22
  12. package/marketplace/plugins/git-forge/src/panel/Change.tsx +20 -24
  13. package/marketplace/plugins/git-forge/src/panel/CiBadge.tsx +16 -7
  14. package/marketplace/plugins/git-forge/src/panel/Credential.tsx +31 -26
  15. package/marketplace/plugins/git-forge/src/panel/Glyph.tsx +18 -2
  16. package/marketplace/plugins/git-forge/src/panel/Header.tsx +160 -96
  17. package/marketplace/plugins/git-forge/src/panel/ItemView.tsx +60 -44
  18. package/marketplace/plugins/git-forge/src/panel/List.tsx +150 -22
  19. package/marketplace/plugins/git-forge/src/panel/Row.tsx +11 -5
  20. package/marketplace/plugins/git-forge/src/panel/Sidebar.tsx +17 -15
  21. package/marketplace/plugins/git-forge/src/panel/Write.tsx +84 -61
  22. package/marketplace/plugins/git-forge/src/panel/format.test.ts +99 -0
  23. package/marketplace/plugins/git-forge/src/panel/format.ts +59 -16
  24. package/marketplace/plugins/git-forge/src/panel/index.test.tsx +109 -5
  25. package/marketplace/plugins/git-forge/src/panel/index.tsx +37 -4
  26. package/marketplace/plugins/git-forge/src/panel/use-forge.ts +17 -0
  27. package/marketplace/plugins/git-forge/src/panel/write.test.tsx +31 -0
  28. package/marketplace/plugins/session-info/package.json +2 -10
  29. package/marketplace/plugins/session-info/settings-schema.json +8 -0
  30. package/marketplace/plugins/stats/README.md +17 -5
  31. package/marketplace/plugins/stats/package.json +3 -23
  32. package/marketplace/plugins/stats/settings-schema.json +20 -0
  33. package/marketplace/plugins/stats/src/app.tsx +1 -1
  34. package/marketplace/plugins/stats/src/groups.test.ts +46 -1
  35. package/marketplace/plugins/stats/src/groups.ts +22 -11
  36. package/marketplace/plugins/stats/src/harness-leases.test.ts +84 -0
  37. package/marketplace/plugins/stats/src/harness-leases.ts +132 -0
  38. package/marketplace/plugins/stats/src/labels.test.ts +54 -1
  39. package/marketplace/plugins/stats/src/labels.ts +33 -7
  40. package/marketplace/plugins/stats/src/sampler.test.ts +61 -0
  41. package/marketplace/plugins/stats/src/sampler.ts +39 -5
  42. package/marketplace/plugins/stats/src/snapshot.ts +6 -0
  43. package/package.json +2 -2
  44. package/src/client/components/common/Toast.test.tsx +28 -2
  45. package/src/client/components/common/Toast.tsx +21 -9
  46. package/src/client/components/common/harness-glyph/index.tsx +18 -1
  47. package/src/client/components/common/session-actions-menu/index.test.tsx +106 -0
  48. package/src/client/components/common/session-actions-menu/index.tsx +43 -1
  49. package/src/client/components/common/session-row/TrailingSlot.tsx +9 -4
  50. package/src/client/components/common/session-row/index.tsx +4 -0
  51. package/src/client/components/common/session-row/session-row.test.tsx +6 -0
  52. package/src/client/components/layout/desktop-layout/LeftColumn.tsx +2 -1
  53. package/src/client/components/layout/session-sidebar/CategoryItem.tsx +4 -2
  54. package/src/client/components/layout/session-sidebar/SessionItem.tsx +9 -1
  55. package/src/client/components/layout/session-sidebar/SessionList.tsx +2 -1
  56. package/src/client/components/layout/session-sidebar/about-modal/UpdateSection.tsx +3 -2
  57. package/src/client/components/layout/session-sidebar/about-modal/index.tsx +2 -1
  58. package/src/client/components/layout/session-sidebar/modern/RevealRow.tsx +56 -0
  59. package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +12 -29
  60. package/src/client/components/layout/session-sidebar/modern/reveal-row.test.tsx +104 -0
  61. package/src/client/components/layout/session-sidebar/scheduler-modal/ModelFields.tsx +202 -0
  62. package/src/client/components/layout/session-sidebar/scheduler-modal/TaskForm.tsx +80 -19
  63. package/src/client/components/layout/session-sidebar/scheduler-modal/TaskList.tsx +23 -3
  64. package/src/client/components/layout/session-sidebar/scheduler-modal/index.tsx +5 -1
  65. package/src/client/components/layout/session-sidebar/variant-props.ts +2 -1
  66. package/src/client/components/mobile/SessionSidebar.tsx +2 -1
  67. package/src/client/components/mobile/mobile-right-sidebar/EditorSurface.tsx +156 -0
  68. package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +41 -86
  69. package/src/client/components/mobile/mobile-session-sidebar/ClassicDrawer.tsx +2 -1
  70. package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +4 -2
  71. package/src/client/components/mobile/mobile-session-sidebar/List.tsx +2 -1
  72. package/src/client/components/mobile/mobile-session-sidebar/SessionRow.test.ts +6 -0
  73. package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +9 -1
  74. package/src/client/components/settings/Modal.tsx +7 -3
  75. package/src/client/components/settings/Sidebar.tsx +30 -3
  76. package/src/client/components/settings/categories/HarnessSettings.tsx +11 -7
  77. package/src/client/components/settings/categories/NotificationSettings.test.tsx +40 -15
  78. package/src/client/components/settings/categories/NotificationSettings.tsx +142 -64
  79. package/src/client/components/settings/categories/PanelPluginSettings.tsx +1 -1
  80. package/src/client/components/settings/categories/harness-settings/CustomHarnessForm.tsx +186 -0
  81. package/src/client/components/settings/categories/panel-plugins/InstalledList.tsx +11 -0
  82. package/src/client/components/settings/categories/panel-plugins/PluginCard.test.tsx +1 -0
  83. package/src/client/components/settings/categories/panel-plugins/PluginCard.tsx +15 -1
  84. package/src/client/components/settings/categories/panel-plugins/SettingsModal.test.tsx +165 -0
  85. package/src/client/components/settings/categories/panel-plugins/SettingsModal.tsx +260 -0
  86. package/src/client/components/settings/categories/project-settings/WorktreeSettings.tsx +2 -1
  87. package/src/client/components/settings/categories/usage-settings/LimitsSection.tsx +39 -19
  88. package/src/client/components/settings/categories/usage-settings/ProviderDetail.tsx +1 -0
  89. package/src/client/components/settings/categories/usage-settings/limit-groups.test.ts +94 -0
  90. package/src/client/components/settings/categories/usage-settings/limit-groups.ts +118 -0
  91. package/src/client/components/settings/categories/usage-settings/limits-section.test.tsx +118 -0
  92. package/src/client/components/workspace/chat-timeline/AiMessageFooter.fork.test.ts +24 -0
  93. package/src/client/components/workspace/chat-timeline/AiMessageFooter.tsx +8 -4
  94. package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +34 -0
  95. package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +61 -56
  96. package/src/client/components/workspace/chat-timeline/MessageItem.fork.test.ts +80 -0
  97. package/src/client/components/workspace/chat-timeline/MessageItem.tsx +9 -3
  98. package/src/client/components/workspace/chat-timeline/MessageList.tsx +3 -1
  99. package/src/client/components/workspace/chat-timeline/PendingChatView.tsx +11 -1
  100. package/src/client/components/workspace/chat-timeline/PendingTranscript.tsx +130 -0
  101. package/src/client/components/workspace/chat-timeline/RunFooter.tsx +2 -1
  102. package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +2 -1
  103. package/src/client/components/workspace/chat-timeline/chat-input/ComposerRows.tsx +8 -0
  104. package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.test.tsx +9 -0
  105. package/src/client/components/workspace/chat-timeline/chat-input/SessionModeDropdown.tsx +4 -1
  106. package/src/client/components/workspace/chat-timeline/chat-input/Toolbar.tsx +24 -0
  107. package/src/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker.tsx +13 -20
  108. package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +2 -0
  109. package/src/client/components/workspace/chat-timeline/chat-input/props.ts +5 -5
  110. package/src/client/components/workspace/chat-timeline/fork-preview.test.tsx +141 -0
  111. package/src/client/components/workspace/chat-timeline/index.tsx +17 -6
  112. package/src/client/components/workspace/chat-timeline/target-picker/DraftTargetRow.tsx +3 -10
  113. package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.test.tsx +101 -0
  114. package/src/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker.tsx +2 -2
  115. package/src/client/components/workspace/chat-timeline/target-picker/WorktreePicker.tsx +5 -4
  116. package/src/client/components/workspace/editor/FilePane.tsx +9 -4
  117. package/src/client/components/workspace/editor/Notices.tsx +2 -2
  118. package/src/client/components/workspace/editor/Pane.tsx +2 -2
  119. package/src/client/components/workspace/editor/Toolbar.tsx +16 -10
  120. package/src/client/components/workspace/editor/index.tsx +6 -10
  121. package/src/client/components/workspace/editor/toolbar-clusters.test.ts +4 -3
  122. package/src/client/components/workspace/editor/toolbar-clusters.tsx +23 -14
  123. package/src/client/components/workspace/git-panel/index.tsx +2 -2
  124. package/src/client/components/workspace/terminal-panel/RealtimeTerminalView.tsx +17 -6
  125. package/src/client/components/workspace/terminal-panel/focus.test.ts +70 -0
  126. package/src/client/components/workspace/terminal-panel/focus.ts +46 -0
  127. package/src/client/components/workspace/terminal-panel/index.tsx +17 -1
  128. package/src/client/components/workspace/terminal-panel/mount.ts +17 -9
  129. package/src/client/components/workspace/terminal-panel/scroll-hold.test.ts +158 -0
  130. package/src/client/components/workspace/terminal-panel/scroll-hold.ts +136 -0
  131. package/src/client/hooks/chat/composer/use-draft.ts +45 -1
  132. package/src/client/hooks/chat/omp/pending-sessions.waiting.test.ts +11 -10
  133. package/src/client/hooks/chat/omp/pending-waiting.ts +15 -7
  134. package/src/client/hooks/chat/omp/prompt-send.test.ts +11 -0
  135. package/src/client/hooks/chat/omp/prompt-send.ts +3 -0
  136. package/src/client/hooks/chat/omp/session-list.tsx +5 -0
  137. package/src/client/hooks/chat/omp/sidebar-reload.test.ts +85 -0
  138. package/src/client/hooks/chat/omp/sidebar-reload.ts +30 -0
  139. package/src/client/hooks/chat/timeline/actions.ts +4 -4
  140. package/src/client/hooks/chat/timeline/composer-modes.ts +13 -2
  141. package/src/client/hooks/chat/timeline/fork-open.ts +52 -0
  142. package/src/client/hooks/chat/timeline/fork-preview.test.ts +148 -0
  143. package/src/client/hooks/chat/timeline/fork-preview.ts +104 -0
  144. package/src/client/hooks/chat/timeline/fork-send.test.ts +139 -0
  145. package/src/client/hooks/chat/timeline/index.ts +5 -2
  146. package/src/client/hooks/chat/timeline/mode-availability.ts +7 -0
  147. package/src/client/hooks/chat/timeline/modes-contract.ts +6 -0
  148. package/src/client/hooks/chat/timeline/modes-hydrate.ts +93 -0
  149. package/src/client/hooks/chat/timeline/modes.ts +32 -52
  150. package/src/client/hooks/chat/timeline/new-chat-open.ts +7 -6
  151. package/src/client/hooks/chat/timeline/new-chat.ts +10 -1
  152. package/src/client/hooks/chat/timeline/pending-branch.ts +9 -0
  153. package/src/client/hooks/chat/timeline/pending-dispatch.ts +53 -0
  154. package/src/client/hooks/chat/timeline/pending-session-mode.test.ts +136 -0
  155. package/src/client/hooks/chat/timeline/pending-session-mode.ts +69 -0
  156. package/src/client/hooks/chat/timeline/pending-warmup.test.ts +147 -0
  157. package/src/client/hooks/chat/timeline/pending-warmup.ts +62 -0
  158. package/src/client/hooks/chat/timeline/run-identity.test.ts +12 -0
  159. package/src/client/hooks/chat/timeline/run-identity.ts +4 -1
  160. package/src/client/hooks/chat/timeline/send-props.ts +2 -0
  161. package/src/client/hooks/chat/timeline/send-steer.test.ts +1 -0
  162. package/src/client/hooks/chat/timeline/send.test-util.ts +1 -0
  163. package/src/client/hooks/chat/timeline/send.test.ts +1 -0
  164. package/src/client/hooks/chat/timeline/session-harness.ts +4 -0
  165. package/src/client/hooks/chat/timeline/stop-with-queue.ts +1 -1
  166. package/src/client/hooks/chat/timeline/use-fork-session.ts +9 -22
  167. package/src/client/hooks/chat/waiting/cancel.ts +15 -7
  168. package/src/client/hooks/chat/waiting/choice.ts +13 -16
  169. package/src/client/hooks/chat/waiting/composer-wait.ts +70 -0
  170. package/src/client/hooks/chat/waiting/dispatch.ts +50 -29
  171. package/src/client/hooks/chat/waiting/held.ts +38 -13
  172. package/src/client/hooks/chat/waiting/hold.test.ts +22 -0
  173. package/src/client/hooks/chat/waiting/hold.ts +20 -11
  174. package/src/client/hooks/chat/waiting/restore.test.ts +69 -0
  175. package/src/client/hooks/chat/waiting/restore.ts +34 -0
  176. package/src/client/hooks/chat/waiting/store.ts +9 -3
  177. package/src/client/hooks/editor/file-editor-types.ts +21 -12
  178. package/src/client/hooks/editor/save-file.test.ts +1 -1
  179. package/src/client/hooks/editor/save-file.ts +35 -8
  180. package/src/client/hooks/editor/target-key.ts +17 -0
  181. package/src/client/hooks/editor/use-disk-digest.test.ts +82 -0
  182. package/src/client/hooks/editor/use-disk-digest.ts +164 -0
  183. package/src/client/hooks/editor/use-disk-sync.ts +212 -0
  184. package/src/client/hooks/editor/use-file-cache.ts +113 -0
  185. package/src/client/hooks/editor/use-file-editor.test.ts +90 -0
  186. package/src/client/hooks/editor/use-file-editor.ts +90 -52
  187. package/src/client/hooks/editor/use-file-read.ts +24 -10
  188. package/src/client/hooks/editor/use-file-writes.ts +4 -4
  189. package/src/client/hooks/models/harness-catalog.ts +15 -0
  190. package/src/client/hooks/settings/providers/actions.ts +3 -2
  191. package/src/client/hooks/settings/providers/messages.ts +9 -7
  192. package/src/client/hooks/settings/providers/model-actions.ts +2 -1
  193. package/src/client/hooks/ui/editor-error-toast.ts +2 -1
  194. package/src/client/hooks/ui/notifications.ts +17 -8
  195. package/src/client/hooks/workspace/batch-archive.test.ts +2 -2
  196. package/src/client/hooks/workspace/batch-archive.ts +4 -2
  197. package/src/client/hooks/workspace/git-action-outcome.ts +4 -3
  198. package/src/client/hooks/workspace/navbar-session-actions.ts +2 -1
  199. package/src/client/hooks/workspace/panel-registry.ts +1 -1
  200. package/src/client/hooks/workspace/scheduled-tasks.ts +26 -11
  201. package/src/client/hooks/workspace/session-actions.test.ts +2 -1
  202. package/src/client/hooks/workspace/session-actions.ts +2 -1
  203. package/src/client/hooks/workspace/terminal/connection.test.ts +63 -0
  204. package/src/client/hooks/workspace/terminal/connection.ts +47 -0
  205. package/src/client/hooks/workspace/terminal/index.ts +35 -4
  206. package/src/client/hooks/workspace/workspace-folder-actions.ts +2 -1
  207. package/src/client/lib/notifications/os.test.ts +1 -30
  208. package/src/client/lib/notifications/os.ts +0 -15
  209. package/src/client/lib/notifications/platform.test.ts +68 -0
  210. package/src/client/lib/notifications/platform.ts +36 -0
  211. package/src/server/index.ts +7 -0
  212. package/src/server/lib/harness/acp/client.ts +81 -87
  213. package/src/server/lib/harness/acp/prewarm.server.ts +237 -0
  214. package/src/server/lib/harness/acp/prewarm.test.ts +171 -0
  215. package/src/server/lib/harness/acp/prompt.test.ts +70 -1
  216. package/src/server/lib/harness/acp/prompt.ts +32 -1
  217. package/src/server/lib/harness/acp/protocol.ts +23 -0
  218. package/src/server/lib/harness/acp/session-handshake.test.ts +26 -0
  219. package/src/server/lib/harness/acp/session-handshake.ts +22 -20
  220. package/src/server/lib/harness/acp/session-options.ts +16 -0
  221. package/src/server/lib/harness/acp/session-process.ts +43 -0
  222. package/src/server/lib/harness/acp/session.ts +11 -12
  223. package/src/server/lib/harness/acp/stdio.ts +129 -0
  224. package/src/server/lib/harness/acp/verbs.test.ts +97 -0
  225. package/src/server/lib/harness/acp/verbs.ts +16 -6
  226. package/src/server/lib/harness/auto-probe.server.ts +4 -3
  227. package/src/server/lib/harness/capabilities.ts +8 -0
  228. package/src/server/lib/harness/config.server.ts +3 -2
  229. package/src/server/lib/harness/custom.server.ts +209 -0
  230. package/src/server/lib/harness/launch.ts +6 -1
  231. package/src/server/lib/harness/register.server.ts +8 -1
  232. package/src/server/lib/harness/schema.server.ts +21 -0
  233. package/src/server/lib/harness/session-lease.server.test.ts +99 -0
  234. package/src/server/lib/harness/session-lease.server.ts +193 -0
  235. package/src/server/lib/harness/session-store.server.test.ts +8 -8
  236. package/src/server/lib/harness/session-store.server.ts +25 -4
  237. package/src/server/lib/harness/session-title.server.ts +12 -2
  238. package/src/server/lib/harness/spawn.server.ts +123 -20
  239. package/src/server/lib/harness/update-queue.server.ts +3 -3
  240. package/src/server/lib/lifecycle/after-listen.ts +12 -1
  241. package/src/server/lib/lifecycle/paths.ts +19 -1
  242. package/src/server/lib/mcp/registry.server.ts +155 -0
  243. package/src/server/lib/mcp/registry.test.ts +169 -0
  244. package/src/server/lib/mcp/store.server.ts +38 -0
  245. package/src/server/lib/omp/rpc/frame-fold-contract.ts +59 -0
  246. package/src/server/lib/omp/rpc/frame-fold-frames.test.ts +64 -1
  247. package/src/server/lib/omp/rpc/frame-fold-host.test-util.ts +2 -1
  248. package/src/server/lib/omp/rpc/frame-fold.test.ts +2 -1
  249. package/src/server/lib/omp/rpc/frame-fold.ts +6 -45
  250. package/src/server/lib/omp/rpc/prewarm-pool.ts +19 -5
  251. package/src/server/lib/omp/rpc/run-model.test.ts +116 -0
  252. package/src/server/lib/omp/rpc/run-model.ts +4 -2
  253. package/src/server/lib/omp/session/sidebar-data.harness.test.ts +6 -3
  254. package/src/server/lib/omp/session/standby.server.ts +13 -2
  255. package/src/server/lib/panels/manifest.test.ts +47 -1
  256. package/src/server/lib/panels/manifest.ts +19 -0
  257. package/src/server/lib/panels/registry.server.ts +19 -2
  258. package/src/server/lib/panels/scan.server.ts +26 -2
  259. package/src/server/lib/panels/settings-schema.server.ts +72 -0
  260. package/src/server/lib/plugins/background.server.ts +21 -3
  261. package/src/server/lib/plugins/background.test.ts +13 -0
  262. package/src/server/lib/plugins/loader.server.ts +35 -51
  263. package/src/server/lib/plugins/mcp.server.ts +100 -0
  264. package/src/server/lib/plugins/mcp.test.ts +75 -0
  265. package/src/server/lib/plugins/schedule-runner.server.ts +153 -0
  266. package/src/server/lib/plugins/schedule-runner.test.ts +186 -0
  267. package/src/server/lib/plugins/schedule-store.server.ts +107 -0
  268. package/src/server/lib/plugins/schema.server.ts +8 -0
  269. package/src/server/lib/plugins/settings.server.ts +56 -19
  270. package/src/server/lib/plugins/shutdown.server.ts +58 -0
  271. package/src/server/lib/plugins/shutdown.test.ts +28 -3
  272. package/src/server/lib/realtime/topics/global.server.ts +5 -1
  273. package/src/server/lib/schedule/rows.server.ts +9 -0
  274. package/src/server/lib/schedule/runtime.server.test.ts +91 -0
  275. package/src/server/lib/schedule/runtime.server.ts +101 -23
  276. package/src/server/lib/schedule/schema.server.ts +15 -0
  277. package/src/server/lib/schedule/store.server.test.ts +34 -0
  278. package/src/server/lib/schedule/store.server.ts +33 -9
  279. package/src/server/lib/sessions/fork.server.test.ts +47 -0
  280. package/src/server/lib/sessions/fork.server.ts +17 -1
  281. package/src/server/lib/sessions/spawn.server.ts +2 -2
  282. package/src/server/lib/usage/report.server.ts +57 -0
  283. package/src/server/lib/waiting/runtime.server.test.ts +48 -0
  284. package/src/server/lib/waiting/runtime.server.ts +22 -0
  285. package/src/server/lib/waiting/schema.server.ts +8 -0
  286. package/src/server/lib/waiting/store.server.test.ts +14 -0
  287. package/src/server/lib/waiting/store.server.ts +6 -2
  288. package/src/server/routes/agent/command-resume.test.ts +9 -4
  289. package/src/server/routes/agent/new-mode.test.ts +40 -0
  290. package/src/server/routes/agent/new.ts +31 -10
  291. package/src/server/routes/agent/prewarm.ts +48 -7
  292. package/src/server/routes/fs/action.ts +9 -1
  293. package/src/server/routes/fs/digest.test.ts +100 -0
  294. package/src/server/routes/fs/digest.ts +106 -0
  295. package/src/server/routes/fs/index.ts +2 -0
  296. package/src/server/routes/fs/read.ts +6 -1
  297. package/src/server/routes/harness/custom.test.ts +131 -0
  298. package/src/server/routes/harness/import-action.ts +2 -2
  299. package/src/server/routes/harness/root.ts +41 -8
  300. package/src/server/routes/harness/update.ts +2 -2
  301. package/src/server/routes/panels/bindings.ts +2 -0
  302. package/src/server/routes/panels/settings.test.ts +165 -0
  303. package/src/server/routes/panels/settings.ts +106 -0
  304. package/src/server/routes/schedule/body.ts +14 -0
  305. package/src/server/routes/schedule/index.ts +28 -4
  306. package/src/server/routes/settings/mcp.ts +9 -26
  307. package/src/server/routes/waiting/index.ts +21 -2
  308. package/src/server/routes/waiting/routes.test.ts +21 -0
  309. package/src/shared/lib/chat/composer/delegation.ts +3 -3
  310. package/src/shared/lib/chat/timeline/fork-anchor.test.ts +97 -0
  311. package/src/shared/lib/chat/timeline/fork-anchor.ts +47 -0
  312. package/src/shared/lib/chat/timeline/fork-preview.test.ts +62 -0
  313. package/src/shared/lib/chat/timeline/fork-preview.ts +36 -0
  314. package/src/shared/lib/fs/content-hash.ts +29 -0
  315. package/src/shared/lib/harness/catalog.ts +48 -6
  316. package/src/shared/lib/harness/fork.ts +60 -0
  317. package/src/shared/lib/harness/mcp-facts.test.ts +30 -0
  318. package/src/shared/lib/harness/mcp-facts.ts +65 -0
  319. package/src/shared/lib/harness/menu.test.ts +16 -1
  320. package/src/shared/lib/harness/menu.ts +2 -2
  321. package/src/shared/lib/harness/rewind.ts +6 -6
  322. package/src/shared/lib/harness/session-modes.ts +31 -0
  323. package/src/shared/lib/harness/transcript.test.ts +29 -0
  324. package/src/shared/lib/harness/transcript.ts +19 -0
  325. package/src/shared/lib/notifications/settings.test.ts +21 -0
  326. package/src/shared/lib/notifications/settings.ts +24 -0
  327. package/src/shared/lib/omp/session/prewarm.test.ts +28 -4
  328. package/src/shared/lib/omp/session/prewarm.ts +25 -6
  329. package/src/shared/lib/omp/session/stream-state.server.test.ts +25 -0
  330. package/src/shared/lib/omp/session/stream-state.server.ts +8 -4
  331. package/src/shared/lib/panels/capabilities.test.ts +1 -1
  332. package/src/shared/lib/panels/capabilities.ts +3 -0
  333. package/src/shared/lib/plugins/settings.ts +22 -0
  334. package/src/shared/lib/schedule/parse.test.ts +48 -0
  335. package/src/shared/lib/schedule/parse.ts +69 -45
  336. package/src/shared/lib/schedule/timezone.ts +128 -0
  337. package/src/shared/lib/settings/defaults.ts +2 -0
  338. package/src/shared/lib/ui/toast-duration.test.ts +25 -1
  339. package/src/shared/lib/ui/toast-duration.ts +22 -4
  340. package/src/shared/lib/workspace/refresh-cadence.test.ts +25 -1
  341. package/src/shared/lib/workspace/relative-time.ts +16 -0
  342. package/src/shared/lib/workspace/session-state/store.ts +4 -0
  343. package/src/shared/types/harness.ts +7 -0
  344. package/src/shared/types/omp/agent.ts +6 -0
  345. package/src/shared/types/panels-registry.ts +3 -3
  346. package/src/shared/types/panels.ts +4 -2
  347. package/src/shared/types/schedule.ts +13 -0
  348. package/src/shared/types/settings/state.ts +12 -1
  349. package/src/shared/types/waiting.ts +9 -0
  350. package/src/test-support/file-editor.test-util.ts +70 -5
  351. package/dist/client/static/js/index-p2yw9ywf.css +0 -1
  352. package/src/client/hooks/editor/use-external-change-notice.ts +0 -71
  353. package/src/client/hooks/editor/use-external-change.test.ts +0 -88
  354. package/src/client/hooks/editor/use-external-change.ts +0 -146
@@ -14,6 +14,7 @@ import { useSessionTitle } from '@/client/hooks/chat/timeline/session-title';
14
14
  import { useSubagentView } from '@/client/hooks/chat/timeline/subagent-view';
15
15
  import { useUndoConfirmation } from '@/client/hooks/chat/timeline/undo-confirmation';
16
16
  import { usePendingBranch } from '@/client/hooks/chat/timeline/pending-branch';
17
+ import { useForkPreview } from '@/client/hooks/chat/timeline/fork-preview';
17
18
  import { useForkSession } from '@/client/hooks/chat/timeline/use-fork-session';
18
19
  import { useStopWithQueuedPrompts } from '@/client/hooks/chat/timeline/stop-with-queue';
19
20
  import { useModelNames } from '@/client/hooks/models/use-model-names';
@@ -24,8 +25,9 @@ import { ChatOverlays } from '@/client/components/workspace/chat-timeline/ChatOv
24
25
  import { composerRootFor } from '@/shared/lib/workspace/active-project';
25
26
  import { usePendingProjectModel } from '@/client/hooks/chat/timeline/pending-model';
26
27
  import { useNewChatOpen } from '@/client/hooks/chat/timeline/new-chat-open';
28
+ import { usePendingWarmup } from '@/client/hooks/chat/timeline/pending-warmup';
27
29
  import { useSidebarData } from '@/client/hooks/chat/omp/session-list';
28
- import { useHeldWait } from '@/client/hooks/chat/waiting/held';
30
+ import { useComposerWait } from '@/client/hooks/chat/waiting/composer-wait';
29
31
  import { useSessionHarness } from '@/client/hooks/chat/timeline/session-harness';
30
32
 
31
33
  interface ChatTimelineProps {
@@ -53,6 +55,7 @@ export function ChatTimeline({ className = '', appSettings = {}, onSessionTitle,
53
55
  localMessages,
54
56
  isGenerating,
55
57
  timelineRunning,
58
+ reloadMessages,
56
59
  hasMore,
57
60
  loadingOlder, loadOlderError, sessionLoading,
58
61
  loadOlder,
@@ -143,8 +146,7 @@ export function ChatTimeline({ className = '', appSettings = {}, onSessionTitle,
143
146
  // A pending "new-…" chat has no messages yet, so the workspace picker stays
144
147
  // available until the first send spawns the real session.
145
148
  const isPendingSession = Boolean(sessionId?.startsWith('new-'));
146
-
147
- const { heldWait, cancelHeldWait } = useHeldWait(sessionId, isPendingSession, pushToast);
149
+ const composerWait = useComposerWait({ sessionId, folders, streamStatusMap, titleFor: titleHint, value: waitingDependency.value, onChange: waitingDependency.set, onNotice: pushToast, onDispatched: reloadMessages });
148
150
  const composerRoot = composerRootFor(folders, sessionId, selectedFolderId);
149
151
  // The workspace's own default model, resolved by the same rule the spawn
150
152
  // uses, so the pending composer's pill does not promise Kabmo's global pick.
@@ -152,6 +154,13 @@ export function ChatTimeline({ className = '', appSettings = {}, onSessionTitle,
152
154
  const sessionDataModel = typeof sessionData?.model === 'object' ? sessionData.model : null;
153
155
  const branch = usePendingBranch({ sessionId, folders, selectedFolderId, setSelectedFolderId, urlParentId: searchParams.get('parentSessionId'), urlForkFrom: searchParams.get('forkFrom'), urlForkAt: searchParams.get('forkAt'), setSearchParams, harnessPicker: activeHarness.picker, pendingHarnessRef });
154
156
  const fork = useForkSession(sessionId, folders, selectedFolderId);
157
+ // Warm the boot here: the harness and the Plan pick are known here only.
158
+ usePendingWarmup({
159
+ sessionId, folders, selectedFolderId, harness: activeHarness.harness, plan: modes.plan, worktreePath: spawnTarget?.worktreePath ?? null,
160
+ });
161
+ // A fork's source transcript, drawn above the pending composer and reloaded
162
+ // when "Fork from" moves to another session.
163
+ const forkPreview = useForkPreview(branch.forkSourceSessionId, branch.forkAnchorEntryId);
155
164
 
156
165
  // The chat-level "a run is in flight" flag is computed in `useChatTimeline`
157
166
  // (it owns the queue-vs-send decision that depends on it) and consumed here
@@ -202,12 +211,12 @@ export function ChatTimeline({ className = '', appSettings = {}, onSessionTitle,
202
211
  titleForSession={titleHint}
203
212
  waitingFor={waitingDependency.value}
204
213
  onWaitingForChange={waitingDependency.set}
205
- heldWait={heldWait ? { title: heldWait.dependsOnTitle } : null}
206
- onCancelWait={cancelHeldWait}
214
+ {...composerWait.held}
207
215
  spawnTarget={spawnTarget}
208
216
  onSpawnTargetChange={setSpawnTarget}
209
217
  {...branch.viewProps}
210
- onWorktreeReport={(message) => pushToast(message, 'success', { duration: 6000 })}
218
+ {...(branch.forkSourceSessionId ? { branchPreview: forkPreview } : {})}
219
+ onWorktreeReport={(message, tone) => pushToast(message, tone ?? 'success', { duration: 6000 })}
211
220
  {...branch.composerProps}
212
221
  />
213
222
  );
@@ -295,6 +304,8 @@ export function ChatTimeline({ className = '', appSettings = {}, onSessionTitle,
295
304
  modes={modes}
296
305
  composerModelRef={composerModelRef}
297
306
  deferredComposerPickRef={deferredComposerPickRef}
307
+ waiting={composerWait.waiting}
308
+ {...composerWait.held}
298
309
  sessionModel={typeof sessionData?.model === 'object' ? sessionData.model : null}
299
310
  sessionThinkingLevel={sessionData?.thinkingLevel}
300
311
  {...activeHarness.picker}
@@ -22,6 +22,7 @@ import {
22
22
  } from '@/client/components/workspace/chat-timeline/chat-input/WaitingDependencyPicker';
23
23
  import type { SpawnTarget } from '@/client/hooks/chat/timeline/spawn-target';
24
24
  import type { WorkspaceFolderData } from '@/shared/types';
25
+ import type { ToastTone } from '@/shared/lib/ui/toast-duration';
25
26
 
26
27
  export interface DraftTargetRowProps {
27
28
  folders: WorkspaceFolderData[];
@@ -30,7 +31,7 @@ export interface DraftTargetRowProps {
30
31
  spawnTarget?: SpawnTarget | null;
31
32
  onSpawnTargetChange?: (next: SpawnTarget | null) => void;
32
33
  /** Reports a worktree the composer created or failed to create. */
33
- onWorktreeReport?: (message: string) => void;
34
+ onWorktreeReport?: (message: string, tone?: ToastTone) => void;
34
35
  /** The session this chat runs under, or null for a top-level chat. */
35
36
  parentSessionId?: string | null;
36
37
  onParentSessionChange?: (sessionId: string | null) => void;
@@ -40,9 +41,6 @@ export interface DraftTargetRowProps {
40
41
  branchAllowNone?: boolean;
41
42
  waitingFor?: WaitingCandidate | null;
42
43
  onWaitingForChange?: (candidate: WaitingCandidate | null) => void;
43
- streamStatusMap?: Record<string, string | undefined>;
44
- /** A name for a streaming session the sidebar has not scanned yet. */
45
- titleForSession?: (id: string) => string | undefined;
46
44
  candidates: WaitingCandidate[];
47
45
  }
48
46
 
@@ -59,8 +57,6 @@ export function DraftTargetRow({
59
57
  branchAllowNone = true,
60
58
  waitingFor = null,
61
59
  onWaitingForChange,
62
- streamStatusMap = {},
63
- titleForSession,
64
60
  candidates,
65
61
  }: DraftTargetRowProps) {
66
62
  return (
@@ -102,10 +98,7 @@ export function DraftTargetRow({
102
98
  wait for (or a pick already made). */}
103
99
  {onWaitingForChange && (waitingFor || candidates.length > 0) && (
104
100
  <WaitingDependencyPicker
105
- folders={folders}
106
- streamStatusMap={streamStatusMap}
107
- sessionId={null}
108
- titleFor={titleForSession}
101
+ candidates={candidates}
109
102
  value={waitingFor}
110
103
  onChange={onWaitingForChange}
111
104
  />
@@ -0,0 +1,101 @@
1
+ /**
2
+ * @license
3
+ * SPDX-License-Identifier: MIT
4
+ */
5
+
6
+ /**
7
+ * The draft-target row's BRANCH control, rendered.
8
+ *
9
+ * Two facts a reader would otherwise only meet in a browser:
10
+ *
11
+ * - the trigger's glyph is the fork, not the branch. Both controls sit in the
12
+ * same row and the worktree picker already draws `GitBranch`, so the two
13
+ * read as one control when this one copied it;
14
+ * - choosing a row reports that session, and "No parent" reports null — the
15
+ * pending chat is born top-level again.
16
+ */
17
+
18
+ import { afterAll, afterEach, beforeAll, describe, expect, test } from 'bun:test';
19
+ import { Window } from 'happy-dom';
20
+ import { h, render } from 'preact';
21
+ import { act } from 'preact/test-utils';
22
+ import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-globals';
23
+ import { ParentSessionPicker } from '@/client/components/workspace/chat-timeline/target-picker/ParentSessionPicker';
24
+ import type { WorkspaceFolderData } from '@/shared/types';
25
+
26
+ const folders = [
27
+ {
28
+ id: 1,
29
+ name: 'kabmo',
30
+ sessions: [{ id: 'a', folder_id: 1, title: 'Alpha' }],
31
+ },
32
+ ] as unknown as WorkspaceFolderData[];
33
+
34
+ const mounted: HTMLElement[] = [];
35
+
36
+ beforeAll(() => {
37
+ installDomGlobals(new Window({ url: 'http://localhost' }));
38
+ });
39
+
40
+ afterEach(() => {
41
+ for (const host of mounted.splice(0)) {
42
+ render(null, host);
43
+ host.remove();
44
+ }
45
+ });
46
+
47
+ afterAll(() => {
48
+ restoreDomGlobals();
49
+ });
50
+
51
+ async function mount(node: h.JSX.Element): Promise<HTMLElement> {
52
+ const host = document.createElement('div');
53
+ document.body.appendChild(host);
54
+ await act(async () => {
55
+ render(node, host);
56
+ });
57
+ mounted.push(host);
58
+ return host;
59
+ }
60
+
61
+ describe('ParentSessionPicker', () => {
62
+ test('the trigger carries the fork glyph, not the worktree branch glyph', async () => {
63
+ const host = await mount(
64
+ h(ParentSessionPicker, { folders, sessionId: null, value: null, onChange: () => {} }),
65
+ );
66
+
67
+ const trigger = host.querySelector('[data-testid="parent-session-picker"]');
68
+ expect(trigger?.querySelector('.lucide-git-fork')).not.toBeNull();
69
+ expect(trigger?.querySelector('.lucide-git-branch')).toBeNull();
70
+ });
71
+
72
+ test('choosing a session reports it, and "No parent" clears the pick', async () => {
73
+ const seen: (string | null)[] = [];
74
+ const host = await mount(
75
+ h(ParentSessionPicker, {
76
+ folders,
77
+ sessionId: 'new-1',
78
+ value: null,
79
+ onChange: (id) => {
80
+ seen.push(id);
81
+ },
82
+ }),
83
+ );
84
+
85
+ await act(async () => {
86
+ (host.querySelector('[data-testid="parent-session-picker"]') as HTMLButtonElement).click();
87
+ });
88
+ await act(async () => {
89
+ (host.querySelector('[data-testid="parent-candidate"]') as HTMLButtonElement).click();
90
+ });
91
+ expect(seen).toEqual(['a']);
92
+
93
+ await act(async () => {
94
+ (host.querySelector('[data-testid="parent-session-picker"]') as HTMLButtonElement).click();
95
+ });
96
+ await act(async () => {
97
+ (host.querySelector('[data-testid="parent-candidate-none"]') as HTMLButtonElement).click();
98
+ });
99
+ expect(seen).toEqual(['a', null]);
100
+ });
101
+ });
@@ -16,7 +16,7 @@
16
16
  */
17
17
 
18
18
  import { useCallback, useMemo, useRef, useState } from 'preact/hooks';
19
- import { Check, ChevronDown, GitBranch, X } from 'lucide-preact';
19
+ import { Check, ChevronDown, GitFork, X } from 'lucide-preact';
20
20
  import { useOnClickOutside } from '@/client/hooks/ui/on-click-outside';
21
21
  import type { WorkspaceFolderData } from '@/shared/types';
22
22
 
@@ -92,7 +92,7 @@ export function ParentSessionPicker({
92
92
  selected ? 'bg-ink/10 text-ink' : 'text-ink/75 hover:text-ink hover:bg-ink/5'
93
93
  }`}
94
94
  >
95
- <GitBranch size={13} className={`flex-shrink-0 ${selected ? 'text-ink/80' : 'text-ink/50 group-hover:text-ink/80'}`} />
95
+ <GitFork size={13} className={`flex-shrink-0 ${selected ? 'text-ink/80' : 'text-ink/50 group-hover:text-ink/80'}`} />
96
96
  <span className="max-w-[220px] truncate tracking-tight">{triggerLabel}</span>
97
97
  <ChevronDown
98
98
  size={13}
@@ -32,6 +32,7 @@ import type { SpawnTarget } from '@/client/hooks/chat/timeline/spawn-target';
32
32
  import type { WorktreeInfo } from '@/shared/lib/workspace/worktree/types';
33
33
  import { lastPathSegment } from '@/shared/lib/fs/paths';
34
34
  import type { WorkspaceFolderData } from '@/shared/types';
35
+ import type { ToastTone } from '@/shared/lib/ui/toast-duration';
35
36
 
36
37
  export interface WorktreePickerProps {
37
38
  folders: WorkspaceFolderData[];
@@ -39,7 +40,7 @@ export interface WorktreePickerProps {
39
40
  target: SpawnTarget | null;
40
41
  setTarget: (next: SpawnTarget | null) => void;
41
42
  /** Reports a completed create, or the refusal that stopped one. */
42
- onReport?: (message: string) => void;
43
+ onReport?: (message: string, tone?: ToastTone) => void;
43
44
  }
44
45
 
45
46
  /** The worktree row the pick names, or null for the project root. */
@@ -131,9 +132,9 @@ export function WorktreePicker({ folders, selectedFolderId, target, setTarget, o
131
132
  // is `wt/groovy-yak` (measured in the browser, and for the whole time the
132
133
  // menu stays closed, which is when the label matters).
133
134
  await refresh();
134
- onReport?.(`Worktree ${created.branch || lastPathSegment(created.path)} created`);
135
+ onReport?.(`Worktree ${created.branch || lastPathSegment(created.path)} created`, 'success');
135
136
  } catch (failure) {
136
- onReport?.(failure instanceof Error ? failure.message : String(failure));
137
+ onReport?.(failure instanceof Error ? failure.message : String(failure), 'error');
137
138
  } finally {
138
139
  setCreating(false);
139
140
  }
@@ -277,7 +278,7 @@ export function WorktreePicker({ folders, selectedFolderId, target, setTarget, o
277
278
  // this control holds has never seen, so the trigger would fall back to
278
279
  // the folder name until the menu was opened again.
279
280
  void refresh();
280
- onReport?.(`Worktree ${created.branch} created`);
281
+ onReport?.(`Worktree ${created.branch} created`, 'success');
281
282
  }}
282
283
  />
283
284
  </div>
@@ -13,6 +13,7 @@ import type { EditorCommand } from '@/shared/lib/code/editor/keymap';
13
13
  import { EDITOR_MAX_FONT_SIZE, EDITOR_MIN_FONT_SIZE } from '@/shared/lib/code/editor/typography';
14
14
  import { RENDERED_VIEWERS, type ViewerKind } from '@/shared/lib/fs/document-kind';
15
15
  import type { OpenedFile } from '@/shared/types/fs';
16
+ import { isProbeableTab } from '@/client/hooks/workspace/missing-files';
16
17
  import type { EditorThemeState } from '@/client/hooks/editor/theme';
17
18
 
18
19
  interface FilePaneProps {
@@ -138,11 +139,15 @@ export function FilePane({
138
139
  onZoomOut={() => setZoomLevel((z) => Math.max(EDITOR_MIN_FONT_SIZE, z - 1))}
139
140
  onCopy={editor.copy}
140
141
  onDownload={editor.download}
141
- onRevert={editor.revertToDisk}
142
+ onReload={editor.reloadFromDisk}
142
143
  onSaveAs={onSaveAs}
143
- // Only a buffer with edits has anything to throw away; a clean one would
144
- // re-read the same bytes and blank the screen for a moment.
145
- canRevert={editor.isDirty && !editor.loadError && !editor.unsupported}
144
+ // Offered for a clean buffer too: the auto-refresh watcher compares the
145
+ // disk's hash, and this is the manual answer to "read it again". Only a
146
+ // tab that names no file on disk (an attachment, a device/handle launch)
147
+ // has nothing to reload, and the same predicate the tab strip uses decides
148
+ // that.
149
+ canReload={isProbeableTab(activeFile) && !editor.loadError && !editor.unsupported}
150
+ reloadDiscardsEdits={editor.isDirty}
146
151
  onToggleMaximize={() => setIsMaximized(!isMaximized)}
147
152
  />
148
153
 
@@ -23,14 +23,14 @@
23
23
 
24
24
  import { ExternalChangeStrip } from '@/client/components/workspace/editor/ExternalChangeStrip';
25
25
  import { ConflictStrip } from '@/client/components/workspace/editor/ConflictStrip';
26
- import type { DiskChange } from '@/client/hooks/editor/use-external-change';
26
+ import type { DiskDigest } from '@/client/hooks/editor/use-disk-digest';
27
27
  import type { WriteConflict } from '@/client/hooks/editor/use-write-conflict';
28
28
  import type { OpenedFile } from '@/shared/types/fs';
29
29
 
30
30
  interface EditorNoticesProps {
31
31
  activeFile: OpenedFile | undefined;
32
32
  /** The disk moved under a dirty buffer, or null. */
33
- externalChange: DiskChange | null;
33
+ externalChange: DiskDigest | null;
34
34
  /** A save was refused because the disk moved, or null. */
35
35
  conflict: WriteConflict | null;
36
36
  /** Take the disk copy and drop the buffer's edits. */
@@ -26,7 +26,7 @@ import type { ComponentChildren } from 'preact';
26
26
  import { EditorNotices } from '@/client/components/workspace/editor/Notices';
27
27
  import { SaveAsModal } from '@/client/components/workspace/editor/SaveAsModal';
28
28
  import { EditorDialogs } from '@/client/components/workspace/editor/Dialogs';
29
- import type { DiskChange } from '@/client/hooks/editor/use-external-change';
29
+ import type { DiskDigest } from '@/client/hooks/editor/use-disk-digest';
30
30
  import type { CloseGuard } from '@/client/hooks/editor/use-close-guard';
31
31
  import type { UseFileEditorResult } from '@/client/hooks/editor/file-editor-types';
32
32
  import type { WriteConflict } from '@/client/hooks/editor/use-write-conflict';
@@ -42,7 +42,7 @@ interface EditorPaneProps {
42
42
  /** The active file and the buffer it is drawn from. */
43
43
  activeFile: OpenedFile | undefined;
44
44
  editor: UseFileEditorResult;
45
- externalChange: DiskChange | null;
45
+ externalChange: DiskDigest | null;
46
46
  conflict: WriteConflict | null;
47
47
  onReload: () => void;
48
48
  onKeepMine: () => void;
@@ -75,14 +75,18 @@ interface EditorToolbarProps {
75
75
  onCopy: () => void;
76
76
  onDownload: () => void;
77
77
  /**
78
- * Throw the buffer away and take the file from disk.
78
+ * Re-read the file from disk.
79
79
  *
80
- * Destructive, so it is never pinned and never in the row: a mis-click on a
81
- * toolbar of icon-only buttons must not be able to lose an edit.
80
+ * Destructive when the buffer has edits, so it is never pinned and never in the
81
+ * row: a mis-click on a toolbar of icon-only buttons must not be able to lose an
82
+ * edit. A clean buffer reloads without losing anything, which is why the control
83
+ * is offered for it too — it is the manual counterpart of the auto-refresh.
82
84
  */
83
- onRevert: () => void;
84
- /** Enabled only for a buffer with edits — reverting a clean one does nothing. */
85
- canRevert: boolean;
85
+ onReload: () => void;
86
+ /** False when the tab names no file on disk (an attachment, a device file). */
87
+ canReload: boolean;
88
+ /** The buffer has edits, so Reload discards them — the title says so. */
89
+ reloadDiscardsEdits: boolean;
86
90
  /** Write the buffer to a NEW path; the original tab stays open. */
87
91
  onSaveAs: () => void;
88
92
  onToggleMaximize: () => void;
@@ -123,8 +127,9 @@ export function EditorToolbar({
123
127
  onZoomOut,
124
128
  onCopy,
125
129
  onDownload,
126
- onRevert,
127
- canRevert,
130
+ onReload,
131
+ canReload,
132
+ reloadDiscardsEdits,
128
133
  onSaveAs,
129
134
  onToggleMaximize,
130
135
  }: EditorToolbarProps) {
@@ -197,7 +202,8 @@ export function EditorToolbar({
197
202
  copied,
198
203
  isMaximized,
199
204
  saveDisabled,
200
- canRevert,
205
+ canReload,
206
+ reloadDiscardsEdits,
201
207
  saveButton,
202
208
  maximizeButton,
203
209
  viewModeButtons: <EditorViewButtons size={14} />,
@@ -223,7 +229,7 @@ export function EditorToolbar({
223
229
  onZoomOut,
224
230
  onCopy,
225
231
  onDownload,
226
- onRevert,
232
+ onReload,
227
233
  onSaveAs,
228
234
  onToggleMaximize,
229
235
  onSave,
@@ -24,7 +24,6 @@ import { retainDirtyTabs } from '@/client/lib/editor-dirty-tabs';
24
24
  import { EditorPane } from '@/client/components/workspace/editor/Pane';
25
25
  import { SplitColumn } from '@/client/components/workspace/editor/SplitColumn';
26
26
  import { useSplitEditor } from '@/client/hooks/editor/use-split-editor';
27
- import { useExternalChangeNotice } from '@/client/hooks/editor/use-external-change-notice';
28
27
  import { useEditorPanelKeys } from '@/client/hooks/editor/use-editor-panel-keys';
29
28
  import { useCloseGuard } from '@/client/hooks/editor/use-close-guard';
30
29
  import { useFileReviewMode } from '@/client/hooks/editor/use-file-review-mode';
@@ -102,14 +101,11 @@ export function Editor({
102
101
  // view, and the resolver is cheap when no plugin contributed one.
103
102
  const pluginFileView = usePluginFileView({ path: activeFile?.path ?? '', content: editor.content, language: editor.language });
104
103
 
105
- // The disk-change strip and its answer; the rules live in the hook.
106
- const { externalChange, keepMine: keepMineAgainstDisk } = useExternalChangeNotice({
107
- file: activeFile,
108
- baseMtimeMs: editor.baseMtimeMs,
109
- dirty: editor.isDirty,
110
- revision: refreshKey,
111
- adoptDiskMtime: editor.adoptDiskMtime,
112
- });
104
+ // The disk-change strip and its answer. The verdict is the editor's own: the
105
+ // watcher compares CONTENT hashes, so a file rewritten with the same bytes (a
106
+ // `touch`, a no-op formatter, a checkout of the revision already open) never
107
+ // raises a strip, and a real change does even when the mtime did not move.
108
+ const externalChange = editor.diskChange;
113
109
 
114
110
  // Built after the editor: the guard writes through `editor.saveNow`.
115
111
  const closeGuard = useCloseGuard({
@@ -319,7 +315,7 @@ export function Editor({
319
315
  externalChange={externalChange}
320
316
  conflict={editor.conflict}
321
317
  onReload={editor.resolveConflictByReload}
322
- onKeepMine={keepMineAgainstDisk}
318
+ onKeepMine={editor.keepMineAgainstDisk}
323
319
  body={<EditorBody {...bodyProps} />}
324
320
  saveAsOpen={panelUi.saveAsOpen}
325
321
  onSaveAsClose={() => panelUi.setSaveAsOpen(false)}
@@ -48,8 +48,9 @@ function state(): ToolbarState {
48
48
  onZoomIn: noop,
49
49
  onZoomOut: noop,
50
50
  onSaveAs: noop,
51
- canRevert: false,
52
- onRevert: noop,
51
+ canReload: false,
52
+ reloadDiscardsEdits: false,
53
+ onReload: noop,
53
54
  copyLabel: 'Copy content',
54
55
  onCopy: noop,
55
56
  onDownload: noop,
@@ -68,7 +69,7 @@ describe('buildEditorClusters order', () => {
68
69
  const ids = buildEditorClusters(state()).map((cluster) => cluster.id);
69
70
  const saveAs = ids.indexOf('save-as');
70
71
  expect(saveAs).toBeGreaterThan(ids.indexOf('save'));
71
- for (const aid of ['blame', 'zoom', 'copy', 'revert']) {
72
+ for (const aid of ['blame', 'zoom', 'copy', 'reload']) {
72
73
  expect(saveAs).toBeLessThan(ids.indexOf(aid));
73
74
  }
74
75
  });
@@ -19,8 +19,9 @@
19
19
  * to a screen reader. **Pinning is not the visual order**: `pinned` marks what a
20
20
  * narrow panel must not bury, and the row is placed in the order a reader looks.
21
21
  *
22
- * **Revert is deliberately never pinned.** It is the only destructive control in
23
- * the row, and a `⋯` menu is exactly the friction a destructive action should have.
22
+ * **Reload is deliberately never pinned.** With a dirty buffer it is the only
23
+ * destructive control in the row, and a `⋯` menu is exactly the friction a
24
+ * destructive action should have; a clean buffer reloads without losing anything.
24
25
  */
25
26
 
26
27
  import type { ComponentChildren } from 'preact';
@@ -30,7 +31,7 @@ import {
30
31
  GitCommitVertical,
31
32
  Maximize,
32
33
  Minimize,
33
- RotateCcw,
34
+ RefreshCw,
34
35
  Search,
35
36
  WrapText,
36
37
  ZoomIn,
@@ -61,7 +62,9 @@ export interface ToolbarState {
61
62
  copied: boolean;
62
63
  isMaximized: boolean;
63
64
  saveDisabled: boolean;
64
- canRevert: boolean;
65
+ canReload: boolean;
66
+ /** The buffer has edits, so Reload discards them — the title says so. */
67
+ reloadDiscardsEdits: boolean;
65
68
  saveButton: ComponentChildren;
66
69
  previewLabel: string;
67
70
  findLabel: string;
@@ -77,7 +80,7 @@ export interface ToolbarState {
77
80
  onZoomOut: () => void;
78
81
  onCopy: () => void;
79
82
  onDownload: () => void;
80
- onRevert: () => void;
83
+ onReload: () => void;
81
84
  onSaveAs: () => void;
82
85
  onToggleMaximize: () => void;
83
86
  onSave: () => void;
@@ -179,22 +182,28 @@ export function buildEditorClusters(state: ToolbarState): ToolbarCluster[] {
179
182
  ),
180
183
  });
181
184
  clusters.push({
182
- id: 'revert',
183
- // Never `pinned`: it is the one destructive control in the row, and a menu is
184
- // exactly the friction it should have.
185
+ id: 'reload',
186
+ // Never `pinned`: with a dirty buffer it is the one destructive control in
187
+ // the row, and a menu is exactly the friction it should have.
185
188
  actions: [
186
- { label: 'Revert file', icon: RotateCcw, onSelect: state.onRevert, disabled: !state.canRevert },
189
+ { label: 'Reload from disk', icon: RefreshCw, onSelect: state.onReload, disabled: !state.canReload },
187
190
  ],
188
191
  children: (
189
192
  <button
190
193
  type="button"
191
- onClick={state.onRevert}
192
- disabled={!state.canRevert}
194
+ onClick={state.onReload}
195
+ disabled={!state.canReload}
193
196
  className={`${ACTION_CLASS} hover:bg-ink/5 hover:text-ink`}
194
- title={state.canRevert ? 'Discard my changes and reload from disk' : 'No unsaved changes to discard'}
195
- aria-label="Revert file"
197
+ title={
198
+ !state.canReload
199
+ ? 'Nothing to reload — this tab has no file on disk'
200
+ : state.reloadDiscardsEdits
201
+ ? 'Discard my changes and reload from disk'
202
+ : 'Reload from disk'
203
+ }
204
+ aria-label="Reload from disk"
196
205
  >
197
- <RotateCcw size={14} />
206
+ <RefreshCw size={14} />
198
207
  </button>
199
208
  ),
200
209
  });
@@ -88,8 +88,8 @@ export function GitPanel({ className = '', enabled = true, rootPath, refreshKey
88
88
  fetcher: actionFetcher,
89
89
  onPage: setViewingOutput,
90
90
  onReload: loadRepo,
91
- onSuccess: (message) => pushToast(message, 'success'),
92
- onError: (message) => pushToast(message),
91
+ onSuccess: (message, tone) => pushToast(message, tone),
92
+ onError: (message) => pushToast(message, 'error'),
93
93
  });
94
94
 
95
95
  useOnClickOutside(optionsRef, () => setShowOptions(false));
@@ -3,6 +3,7 @@ import { forwardRef } from 'preact/compat';
3
3
  import { ArrowDown } from 'lucide-preact';
4
4
  import { useTheme } from '@/client/hooks/ui/theme';
5
5
  import { mountTerminal, type TerminalMount } from '@/client/components/workspace/terminal-panel/mount';
6
+ import { createFocusLatch, type FocusLatch } from '@/client/components/workspace/terminal-panel/focus';
6
7
 
7
8
  export interface RealtimeTerminalHandle {
8
9
  /** Raw PTY output. Bytes, not text: the WASM parser reassembles them. */
@@ -63,6 +64,11 @@ export const RealtimeTerminalView = forwardRef<RealtimeTerminalHandle, RealtimeT
63
64
  const containerRef = useRef<HTMLDivElement>(null);
64
65
  const mountRef = useRef<TerminalMount | null>(null);
65
66
  const [isScrolledUp, setIsScrolledUp] = useState(false);
67
+ // The renderer is imported asynchronously, so a focus request can arrive
68
+ // before there is a terminal to take it; the latch holds it until then.
69
+ const focusLatchRef = useRef<FocusLatch | null>(null);
70
+ if (!focusLatchRef.current) focusLatchRef.current = createFocusLatch();
71
+ const focusLatch = focusLatchRef.current;
66
72
 
67
73
  const inputRef = useRef(onInput);
68
74
  inputRef.current = onInput;
@@ -101,7 +107,7 @@ export const RealtimeTerminalView = forwardRef<RealtimeTerminalHandle, RealtimeT
101
107
  mountRef.current?.reset();
102
108
  },
103
109
  focus() {
104
- mountRef.current?.focus();
110
+ focusLatch.request();
105
111
  },
106
112
  applicationCursorKeys() {
107
113
  return mountRef.current?.applicationCursorKeys() ?? false;
@@ -147,21 +153,26 @@ export const RealtimeTerminalView = forwardRef<RealtimeTerminalHandle, RealtimeT
147
153
  // E2E types into the terminal's hidden input. The renderer creates it
148
154
  // inside `open`, so the hook cannot be written on the JSX element.
149
155
  container.querySelector('textarea')?.setAttribute('data-terminal-input', '');
156
+ focusLatch.attach(() => mountRef.current?.focus());
150
157
  });
151
158
 
152
159
  return () => {
153
160
  cancelled = true;
161
+ focusLatch.detach();
154
162
  mountRef.current?.dispose();
155
163
  mountRef.current = null;
156
164
  };
157
165
  }, []);
158
166
 
159
- // No background and no padding: the terminal is not a surface of its own,
160
- // and the panel's paper shows through the strip the fit addon leaves for
161
- // its in-canvas scrollbar. `p-1.5` also made the grid narrower than the
162
- // panel, which read as a terminal that was not full width.
167
+ // The gutter lives on this WRAPPER, never on the measured container:
168
+ // `safeFit` gates on `container.clientWidth/clientHeight`, and `clientWidth`
169
+ // includes padding — padding on the container itself would size the canvas
170
+ // wider than the box it is drawn in. Here the grid is measured against the
171
+ // content box, so it is narrower by exactly the padding, which is the point.
172
+ // No background: the terminal is not a surface of its own, and the panel's
173
+ // paper shows through the strip the fit addon leaves for its scrollbar.
163
174
  return (
164
- <div className="relative flex-1 w-full h-full overflow-hidden">
175
+ <div className="relative flex-1 w-full h-full overflow-hidden p-2">
165
176
  <div
166
177
  ref={containerRef}
167
178
  data-terminal-root=""