@kabmo-labs/kabmo 0.23.0 → 0.25.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 (325) hide show
  1. package/dist/client/index.html +1 -1
  2. package/dist/client/index.js +805 -736
  3. package/dist/client/static/js/index-bc9aa4mx.css +1 -0
  4. package/dist/client/static/js/{index-ph0q59rs.js → index-ga8cbpt4.js} +1071 -1171
  5. package/package.json +2 -4
  6. package/src/cli/lib/args.js +24 -1
  7. package/src/cli/lib/args.test.js +16 -0
  8. package/src/cli/lib/commands/session.js +233 -0
  9. package/src/cli/lib/commands/session.test.js +103 -0
  10. package/src/cli/main.js +1 -1
  11. package/src/client/components/common/ComposerPicker.tsx +3 -0
  12. package/src/client/components/common/Modal.tsx +2 -6
  13. package/src/client/components/common/code-surface/shiki.test.ts +82 -0
  14. package/src/client/components/common/code-surface/shiki.ts +28 -7
  15. package/src/client/components/common/session-actions-menu/NewChildSessionDialog.tsx +113 -0
  16. package/src/client/components/common/session-actions-menu/index.tsx +33 -2
  17. package/src/client/components/common/session-row/StatusSlot.tsx +4 -4
  18. package/src/client/components/common/session-row/index.tsx +27 -1
  19. package/src/client/components/layout/desktop-layout/WorkspacePanels.tsx +7 -1
  20. package/src/client/components/layout/desktop-layout/resizer/separator-drag.ts +3 -3
  21. package/src/client/components/layout/session-sidebar/CategoryItem.tsx +25 -12
  22. package/src/client/components/layout/session-sidebar/ChildSessionList.tsx +66 -0
  23. package/src/client/components/layout/session-sidebar/SessionItem.tsx +28 -3
  24. package/src/client/components/layout/session-sidebar/about-modal/HarnessTable.test.tsx +20 -0
  25. package/src/client/components/layout/session-sidebar/about-modal/HarnessTable.tsx +59 -12
  26. package/src/client/components/layout/session-sidebar/about-modal/HarnessTableLog.test.tsx +94 -0
  27. package/src/client/components/layout/session-sidebar/about-modal/UpdateLogDialog.test.tsx +130 -0
  28. package/src/client/components/layout/session-sidebar/about-modal/UpdateLogDialog.tsx +120 -0
  29. package/src/client/components/layout/session-sidebar/about-modal/UpdateLogLine.tsx +47 -0
  30. package/src/client/components/layout/session-sidebar/about-modal/index.test.tsx +122 -0
  31. package/src/client/components/layout/session-sidebar/about-modal/index.tsx +55 -46
  32. package/src/client/components/layout/session-sidebar/modern/WorkspaceSection.tsx +18 -5
  33. package/src/client/components/mobile/mobile-session-sidebar/Item.tsx +21 -4
  34. package/src/client/components/mobile/mobile-session-sidebar/SessionRow.tsx +27 -5
  35. package/src/client/components/settings/categories/harness-settings/EnvProviderForm.tsx +31 -0
  36. package/src/client/components/settings/categories/harness-settings/provider-panel.test.tsx +49 -0
  37. package/src/client/components/workspace/chat-timeline/ChatOverlays.tsx +5 -2
  38. package/src/client/components/workspace/chat-timeline/ComposerDock.tsx +64 -70
  39. package/src/client/components/workspace/chat-timeline/ComposerDockFrame.tsx +35 -0
  40. package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +135 -118
  41. package/src/client/components/workspace/chat-timeline/MessageItem.tsx +22 -1
  42. package/src/client/components/workspace/chat-timeline/MessageList.test.ts +14 -0
  43. package/src/client/components/workspace/chat-timeline/MessageList.tsx +4 -0
  44. package/src/client/components/workspace/chat-timeline/TimelineBody.tsx +3 -0
  45. package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +4 -3
  46. package/src/client/components/workspace/chat-timeline/composer-dock-frame.test.tsx +155 -0
  47. package/src/client/components/workspace/chat-timeline/index.tsx +5 -2
  48. package/src/client/components/workspace/chat-timeline/pending-harness.test.tsx +1 -1
  49. package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/FrameControl.tsx +11 -20
  50. package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/GroupedAsk.tsx +1 -1
  51. package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/QuestionBlock.tsx +1 -1
  52. package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/drafts.ts +1 -1
  53. package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/index.tsx +2 -1
  54. package/src/client/components/workspace/file-explorer/index.test.ts +25 -0
  55. package/src/client/components/workspace/file-explorer/index.tsx +9 -3
  56. package/src/client/components/workspace/model-dropdown/harness-models.test.ts +17 -0
  57. package/src/client/components/workspace/model-dropdown/harness-models.ts +33 -18
  58. package/src/client/components/workspace/model-dropdown/index.tsx +3 -3
  59. package/src/client/components/workspace/model-dropdown/popover-metrics.ts +4 -1
  60. package/src/client/components/workspace/terminal-panel/KeyBar.tsx +10 -8
  61. package/src/client/components/workspace/terminal-panel/{RealtimeXtermView.tsx → RealtimeTerminalView.tsx} +51 -58
  62. package/src/client/components/workspace/terminal-panel/fit.test.ts +37 -0
  63. package/src/client/components/workspace/terminal-panel/fit.ts +64 -0
  64. package/src/client/components/workspace/terminal-panel/fonts.test.ts +161 -0
  65. package/src/client/components/workspace/terminal-panel/fonts.ts +164 -0
  66. package/src/client/components/workspace/terminal-panel/grid.test.ts +52 -0
  67. package/src/client/components/workspace/terminal-panel/grid.ts +118 -0
  68. package/src/client/components/workspace/terminal-panel/index.tsx +25 -21
  69. package/src/client/components/workspace/terminal-panel/mount.ts +247 -223
  70. package/src/client/components/workspace/terminal-panel/navigation.test.ts +54 -0
  71. package/src/client/components/workspace/terminal-panel/navigation.ts +47 -0
  72. package/src/client/data/settings/omp-schema.json +5 -5
  73. package/src/client/data/theme/terminal.test.ts +25 -0
  74. package/src/client/data/theme/terminal.ts +96 -79
  75. package/src/client/hooks/chat/composer/items.test.ts +12 -26
  76. package/src/client/hooks/chat/composer/pick-mapping.test.ts +42 -0
  77. package/src/client/hooks/chat/omp/prompt-send.test.ts +7 -7
  78. package/src/client/hooks/chat/omp/prompt-send.ts +26 -14
  79. package/src/client/hooks/chat/timeline/actions.ts +2 -2
  80. package/src/client/hooks/chat/timeline/ask-frames.ts +5 -4
  81. package/src/client/hooks/chat/timeline/new-chat-open.test.ts +86 -0
  82. package/src/client/hooks/chat/timeline/new-chat-open.ts +23 -5
  83. package/src/client/hooks/chat/timeline/new-chat.test.ts +32 -4
  84. package/src/client/hooks/chat/timeline/new-chat.ts +18 -6
  85. package/src/client/hooks/chat/timeline/prompt-text.test.ts +34 -1
  86. package/src/client/hooks/chat/timeline/prompt-text.ts +47 -20
  87. package/src/client/hooks/chat/timeline/rewind-actions.test.ts +24 -1
  88. package/src/client/hooks/chat/timeline/rewind-actions.ts +15 -11
  89. package/src/client/hooks/chat/timeline/run-identity.test.ts +52 -0
  90. package/src/client/hooks/chat/timeline/run-identity.ts +23 -11
  91. package/src/client/hooks/chat/timeline/send-execute.test.ts +56 -0
  92. package/src/client/hooks/chat/timeline/send-helpers.ts +30 -1
  93. package/src/client/hooks/chat/timeline/send-props.ts +5 -3
  94. package/src/client/hooks/chat/timeline/send-steer.test.ts +4 -4
  95. package/src/client/hooks/chat/timeline/send.test-util.ts +8 -2
  96. package/src/client/hooks/chat/timeline/send.test.ts +4 -4
  97. package/src/client/hooks/chat/timeline/send.ts +59 -53
  98. package/src/client/hooks/chat/timeline/session-load.test-util.ts +6 -2
  99. package/src/client/hooks/chat/timeline/session-load.test.ts +31 -0
  100. package/src/client/hooks/chat/timeline/session-load.ts +6 -14
  101. package/src/client/hooks/chat/timeline/session-shapes.ts +32 -0
  102. package/src/client/hooks/chat/timeline/use-fork-session.ts +49 -0
  103. package/src/client/hooks/models/harness-catalog.ts +114 -0
  104. package/src/client/hooks/models/provider-writes.test.ts +81 -0
  105. package/src/client/hooks/models/provider-writes.ts +10 -3
  106. package/src/client/hooks/models/use-harness-update.test.ts +193 -0
  107. package/src/client/hooks/models/use-harness-update.ts +202 -0
  108. package/src/client/hooks/models/use-harnesses-controller.ts +57 -0
  109. package/src/client/hooks/models/use-harnesses-signal.test.ts +128 -0
  110. package/src/client/hooks/models/use-harnesses.test.ts +2 -1
  111. package/src/client/hooks/models/use-harnesses.ts +48 -114
  112. package/src/client/hooks/workspace/child-expansion.ts +33 -0
  113. package/src/client/hooks/workspace/terminal/index.ts +17 -3
  114. package/src/client/hooks/workspace/terminal/socket.ts +9 -4
  115. package/src/client/lib/session-tree.test.ts +50 -0
  116. package/src/client/lib/session-tree.ts +59 -0
  117. package/src/client/tailwind.css +26 -12
  118. package/src/server/index.ts +2 -0
  119. package/src/server/lib/auth/guard.ts +10 -0
  120. package/src/server/lib/btw/session-copy.server.ts +6 -44
  121. package/src/server/lib/btw/session-copy.test.ts +2 -1
  122. package/src/server/lib/db/schema.ts +4 -0
  123. package/src/server/lib/db/seed-terminal.test.ts +1 -1
  124. package/src/server/lib/db/seed.test.ts +1 -1
  125. package/src/server/lib/harness/acp/activation.test.ts +81 -0
  126. package/src/server/lib/harness/acp/activation.ts +72 -0
  127. package/src/server/lib/harness/acp/background-work.test.ts +262 -0
  128. package/src/server/lib/harness/acp/background-work.ts +320 -0
  129. package/src/server/lib/harness/acp/client.ts +2 -2
  130. package/src/server/lib/harness/acp/frames.test.ts +50 -1
  131. package/src/server/lib/harness/acp/frames.ts +17 -5
  132. package/src/server/lib/harness/acp/gateway-env.test.ts +64 -0
  133. package/src/server/lib/harness/acp/gateway-env.ts +70 -0
  134. package/src/server/lib/harness/acp/mapper.ts +6 -4
  135. package/src/server/lib/harness/acp/prompt.test.ts +20 -0
  136. package/src/server/lib/harness/acp/prompt.ts +19 -3
  137. package/src/server/lib/harness/acp/session-background.test.ts +129 -0
  138. package/src/server/lib/harness/acp/session-config.test.ts +73 -0
  139. package/src/server/lib/harness/acp/session-config.ts +87 -6
  140. package/src/server/lib/harness/acp/session-exit.ts +31 -0
  141. package/src/server/lib/harness/acp/session-handshake.test.ts +108 -0
  142. package/src/server/lib/harness/acp/session-handshake.ts +36 -3
  143. package/src/server/lib/harness/acp/session-idle.ts +51 -0
  144. package/src/server/lib/harness/acp/session-listeners.ts +31 -0
  145. package/src/server/lib/harness/acp/session-notifications.ts +19 -3
  146. package/src/server/lib/harness/acp/session-observers.test.ts +9 -0
  147. package/src/server/lib/harness/acp/session-options.ts +33 -0
  148. package/src/server/lib/harness/acp/session-reaper.test.ts +96 -0
  149. package/src/server/lib/harness/acp/session-requests.ts +47 -0
  150. package/src/server/lib/harness/acp/session-turns.ts +20 -5
  151. package/src/server/lib/harness/acp/session.test-util.ts +54 -3
  152. package/src/server/lib/harness/acp/session.test.ts +65 -3
  153. package/src/server/lib/harness/acp/session.ts +79 -79
  154. package/src/server/lib/harness/acp/turn.test.ts +81 -0
  155. package/src/server/lib/harness/acp/turn.ts +54 -13
  156. package/src/server/lib/harness/acp/verbs.ts +12 -2
  157. package/src/server/lib/harness/auto-probe.server.test.ts +121 -0
  158. package/src/server/lib/harness/auto-probe.server.ts +178 -0
  159. package/src/server/lib/harness/config.server.test.ts +1 -1
  160. package/src/server/lib/harness/config.server.ts +1 -1
  161. package/src/server/lib/harness/launch-table.ts +195 -0
  162. package/src/server/lib/harness/launch.test.ts +37 -0
  163. package/src/server/lib/harness/launch.ts +16 -116
  164. package/src/server/lib/harness/provider-entry.ts +32 -0
  165. package/src/server/lib/harness/provider-file.server.ts +3 -0
  166. package/src/server/lib/harness/provider-sources.server.test.ts +45 -0
  167. package/src/server/lib/harness/provider-sources.server.ts +26 -2
  168. package/src/server/lib/harness/provider-write.server.ts +21 -32
  169. package/src/server/lib/harness/provider-zcode.server.test.ts +270 -0
  170. package/src/server/lib/harness/provider-zcode.server.ts +324 -0
  171. package/src/server/lib/harness/spawn.server.ts +15 -2
  172. package/src/server/lib/harness/update-job-store.test.ts +126 -0
  173. package/src/server/lib/harness/update-job-store.ts +109 -0
  174. package/src/server/lib/harness/update-job.server.ts +203 -0
  175. package/src/server/lib/harness/update-state.server.ts +15 -20
  176. package/src/server/lib/harness/update-worker.test.ts +153 -0
  177. package/src/server/lib/harness/update-worker.ts +197 -0
  178. package/src/server/lib/lifecycle/after-listen.ts +7 -0
  179. package/src/server/lib/lifecycle/paths.ts +23 -0
  180. package/src/server/lib/models/registry-refresh.server.test.ts +87 -0
  181. package/src/server/lib/models/registry-refresh.server.ts +98 -0
  182. package/src/server/lib/omp/rpc/child-config.ts +5 -4
  183. package/src/server/lib/omp/rpc/constants.test.ts +2 -1
  184. package/src/server/lib/omp/rpc/forked-resume.test.ts +14 -3
  185. package/src/server/lib/omp/rpc/manager.ts +5 -5
  186. package/src/server/lib/omp/rpc/prewarm-pool.ts +12 -3
  187. package/src/server/lib/omp/rpc/session-registry.ts +14 -2
  188. package/src/server/lib/omp/rpc/terminal-settle.ts +53 -5
  189. package/src/server/lib/omp/session/delete-flow.server.ts +62 -8
  190. package/src/server/lib/omp/session/delete.server.ts +17 -0
  191. package/src/server/lib/omp/session/rewind-file.ts +39 -21
  192. package/src/server/lib/omp/session/sidebar-data.server.ts +6 -6
  193. package/src/server/lib/omp/session/transcript-copy.ts +123 -0
  194. package/src/server/lib/sessions/agent-token.server.test.ts +64 -0
  195. package/src/server/lib/sessions/agent-token.server.ts +134 -0
  196. package/src/server/lib/sessions/answers.server.test.ts +33 -0
  197. package/src/server/lib/sessions/answers.server.ts +37 -0
  198. package/src/server/lib/sessions/dispatch.server.test.ts +143 -0
  199. package/src/server/lib/sessions/dispatch.server.ts +128 -0
  200. package/src/server/lib/sessions/fork.server.test.ts +209 -0
  201. package/src/server/lib/sessions/fork.server.ts +304 -0
  202. package/src/server/lib/sessions/lifecycle.server.test.ts +75 -0
  203. package/src/server/lib/sessions/lifecycle.server.ts +71 -0
  204. package/src/server/lib/sessions/notify.server.test.ts +112 -0
  205. package/src/server/lib/sessions/notify.server.ts +212 -0
  206. package/src/server/lib/sessions/relation-types.ts +76 -0
  207. package/src/server/lib/sessions/relations.server.test.ts +207 -0
  208. package/src/server/lib/sessions/relations.server.ts +337 -0
  209. package/src/server/lib/sessions/resolve.server.ts +106 -0
  210. package/src/server/lib/sessions/schema.server.ts +82 -0
  211. package/src/server/lib/sessions/sidebar-relations.server.test.ts +61 -0
  212. package/src/server/lib/sessions/sidebar-relations.server.ts +47 -0
  213. package/src/server/lib/sessions/spawn.server.test.ts +196 -0
  214. package/src/server/lib/sessions/spawn.server.ts +310 -0
  215. package/src/server/lib/terminal/attach-replay.test.ts +2 -2
  216. package/src/server/lib/terminal/output.test.ts +2 -2
  217. package/src/server/lib/terminal/output.ts +1 -1
  218. package/src/server/lib/terminal/resize.test.ts +99 -0
  219. package/src/server/lib/terminal/runtime.server.ts +26 -6
  220. package/src/server/lib/terminal/send-result.test.ts +18 -1
  221. package/src/server/lib/terminal/send-result.ts +26 -2
  222. package/src/server/lib/terminal/session.server.ts +6 -6
  223. package/src/server/lib/usage/new-api.test.ts +92 -0
  224. package/src/server/lib/usage/new-api.ts +131 -0
  225. package/src/server/lib/usage/provider-endpoint.test.ts +106 -0
  226. package/src/server/lib/usage/provider-key.ts +33 -0
  227. package/src/server/lib/usage/providers.server.ts +10 -3
  228. package/src/server/lib/usage/vendor-balance.server.ts +4 -53
  229. package/src/server/lib/usage/vendor-http.ts +41 -0
  230. package/src/server/lib/usage/window.ts +55 -0
  231. package/src/server/routes/agent/command.ts +14 -1
  232. package/src/server/routes/agent/harness-command.ts +6 -0
  233. package/src/server/routes/agent/new.ts +15 -0
  234. package/src/server/routes/chat/rewind.test.ts +147 -0
  235. package/src/server/routes/chat/rewind.ts +29 -7
  236. package/src/server/routes/chat/session.test.ts +165 -10
  237. package/src/server/routes/chat/session.ts +60 -7
  238. package/src/server/routes/harness/add-provider.test.ts +9 -1
  239. package/src/server/routes/harness/import-action.ts +22 -4
  240. package/src/server/routes/harness/import.test.ts +1 -1
  241. package/src/server/routes/harness/index.ts +5 -1
  242. package/src/server/routes/harness/root.ts +8 -49
  243. package/src/server/routes/harness/toggle.test.ts +20 -0
  244. package/src/server/routes/harness/update-status.ts +26 -0
  245. package/src/server/routes/harness/update.test.ts +119 -0
  246. package/src/server/routes/harness/update.ts +67 -113
  247. package/src/server/routes/harness/versions.ts +5 -1
  248. package/src/server/routes/sessions/answer.ts +24 -0
  249. package/src/server/routes/sessions/batch-delete.ts +11 -5
  250. package/src/server/routes/sessions/delete-acp.test.ts +227 -0
  251. package/src/server/routes/sessions/delete.ts +4 -2
  252. package/src/server/routes/sessions/fork.ts +74 -0
  253. package/src/server/routes/sessions/index.ts +14 -0
  254. package/src/server/routes/sessions/relations.ts +85 -0
  255. package/src/server/routes/sessions/session.ts +4 -0
  256. package/src/server/routes/sessions/spawn.ts +134 -0
  257. package/src/server/routes/settings/model-override.ts +5 -2
  258. package/src/server/routes/settings/provider-entry.ts +2 -2
  259. package/src/server/routes/settings/provider-model.ts +2 -2
  260. package/src/server/routes/settings/provider-models.ts +2 -2
  261. package/src/server/routes/settings/provider-refresh.ts +6 -4
  262. package/src/server/routes/settings/providers.ts +3 -1
  263. package/src/server/routes/settings/settings-config-routes.test.ts +10 -2
  264. package/src/server/routes/terminal/ws.ts +3 -3
  265. package/src/shared/lib/chat/ask-form/fields.ts +76 -0
  266. package/src/shared/lib/chat/ask-form/index.ts +323 -0
  267. package/src/shared/lib/chat/ask-form/tokens.ts +199 -0
  268. package/src/shared/lib/chat/ask-form/types.ts +43 -0
  269. package/src/shared/lib/chat/ask-form.test.ts +137 -0
  270. package/src/shared/lib/chat/ask-questions.test.ts +65 -1
  271. package/src/shared/lib/chat/ask-questions.ts +51 -145
  272. package/src/shared/lib/chat/ask-results.ts +198 -0
  273. package/src/shared/lib/chat/composer/client.ts +31 -2
  274. package/src/shared/lib/chat/composer/delegation.test.ts +93 -0
  275. package/src/shared/lib/chat/composer/delegation.ts +206 -0
  276. package/src/shared/lib/chat/notice-text.ts +1 -1
  277. package/src/shared/lib/chat/timeline/omp-callbacks.ts +13 -1
  278. package/src/shared/lib/chat/timeline/prompt-error.test.ts +146 -0
  279. package/src/shared/lib/chat/timeline/prompt-error.ts +88 -0
  280. package/src/shared/lib/chat/tool/summary-wait.test.ts +11 -0
  281. package/src/shared/lib/code/ansi.ts +1 -1
  282. package/src/shared/lib/fonts/nerd-symbols.css +4 -3
  283. package/src/shared/lib/fonts/nerd-symbols.test.ts +9 -9
  284. package/src/shared/lib/harness/catalog.test.ts +1 -1
  285. package/src/shared/lib/harness/config-fields.test.ts +4 -0
  286. package/src/shared/lib/harness/config-fields.ts +19 -4
  287. package/src/shared/lib/harness/dialects.test.ts +8 -0
  288. package/src/shared/lib/harness/dialects.ts +12 -0
  289. package/src/shared/lib/harness/provider-facts.test.ts +59 -8
  290. package/src/shared/lib/harness/provider-facts.ts +46 -11
  291. package/src/shared/lib/harness/providers.ts +44 -1
  292. package/src/shared/lib/harness/rewind.ts +24 -0
  293. package/src/shared/lib/harness/update-job.ts +33 -0
  294. package/src/shared/lib/harness/update-plan.test.ts +69 -4
  295. package/src/shared/lib/harness/update-plan.ts +57 -9
  296. package/src/shared/lib/harness/updates.test.ts +22 -0
  297. package/src/shared/lib/harness/updates.ts +24 -1
  298. package/src/shared/lib/models/client.ts +10 -1
  299. package/src/shared/lib/omp/dialog-methods.ts +4 -3
  300. package/src/shared/lib/omp/session/wait-idle.test.ts +11 -0
  301. package/src/shared/lib/omp/session/wait-idle.ts +12 -2
  302. package/src/shared/lib/theme/catalog.test.ts +13 -9
  303. package/src/shared/lib/theme/color.test.ts +2 -2
  304. package/src/shared/lib/theme/color.ts +4 -4
  305. package/src/shared/lib/theme/css.ts +2 -0
  306. package/src/shared/lib/theme/ink-scale.ts +21 -1
  307. package/src/shared/lib/theme/theme.test.ts +26 -10
  308. package/src/shared/lib/ui/safe-area.test.ts +28 -0
  309. package/src/shared/lib/ui/safe-area.ts +42 -0
  310. package/src/shared/lib/workspace/terminal/input.test.ts +27 -0
  311. package/src/shared/lib/workspace/terminal/input.ts +33 -0
  312. package/src/shared/lib/workspace/terminal/keys.test.ts +1 -1
  313. package/src/shared/lib/workspace/terminal/keys.ts +7 -7
  314. package/src/shared/types/chat.ts +1 -1
  315. package/src/shared/types/harness-update.ts +65 -0
  316. package/src/shared/types/harness.ts +30 -4
  317. package/src/shared/types/omp/agent.ts +19 -2
  318. package/src/shared/types/workspace.ts +4 -0
  319. package/src/test-support/fake-omp-fork.ts +16 -2
  320. package/src/test-support/file-explorer-render.test-util.ts +37 -0
  321. package/src/test-support/file-explorer.test-util.ts +20 -18
  322. package/src/test-support/harness-table.test-util.ts +21 -4
  323. package/dist/client/static/js/index-jhmg4w91.css +0 -1
  324. package/src/client/components/workspace/terminal-panel/webgl.test.ts +0 -75
  325. package/src/client/components/workspace/terminal-panel/webgl.ts +0 -108
