@amalgm/shell 0.1.164-main.43763074589 → 0.1.164-main.44408383124

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 (316) hide show
  1. package/PURPOSE.md +23 -13
  2. package/README.md +5 -0
  3. package/dist/accepted-fold.d.ts +6 -6
  4. package/dist/accepted-fold.js +8 -8
  5. package/dist/accepted-fold.js.map +1 -1
  6. package/dist/accepted-tail.d.ts +9 -6
  7. package/dist/accepted-tail.js +16 -5
  8. package/dist/accepted-tail.js.map +1 -1
  9. package/dist/apply-control.d.ts +29 -6
  10. package/dist/apply-control.js +36 -8
  11. package/dist/apply-control.js.map +1 -1
  12. package/dist/apply-durability.d.ts +3 -0
  13. package/dist/apply-durability.js +4 -1
  14. package/dist/apply-durability.js.map +1 -1
  15. package/dist/apply-enter-build.d.ts +11 -2
  16. package/dist/apply-enter-build.js +3 -1
  17. package/dist/apply-enter-build.js.map +1 -1
  18. package/dist/apply-git-held.js +2 -2
  19. package/dist/apply-git-held.js.map +1 -1
  20. package/dist/apply-local-work.d.ts +20 -6
  21. package/dist/apply-local-work.js +24 -5
  22. package/dist/apply-local-work.js.map +1 -1
  23. package/dist/apply-map.js +1 -1
  24. package/dist/apply-map.js.map +1 -1
  25. package/dist/apply-showing.d.ts +15 -4
  26. package/dist/apply-showing.js +67 -9
  27. package/dist/apply-showing.js.map +1 -1
  28. package/dist/apply-trash-keep.d.ts +96 -0
  29. package/dist/apply-trash-keep.js +194 -0
  30. package/dist/apply-trash-keep.js.map +1 -0
  31. package/dist/apply-window-cargo.d.ts +7 -2
  32. package/dist/apply-window-cargo.js +13 -1
  33. package/dist/apply-window-cargo.js.map +1 -1
  34. package/dist/apply-window-ground.d.ts +12 -4
  35. package/dist/apply-window-ground.js +24 -6
  36. package/dist/apply-window-ground.js.map +1 -1
  37. package/dist/apply-window-host.d.ts +11 -2
  38. package/dist/apply-window-host.js +306 -101
  39. package/dist/apply-window-host.js.map +1 -1
  40. package/dist/apply-window-lane.d.ts +1 -1
  41. package/dist/apply-window-lane.js +27 -14
  42. package/dist/apply-window-lane.js.map +1 -1
  43. package/dist/apply-window-line.d.ts +8 -6
  44. package/dist/apply-window-line.js +26 -22
  45. package/dist/apply-window-line.js.map +1 -1
  46. package/dist/apply-window-rows.d.ts +24 -1
  47. package/dist/apply-window-rows.js +43 -2
  48. package/dist/apply-window-rows.js.map +1 -1
  49. package/dist/apply-window-saves.d.ts +62 -8
  50. package/dist/apply-window-saves.js +210 -51
  51. package/dist/apply-window-saves.js.map +1 -1
  52. package/dist/apply-window-store.d.ts +24 -6
  53. package/dist/apply-window-store.js +44 -24
  54. package/dist/apply-window-store.js.map +1 -1
  55. package/dist/apply-window-verify.d.ts +4 -0
  56. package/dist/apply-window-verify.js +32 -5
  57. package/dist/apply-window-verify.js.map +1 -1
  58. package/dist/billing/cli.d.ts +18 -0
  59. package/dist/billing/cli.js +276 -0
  60. package/dist/billing/cli.js.map +1 -0
  61. package/dist/billing/mount.d.ts +12 -0
  62. package/dist/billing/mount.js +34 -0
  63. package/dist/billing/mount.js.map +1 -0
  64. package/dist/billing/tools.d.ts +57 -0
  65. package/dist/billing/tools.js +141 -0
  66. package/dist/billing/tools.js.map +1 -0
  67. package/dist/cargo-group.js +15 -3
  68. package/dist/cargo-group.js.map +1 -1
  69. package/dist/cargo-journal.js +6 -8
  70. package/dist/cargo-journal.js.map +1 -1
  71. package/dist/cli.d.ts +1 -0
  72. package/dist/cli.js +47 -13
  73. package/dist/cli.js.map +1 -1
  74. package/dist/content-cache-collection.d.ts +11 -4
  75. package/dist/content-cache-collection.js +74 -62
  76. package/dist/content-cache-collection.js.map +1 -1
  77. package/dist/content-cache-fences.d.ts +27 -0
  78. package/dist/content-cache-fences.js +116 -0
  79. package/dist/content-cache-fences.js.map +1 -0
  80. package/dist/content-cache-host.d.ts +56 -25
  81. package/dist/content-cache-host.js +234 -94
  82. package/dist/content-cache-host.js.map +1 -1
  83. package/dist/content-cache-index.d.ts +12 -7
  84. package/dist/content-cache-index.js +19 -8
  85. package/dist/content-cache-index.js.map +1 -1
  86. package/dist/content-cache-namespace.d.ts +2 -0
  87. package/dist/content-cache-namespace.js +9 -4
  88. package/dist/content-cache-namespace.js.map +1 -1
  89. package/dist/content-cache-retention.d.ts +15 -9
  90. package/dist/content-cache-retention.js +68 -47
  91. package/dist/content-cache-retention.js.map +1 -1
  92. package/dist/content-capture-pool.d.ts +6 -6
  93. package/dist/content-capture-pool.js +8 -8
  94. package/dist/content-capture-pool.js.map +1 -1
  95. package/dist/content-capture-worker.d.ts +1 -1
  96. package/dist/content-capture-worker.js +4 -4
  97. package/dist/content-capture-worker.js.map +1 -1
  98. package/dist/content-clock.d.ts +3 -2
  99. package/dist/content-clock.js +8 -5
  100. package/dist/content-clock.js.map +1 -1
  101. package/dist/derived-relocation.d.ts +5 -1
  102. package/dist/derived-relocation.js +5 -1
  103. package/dist/derived-relocation.js.map +1 -1
  104. package/dist/detection/admission-units.js +13 -7
  105. package/dist/detection/admission-units.js.map +1 -1
  106. package/dist/detection/ground-proof.d.ts +17 -6
  107. package/dist/detection/ground-proof.js +37 -20
  108. package/dist/detection/ground-proof.js.map +1 -1
  109. package/dist/detection/identity-discovery.js +3 -2
  110. package/dist/detection/identity-discovery.js.map +1 -1
  111. package/dist/detection/owed-selection.d.ts +3 -2
  112. package/dist/detection/owed-selection.js +2 -1
  113. package/dist/detection/owed-selection.js.map +1 -1
  114. package/dist/detection/repository-state.d.ts +2 -1
  115. package/dist/detection/repository-state.js +59 -28
  116. package/dist/detection/repository-state.js.map +1 -1
  117. package/dist/detection/root-examination.js +2 -1
  118. package/dist/detection/root-examination.js.map +1 -1
  119. package/dist/detection/root-walk.d.ts +19 -10
  120. package/dist/detection/root-walk.js +128 -67
  121. package/dist/detection/root-walk.js.map +1 -1
  122. package/dist/detection/runtime.d.ts +4 -0
  123. package/dist/detection/runtime.js +28 -4
  124. package/dist/detection/runtime.js.map +1 -1
  125. package/dist/detection/unread-content.js +2 -2
  126. package/dist/detection/unread-content.js.map +1 -1
  127. package/dist/detection/walked-roots.d.ts +2 -2
  128. package/dist/detection/walked-roots.js +2 -2
  129. package/dist/detection/walked-roots.js.map +1 -1
  130. package/dist/detection/withheld.d.ts +11 -8
  131. package/dist/detection/withheld.js +14 -10
  132. package/dist/detection/withheld.js.map +1 -1
  133. package/dist/drive/cloud-files/writes.js +22 -12
  134. package/dist/drive/cloud-files/writes.js.map +1 -1
  135. package/dist/drive/kept.d.ts +5 -16
  136. package/dist/drive/kept.js +5 -45
  137. package/dist/drive/kept.js.map +1 -1
  138. package/dist/drive/mount.js +13 -16
  139. package/dist/drive/mount.js.map +1 -1
  140. package/dist/drive/nfs/nfs3.js +5 -4
  141. package/dist/drive/nfs/nfs3.js.map +1 -1
  142. package/dist/drive/operations.d.ts +10 -7
  143. package/dist/drive/operations.js +18 -13
  144. package/dist/drive/operations.js.map +1 -1
  145. package/dist/durability-barrier.js +4 -14
  146. package/dist/durability-barrier.js.map +1 -1
  147. package/dist/entity-record-observability.js +2 -1
  148. package/dist/entity-record-observability.js.map +1 -1
  149. package/dist/entity-record-saves.d.ts +3 -0
  150. package/dist/entity-record-saves.js +6 -0
  151. package/dist/entity-record-saves.js.map +1 -1
  152. package/dist/entity-record-store.d.ts +13 -7
  153. package/dist/entity-record-store.js +55 -34
  154. package/dist/entity-record-store.js.map +1 -1
  155. package/dist/faults/drain.d.ts +27 -0
  156. package/dist/faults/drain.js +211 -0
  157. package/dist/faults/drain.js.map +1 -0
  158. package/dist/faults/queue.d.ts +46 -0
  159. package/dist/faults/queue.js +100 -0
  160. package/dist/faults/queue.js.map +1 -0
  161. package/dist/faults/show.d.ts +7 -0
  162. package/dist/faults/show.js +32 -0
  163. package/dist/faults/show.js.map +1 -0
  164. package/dist/files-mcp-host.d.ts +58 -0
  165. package/dist/files-mcp-host.js +63 -0
  166. package/dist/files-mcp-host.js.map +1 -0
  167. package/dist/files-observability.d.ts +3 -3
  168. package/dist/files-program/client.d.ts +8 -2
  169. package/dist/files-program/client.js +5 -2
  170. package/dist/files-program/client.js.map +1 -1
  171. package/dist/files-program/program.js +49 -9
  172. package/dist/files-program/program.js.map +1 -1
  173. package/dist/files-program/protocol.d.ts +12 -3
  174. package/dist/files-program/protocol.js.map +1 -1
  175. package/dist/flush.d.ts +10 -4
  176. package/dist/flush.js +17 -11
  177. package/dist/flush.js.map +1 -1
  178. package/dist/git/held-package.d.ts +29 -32
  179. package/dist/git/held-package.js +37 -47
  180. package/dist/git/held-package.js.map +1 -1
  181. package/dist/git/home.js +2 -2
  182. package/dist/git/home.js.map +1 -1
  183. package/dist/git/objects.js +3 -3
  184. package/dist/git/objects.js.map +1 -1
  185. package/dist/git/play.d.ts +30 -0
  186. package/dist/git/play.js +305 -0
  187. package/dist/git/play.js.map +1 -0
  188. package/dist/git/quarantine.d.ts +12 -4
  189. package/dist/git/quarantine.js +16 -14
  190. package/dist/git/quarantine.js.map +1 -1
  191. package/dist/git/rail.d.ts +110 -34
  192. package/dist/git/rail.js +424 -150
  193. package/dist/git/rail.js.map +1 -1
  194. package/dist/git/read-state.d.ts +5 -5
  195. package/dist/git/read-state.js +26 -17
  196. package/dist/git/read-state.js.map +1 -1
  197. package/dist/git/repository.d.ts +9 -9
  198. package/dist/git/repository.js +14 -13
  199. package/dist/git/repository.js.map +1 -1
  200. package/dist/git-binding.js +1 -1
  201. package/dist/git-binding.js.map +1 -1
  202. package/dist/git-command.d.ts +17 -1
  203. package/dist/git-command.js +30 -2
  204. package/dist/git-command.js.map +1 -1
  205. package/dist/git-install-lines.d.ts +12 -0
  206. package/dist/git-install-lines.js +22 -0
  207. package/dist/git-install-lines.js.map +1 -0
  208. package/dist/graph-heads.js +3 -1
  209. package/dist/graph-heads.js.map +1 -1
  210. package/dist/ground-basis.d.ts +2 -0
  211. package/dist/ground-basis.js +2 -0
  212. package/dist/ground-basis.js.map +1 -1
  213. package/dist/ground-checkpoints.js +6 -6
  214. package/dist/ground-contract.d.ts +6 -4
  215. package/dist/ground-contract.js +38 -8
  216. package/dist/ground-contract.js.map +1 -1
  217. package/dist/ground-database.js +65 -18
  218. package/dist/ground-database.js.map +1 -1
  219. package/dist/ground-inventory-schema.js +1 -0
  220. package/dist/ground-inventory-schema.js.map +1 -1
  221. package/dist/ground-profile.d.ts +4 -0
  222. package/dist/ground-profile.js +12 -7
  223. package/dist/ground-profile.js.map +1 -1
  224. package/dist/ground-reads.d.ts +29 -0
  225. package/dist/ground-reads.js +68 -2
  226. package/dist/ground-reads.js.map +1 -1
  227. package/dist/ground-row.d.ts +4 -0
  228. package/dist/ground-row.js +9 -1
  229. package/dist/ground-row.js.map +1 -1
  230. package/dist/ground-save-ops.d.ts +6 -2
  231. package/dist/ground-save-ops.js +7 -3
  232. package/dist/ground-save-ops.js.map +1 -1
  233. package/dist/ground-store.d.ts +2 -0
  234. package/dist/ground-store.js +7 -5
  235. package/dist/ground-store.js.map +1 -1
  236. package/dist/installation/environment.d.ts +4 -0
  237. package/dist/installation/environment.js +13 -0
  238. package/dist/installation/environment.js.map +1 -1
  239. package/dist/line-judge.d.ts +39 -0
  240. package/dist/line-judge.js +177 -0
  241. package/dist/line-judge.js.map +1 -0
  242. package/dist/line-loops.d.ts +22 -0
  243. package/dist/line-loops.js +19 -0
  244. package/dist/line-loops.js.map +1 -0
  245. package/dist/loop-watch.d.ts +17 -0
  246. package/dist/loop-watch.js +44 -0
  247. package/dist/loop-watch.js.map +1 -0
  248. package/dist/machine-host.d.ts +10 -0
  249. package/dist/machine-host.js +63 -5
  250. package/dist/machine-host.js.map +1 -1
  251. package/dist/materialize-records.d.ts +13 -0
  252. package/dist/materialize-records.js +21 -3
  253. package/dist/materialize-records.js.map +1 -1
  254. package/dist/materialized-graph.d.ts +11 -0
  255. package/dist/native/cloud-files.node +0 -0
  256. package/dist/native/inotify.node +0 -0
  257. package/dist/native/windows-fs.node +0 -0
  258. package/dist/open-standing.d.ts +8 -0
  259. package/dist/open-standing.js +109 -0
  260. package/dist/open-standing.js.map +1 -0
  261. package/dist/own-results.d.ts +13 -1
  262. package/dist/own-results.js +29 -15
  263. package/dist/own-results.js.map +1 -1
  264. package/dist/platform-product-host.d.ts +9 -0
  265. package/dist/platform-product-host.js +22 -1
  266. package/dist/platform-product-host.js.map +1 -1
  267. package/dist/platform-tools.d.ts +1 -0
  268. package/dist/platform-tools.js +11 -1
  269. package/dist/platform-tools.js.map +1 -1
  270. package/dist/received-state.d.ts +4 -1
  271. package/dist/received-state.js +4 -0
  272. package/dist/received-state.js.map +1 -1
  273. package/dist/root-install.d.ts +7 -5
  274. package/dist/root-install.js +22 -47
  275. package/dist/root-install.js.map +1 -1
  276. package/dist/runtime-command-host.d.ts +1 -1
  277. package/dist/source-signature.d.ts +13 -4
  278. package/dist/source-signature.js +18 -7
  279. package/dist/source-signature.js.map +1 -1
  280. package/dist/sync-cli.d.ts +6 -2
  281. package/dist/sync-cli.js +18 -3
  282. package/dist/sync-cli.js.map +1 -1
  283. package/dist/sync-setting.d.ts +14 -0
  284. package/dist/sync-setting.js +6 -0
  285. package/dist/sync-setting.js.map +1 -1
  286. package/dist/turns.d.ts +0 -2
  287. package/dist/turns.js +0 -14
  288. package/dist/turns.js.map +1 -1
  289. package/dist/user-ground-host.d.ts +89 -73
  290. package/dist/user-ground-host.js +636 -581
  291. package/dist/user-ground-host.js.map +1 -1
  292. package/dist/watching/host.d.ts +7 -2
  293. package/dist/watching/host.js +42 -2
  294. package/dist/watching/host.js.map +1 -1
  295. package/dist/watching/inotify.d.ts +81 -0
  296. package/dist/watching/inotify.js +184 -0
  297. package/dist/watching/inotify.js.map +1 -0
  298. package/dist/wire-client.d.ts +4 -0
  299. package/dist/wire-client.js +23 -12
  300. package/dist/wire-client.js.map +1 -1
  301. package/dist/wire-outbox.d.ts +3 -0
  302. package/dist/wire-outbox.js +6 -1
  303. package/dist/wire-outbox.js.map +1 -1
  304. package/dist/workspace-add-staging.d.ts +13 -11
  305. package/dist/workspace-add-staging.js +21 -42
  306. package/dist/workspace-add-staging.js.map +1 -1
  307. package/examinations/fixtures/private-wire-authority.js +168 -66
  308. package/examinations/runtime-upgrade.native-test.mjs +9 -9
  309. package/npm-shrinkwrap.json +44 -44
  310. package/package.json +12 -12
  311. package/dist/content-cache-ownership.d.ts +0 -13
  312. package/dist/content-cache-ownership.js +0 -75
  313. package/dist/content-cache-ownership.js.map +0 -1
  314. package/dist/git/merge.d.ts +0 -3
  315. package/dist/git/merge.js +0 -93
  316. package/dist/git/merge.js.map +0 -1
