@pentoshi/clai 4.18.0 → 4.19.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 (403) hide show
  1. package/CONTRIBUTING.md +3 -2
  2. package/PROVIDERS.md +1 -1
  3. package/README.md +108 -267
  4. package/SECURITY.md +5 -1
  5. package/dist/agent/compaction-summary.d.ts +1 -1
  6. package/dist/agent/compaction-summary.js +4 -4
  7. package/dist/agent/compaction-summary.js.map +1 -1
  8. package/dist/agent/context/compaction-user-instructions.js +1 -1
  9. package/dist/agent/context/compaction-user-instructions.js.map +1 -1
  10. package/dist/agent/durable-envelope.js +1 -1
  11. package/dist/agent/durable-envelope.js.map +1 -1
  12. package/dist/agent/turn/tool-execution/result-framing.js +8 -6
  13. package/dist/agent/turn/tool-execution/result-framing.js.map +1 -1
  14. package/dist/app/adapters/current-store-adapter.js +7 -3
  15. package/dist/app/adapters/current-store-adapter.js.map +1 -1
  16. package/dist/app/commands/catalog.js +4 -0
  17. package/dist/app/commands/catalog.js.map +1 -1
  18. package/dist/app/commands/registry.js +1 -1
  19. package/dist/app/commands/registry.js.map +1 -1
  20. package/dist/app/controllers/session-changes.d.ts +5 -0
  21. package/dist/app/controllers/session-changes.js +50 -20
  22. package/dist/app/controllers/session-changes.js.map +1 -1
  23. package/dist/app/controllers/session-controller.d.ts +8 -0
  24. package/dist/app/controllers/session-controller.js +64 -6
  25. package/dist/app/controllers/session-controller.js.map +1 -1
  26. package/dist/app/controllers/session-id.d.ts +1 -0
  27. package/dist/app/controllers/session-id.js +4 -0
  28. package/dist/app/controllers/session-id.js.map +1 -0
  29. package/dist/app/controllers/session-late-work.d.ts +27 -0
  30. package/dist/app/controllers/session-late-work.js +113 -0
  31. package/dist/app/controllers/session-late-work.js.map +1 -0
  32. package/dist/app/controllers/session-persistence.d.ts +5 -3
  33. package/dist/app/controllers/session-persistence.js +8 -5
  34. package/dist/app/controllers/session-persistence.js.map +1 -1
  35. package/dist/app/ports/persistence-port.d.ts +6 -1
  36. package/dist/classic/app/app-wiring.d.ts +4 -2
  37. package/dist/classic/app/app-wiring.js +6 -2
  38. package/dist/classic/app/app-wiring.js.map +1 -1
  39. package/dist/classic/app/use-feed.js +9 -2
  40. package/dist/classic/app/use-feed.js.map +1 -1
  41. package/dist/classic/app/wiring-interactions.d.ts +3 -2
  42. package/dist/classic/app/wiring-interactions.js +15 -7
  43. package/dist/classic/app/wiring-interactions.js.map +1 -1
  44. package/dist/classic/app/wiring-lifecycle.js +9 -1
  45. package/dist/classic/app/wiring-lifecycle.js.map +1 -1
  46. package/dist/classic/app/wiring-types.d.ts +4 -1
  47. package/dist/classic/bootstrap/renderer-handle.js +11 -3
  48. package/dist/classic/bootstrap/renderer-handle.js.map +1 -1
  49. package/dist/classic/bootstrap/start-classic.js +4 -17
  50. package/dist/classic/bootstrap/start-classic.js.map +1 -1
  51. package/dist/classic/feed/background-layout.d.ts +26 -0
  52. package/dist/classic/feed/background-layout.js +77 -0
  53. package/dist/classic/feed/background-layout.js.map +1 -0
  54. package/dist/classic/feed/estimated-height.d.ts +2 -0
  55. package/dist/classic/feed/estimated-height.js +24 -0
  56. package/dist/classic/feed/estimated-height.js.map +1 -0
  57. package/dist/classic/feed/feed-blocks.d.ts +4 -1
  58. package/dist/classic/feed/feed-blocks.js +26 -6
  59. package/dist/classic/feed/feed-blocks.js.map +1 -1
  60. package/dist/classic/feed/transcript-window.d.ts +1 -0
  61. package/dist/classic/feed/transcript-window.js +41 -15
  62. package/dist/classic/feed/transcript-window.js.map +1 -1
  63. package/dist/classic/panels/pager-panel.d.ts +11 -8
  64. package/dist/classic/panels/pager-panel.js +42 -28
  65. package/dist/classic/panels/pager-panel.js.map +1 -1
  66. package/dist/classic/panels/pager-region-paint.d.ts +3 -0
  67. package/dist/classic/panels/pager-region-paint.js +43 -0
  68. package/dist/classic/panels/pager-region-paint.js.map +1 -0
  69. package/dist/classic/panels/pager-search-paint.d.ts +3 -0
  70. package/dist/classic/panels/pager-search-paint.js +59 -0
  71. package/dist/classic/panels/pager-search-paint.js.map +1 -0
  72. package/dist/classic/panels/pager-source-controller.js +2 -0
  73. package/dist/classic/panels/pager-source-controller.js.map +1 -1
  74. package/dist/classic/panels/panel-controller.js +5 -6
  75. package/dist/classic/panels/panel-controller.js.map +1 -1
  76. package/dist/classic/panels/panel-host.js +2 -2
  77. package/dist/classic/panels/panel-host.js.map +1 -1
  78. package/dist/classic/panels/panel-initial-states.d.ts +1 -0
  79. package/dist/classic/panels/panel-initial-states.js +1 -0
  80. package/dist/classic/panels/panel-initial-states.js.map +1 -1
  81. package/dist/classic/panels/panel-types.d.ts +1 -0
  82. package/dist/classic/panels/panel-wheel.js +2 -2
  83. package/dist/classic/panels/panel-wheel.js.map +1 -1
  84. package/dist/classic/panels/text-editor-panel.d.ts +2 -1
  85. package/dist/classic/panels/text-editor-panel.js +21 -12
  86. package/dist/classic/panels/text-editor-panel.js.map +1 -1
  87. package/dist/classic/render/ansi-text.js +49 -33
  88. package/dist/classic/render/ansi-text.js.map +1 -1
  89. package/dist/classic/render/ink-theme.js +1 -1
  90. package/dist/classic/render/ink-theme.js.map +1 -1
  91. package/dist/classic/render/measure.js +2 -3
  92. package/dist/classic/render/measure.js.map +1 -1
  93. package/dist/commands/current-version.d.ts +1 -0
  94. package/dist/commands/current-version.js +42 -0
  95. package/dist/commands/current-version.js.map +1 -0
  96. package/dist/commands/update.d.ts +2 -1
  97. package/dist/commands/update.js +4 -41
  98. package/dist/commands/update.js.map +1 -1
  99. package/dist/index.d.ts +1 -1
  100. package/dist/index.js +21 -12
  101. package/dist/index.js.map +1 -1
  102. package/dist/llm/capabilities.js +13 -6
  103. package/dist/llm/capabilities.js.map +1 -1
  104. package/dist/llm/capability/vision-patterns.js +1 -1
  105. package/dist/llm/capability/vision-patterns.js.map +1 -1
  106. package/dist/llm/freebuff-agent-prompt.d.ts +1 -0
  107. package/dist/llm/freebuff-agent-prompt.js +46 -0
  108. package/dist/llm/freebuff-agent-prompt.js.map +1 -0
  109. package/dist/llm/freebuff-auth.js +15 -3
  110. package/dist/llm/freebuff-auth.js.map +1 -1
  111. package/dist/llm/freebuff-device-key.d.ts +39 -0
  112. package/dist/llm/freebuff-device-key.js +330 -0
  113. package/dist/llm/freebuff-device-key.js.map +1 -0
  114. package/dist/llm/freebuff-env-profile.d.ts +41 -0
  115. package/dist/llm/freebuff-env-profile.js +205 -0
  116. package/dist/llm/freebuff-env-profile.js.map +1 -0
  117. package/dist/llm/freebuff-fingerprint.d.ts +21 -0
  118. package/dist/llm/freebuff-fingerprint.js +137 -0
  119. package/dist/llm/freebuff-fingerprint.js.map +1 -0
  120. package/dist/llm/freebuff-models.d.ts +26 -5
  121. package/dist/llm/freebuff-models.js +137 -80
  122. package/dist/llm/freebuff-models.js.map +1 -1
  123. package/dist/llm/freebuff-run.d.ts +2 -0
  124. package/dist/llm/freebuff-run.js +77 -24
  125. package/dist/llm/freebuff-run.js.map +1 -1
  126. package/dist/llm/freebuff-session-api.d.ts +3 -1
  127. package/dist/llm/freebuff-session-api.js +26 -18
  128. package/dist/llm/freebuff-session-api.js.map +1 -1
  129. package/dist/llm/freebuff-session.d.ts +7 -1
  130. package/dist/llm/freebuff-session.js +81 -31
  131. package/dist/llm/freebuff-session.js.map +1 -1
  132. package/dist/llm/freebuff-wire.d.ts +8 -0
  133. package/dist/llm/freebuff-wire.js +42 -20
  134. package/dist/llm/freebuff-wire.js.map +1 -1
  135. package/dist/llm/freebuff.js +79 -9
  136. package/dist/llm/freebuff.js.map +1 -1
  137. package/dist/llm/main-effort-discovery.d.ts +16 -0
  138. package/dist/llm/main-effort-discovery.js +71 -0
  139. package/dist/llm/main-effort-discovery.js.map +1 -0
  140. package/dist/llm/omnirush-session-upload.d.ts +1 -0
  141. package/dist/llm/omnirush-session-upload.js +14 -1
  142. package/dist/llm/omnirush-session-upload.js.map +1 -1
  143. package/dist/llm/provider-profiles.js +28 -2
  144. package/dist/llm/provider-profiles.js.map +1 -1
  145. package/dist/llm/provider.js +2 -1
  146. package/dist/llm/provider.js.map +1 -1
  147. package/dist/llm/request-plan.js +13 -7
  148. package/dist/llm/request-plan.js.map +1 -1
  149. package/dist/llm/responses-request.js +8 -1
  150. package/dist/llm/responses-request.js.map +1 -1
  151. package/dist/llm/river-models.js +3 -1
  152. package/dist/llm/river-models.js.map +1 -1
  153. package/dist/llm/routing/attempt-complete.js +6 -1
  154. package/dist/llm/routing/attempt-complete.js.map +1 -1
  155. package/dist/llm/routing/attempt-request.d.ts +3 -1
  156. package/dist/llm/routing/attempt-request.js +39 -5
  157. package/dist/llm/routing/attempt-request.js.map +1 -1
  158. package/dist/llm/routing/attempt-stream.js +8 -1
  159. package/dist/llm/routing/attempt-stream.js.map +1 -1
  160. package/dist/llm/routing/error-classification.d.ts +1 -0
  161. package/dist/llm/routing/error-classification.js +9 -1
  162. package/dist/llm/routing/error-classification.js.map +1 -1
  163. package/dist/llm/wire/effort-preflight.d.ts +4 -1
  164. package/dist/llm/wire/effort-preflight.js +49 -6
  165. package/dist/llm/wire/effort-preflight.js.map +1 -1
  166. package/dist/llm/wire/openai-complete.d.ts +1 -0
  167. package/dist/llm/wire/openai-complete.js +5 -1
  168. package/dist/llm/wire/openai-complete.js.map +1 -1
  169. package/dist/llm/wire/openai-stream.d.ts +1 -0
  170. package/dist/llm/wire/openai-stream.js +1 -0
  171. package/dist/llm/wire/openai-stream.js.map +1 -1
  172. package/dist/llm/wire/responses-first.js +3 -0
  173. package/dist/llm/wire/responses-first.js.map +1 -1
  174. package/dist/os/ownership-repair.d.ts +5 -0
  175. package/dist/os/ownership-repair.js +62 -0
  176. package/dist/os/ownership-repair.js.map +1 -0
  177. package/dist/os/permissions.d.ts +7 -0
  178. package/dist/os/permissions.js +27 -22
  179. package/dist/os/permissions.js.map +1 -1
  180. package/dist/os/settle-within.d.ts +1 -0
  181. package/dist/os/settle-within.js +12 -0
  182. package/dist/os/settle-within.js.map +1 -0
  183. package/dist/os/user-environment.d.ts +1 -0
  184. package/dist/os/user-environment.js +3 -0
  185. package/dist/os/user-environment.js.map +1 -0
  186. package/dist/os/user-identity.d.ts +11 -0
  187. package/dist/os/user-identity.js +163 -0
  188. package/dist/os/user-identity.js.map +1 -0
  189. package/dist/safety/tool-classification.js +6 -0
  190. package/dist/safety/tool-classification.js.map +1 -1
  191. package/dist/security/known-secrets.d.ts +5 -0
  192. package/dist/security/known-secrets.js +50 -0
  193. package/dist/security/known-secrets.js.map +1 -0
  194. package/dist/session-runtime/client.d.ts +1 -1
  195. package/dist/session-runtime/client.js +6 -3
  196. package/dist/session-runtime/client.js.map +1 -1
  197. package/dist/session-runtime/host.js +2 -0
  198. package/dist/session-runtime/host.js.map +1 -1
  199. package/dist/session-runtime/paths.js +14 -6
  200. package/dist/session-runtime/paths.js.map +1 -1
  201. package/dist/session-runtime/start-runtime.js +5 -8
  202. package/dist/session-runtime/start-runtime.js.map +1 -1
  203. package/dist/session-runtime/store.js +4 -1
  204. package/dist/session-runtime/store.js.map +1 -1
  205. package/dist/store/config/endpoints.js +3 -1
  206. package/dist/store/config/endpoints.js.map +1 -1
  207. package/dist/store/credentials/crypto.d.ts +7 -0
  208. package/dist/store/credentials/crypto.js +118 -0
  209. package/dist/store/credentials/crypto.js.map +1 -0
  210. package/dist/store/credentials.d.ts +21 -0
  211. package/dist/store/credentials.js +150 -0
  212. package/dist/store/credentials.js.map +1 -0
  213. package/dist/store/history/freshness.d.ts +2 -0
  214. package/dist/store/history/freshness.js +3 -2
  215. package/dist/store/history/freshness.js.map +1 -1
  216. package/dist/store/history/jsonl-backend.js +20 -6
  217. package/dist/store/history/jsonl-backend.js.map +1 -1
  218. package/dist/store/history/jsonl-lock.d.ts +1 -0
  219. package/dist/store/history/jsonl-lock.js +94 -71
  220. package/dist/store/history/jsonl-lock.js.map +1 -1
  221. package/dist/store/history/recovery.d.ts +2 -0
  222. package/dist/store/history/recovery.js.map +1 -1
  223. package/dist/store/history/session-queries.js +0 -3
  224. package/dist/store/history/session-queries.js.map +1 -1
  225. package/dist/store/history/sqlite-backend.js +2 -0
  226. package/dist/store/history/sqlite-backend.js.map +1 -1
  227. package/dist/store/history/transcript-merge.d.ts +2 -0
  228. package/dist/store/history/transcript-merge.js +46 -0
  229. package/dist/store/history/transcript-merge.js.map +1 -0
  230. package/dist/store/history-index.d.ts +2 -0
  231. package/dist/store/history-index.js +3 -2
  232. package/dist/store/history-index.js.map +1 -1
  233. package/dist/store/history.d.ts +2 -1
  234. package/dist/store/history.js +43 -11
  235. package/dist/store/history.js.map +1 -1
  236. package/dist/store/keys/secret-store.js +5 -2
  237. package/dist/store/keys/secret-store.js.map +1 -1
  238. package/dist/store/legacy-location.d.ts +1 -0
  239. package/dist/store/legacy-location.js +37 -0
  240. package/dist/store/legacy-location.js.map +1 -0
  241. package/dist/store/ownership.d.ts +3 -0
  242. package/dist/store/ownership.js +23 -0
  243. package/dist/store/ownership.js.map +1 -0
  244. package/dist/store/paths.js +3 -2
  245. package/dist/store/paths.js.map +1 -1
  246. package/dist/store/redaction-cache.d.ts +0 -5
  247. package/dist/store/redaction-cache.js +6 -5
  248. package/dist/store/redaction-cache.js.map +1 -1
  249. package/dist/store/scope.js +7 -2
  250. package/dist/store/scope.js.map +1 -1
  251. package/dist/store/session-prompts.d.ts +1 -0
  252. package/dist/store/session-prompts.js +34 -13
  253. package/dist/store/session-prompts.js.map +1 -1
  254. package/dist/store/session-workspace.js +3 -0
  255. package/dist/store/session-workspace.js.map +1 -1
  256. package/dist/tools/credentials.d.ts +2 -0
  257. package/dist/tools/credentials.js +27 -0
  258. package/dist/tools/credentials.js.map +1 -0
  259. package/dist/tools/definitions/aggregate.js +2 -0
  260. package/dist/tools/definitions/aggregate.js.map +1 -1
  261. package/dist/tools/definitions/credentials.d.ts +1 -0
  262. package/dist/tools/definitions/credentials.js +15 -0
  263. package/dist/tools/definitions/credentials.js.map +1 -0
  264. package/dist/tools/definitions/fs-read.js +3 -2
  265. package/dist/tools/definitions/fs-read.js.map +1 -1
  266. package/dist/tools/definitions/terminal.js +2 -1
  267. package/dist/tools/definitions/terminal.js.map +1 -1
  268. package/dist/tools/elevated-shell.js +11 -14
  269. package/dist/tools/elevated-shell.js.map +1 -1
  270. package/dist/tools/interactive-session-tools.js +20 -4
  271. package/dist/tools/interactive-session-tools.js.map +1 -1
  272. package/dist/tools/registry.js +2 -0
  273. package/dist/tools/registry.js.map +1 -1
  274. package/dist/tools/sudo-session.d.ts +2 -1
  275. package/dist/tools/sudo-session.js +26 -9
  276. package/dist/tools/sudo-session.js.map +1 -1
  277. package/dist/tui-v2/app/App.js +9 -9
  278. package/dist/tui-v2/app/App.js.map +1 -1
  279. package/dist/tui-v2/app/layout-widths.js +4 -4
  280. package/dist/tui-v2/app/layout-widths.js.map +1 -1
  281. package/dist/tui-v2/bootstrap/renderer-handle.d.ts +2 -0
  282. package/dist/tui-v2/bootstrap/renderer-handle.js +21 -10
  283. package/dist/tui-v2/bootstrap/renderer-handle.js.map +1 -1
  284. package/dist/tui-v2/bootstrap/start-tui-v2.js +13 -28
  285. package/dist/tui-v2/bootstrap/start-tui-v2.js.map +1 -1
  286. package/dist/tui-v2/components/modal/text-editor-modal.js +4 -0
  287. package/dist/tui-v2/components/modal/text-editor-modal.js.map +1 -1
  288. package/dist/tui-v2/components/overlay/overlay-host.js +1 -2
  289. package/dist/tui-v2/components/overlay/overlay-host.js.map +1 -1
  290. package/dist/tui-v2/components/pager/pager-line.d.ts +1 -0
  291. package/dist/tui-v2/components/pager/pager-line.js +46 -27
  292. package/dist/tui-v2/components/pager/pager-line.js.map +1 -1
  293. package/dist/tui-v2/components/pager/pager-rows.d.ts +3 -0
  294. package/dist/tui-v2/components/pager/pager-rows.js +18 -1
  295. package/dist/tui-v2/components/pager/pager-rows.js.map +1 -1
  296. package/dist/tui-v2/components/pager/pager.d.ts +2 -0
  297. package/dist/tui-v2/components/pager/pager.js +10 -6
  298. package/dist/tui-v2/components/pager/pager.js.map +1 -1
  299. package/dist/tui-v2/components/plan/plan-view.js +5 -3
  300. package/dist/tui-v2/components/plan/plan-view.js.map +1 -1
  301. package/dist/tui-v2/components/toast/toast-anim.d.ts +6 -0
  302. package/dist/tui-v2/components/toast/toast-anim.js +17 -0
  303. package/dist/tui-v2/components/toast/toast-anim.js.map +1 -1
  304. package/dist/tui-v2/components/toast/toast-host.js +15 -5
  305. package/dist/tui-v2/components/toast/toast-host.js.map +1 -1
  306. package/dist/tui-v2/components/transcript/tool-card.js +5 -2
  307. package/dist/tui-v2/components/transcript/tool-card.js.map +1 -1
  308. package/dist/tui-v2/components/transcript/transcript-anchor.d.ts +20 -0
  309. package/dist/tui-v2/components/transcript/transcript-anchor.js +43 -0
  310. package/dist/tui-v2/components/transcript/transcript-anchor.js.map +1 -0
  311. package/dist/tui-v2/components/transcript/transcript-view.js +27 -40
  312. package/dist/tui-v2/components/transcript/transcript-view.js.map +1 -1
  313. package/dist/tui-v2/components/transcript/user-message.js +31 -21
  314. package/dist/tui-v2/components/transcript/user-message.js.map +1 -1
  315. package/dist/tui-v2/rendering/pager-markdown.d.ts +3 -2
  316. package/dist/tui-v2/rendering/pager-markdown.js +15 -11
  317. package/dist/tui-v2/rendering/pager-markdown.js.map +1 -1
  318. package/dist/types.d.ts +1 -0
  319. package/dist/ui-core/bootstrap/composition-root.js +23 -0
  320. package/dist/ui-core/bootstrap/composition-root.js.map +1 -1
  321. package/dist/ui-core/bootstrap/lifecycle.d.ts +1 -0
  322. package/dist/ui-core/bootstrap/lifecycle.js +6 -0
  323. package/dist/ui-core/bootstrap/lifecycle.js.map +1 -1
  324. package/dist/ui-core/bootstrap/resume-option.d.ts +11 -0
  325. package/dist/ui-core/bootstrap/resume-option.js +9 -0
  326. package/dist/ui-core/bootstrap/resume-option.js.map +1 -0
  327. package/dist/ui-core/bootstrap/session-merge.d.ts +4 -0
  328. package/dist/ui-core/bootstrap/session-merge.js +19 -0
  329. package/dist/ui-core/bootstrap/session-merge.js.map +1 -0
  330. package/dist/ui-core/bootstrap/session-resume.d.ts +2 -11
  331. package/dist/ui-core/bootstrap/session-resume.js +2 -8
  332. package/dist/ui-core/bootstrap/session-resume.js.map +1 -1
  333. package/dist/ui-core/bootstrap/shutdown-services.d.ts +3 -0
  334. package/dist/ui-core/bootstrap/shutdown-services.js +24 -0
  335. package/dist/ui-core/bootstrap/shutdown-services.js.map +1 -0
  336. package/dist/ui-core/commands/change-commands.js +53 -15
  337. package/dist/ui-core/commands/change-commands.js.map +1 -1
  338. package/dist/ui-core/commands/command-handlers.js +2 -0
  339. package/dist/ui-core/commands/command-handlers.js.map +1 -1
  340. package/dist/ui-core/commands/credential-commands.d.ts +7 -0
  341. package/dist/ui-core/commands/credential-commands.js +114 -0
  342. package/dist/ui-core/commands/credential-commands.js.map +1 -0
  343. package/dist/ui-core/commands/pickers/search-reasoning.js +14 -4
  344. package/dist/ui-core/commands/pickers/search-reasoning.js.map +1 -1
  345. package/dist/ui-core/controllers/overlay-controller.d.ts +4 -1
  346. package/dist/ui-core/controllers/overlay-controller.js +3 -2
  347. package/dist/ui-core/controllers/overlay-controller.js.map +1 -1
  348. package/dist/ui-core/layout/compute-layout.d.ts +3 -1
  349. package/dist/ui-core/layout/compute-layout.js +4 -2
  350. package/dist/ui-core/layout/compute-layout.js.map +1 -1
  351. package/dist/{classic/render/palette.js → ui-core/rendering/ansi-palette.js} +1 -1
  352. package/dist/ui-core/rendering/ansi-palette.js.map +1 -0
  353. package/dist/ui-core/rendering/artifact-pager-source.d.ts +1 -0
  354. package/dist/ui-core/rendering/artifact-pager-source.js.map +1 -1
  355. package/dist/ui-core/rendering/markdown-diff-rows.d.ts +12 -0
  356. package/dist/ui-core/rendering/markdown-diff-rows.js +85 -0
  357. package/dist/ui-core/rendering/markdown-diff-rows.js.map +1 -0
  358. package/dist/ui-core/rendering/markdown.d.ts +1 -0
  359. package/dist/ui-core/rendering/markdown.js +12 -0
  360. package/dist/ui-core/rendering/markdown.js.map +1 -1
  361. package/dist/ui-core/rendering/open-tool-output.js +40 -14
  362. package/dist/ui-core/rendering/open-tool-output.js.map +1 -1
  363. package/dist/ui-core/rendering/pager-regions.d.ts +7 -0
  364. package/dist/ui-core/rendering/pager-regions.js +8 -0
  365. package/dist/ui-core/rendering/pager-regions.js.map +1 -0
  366. package/dist/ui-core/rendering/plan-view.js +5 -5
  367. package/dist/ui-core/rendering/plan-view.js.map +1 -1
  368. package/dist/ui-core/rendering/render-markdown-lines.d.ts +1 -0
  369. package/dist/ui-core/rendering/render-markdown-lines.js +5 -2
  370. package/dist/ui-core/rendering/render-markdown-lines.js.map +1 -1
  371. package/dist/ui-core/rendering/session-change-diff.d.ts +2 -0
  372. package/dist/ui-core/rendering/session-change-diff.js +85 -0
  373. package/dist/ui-core/rendering/session-change-diff.js.map +1 -0
  374. package/dist/ui-core/rendering/session-prompts-pager-source.js +1 -1
  375. package/dist/ui-core/rendering/session-prompts-pager-source.js.map +1 -1
  376. package/dist/ui-core/rendering/task-disclosure.js +3 -3
  377. package/dist/ui-core/rendering/task-disclosure.js.map +1 -1
  378. package/dist/ui-core/rendering/text-width.d.ts +1 -0
  379. package/dist/ui-core/rendering/text-width.js +80 -4
  380. package/dist/ui-core/rendering/text-width.js.map +1 -1
  381. package/dist/ui-core/rendering/tool-presenter.d.ts +2 -0
  382. package/dist/ui-core/rendering/tool-presenter.js +53 -0
  383. package/dist/ui-core/rendering/tool-presenter.js.map +1 -1
  384. package/dist/ui-core/state/pager-search.d.ts +8 -0
  385. package/dist/ui-core/state/pager-search.js +20 -0
  386. package/dist/ui-core/state/pager-search.js.map +1 -1
  387. package/dist/ui-core/state/transcript-store.d.ts +2 -1
  388. package/dist/ui-core/state/transcript-store.js +35 -0
  389. package/dist/ui-core/state/transcript-store.js.map +1 -1
  390. package/dist/ui-core/state/transcript-window.d.ts +2 -2
  391. package/dist/ui-core/state/transcript-window.js +2 -2
  392. package/dist/ui-core/state/transcript-window.js.map +1 -1
  393. package/dist/version.generated.d.ts +2 -2
  394. package/dist/version.generated.js +2 -2
  395. package/package.json +1 -1
  396. package/dist/classic/render/palette.js.map +0 -1
  397. package/dist/tui-v2/components/modal/prompt-actions-modal.d.ts +0 -10
  398. package/dist/tui-v2/components/modal/prompt-actions-modal.js +0 -101
  399. package/dist/tui-v2/components/modal/prompt-actions-modal.js.map +0 -1
  400. package/dist/ui-core/rendering/prompt-preview.d.ts +0 -5
  401. package/dist/ui-core/rendering/prompt-preview.js +0 -27
  402. package/dist/ui-core/rendering/prompt-preview.js.map +0 -1
  403. /package/dist/{classic/render/palette.d.ts → ui-core/rendering/ansi-palette.d.ts} +0 -0