@@ -23,6 +23,7 @@ import { fetchOmpRegistrySnapshot } from '@/server/lib/models/provider-registry.
23
23
  import { readProviderIconUrls } from '@/server/lib/models/provider-icon.server';
24
24
  import { buildDeepSeekReport } from '@/server/lib/usage/deepseek';
25
25
  import { buildKenariReport } from '@/server/lib/usage/kenari';
26
+ import { buildNewApiReports } from '@/server/lib/usage/new-api';
26
27
  import { fetchOmpUsageSnapshot, type OmpUsageSnapshot } from '@/server/lib/usage/omp-usage.server';
27
28
  import { fetchVendorBalance, type VendorBalance } from '@/server/lib/usage/vendor-balance.server';
28
29
  import { kenariProviderSlugs, listCredentialedProviders, type CredentialedProvider } from '@/server/lib/usage/provider-key';
@@ -123,10 +124,13 @@ export async function buildUsageProviders(options: { force?: boolean } = {}): Pr
123
124
  // one (`kenari2`) with no quota card while its key was never read. DeepSeek
124
125
  // still resolves by its canonical slug.
125
126
  const kenariSlugs = await kenariProviderSlugs(credentials.keys());
126
- const [kenariReports, deepseek, balances] = await Promise.all([
127
+ const [kenariReports, deepseek, balances, gateways] = await Promise.all([
127
128
  Promise.all([...kenariSlugs].map(async (slug) => [slug, await buildKenariReport(slug)] as const)),
128
129
  credentials.has('deepseek') ? buildDeepSeekReport() : Promise.resolve(null),
129
130
  loadVendorBalances([...credentials.keys()]),
131
+ // Self-hosted relays answer on the provider's OWN base URL, so they cannot
132
+ // live in `vendor-balance`'s fixed-URL table.
133
+ buildNewApiReports(credentials.keys()),
130
134
  ]);
131
135
  const kenariBySlug = new Map<string, KenariUsageReport>();
132
136
  for (const [slug, report] of kenariReports) {
@@ -137,6 +141,7 @@ export async function buildUsageProviders(options: { force?: boolean } = {}): Pr
137
141
  for (const [slug, sources] of credentials) {
138
142
  const report = snapshot.reports.get(slug);
139
143
  const balance = balances.get(slug);
144
+ const gateway = gateways.get(slug);
140
145
  const { tracked, limitsUnavailable } = resolveUsageTracking(slug, snapshot);
141
146
  const summary: UsageProviderSummary = {
142
147
  id: slug,
@@ -144,8 +149,8 @@ export async function buildUsageProviders(options: { force?: boolean } = {}): Pr
144
149
  ...(iconUrls.get(slug) ? { iconUrl: iconUrls.get(slug) } : {}),
145
150
  credentialSources: sources,
146
151
  // A vendor balance is real quota data even when omp has no adapter for it.
147
- tracked: tracked || Boolean(balance && balance.limits.length > 0),
148
- limits: [...(report?.limits ?? []), ...(balance?.limits ?? [])],
152
+ tracked: tracked || Boolean(balance?.limits.length) || Boolean(gateway?.limits.length),
153
+ limits: [...(report?.limits ?? []), ...(balance?.limits ?? []), ...(gateway?.limits ?? [])],
149
154
  ...(limitsUnavailable ? { limitsUnavailable: true } : {}),
150
155
  ...(report?.notes ? { notes: report.notes } : {}),
151
156
  };
@@ -157,6 +162,8 @@ export async function buildUsageProviders(options: { force?: boolean } = {}): Pr
157
162
  } else if (slug === 'deepseek' && deepseek) {
158
163
  summary.deepseek = deepseek;
159
164
  if (deepseek.error) summary.error = deepseek.error;
165
+ } else if (gateway?.error) {
166
+ summary.error = gateway.error;
160
167
  } else if (balance?.error && !summary.error) {
161
168
  // Only surface a balance failure when nothing richer already reported one.
162
169
  summary.error = balance.error;
@@ -24,10 +24,11 @@
24
24
 
25
25
  import { readOmpProviderApiKey } from '@/server/lib/omp/core/auth-credentials';
26
26
  import { loadProviderEntries } from '@/server/lib/usage/provider-key';
27
+ import { fetchProviderJson } from '@/server/lib/usage/vendor-http';
28
+ import { num, usdWindow } from '@/server/lib/usage/window';
27
29
  import { isRecord } from '@/shared/lib/util/guards';
28
- import type { UsageLimitWindow, UsageWindowStatus } from '@/shared/types';
30
+ import type { UsageLimitWindow } from '@/shared/types';
29
31
 
30
- const FETCH_TIMEOUT_MS = 10_000;
31
32
  const MASKED_KEY_PATTERN = /•{3,}/;
32
33
 
33
34
  /** A vendor balance adapter: where to ask, and how to read the answer. */
@@ -41,46 +42,6 @@ interface BalanceAdapter {
41
42
  parse: (payload: unknown) => UsageLimitWindow[];
42
43
  }
43
44
 
44
- function num(value: unknown): number | undefined {
45
- if (typeof value === 'number' && Number.isFinite(value)) return value;
46
- if (typeof value === 'string' && value.trim() !== '') {
47
- const parsed = Number(value);
48
- if (Number.isFinite(parsed)) return parsed;
49
- }
50
- return undefined;
51
- }
52
-
53
- /** Status for a credit window: exhausted at zero remaining, else ok. */
54
- function balanceStatus(remaining: number | undefined): UsageWindowStatus {
55
- if (remaining === undefined) return 'unknown';
56
- return remaining <= 0 ? 'exhausted' : 'ok';
57
- }
58
-
59
- /** One USD window from a balance; `limit` is omitted when the vendor has none. */
60
- function usdWindow(input: {
61
- id: string;
62
- label: string;
63
- used?: number;
64
- limit?: number;
65
- remaining?: number;
66
- note?: string;
67
- }): UsageLimitWindow {
68
- const usedFraction = input.limit && input.limit > 0 && input.used !== undefined
69
- ? input.used / input.limit
70
- : undefined;
71
- return {
72
- id: input.id,
73
- label: input.label,
74
- unit: 'usd',
75
- status: balanceStatus(input.remaining),
76
- ...(input.used !== undefined ? { used: input.used } : {}),
77
- ...(input.limit !== undefined ? { limit: input.limit } : {}),
78
- ...(input.remaining !== undefined ? { remaining: input.remaining } : {}),
79
- ...(usedFraction !== undefined ? { usedFraction } : {}),
80
- ...(input.note ? { notes: [input.note] } : {}),
81
- };
82
- }
83
-
84
45
  /** Pull `data` (or the root) out of a vendor envelope. */
85
46
  function envelope(payload: unknown): Record<string, unknown> {
86
47
  if (!isRecord(payload)) throw new Error('unexpected balance response');
@@ -263,17 +224,7 @@ export async function fetchVendorBalance(slug: string): Promise<VendorBalance |
263
224
  const apiKey = await resolveVendorKey(adapter);
264
225
  if (!apiKey) return null;
265
226
  try {
266
- const response = await fetch(adapter.url, {
267
- headers: { Authorization: `Bearer ${apiKey}`, Accept: 'application/json' },
268
- signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
269
- });
270
- if (response.status === 401 || response.status === 403) {
271
- return { limits: [], error: `${adapter.slug} rejected the API key (HTTP ${response.status}).` };
272
- }
273
- if (response.status < 200 || response.status >= 300) {
274
- return { limits: [], error: `${adapter.slug} balance request failed (HTTP ${response.status}).` };
275
- }
276
- const limits = adapter.parse(await response.json());
227
+ const limits = adapter.parse(await fetchProviderJson(adapter.url, apiKey, adapter.slug));
277
228
  return { limits };
278
229
  } catch (error) {
279
230
  return {
@@ -0,0 +1,41 @@
1
+ /**
2
+ * @license
3
+ * SPDX-License-Identifier: MIT
4
+ */
5
+
6
+ /**
7
+ * One authenticated GET against a provider's own balance/usage endpoint.
8
+ *
9
+ * Every balance source needs the same three answers — key rejected, request
10
+ * failed, response is not JSON — and they must read the same on every card, so
11
+ * the status handling lives here rather than in each adapter.
12
+ */
13
+
14
+ const FETCH_TIMEOUT_MS = 10_000;
15
+
16
+ /**
17
+ * Fetch and parse JSON, or throw an error whose message is safe to show in the
18
+ * provider card (it names the provider, never the credential).
19
+ */
20
+ export async function fetchProviderJson(url: string, apiKey: string, label: string): Promise<unknown> {
21
+ let response: Response;
22
+ try {
23
+ response = await fetch(url, {
24
+ headers: { Authorization: `Bearer ${apiKey}`, Accept: 'application/json' },
25
+ signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
26
+ });
27
+ } catch (error) {
28
+ throw new Error(error instanceof Error ? error.message : `${label} balance request failed`);
29
+ }
30
+ if (response.status === 401 || response.status === 403) {
31
+ throw new Error(`${label} rejected the API key (HTTP ${response.status}).`);
32
+ }
33
+ if (response.status < 200 || response.status >= 300) {
34
+ throw new Error(`${label} balance request failed (HTTP ${response.status}).`);
35
+ }
36
+ try {
37
+ return await response.json();
38
+ } catch {
39
+ throw new Error(`${label} returned an unreadable balance response.`);
40
+ }
41
+ }
@@ -0,0 +1,55 @@
1
+ /**
2
+ * @license
3
+ * SPDX-License-Identifier: MIT
4
+ */
5
+
6
+ /**
7
+ * The USD window shape every provider-reported credit source produces
8
+ * (OpenRouter's key limits, a New API gateway's billing endpoints, …).
9
+ *
10
+ * One builder: `remaining` means the same thing on every card, and a
11
+ * vendor-specific copy drifts the moment one of them is "fixed".
12
+ */
13
+
14
+ import type { UsageLimitWindow, UsageWindowStatus } from '@/shared/types';
15
+
16
+ /** A finite number from a JSON value, including the numeric strings vendors send. */
17
+ export function num(value: unknown): number | undefined {
18
+ if (typeof value === 'number' && Number.isFinite(value)) return value;
19
+ if (typeof value === 'string' && value.trim() !== '') {
20
+ const parsed = Number(value);
21
+ if (Number.isFinite(parsed)) return parsed;
22
+ }
23
+ return undefined;
24
+ }
25
+
26
+ /** Status for a credit window: exhausted at zero remaining, else ok. */
27
+ function balanceStatus(remaining: number | undefined): UsageWindowStatus {
28
+ if (remaining === undefined) return 'unknown';
29
+ return remaining <= 0 ? 'exhausted' : 'ok';
30
+ }
31
+
32
+ /** One USD window from a balance; `limit` is omitted when the vendor has none. */
33
+ export function usdWindow(input: {
34
+ id: string;
35
+ label: string;
36
+ used?: number;
37
+ limit?: number;
38
+ remaining?: number;
39
+ note?: string;
40
+ }): UsageLimitWindow {
41
+ const usedFraction = input.limit && input.limit > 0 && input.used !== undefined
42
+ ? input.used / input.limit
43
+ : undefined;
44
+ return {
45
+ id: input.id,
46
+ label: input.label,
47
+ unit: 'usd',
48
+ status: balanceStatus(input.remaining),
49
+ ...(input.used !== undefined ? { used: input.used } : {}),
50
+ ...(input.limit !== undefined ? { limit: input.limit } : {}),
51
+ ...(input.remaining !== undefined ? { remaining: input.remaining } : {}),
52
+ ...(usedFraction !== undefined ? { usedFraction } : {}),
53
+ ...(input.note ? { notes: [input.note] } : {}),
54
+ };
55
+ }
@@ -11,6 +11,7 @@ import { assertBtwIdle } from '@/server/lib/btw/service.server';
11
11
  import { loadPersistedModes } from '@/server/lib/omp/session/modes';
12
12
  import { isModeCommandType, modeCommandPrompt, parseModeRequest, parseModeSelection } from '@/server/lib/omp/mode/request';
13
13
  import { kabmoModeEnv } from '@/server/lib/omp/extensions/locator';
14
+ import { mintAgentEnvironment, rememberAgentToken } from '@/server/lib/sessions/agent-token.server';
14
15
  import { resetGoalDriverState } from '@/server/lib/omp/session/goal-driver.server';
15
16
  import { forwardToPeer, isPeerRelayed, peerOriginForSession } from '@/server/lib/omp/rpc/peer-proxy.server';
16
17
  import { applyHarnessMode, resumeRecordedHarnessSession } from '@/server/routes/agent/harness-command';
@@ -176,7 +177,19 @@ export async function sendCommand({ params, request }: ActionFunctionArgs) {
176
177
  const asked = body.type === 'set_model' && typeof body.provider === 'string' && typeof body.modelId === 'string'
177
178
  ? { provider: body.provider, modelId: body.modelId }
178
179
  : undefined;
179
- const { session } = await startRpcSession(sessionId, filePath, cwd, recordedCwd, spawnMode, modeEnv, asked);
180
+ const { token, env: agentEnv } = mintAgentEnvironment();
181
+ const { session } = await startRpcSession(
182
+ sessionId,
183
+ filePath,
184
+ cwd,
185
+ recordedCwd,
186
+ spawnMode,
187
+ { ...(modeEnv ?? {}), ...agentEnv },
188
+ asked,
189
+ );
190
+ await rememberAgentToken(sessionId, token).catch((cause: unknown) => {
191
+ console.error(`[sessions] could not record the agent token for ${sessionId}:`, cause);
192
+ });
180
193
  const result = await session.send(forwarded);
181
194
  // Same Resume nudge as the live path: a resumed goal must not sit idle
182
195
  // waiting for the operator's next message.
@@ -15,6 +15,7 @@
15
15
 
16
16
  import { freshProbe } from '@/server/lib/harness/probe-cache.server';
17
17
  import { startAcpSession } from '@/server/lib/harness/spawn.server';
18
+ import { mintAgentEnvironment, rememberAgentToken } from '@/server/lib/sessions/agent-token.server';
18
19
  import { knownHarness, loadHarnessSession, repointHarnessSession } from '@/server/lib/harness/session-store.server';
19
20
  import { selectValues } from '@/server/lib/harness/launch';
20
21
  import { harnessOfSession } from '@/server/lib/omp/rpc/session-registry';
@@ -65,6 +66,7 @@ export async function resumeRecordedHarnessSession(
65
66
  if (probe?.capabilities.loadSession === false) {
66
67
  throw new Error(`${label} cannot restore this chat: it does not support session/load.`);
67
68
  }
69
+ const { token, env } = mintAgentEnvironment();
68
70
  const { session, realSessionId } = await startAcpSession({
69
71
  harness,
70
72
  sessionId,
@@ -77,6 +79,10 @@ export async function resumeRecordedHarnessSession(
77
79
  resumeAgentSessionId: record.agentSessionId || sessionId,
78
80
  cwd: record.cwd,
79
81
  accessMode,
82
+ env,
83
+ });
84
+ await rememberAgentToken(sessionId, token).catch((cause: unknown) => {
85
+ console.error(`[sessions] could not record the agent token for ${sessionId}:`, cause);
80
86
  });
81
87
  // A forking load answers a NEW agent id, and the spawn recorded that id as its
82
88
  // own row — a second sidebar row for one conversation. The chat keeps ITS id
@@ -10,6 +10,8 @@ import { parseModeSelection } from '@/server/lib/omp/mode/request';
10
10
  import { projectModelForCwd } from '@/server/lib/workspace/project-model.server';
11
11
  import { HARNESS_IDS, type HarnessId } from '@/shared/lib/harness/catalog';
12
12
  import { startAcpSession } from '@/server/lib/harness/spawn.server';
13
+ import { mintAgentEnvironment, rememberAgentToken } from '@/server/lib/sessions/agent-token.server';
14
+ import { isMockMode } from '@/server/mock.server';
13
15
 
14
16
  /** The model-dropdown persists its selection here (actionType 'selectModel');
15
17
  * a spawn that arrives without an explicit provider/modelId falls back to it. */
@@ -40,6 +42,14 @@ async function loadPersistedModel(): Promise<{ provider: string; modelId: string
40
42
  // omp itself, so Kabmo adopts it via the URL param after the response.
41
43
  export async function action({ request }: ActionFunctionArgs) {
42
44
  try {
45
+ // MOCK mode has no agent process to start, and saying so with a CODE is what
46
+ // lets the composer take its simulated path instead of reporting "Prompt not
47
+ // sent: omp binary not found" — measured in the demo shell on a host without
48
+ // omp, where the landing composer silently did nothing. Real spawn failures
49
+ // still report, because they carry no `mock_mode`.
50
+ if (isMockMode()) {
51
+ return json({ error: 'Mock mode runs no agent process', code: 'mock_mode' }, { status: 400 });
52
+ }
43
53
  const body = await request.json().catch(() => null);
44
54
  if (!body || typeof body.type !== 'string' || !body.type.trim()) {
45
55
  return json({ error: 'command type is required', code: 'command_type_required' }, { status: 400 });
@@ -151,6 +161,7 @@ async function startAcpChat({ harness, cwd, body, model, accessMode }: {
151
161
  const projectModel = await projectModelForCwd(await getDb(), cwd);
152
162
  const thinkingLevel = typeof body.thinkingLevel === 'string' ? body.thinkingLevel : null;
153
163
  const mode = harnessModeSelection(body);
164
+ const { token, env: agentEnv } = mintAgentEnvironment();
154
165
  const { session, realSessionId } = await startAcpSession({
155
166
  harness,
156
167
  sessionId: `__new__${Bun.randomUUIDv7()}`,
@@ -159,6 +170,10 @@ async function startAcpChat({ harness, cwd, body, model, accessMode }: {
159
170
  thinkingLevel,
160
171
  mode,
161
172
  accessMode,
173
+ env: agentEnv,
174
+ });
175
+ await rememberAgentToken(realSessionId, token).catch((cause: unknown) => {
176
+ console.error(`[sessions] could not record the agent token for ${realSessionId}:`, cause);
162
177
  });
163
178
 
164
179
  if (type === 'ensure_session') {
@@ -0,0 +1,147 @@
1
+ /**
2
+ * @license
3
+ * SPDX-License-Identifier: MIT
4
+ */
5
+
6
+ /**
7
+ * The in-place rewind endpoint, driven against a real session file.
8
+ *
9
+ * Two rules are pinned here, both of which the ACP transport made visible:
10
+ *
11
+ * - the live child is torn down BEFORE the file is touched. `omp-acp` writes
12
+ * the same JSONL and flushes it on shutdown, so a rewind that rewrote the
13
+ * file first raced the child and could be overwritten by its final flush;
14
+ * - a harness whose agent keeps its own transcript is refused BEFORE its child
15
+ * is destroyed. `claude` has no omp file to truncate, so the old shape would
16
+ * have killed a working chat and then answered 404.
17
+ */
18
+
19
+ import { afterEach, beforeEach, describe, expect, test } from 'bun:test';
20
+ import { mkdirSync, mkdtempSync, readFileSync, writeFileSync } from 'node:fs';
21
+ import { tmpdir } from 'node:os';
22
+ import { join } from 'node:path';
23
+ import { isolateDb, releaseDb } from '@/test-support/isolated-db';
24
+ import { removeDir } from '@/test-support/remove-dir';
25
+ import { registerAcpSession } from '@/server/lib/harness/register.server';
26
+ import { claimHarness } from '@/server/lib/harness/registry';
27
+ import { clearSessionFileCaches } from '@/server/lib/omp/session/files';
28
+ import { action } from '@/server/routes/chat/rewind';
29
+ import type { HarnessSession } from '@/server/lib/harness/session';
30
+ import type { HarnessId } from '@/shared/lib/harness/catalog';
31
+
32
+ const SESSION_ID = '01a1b49f-0000-7000-8000-000000000001';
33
+
34
+ const FIXTURE = [
35
+ JSON.stringify({ type: 'session', id: SESSION_ID, cwd: '/tmp/project' }),
36
+ JSON.stringify({ type: 'message', id: 'u1', timestamp: 1_000, message: { role: 'user', content: 'first ask' } }),
37
+ JSON.stringify({ type: 'message', id: 'a1', timestamp: 2_000, message: { role: 'assistant', content: 'answer' } }),
38
+ '',
39
+ ].join('\n');
40
+
41
+ let root = '';
42
+ let filePath = '';
43
+ let previousAgentDir: string | undefined;
44
+
45
+ /** Register a fake ACP session the route's `getLiveSession` lookup will find. */
46
+ function registerLive(id: string, harness: HarnessId, onDestroy?: () => void): () => void {
47
+ let release: (() => void) | null = null;
48
+ const session = {
49
+ sessionId: id,
50
+ harness,
51
+ sessionFile: '',
52
+ cwd: '/tmp/project',
53
+ isStreaming: false,
54
+ isPromptRunning: false,
55
+ runModel: null,
56
+ isAlive: () => true,
57
+ isRunning: () => false,
58
+ isBusy: () => false,
59
+ send: async () => ({}),
60
+ getPendingUiDialogs: () => [],
61
+ resolvePendingUiDialog: () => {},
62
+ onEvent: () => () => {},
63
+ emit: () => {},
64
+ destroy: () => {},
65
+ destroyAndWait: async () => {
66
+ onDestroy?.();
67
+ release?.();
68
+ },
69
+ onDestroy: (callback: () => void) => {
70
+ release = callback;
71
+ },
72
+ } as unknown as HarnessSession;
73
+ registerAcpSession(session, id);
74
+ claimHarness(session, harness);
75
+ return () => release?.();
76
+ }
77
+
78
+ function rewind(entryId = 'u1'): Promise<Response> {
79
+ return action({
80
+ params: { sessionId: SESSION_ID },
81
+ request: new Request(`http://localhost/api/chat/${SESSION_ID}/rewind`, {
82
+ method: 'POST',
83
+ headers: { 'Content-Type': 'application/json' },
84
+ body: JSON.stringify({ entryId }),
85
+ }),
86
+ } as never) as Promise<Response>;
87
+ }
88
+
89
+ beforeEach(async () => {
90
+ previousAgentDir = Bun.env.PI_CODING_AGENT_DIR;
91
+ root = mkdtempSync(join(tmpdir(), 'kabmo-rewind-'));
92
+ Bun.env.PI_CODING_AGENT_DIR = root;
93
+ const project = join(root, 'sessions', 'project');
94
+ mkdirSync(project, { recursive: true });
95
+ filePath = join(project, `${SESSION_ID}.jsonl`);
96
+ writeFileSync(filePath, FIXTURE);
97
+ clearSessionFileCaches();
98
+ await isolateDb();
99
+ });
100
+
101
+ afterEach(async () => {
102
+ await releaseDb();
103
+ clearSessionFileCaches();
104
+ if (previousAgentDir === undefined) delete Bun.env.PI_CODING_AGENT_DIR;
105
+ else Bun.env.PI_CODING_AGENT_DIR = previousAgentDir;
106
+ if (root) removeDir(root);
107
+ root = '';
108
+ });
109
+
110
+ describe('POST /api/chat/:id/rewind', () => {
111
+ test('an omp-acp chat is torn down BEFORE its shared JSONL is rewritten', async () => {
112
+ const atTeardown: string[] = [];
113
+ const release = registerLive(SESSION_ID, 'omp-acp', () => atTeardown.push(readFileSync(filePath, 'utf8')));
114
+ try {
115
+ const response = await rewind();
116
+ expect(response.status).toBe(200);
117
+ // The child still had the abandoned turn when it was destroyed — proof the
118
+ // teardown ran first, not after the rewrite.
119
+ expect(atTeardown).toHaveLength(1);
120
+ expect(atTeardown[0]).toContain('"id":"a1"');
121
+
122
+ const next = readFileSync(filePath, 'utf8');
123
+ expect(next).not.toContain('"id":"u1"');
124
+ expect(next).not.toContain('"id":"a1"');
125
+ expect(next).toContain('"type":"session"');
126
+ } finally {
127
+ release();
128
+ }
129
+ });
130
+
131
+ test('another ACP agent is refused without destroying its live child', async () => {
132
+ let destroyed = 0;
133
+ const release = registerLive(SESSION_ID, 'claude', () => { destroyed += 1; });
134
+ try {
135
+ const response = await rewind();
136
+ expect(response.status).toBe(400);
137
+ const body = (await response.json()) as { code?: string; error?: string };
138
+ expect(body.code).toBe('harness_not_rewindable');
139
+ expect(body.error).toContain('claude');
140
+ expect(destroyed).toBe(0);
141
+ // Its file — when it has one Kabmo can find — is untouched.
142
+ expect(readFileSync(filePath, 'utf8')).toContain('"id":"u1"');
143
+ } finally {
144
+ release();
145
+ }
146
+ });
147
+ });
@@ -2,10 +2,11 @@ import { json } from '@/server/lib/remix-compat';
2
2
  import type { ActionFunctionArgs } from '@/server/lib/remix-compat';
3
3
  import { getDb } from '@/server/db.server';
4
4
  import { resolveSessionFileOr404 } from '@/server/lib/omp/session/locator';
5
- import { getRpcSession } from '@/server/lib/omp/rpc/session-registry';
5
+ import { getLiveSession, harnessOfSession } from '@/server/lib/omp/rpc/session-registry';
6
6
  import { clearSessionFileCaches } from '@/server/lib/omp/session/files';
7
7
  import { pruneStoredAfterCut, survivingUserTexts, truncateSessionBody } from '@/server/lib/omp/session/rewind-file';
8
8
  import { userTurnsRelate } from '@/shared/lib/chat/timeline/turns';
9
+ import { harnessSupportsRewind } from '@/shared/lib/harness/rewind';
9
10
 
10
11
  /**
11
12
  * In-place rewind (undo) for an omp session: truncate the session JSONL back
@@ -16,9 +17,18 @@ import { userTurnsRelate } from '@/shared/lib/chat/timeline/turns';
16
17
  * file in place for equivalent operations (`rewriteEntries`), and its JSONL
17
18
  * readers walk entries in order, so a prefix-preserving truncation is faithful.
18
19
  *
20
+ * Both omp transports reach this endpoint. `omp-acp` writes the SAME JSONL as
21
+ * `omp-rpc`, so a chat that ran over ACP is rewound the same way — the ACP
22
+ * child is torn down first, because it holds the old context in memory and is
23
+ * the only other writer of the file; the next prompt resumes the truncated
24
+ * transcript over RPC (`resumeRecordedHarnessSession` deliberately excludes
25
+ * `omp-acp`, whose `session/load` forks). Every other ACP agent stores its own
26
+ * history and offers no truncation, so it is refused in words instead of
27
+ * truncating a file it does not read.
28
+ *
19
29
  * Safety contract:
20
- * - the live omp process for this session is destroyed first (it flushes all
21
- * pending state on shutdown and is the only other writer of this file);
30
+ * - the live child for this session is destroyed first (it flushes pending
31
+ * state on shutdown and is the only other writer of this file);
22
32
  * - the original file is kept as `<name>.bak-<timestamp>` (omp's session
23
33
  * listing ignores names containing `.bak`, so it never becomes a phantom
24
34
  * session).
@@ -54,10 +64,22 @@ export async function action({ params, request }: ActionFunctionArgs) {
54
64
  if ('response' in resolved) return resolved.response;
55
65
  const { filePath } = resolved;
56
66
 
57
- // Tear down the live process first: it flushes pending writes on shutdown
58
- // and must not race the rewrite. Best-effort — the session may already be
59
- // gone or mid-restart.
60
- const live = getRpcSession(sessionId);
67
+ // Tear down the live child FIRST, whichever transport runs it: it flushes
68
+ // pending writes on shutdown, it is the only other writer of the file, and
69
+ // the file's CONTENT is read below. Best-effort: the session may already be
70
+ // gone or mid-restart. A harness whose agent keeps its own transcript is
71
+ // refused BEFORE its child is touched — truncating a file it does not read
72
+ // would kill a working chat to no effect.
73
+ const live = getLiveSession(sessionId);
74
+ if (live && !harnessSupportsRewind(harnessOfSession(live))) {
75
+ return json(
76
+ {
77
+ error: `${harnessOfSession(live)} cannot rewind this chat: its agent keeps its own transcript and offers no truncation.`,
78
+ code: 'harness_not_rewindable',
79
+ },
80
+ { status: 400 },
81
+ );
82
+ }
61
83
  if (live?.isAlive()) {
62
84
  await live.destroyAndWait();
63
85
  }