package/PURPOSE.md CHANGED
@@ -929,21 +929,24 @@ after adoption.
929
929
  declared cargo is bounded, Shell supplies the cached manifest and blocks to
930
930
  Live for the same submit frame; otherwise it uses the ordinary missing-block
931
931
  effect. A cached manifest is read off the main thread and is only a hint:
932
- an absent or invalid one takes the ordinary obtain-or-derive path, and the
933
- cache use that protects it lasts until the read finishes. The cloud, not Shell, owns the final seal-before-number decision.
932
+ an absent or invalid one takes the ordinary obtain-or-derive path; the
933
+ pending Record that names it retains it. The cloud, not Shell, owns the
934
+ final seal-before-number decision.
934
935
  Cache bytes remain only while an unresolved durable operation names their
935
- content head or while the current verified text or repository head is the
936
- one exact base for that entity's next delta. Once Send acceptance is
937
- durable, Shell removes every sealed artifact and manifest that neither a
938
- pending Record nor a current replay base retains; restart performs the same
939
- derivation from SQLite, so accepted history cannot accumulate as machine
940
- storage.
936
+ content head, while the current verified text or repository head is the
937
+ one exact base for that entity's next delta, or while a writer that will
938
+ Record them holds their fence (`src/content-cache-fences.ts`). Collection
939
+ is due at boot, after 1,024 new cached names, and hourly, as `git gc
940
+ --auto` is; it derives what no row retains from SQLite and removes it,
941
+ skipping each name fenced since its listing and that name's held parent
942
+ chain, so accepted history cannot accumulate as machine storage.
941
943
 