@@ -0,0 +1 @@
1
+ {"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../../src/store/credentials/crypto.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,21 @@
1
+ export interface Credential {
2
+ readonly id: string;
3
+ readonly title: string;
4
+ readonly content: string;
5
+ readonly kind: "freeform" | "sudo";
6
+ readonly createdAt: string;
7
+ readonly updatedAt: string;
8
+ }
9
+ export type CredentialSummary = Omit<Credential, "content">;
10
+ export declare const MAX_CREDENTIAL_BYTES = 1048576;
11
+ export declare function machineSudoId(): string;
12
+ export declare function listCredentials(): Promise<CredentialSummary[]>;
13
+ export declare function getCredential(id: string): Promise<Credential | undefined>;
14
+ export declare function getMachineSudoPassword(): Promise<string | undefined>;
15
+ export declare function saveCredential(input: {
16
+ id?: string | undefined;
17
+ title: string;
18
+ content: string;
19
+ }): Promise<string>;
20
+ export declare function setMachineSudoPassword(password: string): Promise<void>;
21
+ export declare function deleteCredential(id: string): Promise<void>;
@@ -0,0 +1,150 @@
1
+ import { randomUUID, createHash } from "node:crypto";
2
+ import { hostname } from "node:os";
3
+ import { chmod, lstat, mkdir, open, readFile, rename, rm } from "node:fs/promises";
4
+ import { join } from "node:path";
5
+ import { getDataDir } from "./paths.js";
6
+ import { acquireStorageWriteLock } from "./history/jsonl-lock.js";
7
+ import { fixOwner } from "../os/permissions.js";
8
+ import { registerSensitiveText, registerKnownSecret } from "../security/known-secrets.js";
9
+ import { createKey, decryptVault, encryptVault, isMissing, readKey, syncCredentialDirectory } from "./credentials/crypto.js";
10
+ export const MAX_CREDENTIAL_BYTES = 1_048_576;
11
+ const MAX_VAULT_BYTES = 24 * 1_048_576;
12
+ export function machineSudoId() {
13
+ return `sudo:${createHash("sha256").update(hostname()).digest("hex").slice(0, 24)}`;
14
+ }
15
+ function vaultPaths() {
16
+ const directory = join(getDataDir(), "credentials");
17
+ return { directory, vault: join(directory, "vault.json"), key: join(directory, "master.key"), lock: join(directory, "vault.lock") };
18
+ }
19
+ function isCredential(value) {
20
+ if (typeof value !== "object" || value === null)
21
+ return false;
22
+ return "id" in value && typeof value.id === "string" &&
23
+ "title" in value && typeof value.title === "string" &&
24
+ "content" in value && typeof value.content === "string" &&
25
+ "kind" in value && (value.kind === "freeform" || value.kind === "sudo") &&
26
+ "createdAt" in value && typeof value.createdAt === "string" &&
27
+ "updatedAt" in value && typeof value.updatedAt === "string";
28
+ }
29
+ async function loadVault() {
30
+ const paths = vaultPaths();
31
+ let text;
32
+ try {
33
+ const info = await lstat(paths.vault);
34
+ if (!info.isFile() || info.size > MAX_VAULT_BYTES)
35
+ throw new Error("Credential vault is not a regular file or exceeds its size limit.");
36
+ text = await readFile(paths.vault, "utf8");
37
+ }
38
+ catch (error) {
39
+ if (isMissing(error))
40
+ return [];
41
+ throw error;
42
+ }
43
+ const key = await readKey(paths.key);
44
+ try {
45
+ const data = decryptVault(text, key);
46
+ if (!Array.isArray(data) || !data.every(isCredential))
47
+ throw new Error("Credential vault has an unsupported format; no credentials were changed.");
48
+ return data;
49
+ }
50
+ finally {
51
+ key.fill(0);
52
+ }
53
+ }
54
+ async function saveVault(entries) {
55
+ const paths = vaultPaths();
56
+ const key = await lstat(paths.key).then(() => readKey(paths.key)).catch((error) => {
57
+ if (isMissing(error))
58
+ return createKey(paths.key);
59
+ throw error;
60
+ });
61
+ let encrypted;
62
+ try {
63
+ encrypted = encryptVault(JSON.stringify(entries), key);
64
+ }
65
+ finally {
66
+ key.fill(0);
67
+ }
68
+ if (Buffer.byteLength(encrypted) > MAX_VAULT_BYTES)
69
+ throw new Error("Credential vault size limit reached; no credentials were changed.");
70
+ const temporary = join(paths.directory, `.vault-${randomUUID()}.tmp`);
71
+ try {
72
+ const file = await open(temporary, "wx", 0o600);
73
+ try {
74
+ await file.writeFile(encrypted);
75
+ await file.sync();
76
+ await fixOwner(temporary);
77
+ }
78
+ finally {
79
+ await file.close();
80
+ }
81
+ await rename(temporary, paths.vault);
82
+ await syncCredentialDirectory(paths.directory);
83
+ }
84
+ finally {
85
+ await rm(temporary, { force: true });
86
+ }
87
+ }
88
+ async function updateVault(update) {
89
+ const paths = vaultPaths();
90
+ await mkdir(getDataDir(), { recursive: true, mode: 0o700 });
91
+ await fixOwner(getDataDir());
92
+ await mkdir(paths.directory, { recursive: true, mode: 0o700 });
93
+ await fixOwner(paths.directory);
94
+ if (process.platform !== "win32")
95
+ await chmod(paths.directory, 0o700);
96
+ const release = await acquireStorageWriteLock(paths.lock, "credential");
97
+ try {
98
+ await saveVault(update(await loadVault()));
99
+ }
100
+ finally {
101
+ await release();
102
+ }
103
+ }
104
+ export async function listCredentials() {
105
+ return (await loadVault()).filter((entry) => entry.kind !== "sudo" || entry.id === machineSudoId()).map(({ content: _content, ...summary }) => summary);
106
+ }
107
+ export async function getCredential(id) {
108
+ const entry = (await loadVault()).find((candidate) => candidate.id === id && candidate.kind === "freeform");
109
+ if (entry)
110
+ registerSensitiveText(entry.content);
111
+ return entry;
112
+ }
113
+ export async function getMachineSudoPassword() {
114
+ const entry = (await loadVault()).find((candidate) => candidate.id === machineSudoId() && candidate.kind === "sudo");
115
+ if (entry)
116
+ registerKnownSecret(entry.content);
117
+ return entry?.content;
118
+ }
119
+ export async function saveCredential(input) {
120
+ const title = input.title.trim();
121
+ if (!title || title.length > 160 || /[\r\n\x00-\x1f\x7f]/.test(title))
122
+ throw new Error("Credential title must be one line of 1–160 characters.");
123
+ if (!input.content || Buffer.byteLength(input.content) > MAX_CREDENTIAL_BYTES)
124
+ throw new Error("Credential content must contain 1 byte to 1 MiB of text.");
125
+ const id = input.id ?? randomUUID();
126
+ await updateVault((entries) => {
127
+ const previous = entries.find((entry) => entry.id === id);
128
+ if (input.id && (!previous || previous.kind !== "freeform"))
129
+ throw new Error("Credential no longer exists or is reserved for this machine.");
130
+ const now = new Date().toISOString();
131
+ return [...entries.filter((entry) => entry.id !== id), { id, title, content: input.content, kind: "freeform", createdAt: previous?.createdAt ?? now, updatedAt: now }];
132
+ });
133
+ registerSensitiveText(input.content);
134
+ return id;
135
+ }
136
+ export async function setMachineSudoPassword(password) {
137
+ if (!password || /[\r\n\x00]/.test(password) || Buffer.byteLength(password) > 4_096)
138
+ throw new Error("Machine sudo password must be a single nonempty line of at most 4096 bytes.");
139
+ const id = machineSudoId();
140
+ await updateVault((entries) => {
141
+ const previous = entries.find((entry) => entry.id === id);
142
+ const now = new Date().toISOString();
143
+ return [...entries.filter((entry) => entry.id !== id), { id, title: "Machine sudo password", content: password, kind: "sudo", createdAt: previous?.createdAt ?? now, updatedAt: now }];
144
+ });
145
+ registerKnownSecret(password);
146
+ }
147
+ export async function deleteCredential(id) {
148
+ await updateVault((entries) => entries.filter((entry) => entry.id !== id || (entry.kind === "sudo" && id !== machineSudoId())));
149
+ }
150
+ //# sourceMappingURL=credentials.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/store/credentials.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,8 @@ export interface HistoryFreshness {
3
3
  readonly revision?: number | undefined;
4
4
  readonly createdAt: string;
5
5
  readonly updatedAt: string;
6
+ readonly transcript?: readonly unknown[] | undefined;
7
+ readonly itemCount?: number | undefined;
6
8
  }