942
944
  25. **Each cold stage performs only its necessary byte pass.** Registration
943
945
  reads every ordinary text or binary file once through the bounded capture
944
946
  stream to classify it, derive its content head, and retain large-file
945
- manifest evidence; a package publication does not also copy those bytes into
946
- the disposable cache. Upload first proves which heads are already sealed,
947
+ manifest evidence. A Detect that plans Send seals those bytes in the
948
+ disposable cache in the same read; a first publication's login walk does
949
+ not also copy them there. Upload first proves which heads are already sealed,
947
950
  touches no source for those heads, and reads each remaining artifact once
948
951
  from the strongest available evidence: an existing verified cache object,
949
952
  otherwise its registered ground path. Every emitted block is checked
@@ -1883,7 +1886,10 @@ consumed an identity
1883
1886
  discovery reads and stands on that discovery's whole scope.
1884
1887
  Directory listings close on the same rule: a racy listing names no complete
1885
1888
  membership until a fresh listing under a later stamp, and only filesystems
1886
- `ground-profile.ts` names qualify at all. A listing no stamp can qualify
1889
+ `ground-profile.ts` names qualify at all. A listing is racy only while its
1890
+ directory stands as walked: one changed since, by Apply's reveal or a
1891
+ person's write, has moved, a cause to wait on and never a fault, and no
1892
+ count of readings fails a ticket. A listing no stamp can qualify
1887
1893
  closes only when a fresh listing taken after the whole walk names exactly
1888
1894
  what the walk listed while the directory held still on both sides; only an
1889
1895
  entry moved and moved back across both listings inside its directories'
@@ -1893,8 +1899,12 @@ process when absent or different, so a registered repository's Git status
1893
1899
  never shows it. Ground without a qualified clock (another device, a root that
1894
1900
  cannot hold a stamp) is read by every
1895
1901
  examination and closes each listing by reading it again: it loses shortcuts,
1896
- never conclusions. Qualifying further filesystems, NTFS and ReFS among them,
1897
- is unfinished.
1902
+ never conclusions. NTFS qualifies presence and keys, never content: a writer
1903
+ sets its change time (CopyFile copies the source's), so no NTFS time proves
1904
+ content or closes a listing (`timesProve`), and NTFS ground is read as ground
1905
+ without a clock. Every examination therefore reads each NTFS leaf, so the
1906
+ Windows performance gate is missed; no OS-specific mechanism wins that speed
1907
+ back. Qualifying ReFS is unfinished.
1898
1908
  A write through a writable `MAP_SHARED` mapping can change bytes while the
1899
1909
  signature stays equal, through flush, unmap and fsync: that mapped-write
1900
1910
  limitation is outside the metadata-only guarantee, and a faster stat tier
package/README.md CHANGED
@@ -119,6 +119,11 @@ npx --package @amalgm/shell amalgm files register ./project --user person@exampl
119
119
  # Materialize into the current directory and keep it on that same running Watch
120
120
  npx --package @amalgm/shell amalgm files add <workspace-id> --user person@example.com
121
121
 
122
+ # Delete for good what stands in Trash: all of it, or one item; never a root.
123
+ # Only roots this computer holds whole; a root its drive serves on demand is left to the web
124
+ npx --package @amalgm/shell amalgm files trash empty --user person@example.com
125
+ npx --package @amalgm/shell amalgm files trash delete <uuid> --user person@example.com
126
+
122
127
  # Use Automations' six MCP-equivalent JSON commands through the signed-in runtime
123
128
  npx --package @amalgm/shell amalgm automations list --user person@example.com
124
129
 
@@ -1,6 +1,6 @@
1
1
  /**
2
- * The accepted fold: a committed head H at watermark M with every result
3
- * the authority accepted in (M, N], read through Live's accepted view
2
+ * The accepted fold: a committed head H at watermark M with every change
3
+ * the authority accepted in (M, N] played on, read through Live's accepted view
4
4
  * (accepted-view.ts), which answers what the one reducer holds a point at a
5
5
  * time.
6
6
  *
@@ -11,7 +11,7 @@
11
11
  * in it, since then it holds exactly H's rows, and otherwise as the view's
12
12
  * subtree beneath it.
13
13
  */
14
- import { type AcceptedRecord, type CloudEntityRecord, type Sha256Hex } from "@amalgm/live";
14
+ import { type AcceptedRecord, type CloudEntityRecord, type PlayableChange, type Sha256Hex } from "@amalgm/live";
15
15
  import type { RegistryGraph } from "./registry-graph.js";
16
16
  export type { AcceptedRecord } from "@amalgm/live";
17
17
  export declare class AcceptedFold {
@@ -20,11 +20,11 @@ export declare class AcceptedFold {
20
20
  private constructor();
21
21
  /** The view of `results` over `graph`. Nothing folds: each question reads
22
22
  * what it names. */
23
- static open(graph: RegistryGraph, results: readonly CloudEntityRecord[], sha256Hex: Sha256Hex): Promise<AcceptedFold>;
24
- /** Take the results accepted next, in acceptance order, and say which
23
+ static open(graph: RegistryGraph, changes: readonly PlayableChange[], sha256Hex: Sha256Hex): Promise<AcceptedFold>;
24
+ /** Play the changes accepted next, in acceptance order, and say which
25
25
  * identities they touch: every row whose answer they can move is among
26
26
  * them. */
27
- advance(results: readonly CloudEntityRecord[]): Promise<Set<string>>;
27
+ advance(changes: readonly PlayableChange[]): Promise<Set<string>>;
28
28
  /** One root's rows, in uuid order; empty when the fold holds no root by
29
29
  * that id. Only this asks where H holds what a result touched. */
30
30
  root(rootId: string): Promise<readonly CloudEntityRecord[]>;
@@ -1,6 +1,6 @@
1
1
  /**
2
- * The accepted fold: a committed head H at watermark M with every result
3
- * the authority accepted in (M, N], read through Live's accepted view
2
+ * The accepted fold: a committed head H at watermark M with every change
3
+ * the authority accepted in (M, N] played on, read through Live's accepted view
4
4
  * (accepted-view.ts), which answers what the one reducer holds a point at a
5
5
  * time.
6
6
  *
@@ -29,20 +29,20 @@ export class AcceptedFold {
29
29
  }
30
30
  /** The view of `results` over `graph`. Nothing folds: each question reads
31
31
  * what it names. */
32
- static async open(graph, results, sha256Hex) {
32
+ static async open(graph, changes, sha256Hex) {
33
33
  const fold = new AcceptedFold(graph, sha256Hex);
34
- await fold.advance(results);
34
+ await fold.advance(changes);
35
35
  return fold;
36
36
  }
37
- /** Take the results accepted next, in acceptance order, and say which
37
+ /** Play the changes accepted next, in acceptance order, and say which
38
38
  * identities they touch: every row whose answer they can move is among
39
39
  * them. */
40
- async advance(results) {
41
- for (const { uuid, parentUUID } of results) {
40
+ async advance(changes) {
41
+ for (const { result: { uuid, parentUUID } } of changes) {
42
42
  if (parentUUID === null || this.#heldRoots.has(uuid))
43
43
  this.#statedRoots.add(uuid);
44
44
  }
45
- const touched = await this.#view.advance(results);
45
+ const { touched } = await this.#view.advance(changes);
46
46
  for (const uuid of touched)
47
47
  this.#touched.add(uuid);
48
48
  return touched;
@@ -1 +1 @@
1
- {"version":3,"file":"accepted-fold.js","sourceRoot":"","sources":["../src/accepted-fold.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EACL,YAAY,EACZ,SAAS,GAIV,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAIhD,MAAM,MAAM,GAAG,CAAC,IAAuB,EAAE,KAAwB,EAAU,EAAE,CAC3E,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/D,MAAM,OAAO,YAAY;IAQM;IAPpB,KAAK,CAAe;IACpB,UAAU,CAAsB;IACzC,0DAA0D;IACjD,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,uCAAuC;IAC9B,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAEtC,YAA6B,KAAoB,EAAE,SAAoB;QAA1C,UAAK,GAAL,KAAK,CAAe;QAC/C,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED;wBACoB;IACpB,MAAM,CAAC,KAAK,CAAC,IAAI,CACf,KAAoB,EACpB,OAAqC,EACrC,SAAoB;QAEpB,MAAM,IAAI,GAAG,IAAI,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;eAEW;IACX,KAAK,CAAC,OAAO,CAAC,OAAqC;QACjD,KAAK,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,OAAO,EAAE,CAAC;YAC3C,IAAI,UAAU,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpF,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClD,KAAK,MAAM,IAAI,IAAI,OAAO;YAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;sEACkE;IAClE,KAAK,CAAC,IAAI,CAAC,MAAc;QACvB,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC7F,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,KAAK,IAAI;YAAE,OAAO,EAAE,CAAC;QAC/C,OAAO,kBAAkB,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED;;;6CAGyC;IACzC,KAAK,CAAC,OAAO,CAAC,IAAY;QACxB,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED;wBACoB;IACpB,QAAQ,CAAC,IAAY;QACnB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,gEAAgE;IAChE,GAAG,CAAC,IAAY;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED,0EAA0E;IAC1E,IAAI,CAAC,KAAwB;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,wEAAwE;IACxE,MAAM,CAAC,IAAY;QACjB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;yCACqC;IACrC,KAAK,CAAC,WAAW;QACf,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAU,CAAC,CAAC,CAAC;QACxG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;QAC7D,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACrC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACnB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,GAAG,EAAE,UAAU,KAAK,IAAI;gBAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACrD,CAAC;QACD,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED;qDACiD;IACjD,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;CACF"}
1
+ {"version":3,"file":"accepted-fold.js","sourceRoot":"","sources":["../src/accepted-fold.ts"],"names":[],"mappings":"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"}
@@ -3,9 +3,9 @@
3
3
  * acceptance order, read in one SQLite transaction together with this
4
4
  * machine's delivery receipt and its history floor (graph-heads.ts). N is
5
5
  * the receipt, or an earlier position the receipt has passed. The one
6
- * reducer (AGENTS.md §3.4) folds the statements in that order; the latest
7
- * result of each entity answers where an identity stands. A package states
8
- * each member of its subtree (package-pages.ts).
6
+ * reducer (AGENTS.md §3.4) plays the changes in that order, each changing
7
+ * only its facets (Live play.ts). A package creates each member of its
8
+ * subtree (package-pages.ts).
9
9
  *
10
10
  * The Inbox holds every authority record above the floor through the
11
11
  * receipt. A tail may begin only at or above that floor: below it this
@@ -13,7 +13,7 @@
13
13
  * would silently omit accepted results. Such a read fails closed.
14
14
  */
15
15
  import type Database from "better-sqlite3";
16
- import { type CloudEntityRecord } from "@amalgm/live";
16
+ import { type AcceptedEntityRecord, type CloudEntityRecord, type PlayableChange } from "@amalgm/live";
17
17
  export declare class AcceptedHistoryUnavailableError extends Error {
18
18
  readonly after: number;
19
19
  readonly floor: number;
@@ -25,8 +25,11 @@ export interface AcceptedTail {
25
25
  /** N: the position the tail runs through, never past the local gap-free
26
26
  * authority cursor. */
27
27
  readonly through: number;
28
- /** Every accepted result in (after, through], in acceptance order. */
29
- readonly accepted: readonly CloudEntityRecord[];
28
+ /** Every accepted change in (after, through], in acceptance order. */
29
+ readonly accepted: readonly PlayableChange[];
30
+ /** The accepted record each change came from, aligned with `accepted`: a
31
+ * package's members each name the package. */
32
+ readonly origins: readonly AcceptedEntityRecord[];
30
33
  /** The latest accepted result per entity in (after, through]. */
31
34
  readonly results: readonly CloudEntityRecord[];
32
35
  }
@@ -1,4 +1,4 @@
1
- import { decodeAcceptedEntityRecord } from "@amalgm/live";
1
+ import { decodeAcceptedEntityRecord, } from "@amalgm/live";
2
2
  import { readDeliveryReceipt } from "./graph-heads.js";
3
3
  import { statedResults } from "./package-pages.js";
4
4
  export class AcceptedHistoryUnavailableError extends Error {
@@ -25,19 +25,30 @@ export function readAcceptedTail(database, authorityId, after, until) {
25
25
  if (floor > after)
26
26
  throw new AcceptedHistoryUnavailableError(after, floor);
27
27
  const accepted = [];
28
+ const origins = [];
28
29
  const latest = new Map();
29
30
  for (const { recordJson } of database.prepare(`
30
31
  SELECT record_json AS recordJson FROM record_inbox
31
32
  WHERE authority_id = ? AND delivery_sequence > ? AND delivery_sequence <= ?
32
33
  ORDER BY delivery_sequence
33
34
  `).iterate(authorityId, after, through)) {
34
- // A package states its whole subtree; every member is a result here.
35
- for (const result of statedResults(database, decodeAcceptedEntityRecord(recordJson).change)) {
36
- accepted.push(result);
35
+ // A package creates its whole subtree; every member is made here.
36
+ const record = decodeAcceptedEntityRecord(recordJson);
37
+ const { change } = record;
38
+ // Every other change plays as it was accepted, an echo's joins included.
39
+ if (change.replay.kind !== "package") {
40
+ accepted.push(change);
41
+ origins.push(record);
42
+ }
43
+ for (const result of statedResults(database, change)) {
44
+ if (change.replay.kind === "package") {
45
+ accepted.push({ facets: ["create"], result });
46
+ origins.push(record);
47
+ }
37
48
  latest.set(result.uuid, result);
38
49
  }
39
50
  }
40
- return { after, through, accepted, results: [...latest.values()] };
51
+ return { after, through, accepted, origins, results: [...latest.values()] };
41
52
  })();
42
53
  }
43
54
  //# sourceMappingURL=accepted-tail.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"accepted-tail.js","sourceRoot":"","sources":["../src/accepted-tail.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,0BAA0B,EAA0B,MAAM,cAAc,CAAC;AAElF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,OAAO,+BAAgC,SAAQ,KAAK;IACnC;IAAwB;IAA7C,YAAqB,KAAa,EAAW,KAAa;QACxD,KAAK,CAAC,mCAAmC,KAAK,qCAAqC,KAAK,EAAE,CAAC,CAAC;QADzE,UAAK,GAAL,KAAK,CAAQ;QAAW,UAAK,GAAL,KAAK,CAAQ;QAExD,IAAI,CAAC,IAAI,GAAG,iCAAiC,CAAC;IAChD,CAAC;CACF;AAcD,MAAM,UAAU,gBAAgB,CAC9B,QAA2B,EAC3B,WAAmB,EACnB,KAAa,EACb,KAAc;IAEd,OAAO,QAAQ,CAAC,WAAW,CAAC,GAAiB,EAAE;QAC7C,MAAM,OAAO,GAAG,mBAAmB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,OAAO,EAAE,OAAO,IAAI,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,KAAK,IAAI,QAAQ,CAAC;QAClC,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC;QAClC,IAAI,QAAQ,GAAG,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,oBAAoB,OAAO,EAAE,CAAC,CAAC;QACxG,IAAI,OAAO,GAAG,KAAK,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,KAAK,GAAG,KAAK;YAAE,MAAM,IAAI,+BAA+B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAwB,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,GAAG,EAA6B,CAAC;QACpD,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,QAAQ,CAAC,OAAO,CAAC;;;;KAI7C,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,CAAqC,EAAE,CAAC;YAC5E,qEAAqE;YACrE,KAAK,MAAM,MAAM,IAAI,aAAa,CAAC,QAAQ,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC5F,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACtB,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;IACrE,CAAC,CAAC,EAAE,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"accepted-tail.js","sourceRoot":"","sources":["../src/accepted-tail.ts"],"names":[],"mappings":"AAeA,OAAO,EACL,0BAA0B,GAI3B,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,OAAO,+BAAgC,SAAQ,KAAK;IACnC;IAAwB;IAA7C,YAAqB,KAAa,EAAW,KAAa;QACxD,KAAK,CAAC,mCAAmC,KAAK,qCAAqC,KAAK,EAAE,CAAC,CAAC;QADzE,UAAK,GAAL,KAAK,CAAQ;QAAW,UAAK,GAAL,KAAK,CAAQ;QAExD,IAAI,CAAC,IAAI,GAAG,iCAAiC,CAAC;IAChD,CAAC;CACF;AAiBD,MAAM,UAAU,gBAAgB,CAC9B,QAA2B,EAC3B,WAAmB,EACnB,KAAa,EACb,KAAc;IAEd,OAAO,QAAQ,CAAC,WAAW,CAAC,GAAiB,EAAE;QAC7C,MAAM,OAAO,GAAG,mBAAmB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,OAAO,EAAE,OAAO,IAAI,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,KAAK,IAAI,QAAQ,CAAC;QAClC,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC;QAClC,IAAI,QAAQ,GAAG,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,oBAAoB,OAAO,EAAE,CAAC,CAAC;QACxG,IAAI,OAAO,GAAG,KAAK,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,KAAK,GAAG,KAAK;YAAE,MAAM,IAAI,+BAA+B,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAqB,EAAE,CAAC;QACtC,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,IAAI,GAAG,EAA6B,CAAC;QACpD,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,QAAQ,CAAC,OAAO,CAAC;;;;KAI7C,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,CAAqC,EAAE,CAAC;YAC5E,kEAAkE;YAClE,MAAM,MAAM,GAAG,0BAA0B,CAAC,UAAU,CAAC,CAAC;YACtD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;YAC1B,yEAAyE;YACzE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACrC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACtB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvB,CAAC;YACD,KAAK,MAAM,MAAM,IAAI,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;gBACrD,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACrC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;oBAC9C,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvB,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;IAC9E,CAAC,CAAC,EAAE,CAAC;AACP,CAAC"}
@@ -21,6 +21,7 @@
21
21
  * window held left with the old object: its members stay owed, and
22
22
  * nothing beneath the new root is touched, not even the control tree. */
23
23
  import { type BigIntStats } from "node:fs";
24
+ import type { GitLine } from "./materialized-graph.js";
24
25
  /** A binding root as a receipt names it: its path and exact object. */
25
26
  export interface BoundRoot {
26
27
  readonly path: string;
@@ -43,16 +44,38 @@ export declare const stagedPath: (control: string, entityId: string) => string;
43
44
  export declare const displacedPath: (control: string, entityId: string) => string;
44
45
  /** A repository reveal's Git part marker: absent before the part begins,
45
46
  * `started`, durably, before Git writes anything, and `ended` once Git's own
46
- * read proved the result (apply-window-recovery.ts), followed by the state ID
47
- * the repository shows when that is not the target's: both sides joined
48
- * (src/git/rail.ts). */
47
+ * read proved the result (apply-window-recovery.ts). A record played onto a
48
+ * line it was not made from (src/git/rail.ts) ends as `ended <state>
49
+ * <package> <line>`: the state the repository shows, the package that
50
+ * carries it, and the line after the record, each sealed in the cache before
51
+ * the marker names it. */
49
52
  export declare const gitPartPath: (control: string, entityId: string) => string;
50
53
  export type GitPart = "started" | "ended";
54
+ /** What a played repository shows, and the line it keeps. */
55
+ export interface GitPartEnd {
56
+ readonly state: string;
57
+ readonly package: string;
58
+ readonly line: GitLine;
59
+ }
60
+ /** A checkout file the line holds otherwise than the record did
61
+ * (src/git/play.ts `gitJoinedFiles`): its path in the repository, the hash
62
+ * of the record's bytes and of the joined bytes, and their length. The
63
+ * reveal seals the joined bytes in the cache before the marker names them,
64
+ * so its sender's echo can state them (apply-window-saves.ts). */
65
+ export interface GitJoinedHead {
66
+ readonly path: string;
67
+ readonly record: string;
68
+ readonly joined: string;
69
+ readonly size: number;
70
+ }
51
71
  /** The member's Git part; anything but `ended` is a `started` a crash tore. */
52
72
  export declare function readGitPart(control: string, entityId: string): GitPart | null;
53
- /** The state ID an ended Git part shows in place of its target's; null for
54
- * the target's own. */
55
- export declare const gitPartShows: (control: string, entityId: string) => string | null;
73
+ /** What an ended Git part shows and keeps in place of its target's; null
74
+ * for the target's own. */
75
+ export declare function gitPartEnd(control: string, entityId: string): GitPartEnd | null;
76
+ /** The checkout files an ended Git part joined. */
77
+ export declare const gitPartJoined: (control: string, entityId: string) => readonly GitJoinedHead[];
78
+ export declare const gitPartEnded: (end: GitPartEnd | null, joined?: readonly GitJoinedHead[]) => string;
56
79
  /** A former repository's displaced Git storage (src/apply-git-storage.ts). */
57
80
  export declare const displacedGitPath: (control: string, entityId: string) => string;
58
81
  export type BoundRootGround = "present" | "unavailable" | "replaced";
@@ -52,11 +52,32 @@ export const stagedPath = (control, entityId) => join(control, "staged", entityI
52
52
  export const displacedPath = (control, entityId) => join(control, "displaced", entityId);
53
53
  /** A repository reveal's Git part marker: absent before the part begins,
54
54
  * `started`, durably, before Git writes anything, and `ended` once Git's own
55
- * read proved the result (apply-window-recovery.ts), followed by the state ID
56
- * the repository shows when that is not the target's: both sides joined
57
- * (src/git/rail.ts). */
55
+ * read proved the result (apply-window-recovery.ts). A record played onto a
56
+ * line it was not made from (src/git/rail.ts) ends as `ended <state>
57
+ * <package> <line>`: the state the repository shows, the package that
58
+ * carries it, and the line after the record, each sealed in the cache before
59
+ * the marker names it. */
58
60
  export const gitPartPath = (control, entityId) => join(control, "git", entityId);
59
- const ENDED = /^ended(?: ([0-9a-f]{64}))?$/;
61
+ const ENDED = /^ended(?: ([0-9a-f]{64}) ([0-9a-f]{64}) ([0-9a-f]{64}) ([0-9a-f]{64}))?$/;
62
+ /** An ended marker's two lines: what the part shows and keeps, then the
63
+ * joined files as JSON when there are any. Anything else, a torn write
64
+ * included, is a `started` a crash tore. */
65
+ function parseEnded(marker) {
66
+ if (marker === null)
67
+ return null;
68
+ const [first, rest] = [marker.split("\n", 1)[0], marker.slice(marker.indexOf("\n") + 1)];
69
+ const end = ENDED.exec(first);
70
+ if (end === null)
71
+ return null;
72
+ if (first === marker)
73
+ return { end, joined: [] };
74
+ try {
75
+ return { end, joined: JSON.parse(rest) };
76
+ }
77
+ catch {
78
+ return null;
79
+ }
80
+ }
60
81
  function readMarker(control, entityId) {
61
82
  try {
62
83
  return readFileSync(gitPartPath(control, entityId), "utf8");
@@ -70,11 +91,18 @@ function readMarker(control, entityId) {
70
91
  /** The member's Git part; anything but `ended` is a `started` a crash tore. */
71
92
  export function readGitPart(control, entityId) {
72
93
  const marker = readMarker(control, entityId);
73
- return marker === null ? null : ENDED.test(marker) ? "ended" : "started";
94
+ return marker === null ? null : parseEnded(marker) !== null ? "ended" : "started";
95
+ }
96
+ /** What an ended Git part shows and keeps in place of its target's; null
97
+ * for the target's own. */
98
+ export function gitPartEnd(control, entityId) {
99
+ const found = parseEnded(readMarker(control, entityId))?.end;
100
+ return found?.[1] ? { state: found[1], package: found[2], line: { package: found[3], state: found[4] } } : null;
74
101
  }
75
- /** The state ID an ended Git part shows in place of its target's; null for
76
- * the target's own. */
77
- export const gitPartShows = (control, entityId) => ENDED.exec(readMarker(control, entityId) ?? "")?.[1] ?? null;
102
+ /** The checkout files an ended Git part joined. */
103
+ export const gitPartJoined = (control, entityId) => parseEnded(readMarker(control, entityId))?.joined ?? [];
104
+ export const gitPartEnded = (end, joined = []) => (end === null ? "ended" : `ended ${end.state} ${end.package} ${end.line.package} ${end.line.state}`)
105
+ + (joined.length === 0 ? "" : `\n${JSON.stringify(joined)}`);
78
106
  /** A former repository's displaced Git storage (src/apply-git-storage.ts). */
79
107
  export const displacedGitPath = (control, entityId) => join(control, "displaced-git", entityId);
80
108
  function stand(path) {
@@ -1 +1 @@
1
- {"version":3,"file":"apply-control.js","sourceRoot":"","sources":["../src/apply-control.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apply-control.js","sourceRoot":"","sources":["../src/apply-control.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { type TrashStep } from "./apply-trash-keep.js";
1
2
  /** The members one point may owe before it runs early. */
2
3
  export declare const DURABILITY_CAP: {
3
4
  readonly members: 4096;
@@ -9,6 +10,8 @@ export interface OwedWindow {
9
10
  readonly directories: readonly string[];
10
11
  /** Control trees the window may let go once durable. */
11
12
  readonly controls: readonly string[];
13
+ /** What its Trash keeps take from those trees, or release, first. */
14
+ readonly trash: readonly TrashStep[];
12
15
  readonly members: number;
13
16
  }
14
17
  export interface ApplyDurabilityOptions {
@@ -4,10 +4,12 @@
4
4
  * bindWindow), so the point owes placement only. At idle or at the cap,
5
5
  * for every window ended since the last point, each touched directory and
6
6
  * revealed file is flushed, in parallel, and then one strict save marks
7
- * those windows durable, which also lets their control trees go. The hot
7
+ * those windows durable, which also lets their control trees go, once their
8
+ * Trash keeps have taken what they keep (apply-trash-keep.ts). The hot
8
9
  * path per window owes no placement flush. */
9
10
  import { rm } from "node:fs/promises";
10
11
  import { parallelForEach } from "@amalgm/live";
12
+ import { settleTrash } from "./apply-trash-keep.js";
11
13
  import { flushEach } from "./flush.js";
12
14
  import { save } from "./ground-saver.js";
13
15
  /** The members one point may owe before it runs early. */
@@ -63,6 +65,7 @@ export class ApplyDurability {
63
65
  this.#members += window.members;
64
66
  throw error;
65
67
  }
68
+ await settleTrash(windows.flatMap(window => window.trash));
66
69
  await parallelForEach(windows.flatMap(window => window.controls), 16, control => rm(control, { recursive: true, force: true }));
67
70
  }
68
71
  }
@@ -1 +1 @@
1
- {"version":3,"file":"apply-durability.js","sourceRoot":"","sources":["../src/apply-durability.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apply-durability.js","sourceRoot":"","sources":["../src/apply-durability.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,11 @@
1
1
  import type { CloudEntityRecord, TransferArtifact } from "@amalgm/live";
2
+ import type { GitLine } from "./materialized-graph.js";
2
3
  import type { EnterClosure } from "./apply-enter-plan.js";
3
4
  import type { ContentBoundary } from "./content-clock.js";
4
5
  import type { GitOwners } from "./git/home.js";
5
- import { type LocalArtifactFile } from "./materialize-records.js";
6
+ import { type GitLines, type LocalArtifactFile } from "./materialize-records.js";
6
7
  import type { AddStagingRouting } from "./workspace-add-staging.js";
7
- declare const CONTRACT = "amalgm.apply-enter@2";
8
+ declare const CONTRACT = "amalgm.apply-enter@3";
8
9
  /** One row the landing saves, addressed relative to the tree. The target's
9
10
  * own row has the empty path. */
10
11
  export interface SealedEnterRow {
@@ -28,6 +29,12 @@ export interface EnterSeal {
28
29
  /** Where the tree lands. Reference link text was computed from it. */
29
30
  readonly targetPath: string;
30
31
  readonly rows: readonly SealedEnterRow[];
32
+ /** Each repository the build played onto its line, with that line
33
+ * (git-install-lines.ts). */
34
+ readonly lines?: readonly {
35
+ readonly uuid: string;
36
+ readonly line: GitLine;
37
+ }[];
31
38
  }
32
39
  export interface PreparedEnter {
33
40
  readonly tree: string;
@@ -77,6 +84,8 @@ export declare function prepareEnter(input: {
77
84
  /** The repositories this computer already holds, where a worktree or
78
85
  * submodule entering finds its home. */
79
86
  readonly held: GitOwners;
87
+ /** Each repository's line (materialize-records.ts `GitLines`). */
88
+ readonly gitLines?: GitLines;
80
89
  readContent(artifacts: readonly TransferArtifact[], staged?: AddStagingRouting): Promise<ReadonlyMap<string, LocalArtifactFile>>;
81
90
  }): Promise<PreparedEnter>;
82
91
  export {};
@@ -30,7 +30,7 @@ import { holds, standing } from "./apply-spelling.js";
30
30
  import { durabilityBarrier } from "./durability-barrier.js";
31
31
  import { materializeRecords } from "./materialize-records.js";
32
32
  import { isPhysicalKey, physicalKey } from "./source-signature.js";
33
- const CONTRACT = "amalgm.apply-enter@2";
33
+ const CONTRACT = "amalgm.apply-enter@3";
34
34
  /** One Enter's staging directory inside its window's control directory.
35
35
  * Every member of a window shares that directory, so each Enter takes its own
36
36
  * slot, numbered in the order its window first builds it. The slot is the
@@ -103,6 +103,7 @@ export async function prepareEnter(input) {
103
103
  leftOut: new Set(expected.leftOut),
104
104
  held: input.held,
105
105
  gitStorage: input.held.storage,
106
+ ...(input.gitLines ? { gitLines: input.gitLines } : {}),
106
107
  staged: true,
107
108
  readContent: (artifacts, staged) => input.readContent(artifacts, staged),
108
109
  });
@@ -121,6 +122,7 @@ export async function prepareEnter(input) {
121
122
  record: row.record, relativePath: row.relativePath, physicalKey: row.physicalKey,
122
123
  sourceSignature: row.sourceSignature, filesystemMode: row.filesystemMode,
123
124
  })),
125
+ ...rows.some(row => row.gitLine) ? { lines: rows.flatMap(({ record, gitLine }) => gitLine ? [{ uuid: record.uuid, line: gitLine }] : []) } : {},
124
126
  };
125
127
  await writeSeal(staging, seal, (await built.durable).files);
126
128
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"apply-enter-build.js","sourceRoot":"","sources":["../src/apply-enter-build.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apply-enter-build.js","sourceRoot":"","sources":["../src/apply-enter-build.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ import { join, relative, sep } from "node:path";
19
19
  import { CHUNK_BYTES } from "@amalgm/live";
20
20
  import { pathInside } from "./apply-window-ground.js";
21
21
  import { CatFile } from "./git-cat-file.js";
22
- import { GitFailure, runGit } from "./git-command.js";
22
+ import { GitRefused, runGit } from "./git-command.js";
23
23
  import { sha256Hex } from "./sha256.js";
24
24
  /** Refs asked, most recently made first: a step lands on a state its
25
25
  * repository named lately, and the question stays the same size however
@@ -84,7 +84,7 @@ export class GitHeld {
84
84
  yield* this.#readRepository(checkout, placed, this.#left.get(repository) ?? []);
85
85
  }
86
86
  catch (error) {
87
- if (!(error instanceof GitFailure) || error.status !== 128 || error.code !== undefined)
87
+ if (!(error instanceof GitRefused))
88
88
  this.#report(error);
89
89
  }
90
90
  }
@@ -1 +1 @@
1
- {"version":3,"file":"apply-git-held.js","sourceRoot":"","sources":["../src/apply-git-held.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apply-git-held.js","sourceRoot":"","sources":["../src/apply-git-held.ts"],"names":[],"mappings":"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"}