7
9
  export declare function historyRevision(record: Pick<HistoryFreshness, "revision"> | undefined): number;
8
10
  export declare function historyWriterGeneration(record: Pick<HistoryFreshness, "writerGeneration"> | undefined): string | undefined;
@@ -21,8 +21,9 @@ export function compareHistoryFreshness(left, right) {
21
21
  const delta = historyRevision(left) - historyRevision(right);
22
22
  if (delta !== 0)
23
23
  return delta;
24
- if (historyRevision(left) > 0)
25
- return 0;
24
+ if (historyRevision(left) > 0) {
25
+ return (left.transcript?.length ?? left.itemCount ?? 0) - (right.transcript?.length ?? right.itemCount ?? 0);
26
+ }
26
27
  const timestamp = (record) => Date.parse(record.updatedAt || record.createdAt || "") || 0;
27
28
  return timestamp(left) - timestamp(right);
28
29
  }
@@ -1 +1 @@
1
- {"version":3,"file":"freshness.js","sourceRoot":"","sources":["../../../src/store/history/freshness.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,eAAe,CAAC,MAAsD;IACpF,MAAM,QAAQ,GAAG,MAAM,EAAE,QAAQ,CAAC;IAClC,OAAO,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AACvG,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAA8D;IACpG,MAAM,UAAU,GAAG,MAAM,EAAE,gBAAgB,CAAC;IAC5C,OAAO,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1F,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,IAAsB,EAAE,KAAuB;IACrF,MAAM,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;QACtC,IAAI,CAAC,cAAc;YAAE,OAAO,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,eAAe;YAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAC5D,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;IAChC,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9B,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,CAAC,MAAwB,EAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;IACpH,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC"}
1
+ {"version":3,"file":"freshness.js","sourceRoot":"","sources":["../../../src/store/history/freshness.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,eAAe,CAAC,MAAsD;IACpF,MAAM,QAAQ,GAAG,MAAM,EAAE,QAAQ,CAAC;IAClC,OAAO,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AACvG,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAA8D;IACpG,MAAM,UAAU,GAAG,MAAM,EAAE,gBAAgB,CAAC;IAC5C,OAAO,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1F,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,IAAsB,EAAE,KAAuB;IACrF,MAAM,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IACvD,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;QACtC,IAAI,CAAC,cAAc;YAAE,OAAO,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,eAAe;YAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,KAAK,GAAG,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAC5D,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;IAChC,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9B,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,IAAI,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;IAC/G,CAAC;IACD,MAAM,SAAS,GAAG,CAAC,MAAwB,EAAU,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC;IACpH,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC"}
@@ -5,6 +5,7 @@ import { acquireJsonlWriteLock, historyDirPath } from "./jsonl-lock.js";
5
5
  import { backupActiveHistory, compareHistoryFreshness, dedupeHistoryById, ensureHistoryRecovered, hydrateHistoryRecord, invalidateSessionListCache, jsonlFilePath, jsonlIndexFilePath, readJsonlRecordsFrom, sortHistoryByUpdatedDesc } from "./recovery.js";
6
6
  import { appendRecordsToFile, archiveFilePath } from "./sqlite-backend.js";
7
7
  import { mkdir } from "node:fs/promises";
8
+ import { mergeTranscripts } from "./transcript-merge.js";
8
9
  let jsonlWriteChain = Promise.resolve();
9
10
  export function queueJsonlWrite(operation, fallback) {
10
11
  invalidateSessionListCache();
@@ -88,10 +89,11 @@ async function writeJsonlAtomic(records, knownExistingCount) {
88
89
  ]);
89
90
  }
90
91
  const HISTORY_COMPACT_MIN_BYTES = 1_000_000;
91
- const HISTORY_COMPACT_LIVE_RATIO = 0.6;
92
+ const HISTORY_COMPACT_MIN_STALE_BYTES = 8 * 1024 * 1024;
92
93
  function summaryFreshness(summary) {
93
94
  return {
94
95
  id: summary.id,
96
+ itemCount: summary.itemCount,
95
97
  writerGeneration: summary.writerGeneration,
96
98
  revision: summary.revision,
97
99
  createdAt: summary.createdAt,
@@ -106,7 +108,8 @@ function shouldCompactHistory(result) {
106
108
  return true;
107
109
  if (result.fileSize < HISTORY_COMPACT_MIN_BYTES)
108
110
  return false;
109
- return result.liveBytes / result.fileSize < HISTORY_COMPACT_LIVE_RATIO;
111
+ const staleBytes = result.fileSize - result.liveBytes;
112
+ return staleBytes >= Math.max(HISTORY_COMPACT_MIN_STALE_BYTES, result.liveBytes);
110
113
  }
111
114
  async function compactJsonlUnderLock(entries) {
112
115
  const byId = new Map(entries.map((entry) => [entry.id, entry]));
@@ -136,11 +139,22 @@ async function upsertJsonlUnderLock(record) {
136
139
  await fixOwner(historyDirPath());
137
140
  const entries = (await readValidatedHistoryIndex(jsonlFilePath(), jsonlIndexFilePath())) ?? await rebuildHistoryIndex(jsonlFilePath(), jsonlIndexFilePath());
138
141
  const existingEntry = entries.find((entry) => entry.id === record.id);
139
- if (existingEntry &&
140
- compareHistoryFreshness(record, summaryFreshness(existingEntry.summary)) <= 0) {
142
+ const stale = existingEntry && compareHistoryFreshness(record, summaryFreshness(existingEntry.summary)) <= 0;
143
+ const changedWriter = existingEntry?.summary.writerGeneration !== record.writerGeneration;
144
+ const mayLoseItems = existingEntry && existingEntry.summary.itemCount > (record.transcript?.length ?? 0);
145
+ const pendingMerge = existingEntry?.summary.pendingMerge === true;
146
+ if (existingEntry && (stale || changedWriter || mayLoseItems || pendingMerge)) {
141
147
  const stored = await readIndexedHistoryRecord(jsonlFilePath(), existingEntry);
142
- if (stored)
143
- return hydrateHistoryRecord(stored);
148
+ if (stored) {
149
+ const winner = stale ? stored : record;
150
+ const loser = stale ? record : stored;
151
+ const transcript = mergeTranscripts(winner.transcript, loser.transcript);
152
+ if (stale && (transcript?.length ?? 0) === (stored.transcript?.length ?? 0))
153
+ return hydrateHistoryRecord(stored);
154
+ const { pendingMerge: _pendingMerge, ...base } = winner;
155
+ const unseen = (transcript?.length ?? 0) > (winner.transcript?.length ?? 0);
156
+ record = { ...base, transcript, ...(unseen ? { pendingMerge: true } : {}) };
157
+ }
144
158
  }
145
159
  const result = await appendIndexedHistoryRecord(jsonlFilePath(), jsonlIndexFilePath(), entries, record);
146
160
  await Promise.all([
@@ -1 +1 @@
1
- {"version":3,"file":"jsonl-backend.js","sourceRoot":"","sources":["../../../src/store/history/jsonl-backend.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jsonl-backend.js","sourceRoot":"","sources":["../../../src/store/history/jsonl-backend.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,3 @@
1
1
  export declare function historyDirPath(): string;
2
+ export declare function acquireStorageWriteLock(path: string, label?: string): Promise<() => Promise<void>>;
2
3
  export declare function acquireJsonlWriteLock(): Promise<() => Promise<void>>;
@@ -1,123 +1,146 @@
1
1
  import { getHistoryDir } from "../paths.js";
2
- import { mkdir, open, readFile, rm, stat, utimes } from "node:fs/promises";
3
- import { join } from "node:path";
2
+ import { fixOwner } from "../../os/permissions.js";
3
+ import { processIdentity, processIdentityTracker } from "../../os/process-identity.js";
4
+ import { processAlive } from "../../os/process-tree.js";
5
+ import { mkdir, open, readFile, rm, stat } from "node:fs/promises";
6
+ import { dirname, join } from "node:path";
4
7
  export function historyDirPath() {
5
8
  return getHistoryDir();
6
9
  }
7
- function jsonlLockFilePath() {
8
- return join(historyDirPath(), "history.jsonl.lock");
10
+ const LOCK_INITIALIZE_MS = 5_000;
11
+ const LOCK_STALE_MS = 15_000;
12
+ const LOCK_HEARTBEAT_MS = 1_000;
13
+ const LOCK_RETRIES = 400;
14
+ const LOCK_TIMEOUT_MS = 20_000;
15
+ function errorCode(error) {
16
+ return error instanceof Error && "code" in error ? String(error.code) : undefined;
9
17
  }
10
- function jsonlLockReaperPath() {
11
- return join(historyDirPath(), "history.jsonl.lock.reaper");
18
+ let ownIdentity = process.platform === "linux" ? processIdentity(process.pid) : undefined;
19
+ let ownIdentityPending;
20
+ function warmOwnIdentity() {
21
+ if (ownIdentity !== undefined || ownIdentityPending || process.platform === "win32")
22
+ return;
23
+ ownIdentityPending = processIdentityTracker.captureAsync(process.pid)
24
+ .then((identity) => { ownIdentity = identity; })
25
+ .catch(() => undefined);
12
26
  }
13
- const JSONL_LOCK_STALE_MS = 60_000;
14
- const JSONL_LOCK_INITIALIZE_MS = 5_000;
15
- const JSONL_LOCK_RETRIES = 400;
16
- const JSONL_LOCK_TIMEOUT_MS = 20_000;
17
- function isPidAlive(pid) {
18
- try {
19
- process.kill(pid, 0);
20
- return true;
21
- }
22
- catch (error) {
23
- return error?.code === "EPERM";
24
- }
27
+ function lockToken() {
28
+ const token = `${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
29
+ return ownIdentity ? `${token}-${ownIdentity}` : token;
30
+ }
31
+ async function observeLock(path) {
32
+ const info = await stat(path).catch(() => undefined);
33
+ if (!info)
34
+ return undefined;
35
+ const token = await readFile(path, "utf8").catch(() => undefined);
36
+ return { token, ino: info.ino, mtimeMs: info.mtimeMs };
25
37
  }
26
- function lockIsAbandoned(token, modifiedAt) {
27
- const age = Date.now() - modifiedAt;
28
- if (age > JSONL_LOCK_STALE_MS)
38
+ async function lockIsAbandoned(observed) {
39
+ const age = Date.now() - observed.mtimeMs;
40
+ if (observed.token === undefined)
41
+ return age > LOCK_STALE_MS;
42
+ const [pidText, , , identity] = observed.token.split("-");
43
+ const pid = Number(pidText);
44
+ if (!Number.isSafeInteger(pid) || pid <= 0)
45
+ return age > LOCK_INITIALIZE_MS;
46
+ if (!processAlive(pid))
29
47
  return true;
30
- const pid = Number(token?.split("-")[0]);
31
- if (!Number.isSafeInteger(pid) || pid <= 0) {
32
- return token !== undefined && age > JSONL_LOCK_INITIALIZE_MS;
33
- }
34
- return !isPidAlive(pid);
48
+ if (!identity || pid === process.pid || age <= LOCK_HEARTBEAT_MS * 3)
49
+ return false;
50
+ return await processIdentityTracker.compareAsync(pid, identity, { refresh: true }) === "mismatch";
35
51
  }
36
- async function reapStaleJsonlLock() {
52
+ async function removeIfUnchanged(path, observed) {
53
+ const current = await observeLock(path);
54
+ if (!current || current.ino !== observed.ino || current.token !== observed.token)
55
+ return;
56
+ if (observed.token === undefined && current.mtimeMs !== observed.mtimeMs)
57
+ return;
58
+ await rm(path, { force: true });
59
+ }
60
+ async function reapStaleLock(path) {
61
+ const reaperPath = `${path}.reaper`;
37
62
  let reaper;
38
- const reaperToken = `${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
63
+ const reaperToken = lockToken();
39
64
  try {
40
- reaper = await open(jsonlLockReaperPath(), "wx", 0o600);
65
+ reaper = await open(reaperPath, "wx", 0o600);
41
66
  try {
42
67
  await reaper.writeFile(reaperToken);
68
+ await fixOwner(reaperPath);
43
69
  }
44
70
  catch (error) {
45
71
  await reaper.close().catch(() => undefined);
46
- await rm(jsonlLockReaperPath(), { force: true }).catch(() => undefined);
72
+ await rm(reaperPath, { force: true }).catch(() => undefined);
47
73
  throw error;
48
74
  }
49
75
  }
50
76
  catch (error) {
51
- if (error?.code !== "EEXIST")
77
+ if (errorCode(error) !== "EEXIST")
52
78
  throw error;
53
- const existingToken = await readFile(jsonlLockReaperPath(), "utf8").catch(() => undefined);
54
- const reaperStat = await stat(jsonlLockReaperPath()).catch(() => undefined);
55
- if (!reaperStat || !lockIsAbandoned(existingToken, reaperStat.mtimeMs)) {
56
- return;
57
- }
58
- const confirmed = await readFile(jsonlLockReaperPath(), "utf8").catch(() => undefined);
59
- if (confirmed !== undefined && confirmed === existingToken) {
60
- await rm(jsonlLockReaperPath(), { force: true }).catch(() => undefined);
61
- }
79
+ const existing = await observeLock(reaperPath);
80
+ const stale = existing && (await lockIsAbandoned(existing) || Date.now() - existing.mtimeMs > LOCK_STALE_MS);
81
+ if (existing && stale)
82
+ await removeIfUnchanged(reaperPath, existing).catch(() => undefined);
62
83
  return;
63
84
  }
64
85
  try {
65
- const token = await readFile(jsonlLockFilePath(), "utf8").catch(() => undefined);
66
- const lockStat = await stat(jsonlLockFilePath()).catch(() => undefined);
67
- if (!lockStat || !lockIsAbandoned(token, lockStat.mtimeMs)) {
68
- return;
69
- }
70
- const confirmed = await readFile(jsonlLockFilePath(), "utf8").catch(() => undefined);
71
- if (confirmed !== undefined && confirmed === token) {
72
- await rm(jsonlLockFilePath(), { force: true });
73
- }
86
+ const observed = await observeLock(path);
87
+ if (observed && await lockIsAbandoned(observed))
88
+ await removeIfUnchanged(path, observed);
74
89
  }
75
90
  finally {
76
91
  await reaper.close().catch(() => undefined);
77
- const currentReaper = await readFile(jsonlLockReaperPath(), "utf8").catch(() => undefined);
78
- if (currentReaper === reaperToken) {
79
- await rm(jsonlLockReaperPath(), { force: true }).catch(() => undefined);
80
- }
92
+ const current = await readFile(reaperPath, "utf8").catch(() => undefined);
93
+ if (current === reaperToken)
94
+ await rm(reaperPath, { force: true }).catch(() => undefined);
81
95
  }
82
96
  }
83
- export async function acquireJsonlWriteLock() {
84
- await mkdir(historyDirPath(), { recursive: true });
85
- const deadline = Date.now() + JSONL_LOCK_TIMEOUT_MS;
86
- for (let attempt = 0; attempt < JSONL_LOCK_RETRIES; attempt += 1) {
97
+ export async function acquireStorageWriteLock(path, label = "history") {
98
+ await mkdir(dirname(path), { recursive: true, mode: 0o700 });
99
+ await fixOwner(dirname(path));
100
+ warmOwnIdentity();
101
+ const deadline = Date.now() + LOCK_TIMEOUT_MS;
102
+ for (let attempt = 0; attempt < LOCK_RETRIES; attempt += 1) {
87
103
  try {
88
- const token = `${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
89
- const handle = await open(jsonlLockFilePath(), "wx", 0o600);
104
+ const token = lockToken();
105
+ const handle = await open(path, "wx", 0o600);
90
106
  try {
91
107
  await handle.writeFile(token);
108
+ await fixOwner(path);
92
109
  }
93
110
  catch (error) {
94
111
  await handle.close().catch(() => undefined);
95
- await rm(jsonlLockFilePath(), { force: true }).catch(() => undefined);
112
+ await rm(path, { force: true }).catch(() => undefined);
96
113
  throw error;
97
114
  }
98
115
  const heartbeat = setInterval(() => {
99
116
  const now = new Date();
100
- void utimes(jsonlLockFilePath(), now, now).catch(() => undefined);
101
- }, JSONL_LOCK_STALE_MS / 3);
102
- heartbeat.unref();
117
+ void handle.utimes(now, now).catch(() => undefined);
118
+ }, LOCK_HEARTBEAT_MS);
119
+ heartbeat.unref?.();
120
+ let released = false;
103
121
  return async () => {
122
+ if (released)
123
+ return;
124
+ released = true;
104
125
  clearInterval(heartbeat);
105
126
  await handle.close().catch(() => undefined);
106
- const currentToken = await readFile(jsonlLockFilePath(), "utf8").catch(() => undefined);
107
- if (currentToken === token) {
108
- await rm(jsonlLockFilePath(), { force: true }).catch(() => undefined);
109
- }
127
+ const currentToken = await readFile(path, "utf8").catch(() => undefined);
128
+ if (currentToken === token)
129
+ await rm(path, { force: true }).catch(() => undefined);
110
130
  };
111
131
  }
112
132
  catch (error) {
113
- if (error?.code !== "EEXIST")
133
+ if (errorCode(error) !== "EEXIST")
114
134
  throw error;
115
- if (attempt + 1 >= JSONL_LOCK_RETRIES || Date.now() >= deadline)
135
+ if (attempt + 1 >= LOCK_RETRIES || Date.now() >= deadline)
116
136
  break;
117
- await reapStaleJsonlLock();
137
+ await reapStaleLock(path);
118
138
  await new Promise((resolve) => setTimeout(resolve, 25 + Math.floor(Math.random() * 50)));
119
139
  }
120
140
  }
121
- throw new Error("timed out waiting for history write lock");
141
+ throw new Error(`timed out waiting for ${label} write lock`);
142
+ }
143
+ export function acquireJsonlWriteLock() {
144
+ return acquireStorageWriteLock(join(historyDirPath(), "history.jsonl.lock"));
122
145
  }
123
146
  //# sourceMappingURL=jsonl-lock.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jsonl-lock.js","sourceRoot":"","sources":["../../../src/store/history/jsonl-lock.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jsonl-lock.js","sourceRoot":"","sources":["../../../src/store/history/jsonl-lock.ts"],"names":[],"mappings":"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"}
@@ -34,6 +34,8 @@ export interface HistoryRecord {
34
34
  provider?: ProviderId | undefined;
35
35
  model?: string | undefined;
36
36
  thinking?: ReasoningPreference | undefined;
37
+ pendingMerge?: true | undefined;
38
+ unsyncedItemIds?: readonly string[] | undefined;
37
39
  }
38
40
  export declare let cachedSessionList: {
39
41
  historyDir: string;