@narumitw/pi-sync-daemon 0.0.0-stage → 0.2.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 (265) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/LICENSE +21 -0
  3. package/README.md +89 -2
  4. package/dist/cli.d.ts +2 -0
  5. package/dist/cli.js +128 -0
  6. package/dist/client.d.ts +55 -0
  7. package/dist/client.js +484 -0
  8. package/dist/consent.d.ts +24 -0
  9. package/dist/consent.js +205 -0
  10. package/dist/document.d.ts +10 -0
  11. package/dist/document.js +6 -0
  12. package/dist/endpoint.d.ts +8 -0
  13. package/dist/endpoint.js +91 -0
  14. package/dist/engine/backends/backend-factory.d.ts +6 -0
  15. package/dist/engine/backends/backend-factory.js +16 -0
  16. package/dist/engine/backends/backend-identity.d.ts +3 -0
  17. package/dist/engine/backends/backend-identity.js +38 -0
  18. package/dist/engine/backends/backend-types.d.ts +70 -0
  19. package/dist/engine/backends/backend-types.js +1 -0
  20. package/dist/engine/backends/git/git-backend.d.ts +55 -0
  21. package/dist/engine/backends/git/git-backend.js +700 -0
  22. package/dist/engine/backends/git/git-config.d.ts +5 -0
  23. package/dist/engine/backends/git/git-config.js +118 -0
  24. package/dist/engine/backends/git/git-runner.d.ts +25 -0
  25. package/dist/engine/backends/git/git-runner.js +232 -0
  26. package/dist/engine/backends/git/git-storage.d.ts +39 -0
  27. package/dist/engine/backends/git/git-storage.js +226 -0
  28. package/dist/engine/backends/s3/s3-backend.d.ts +32 -0
  29. package/dist/engine/backends/s3/s3-backend.js +436 -0
  30. package/dist/engine/backends/s3/s3-client.d.ts +36 -0
  31. package/dist/engine/backends/s3/s3-client.js +352 -0
  32. package/dist/engine/backends/s3/s3-conditions.d.ts +4 -0
  33. package/dist/engine/backends/s3/s3-conditions.js +66 -0
  34. package/dist/engine/backends/snapshot-pointer.d.ts +6 -0
  35. package/dist/engine/backends/snapshot-pointer.js +22 -0
  36. package/dist/engine/backends/sync-backend.d.ts +71 -0
  37. package/dist/engine/backends/sync-backend.js +23 -0
  38. package/dist/engine/backends/webdav/webdav-backend.d.ts +34 -0
  39. package/dist/engine/backends/webdav/webdav-backend.js +534 -0
  40. package/dist/engine/backends/webdav/webdav-client.d.ts +36 -0
  41. package/dist/engine/backends/webdav/webdav-client.js +326 -0
  42. package/dist/engine/backends/webdav/webdav-config.d.ts +5 -0
  43. package/dist/engine/backends/webdav/webdav-config.js +73 -0
  44. package/dist/engine/commands/command-types.d.ts +31 -0
  45. package/dist/engine/commands/command-types.js +1 -0
  46. package/dist/engine/host.d.ts +70 -0
  47. package/dist/engine/host.js +16 -0
  48. package/dist/engine/paths.d.ts +9 -0
  49. package/dist/engine/paths.js +71 -0
  50. package/dist/engine/settings/config-errors.d.ts +1 -0
  51. package/dist/engine/settings/config-errors.js +4 -0
  52. package/dist/engine/settings/config-file.d.ts +33 -0
  53. package/dist/engine/settings/config-file.js +630 -0
  54. package/dist/engine/settings/config.d.ts +24 -0
  55. package/dist/engine/settings/config.js +200 -0
  56. package/dist/engine/settings/settings-management.d.ts +24 -0
  57. package/dist/engine/settings/settings-management.js +191 -0
  58. package/dist/engine/settings/settings-store.d.ts +8 -0
  59. package/dist/engine/settings/settings-store.js +41 -0
  60. package/dist/engine/settings/settings-types.d.ts +134 -0
  61. package/dist/engine/settings/settings-types.js +1 -0
  62. package/dist/engine/settings/settings-validation.d.ts +15 -0
  63. package/dist/engine/settings/settings-validation.js +356 -0
  64. package/dist/engine/snapshot/session-paths.d.ts +12 -0
  65. package/dist/engine/snapshot/session-paths.js +91 -0
  66. package/dist/engine/snapshot/snapshot-apply.d.ts +22 -0
  67. package/dist/engine/snapshot/snapshot-apply.js +262 -0
  68. package/dist/engine/snapshot/snapshot-case-replacement.d.ts +15 -0
  69. package/dist/engine/snapshot/snapshot-case-replacement.js +82 -0
  70. package/dist/engine/snapshot/snapshot-codec.d.ts +6 -0
  71. package/dist/engine/snapshot/snapshot-codec.js +53 -0
  72. package/dist/engine/snapshot/snapshot-exclude-safety.d.ts +7 -0
  73. package/dist/engine/snapshot/snapshot-exclude-safety.js +47 -0
  74. package/dist/engine/snapshot/snapshot-mutation-queues.d.ts +9 -0
  75. package/dist/engine/snapshot/snapshot-mutation-queues.js +133 -0
  76. package/dist/engine/snapshot/snapshot-paths.d.ts +1 -0
  77. package/dist/engine/snapshot/snapshot-paths.js +11 -0
  78. package/dist/engine/snapshot/snapshot-root-transition.d.ts +25 -0
  79. package/dist/engine/snapshot/snapshot-root-transition.js +122 -0
  80. package/dist/engine/snapshot/snapshot-transaction-directory.d.ts +2 -0
  81. package/dist/engine/snapshot/snapshot-transaction-directory.js +16 -0
  82. package/dist/engine/snapshot/snapshot-transaction-plan.d.ts +12 -0
  83. package/dist/engine/snapshot/snapshot-transaction-plan.js +68 -0
  84. package/dist/engine/snapshot/snapshot-transaction.d.ts +15 -0
  85. package/dist/engine/snapshot/snapshot-transaction.js +787 -0
  86. package/dist/engine/snapshot/snapshot-types.d.ts +48 -0
  87. package/dist/engine/snapshot/snapshot-types.js +1 -0
  88. package/dist/engine/snapshot/snapshot.d.ts +30 -0
  89. package/dist/engine/snapshot/snapshot.js +364 -0
  90. package/dist/engine/state/json-file.d.ts +6 -0
  91. package/dist/engine/state/json-file.js +49 -0
  92. package/dist/engine/state/lock-policy.d.ts +2 -0
  93. package/dist/engine/state/lock-policy.js +2 -0
  94. package/dist/engine/state/lock.d.ts +20 -0
  95. package/dist/engine/state/lock.js +259 -0
  96. package/dist/engine/state/lockfile-fs.d.ts +13 -0
  97. package/dist/engine/state/lockfile-fs.js +13 -0
  98. package/dist/engine/state/merge-baseline-store.d.ts +11 -0
  99. package/dist/engine/state/merge-baseline-store.js +187 -0
  100. package/dist/engine/state/mutation-directory-sync.d.ts +5 -0
  101. package/dist/engine/state/mutation-directory-sync.js +34 -0
  102. package/dist/engine/state/operation-availability.d.ts +49 -0
  103. package/dist/engine/state/operation-availability.js +40 -0
  104. package/dist/engine/state/state-directory.d.ts +14 -0
  105. package/dist/engine/state/state-directory.js +225 -0
  106. package/dist/engine/state/state-types.d.ts +27 -0
  107. package/dist/engine/state/state-types.js +1 -0
  108. package/dist/engine/state/sync-state-store.d.ts +11 -0
  109. package/dist/engine/state/sync-state-store.js +54 -0
  110. package/dist/engine/sync/agent-candidate.d.ts +44 -0
  111. package/dist/engine/sync/agent-candidate.js +207 -0
  112. package/dist/engine/sync/agent-plan.d.ts +8 -0
  113. package/dist/engine/sync/agent-plan.js +84 -0
  114. package/dist/engine/sync/agent-policy.d.ts +9 -0
  115. package/dist/engine/sync/agent-policy.js +10 -0
  116. package/dist/engine/sync/agent-refusal-retry.d.ts +4 -0
  117. package/dist/engine/sync/agent-refusal-retry.js +39 -0
  118. package/dist/engine/sync/agent-request.d.ts +14 -0
  119. package/dist/engine/sync/agent-request.js +13 -0
  120. package/dist/engine/sync/agent-runner.d.ts +6 -0
  121. package/dist/engine/sync/agent-runner.js +183 -0
  122. package/dist/engine/sync/agent-store.d.ts +7 -0
  123. package/dist/engine/sync/agent-store.js +177 -0
  124. package/dist/engine/sync/agent-sync.d.ts +4 -0
  125. package/dist/engine/sync/agent-sync.js +132 -0
  126. package/dist/engine/sync/apply-review.d.ts +8 -0
  127. package/dist/engine/sync/apply-review.js +51 -0
  128. package/dist/engine/sync/conflict-artifact-ownership.d.ts +4 -0
  129. package/dist/engine/sync/conflict-artifact-ownership.js +53 -0
  130. package/dist/engine/sync/conflict-artifacts.d.ts +32 -0
  131. package/dist/engine/sync/conflict-artifacts.js +158 -0
  132. package/dist/engine/sync/conflict-groups.d.ts +9 -0
  133. package/dist/engine/sync/conflict-groups.js +76 -0
  134. package/dist/engine/sync/conflict-preview.d.ts +4 -0
  135. package/dist/engine/sync/conflict-preview.js +53 -0
  136. package/dist/engine/sync/conflict-resolution.d.ts +13 -0
  137. package/dist/engine/sync/conflict-resolution.js +53 -0
  138. package/dist/engine/sync/conflict-retention.d.ts +5 -0
  139. package/dist/engine/sync/conflict-retention.js +61 -0
  140. package/dist/engine/sync/conflict-review.d.ts +4 -0
  141. package/dist/engine/sync/conflict-review.js +73 -0
  142. package/dist/engine/sync/content-conflicts.d.ts +10 -0
  143. package/dist/engine/sync/content-conflicts.js +70 -0
  144. package/dist/engine/sync/continuous-errors.d.ts +14 -0
  145. package/dist/engine/sync/continuous-errors.js +66 -0
  146. package/dist/engine/sync/continuous-lease.d.ts +9 -0
  147. package/dist/engine/sync/continuous-lease.js +206 -0
  148. package/dist/engine/sync/continuous-record.d.ts +31 -0
  149. package/dist/engine/sync/continuous-record.js +199 -0
  150. package/dist/engine/sync/continuous-storage.d.ts +14 -0
  151. package/dist/engine/sync/continuous-storage.js +59 -0
  152. package/dist/engine/sync/continuous-sync.d.ts +15 -0
  153. package/dist/engine/sync/continuous-sync.js +496 -0
  154. package/dist/engine/sync/continuous-watch.d.ts +3 -0
  155. package/dist/engine/sync/continuous-watch.js +65 -0
  156. package/dist/engine/sync/exclude-policy.d.ts +5 -0
  157. package/dist/engine/sync/exclude-policy.js +79 -0
  158. package/dist/engine/sync/field-migration.d.ts +5 -0
  159. package/dist/engine/sync/field-migration.js +20 -0
  160. package/dist/engine/sync/file-merge-planner.d.ts +36 -0
  161. package/dist/engine/sync/file-merge-planner.js +123 -0
  162. package/dist/engine/sync/initialization.d.ts +12 -0
  163. package/dist/engine/sync/initialization.js +75 -0
  164. package/dist/engine/sync/json-document.d.ts +29 -0
  165. package/dist/engine/sync/json-document.js +172 -0
  166. package/dist/engine/sync/local-field-policy.d.ts +2 -0
  167. package/dist/engine/sync/local-field-policy.js +26 -0
  168. package/dist/engine/sync/local-fields.d.ts +9 -0
  169. package/dist/engine/sync/local-fields.js +116 -0
  170. package/dist/engine/sync/merge-apply.d.ts +5 -0
  171. package/dist/engine/sync/merge-apply.js +386 -0
  172. package/dist/engine/sync/merge-journal.d.ts +31 -0
  173. package/dist/engine/sync/merge-journal.js +179 -0
  174. package/dist/engine/sync/merge-transfer-error.d.ts +3 -0
  175. package/dist/engine/sync/merge-transfer-error.js +64 -0
  176. package/dist/engine/sync/merged-sync.d.ts +6 -0
  177. package/dist/engine/sync/merged-sync.js +618 -0
  178. package/dist/engine/sync/mutation-owner.d.ts +2 -0
  179. package/dist/engine/sync/mutation-owner.js +18 -0
  180. package/dist/engine/sync/package-merge.d.ts +3 -0
  181. package/dist/engine/sync/package-merge.js +82 -0
  182. package/dist/engine/sync/partial-progress.d.ts +15 -0
  183. package/dist/engine/sync/partial-progress.js +39 -0
  184. package/dist/engine/sync/remote-snapshot.d.ts +28 -0
  185. package/dist/engine/sync/remote-snapshot.js +62 -0
  186. package/dist/engine/sync/resolver-stream.d.ts +4 -0
  187. package/dist/engine/sync/resolver-stream.js +34 -0
  188. package/dist/engine/sync/session-merge.d.ts +3 -0
  189. package/dist/engine/sync/session-merge.js +178 -0
  190. package/dist/engine/sync/session-push.d.ts +5 -0
  191. package/dist/engine/sync/session-push.js +32 -0
  192. package/dist/engine/sync/settings-conflicts.d.ts +8 -0
  193. package/dist/engine/sync/settings-conflicts.js +56 -0
  194. package/dist/engine/sync/settings-merge.d.ts +13 -0
  195. package/dist/engine/sync/settings-merge.js +93 -0
  196. package/dist/engine/sync/signals.d.ts +2 -0
  197. package/dist/engine/sync/signals.js +8 -0
  198. package/dist/engine/sync/startup-timings.d.ts +11 -0
  199. package/dist/engine/sync/startup-timings.js +44 -0
  200. package/dist/engine/sync/sync-decision.d.ts +35 -0
  201. package/dist/engine/sync/sync-decision.js +66 -0
  202. package/dist/engine/sync/sync-error-guidance.d.ts +2 -0
  203. package/dist/engine/sync/sync-error-guidance.js +55 -0
  204. package/dist/engine/sync/sync-errors.d.ts +9 -0
  205. package/dist/engine/sync/sync-errors.js +18 -0
  206. package/dist/engine/sync/sync-inspection.d.ts +26 -0
  207. package/dist/engine/sync/sync-inspection.js +40 -0
  208. package/dist/engine/sync/sync-loaders.d.ts +7 -0
  209. package/dist/engine/sync/sync-loaders.js +8 -0
  210. package/dist/engine/sync/sync-local.d.ts +5 -0
  211. package/dist/engine/sync/sync-local.js +40 -0
  212. package/dist/engine/sync/sync-mutations.d.ts +30 -0
  213. package/dist/engine/sync/sync-mutations.js +589 -0
  214. package/dist/engine/sync/sync-operations.d.ts +2 -0
  215. package/dist/engine/sync/sync-operations.js +3 -0
  216. package/dist/engine/sync/sync-policy.d.ts +85 -0
  217. package/dist/engine/sync/sync-policy.js +356 -0
  218. package/dist/engine/sync/sync-queries.d.ts +7 -0
  219. package/dist/engine/sync/sync-queries.js +195 -0
  220. package/dist/engine/sync/sync-state.d.ts +31 -0
  221. package/dist/engine/sync/sync-state.js +92 -0
  222. package/dist/engine/sync/text-merge.d.ts +19 -0
  223. package/dist/engine/sync/text-merge.js +124 -0
  224. package/dist/engine/types.d.ts +5 -0
  225. package/dist/engine/types.js +2 -0
  226. package/dist/engine/ui/merge-review.d.ts +2 -0
  227. package/dist/engine/ui/merge-review.js +7 -0
  228. package/dist/engine/ui/merged-sync-summary.d.ts +25 -0
  229. package/dist/engine/ui/merged-sync-summary.js +86 -0
  230. package/dist/engine/ui/sync-format.d.ts +13 -0
  231. package/dist/engine/ui/sync-format.js +150 -0
  232. package/dist/engine/ui/sync-status.d.ts +9 -0
  233. package/dist/engine/ui/sync-status.js +30 -0
  234. package/dist/engine/ui/terminal-text.d.ts +3 -0
  235. package/dist/engine/ui/terminal-text.js +9 -0
  236. package/dist/engine/ui/transfer-changes.d.ts +12 -0
  237. package/dist/engine/ui/transfer-changes.js +24 -0
  238. package/dist/engine/ui/transfer-review.d.ts +3 -0
  239. package/dist/engine/ui/transfer-review.js +19 -0
  240. package/dist/engine-service.d.ts +11 -0
  241. package/dist/engine-service.js +315 -0
  242. package/dist/identity.d.ts +20 -0
  243. package/dist/identity.js +133 -0
  244. package/dist/index.d.ts +8 -0
  245. package/dist/index.js +4 -0
  246. package/dist/lifecycle-log.d.ts +7 -0
  247. package/dist/lifecycle-log.js +53 -0
  248. package/dist/lifecycle.d.ts +2 -0
  249. package/dist/lifecycle.js +21 -0
  250. package/dist/model-signature.d.ts +2 -0
  251. package/dist/model-signature.js +7 -0
  252. package/dist/monitor.d.ts +11 -0
  253. package/dist/monitor.js +245 -0
  254. package/dist/participant-admission.d.ts +5 -0
  255. package/dist/participant-admission.js +30 -0
  256. package/dist/protocol.d.ts +97 -0
  257. package/dist/protocol.js +90 -0
  258. package/dist/resolver-host.d.ts +11 -0
  259. package/dist/resolver-host.js +78 -0
  260. package/dist/server.d.ts +18 -0
  261. package/dist/server.js +724 -0
  262. package/dist/service-host.d.ts +7 -0
  263. package/dist/service-host.js +174 -0
  264. package/docs/architecture.md +133 -0
  265. package/package.json +54 -4
@@ -0,0 +1,618 @@
1
+ import { createSyncBackend } from "../backends/backend-factory.js";
2
+ import { expectedRemoteHead, SyncBackendConflictError, } from "../backends/sync-backend.js";
3
+ import { loadConfig, syncCheckConfigFingerprint } from "../settings/config.js";
4
+ import { effectiveSessionRoot, requireStableMergeSessionRoot, snapshotOptionsForContext, } from "../snapshot/session-paths.js";
5
+ import { createSnapshot, filterSnapshotForConfigPolicy, mergeRemotePreservedFiles, regenerateSnapshotIdentity, scanSnapshot, } from "../snapshot/snapshot.js";
6
+ import { hasCurrentMergeBaseline, pruneMergeBaselines, readMergeAncestors, stageMergeBaseline, } from "../state/merge-baseline-store.js";
7
+ import { readStateForConfig, statePathForConfig, syncStateFingerprint, writeStateForConfig, } from "../state/sync-state-store.js";
8
+ import { confirmMergeReview } from "../ui/merge-review.js";
9
+ import { mergedSyncSummary } from "../ui/merged-sync-summary.js";
10
+ import { safeTerminalText } from "../ui/terminal-text.js";
11
+ import { startupTransferEnabled } from "./agent-policy.js";
12
+ import { releaseConflictArtifacts } from "./conflict-artifact-ownership.js";
13
+ import { conflictGroups, readConflictArtifact, saveConflictArtifact, } from "./conflict-artifacts.js";
14
+ import { resolveReviewedGroup } from "./conflict-resolution.js";
15
+ import { pruneCompletedConflicts } from "./conflict-retention.js";
16
+ import { resolveContentConflicts } from "./content-conflicts.js";
17
+ import { ContinuousError } from "./continuous-errors.js";
18
+ import { planFileMerge } from "./file-merge-planner.js";
19
+ import { overlayLocalFields, portableSnapshot, sameLocalFields } from "./local-fields.js";
20
+ import { applyMergedSnapshot, preflightMergedTargets } from "./merge-apply.js";
21
+ import { clearMergeJournal, mergeJournalIdentity, readMergeJournal, writeMergeJournal, } from "./merge-journal.js";
22
+ import { mergeTransferError } from "./merge-transfer-error.js";
23
+ import { acceptedMergeFiles, progressState } from "./partial-progress.js";
24
+ import { formatRemoteSelectionStatus, readSnapshotForHead, requireCompatibleRemoteSelection, } from "./remote-snapshot.js";
25
+ import { resolveSettingsConflicts } from "./settings-conflicts.js";
26
+ import { createStartupTimings } from "./startup-timings.js";
27
+ import { createSyncDecision } from "./sync-decision.js";
28
+ import { backupLocal, captureMutationOwner, protectedSessionPaths } from "./sync-local.js";
29
+ import { configuredSnapshotPathMatcher, inspectRemoteSelection, syncSessionsSelected } from "./sync-policy.js";
30
+ import { fileHashMap, hasLocalChanges, hasRemoteChanges, sameHashes, syncPolicyChanged } from "./sync-state.js";
31
+ import { TEXT_MERGE_WORK_LIMIT } from "./text-merge.js";
32
+ const MAX_ATTEMPTS = 3;
33
+ /** Established-baseline sync only. First-source selection remains in the existing command flow. */
34
+ export async function mergeSync(ctx, options, factory = createSyncBackend, resolution) {
35
+ const timings = options.startupTimings ?? createStartupTimings();
36
+ const sessionOwner = captureMutationOwner(ctx, options.signal);
37
+ const validateOwner = (config) => {
38
+ sessionOwner();
39
+ options.background?.validate(config);
40
+ };
41
+ const isCurrent = () => {
42
+ try {
43
+ validateOwner();
44
+ return true;
45
+ }
46
+ catch {
47
+ return false;
48
+ }
49
+ };
50
+ const validateRetryAuthorization = (config) => {
51
+ if (options.agentRetryRefusal &&
52
+ (!config.agentMode || options.auto || options.background || !ctx.hasUI || !["tui", "rpc"].includes(ctx.mode)))
53
+ throw new Error("Refused-candidate retry requires foreground Autonomous sync in TUI or RPC.");
54
+ };
55
+ const config = await loadConfig(options.setup);
56
+ validateOwner(config);
57
+ validateRetryAuthorization(config);
58
+ const configToken = syncCheckConfigFingerprint(config);
59
+ const modelToken = JSON.stringify(ctx.model);
60
+ const sessionRoot = syncSessionsSelected(config) ? await effectiveSessionRoot(ctx) : undefined;
61
+ validateOwner();
62
+ const snapshotOptions = {
63
+ ...snapshotOptionsForContext(ctx, config),
64
+ sessionDir: sessionRoot,
65
+ signal: options.signal,
66
+ };
67
+ const validate = () => timings.measure("transfer authorization", async () => {
68
+ validateOwner();
69
+ const latest = await loadConfig(options.setup);
70
+ validateOwner(latest);
71
+ validateRetryAuthorization(latest);
72
+ if (configToken !== syncCheckConfigFingerprint(latest))
73
+ throw new Error("Sync setup or settings changed during transfer; reopen sync.");
74
+ if (sessionRoot !== undefined) {
75
+ const currentRoot = await effectiveSessionRoot(ctx);
76
+ validateOwner();
77
+ if (currentRoot !== sessionRoot)
78
+ throw new Error("Session storage root changed during transfer; evidence retained for review.");
79
+ }
80
+ if (config.agentMode && JSON.stringify(ctx.model) !== modelToken)
81
+ throw new Error("Autonomous sync paused: selected model changed during transfer.");
82
+ if (options.auto && (!startupTransferEnabled(latest) || !ctx.isIdle()))
83
+ throw new Error("Automatic transfer is no longer authorized at this idle boundary.");
84
+ });
85
+ await validate();
86
+ const backend = await timings.measure("transfer backend initialization", () => factory(config));
87
+ await validate();
88
+ const pending = await timings.measure("transfer journal read", () => readMergeJournal(config));
89
+ await validate();
90
+ if (pending && options.agentRetryRefusal)
91
+ throw new Error("A pending merge journal requires ordinary Sync now before retrying a refused candidate.");
92
+ if (pending) {
93
+ const recovered = await timings.measure("transfer journal recovery", () => completeJournal(ctx, config, backend, pending, validate, timings, options.signal, options.auto, options.background?.validate));
94
+ if (!recovered) {
95
+ if ((options.auto || !options.silent) && !options.signal?.aborted)
96
+ ctx.ui.notify("Interrupted candidate is not active; local content and baseline were unchanged. Evidence was reconciled without retrying publication. Run sync again for a fresh plan.", "warning");
97
+ return "cancelled";
98
+ }
99
+ if ((options.auto || !options.silent) && !options.signal?.aborted)
100
+ ctx.ui.notify("Recovered the committed merged transfer. Run sync again to inspect newer changes.", "info");
101
+ return "applied";
102
+ }
103
+ // Recovery above never publishes. This gate applies only to new autonomous transfers.
104
+ if ((options.auto || config.agentMode) && backend.capability === "read-check-write-verify") {
105
+ throw new Error("Automatic transfer requires conditional publication or a lease; this backend supports only read/check/write/verify. Disable Autonomous sync and use manual sync.");
106
+ }
107
+ const textBudget = { remaining: TEXT_MERGE_WORK_LIMIT };
108
+ const createdArtifacts = [];
109
+ const ownedStatePath = statePathForConfig(config);
110
+ try {
111
+ for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
112
+ await validate();
113
+ const state = await timings.measure("transfer state read", () => readStateForConfig(config));
114
+ if (state.unresolved?.length && !config.partialSync)
115
+ throw new Error("Partial progress remains unresolved; re-enable partial sync or review an explicit force direction.");
116
+ const localRaw = await timings.measure("transfer local snapshot", () => createSnapshot(config.snapshotIdentity, snapshotOptions));
117
+ const local = portableSnapshot(localRaw, config.localFields);
118
+ if (!sameLocalFields(state.localFields, config.localFields))
119
+ throw new Error("Local-field rules changed; review and confirm a directional migration first.");
120
+ const head = await timings.measure("transfer remote head", () => backend.readHead(options.signal));
121
+ await validate();
122
+ // This is a read-only shortcut, never authority to apply or publish. Pending
123
+ // journals were handled above. Legacy/partial baselines retain the full path.
124
+ if (options.auto &&
125
+ !resolution &&
126
+ !config.partialSync &&
127
+ head &&
128
+ state.lastAppliedSnapshot &&
129
+ state.lastRemoteRevision &&
130
+ !state.unresolved?.length &&
131
+ head.snapshotId === state.lastAppliedSnapshot &&
132
+ backend.sameRevision(head.revision, state.lastRemoteRevision) &&
133
+ inspectRemoteSelection(config.include, { selection: head.selection, files: [] }, config.exclude).kind ===
134
+ "same" &&
135
+ matchesAcceptedState(state, config, head, local)) {
136
+ const unchanged = await timings.measure("transfer unchanged verification", async () => {
137
+ if (!(await hasCurrentMergeBaseline(config, local, state)))
138
+ return false;
139
+ await validate();
140
+ const currentLocal = await timings.measure("transfer local snapshot", () => createSnapshot(config.snapshotIdentity, snapshotOptions));
141
+ await validate();
142
+ const currentState = await timings.measure("transfer state read", () => readStateForConfig(config));
143
+ await validate();
144
+ return (sameHashes(fileHashMap(currentLocal), fileHashMap(localRaw)) &&
145
+ syncStateFingerprint(currentState) === syncStateFingerprint(state));
146
+ });
147
+ await validate();
148
+ if (unchanged) {
149
+ timings.markUnchanged();
150
+ return "applied";
151
+ }
152
+ }
153
+ const rawRemote = head
154
+ ? await timings.measure("transfer snapshot download", () => readSnapshotForHead(backend, head, options.signal))
155
+ : undefined;
156
+ await validate();
157
+ if (rawRemote) {
158
+ const files = [...local.files, ...rawRemote.files];
159
+ if (files.length > 16_384 ||
160
+ files.reduce((bytes, file) => bytes + file.contentBase64.length * 0.75, 0) > 64 * 1024 * 1024) {
161
+ throw new Error("Merged transfer exceeds the 64 MiB / 16,384 input-file bound; review an explicit push or pull instead.");
162
+ }
163
+ }
164
+ const remote = rawRemote
165
+ ? portableSnapshot(filterSnapshotForConfigPolicy(rawRemote, config), rawRemote.localFields)
166
+ : undefined;
167
+ if (rawRemote) {
168
+ requireCompatibleRemoteSelection(config, rawRemote);
169
+ const validation = await timings.measure("transfer merge planning", () => planFileMerge({
170
+ baseline: state.lastFileHashes,
171
+ local: local.files,
172
+ remote: rawRemote.files,
173
+ selectionCompatible: true,
174
+ }));
175
+ await validate();
176
+ const managedPaths = new Set([
177
+ ...Object.keys(state.lastFileHashes),
178
+ ...[...local.files, ...(remote?.files ?? [])].map((file) => file.path),
179
+ ]);
180
+ if (validation.kind === "planned" &&
181
+ validation.conflicts.some((item) => item.reason === "path-collision" && (!config.partialSync || !managedPaths.has(item.path))))
182
+ throw new Error("Remote snapshot contains path collisions; review a directional recovery before merging.");
183
+ }
184
+ const review = (message, kind = "both-changed") => createSyncDecision({
185
+ kind,
186
+ config,
187
+ state,
188
+ local,
189
+ remote,
190
+ localChanged: hasLocalChanges(local, state, config),
191
+ remoteChanged: remote ? hasRemoteChanges(remote, state, config) : Boolean(state.lastAppliedSnapshot),
192
+ directMessage: message,
193
+ });
194
+ if (!state.lastAppliedSnapshot)
195
+ throw review("Choose the initial source before enabling automatic transfer.");
196
+ if (syncPolicyChanged(state, config))
197
+ throw review("Included content changed; review the selection before merging.", "remote-or-policy-changed");
198
+ if (!head || !remote || !rawRemote)
199
+ throw review("The established remote is missing; choose an explicit recovery direction.", "remote-empty");
200
+ const selectionState = inspectRemoteSelection(config.include, rawRemote, config.exclude);
201
+ const selectionCompatible = selectionState.kind === "same";
202
+ let plan = await timings.measure("transfer merge planning", () => planFileMerge({
203
+ baseline: state.lastFileHashes,
204
+ local: local.files,
205
+ remote: remote.files,
206
+ selectionCompatible,
207
+ protectedPaths: protectedSessionPaths(ctx, sessionRoot),
208
+ }));
209
+ await validate();
210
+ let resolved = { plan, fields: [] };
211
+ if (config.mergeSettings || config.agentMode) {
212
+ try {
213
+ resolved = await timings.measure("transfer settings merge", () => resolveSettingsConflicts(config, state, local, remote, plan));
214
+ }
215
+ catch (error) {
216
+ if (!config.partialSync)
217
+ throw error;
218
+ }
219
+ }
220
+ await validate();
221
+ plan = await timings.measure("transfer content merge", () => resolveContentConflicts(config, state, local, remote, resolved.plan, protectedSessionPaths(ctx, sessionRoot), {
222
+ textBudget,
223
+ signal: options.signal,
224
+ }));
225
+ await validate();
226
+ if (resolution) {
227
+ plan = await resolveReviewedGroup(config, backend, state, local, remote, head, plan, resolution, protectedSessionPaths(ctx, sessionRoot));
228
+ await validate();
229
+ }
230
+ if (config.agentMode && !resolution) {
231
+ const { resolveAgentPlan } = await import("./agent-plan.js");
232
+ await validate();
233
+ plan = await resolveAgentPlan(ctx, options, config, backend, state, local, localRaw, remote, head, plan, snapshotOptions, validate);
234
+ await validate();
235
+ if (plan.kind !== "planned" || (plan.conflicts.length && !config.partialSync))
236
+ throw new ContinuousError("unsafe", "Autonomous sync paused: unsupported or refused conflict groups remain; no transfer was performed.");
237
+ }
238
+ if (plan.kind !== "planned" ||
239
+ (plan.conflicts.length && (!config.partialSync || (options.auto && !config.agentMode)))) {
240
+ const decision = review(selectionCompatible
241
+ ? `Conflicting or protected paths require review; no merged transfer was performed. Use /sync diff and an explicit direction.${resolved.fields.length ? ` Settings fields: ${resolved.fields.map(safeTerminalText).join(", ")}` : ""}`
242
+ : "Remote selection metadata is unavailable; review the included content and choose an explicit direction before merging.", selectionCompatible ? "both-changed" : "remote-or-policy-changed");
243
+ if (!selectionCompatible)
244
+ decision.decision.review += `\n\n${formatRemoteSelectionStatus(selectionState)}\nAn explicit direction adopts this setup's included-content policy; no automatic merge was performed.`;
245
+ throw decision;
246
+ }
247
+ if (plan.kind !== "planned")
248
+ throw new Error("Cannot partition an unverified merge plan.");
249
+ const groups = conflictGroups(plan, config);
250
+ const withheld = new Set(groups.flatMap((group) => group.paths));
251
+ // Transfer plans defer artifact writes until approved review and freshness guards pass.
252
+ // A no-transfer manual inspection can persist referenced conflict state directly.
253
+ const persistProgress = async () => {
254
+ if (!groups.length)
255
+ return;
256
+ let ancestors = [];
257
+ try {
258
+ const configured = configuredSnapshotPathMatcher(config);
259
+ ancestors = ((await readMergeAncestors(config, state)) ?? []).filter((file) => withheld.has(file.path) && configured(file.path));
260
+ }
261
+ catch {
262
+ /* Retain unknown evidence; absence remains explicit. */
263
+ }
264
+ await validate();
265
+ const previousArtifacts = new Map();
266
+ for (const token of new Set(state.unresolved?.map((group) => group.artifact) ?? [])) {
267
+ try {
268
+ const artifact = await readConflictArtifact(config, backend.identity, token);
269
+ previousArtifacts.set(token, {
270
+ artifact,
271
+ local: fileHashMap(artifact.local),
272
+ remote: fileHashMap(artifact.remote),
273
+ });
274
+ }
275
+ catch {
276
+ /* Unknown evidence retained, never reused. */
277
+ }
278
+ await validate();
279
+ }
280
+ const localHashes = fileHashMap(local);
281
+ const remoteHashes = fileHashMap(remote);
282
+ const previousGroups = new Map(state.unresolved?.map((item) => [JSON.stringify(item.paths), item]));
283
+ const pending = groups.map((group) => {
284
+ const previous = previousGroups.get(JSON.stringify(group.paths));
285
+ const original = previous ? previousArtifacts.get(previous.artifact) : undefined;
286
+ if (!original || !previous)
287
+ return { group };
288
+ return group.paths.every((filePath) => localHashes[filePath] === original.local[filePath] &&
289
+ remoteHashes[filePath] === original.remote[filePath] &&
290
+ state.lastFileHashes[filePath] === original.artifact.state.lastFileHashes[filePath])
291
+ ? { group, artifact: previous.artifact }
292
+ : { group };
293
+ });
294
+ let artifact;
295
+ const newGroups = pending.filter((item) => !item.artifact).map((item) => item.group);
296
+ const newPaths = new Set(newGroups.flatMap((group) => group.paths));
297
+ if (newGroups.length)
298
+ artifact = await saveConflictArtifact(config, backend.identity, {
299
+ state,
300
+ local: { ...local, files: local.files.filter((file) => newPaths.has(file.path)) },
301
+ remote: { ...remote, files: remote.files.filter((file) => newPaths.has(file.path)) },
302
+ ancestors: ancestors.filter((file) => newPaths.has(file.path)),
303
+ groups: newGroups,
304
+ observed: { snapshotId: head.snapshotId, revision: head.revision },
305
+ }, captureMutationOwner(ctx, options.signal), (created) => createdArtifacts.push(created));
306
+ await validate();
307
+ return {
308
+ previous: state,
309
+ groups: pending.map((item) => ({ paths: item.group.paths, artifact: item.artifact ?? artifact ?? "" })),
310
+ };
311
+ };
312
+ let progress;
313
+ const accepted = regenerateSnapshotIdentity({
314
+ ...local,
315
+ files: acceptedMergeFiles(plan.decisions, local.files, withheld),
316
+ });
317
+ const after = overlayLocalFields(accepted, localRaw, config.localFields);
318
+ if (syncSessionsSelected(config))
319
+ requireStableMergeSessionRoot(localRaw, after);
320
+ const publication = regenerateSnapshotIdentity({
321
+ ...accepted,
322
+ version: accepted.version === 4 ? 4 : config.partialSync ? 3 : accepted.version,
323
+ files: [
324
+ ...accepted.files.filter((file) => !withheld.has(file.path)),
325
+ ...remote.files.filter((file) => withheld.has(file.path)),
326
+ ],
327
+ });
328
+ const upload = mergeRemotePreservedFiles(publication, rawRemote, config);
329
+ const publish = !sameHashes(fileHashMap(publication), fileHashMap(remote)) ||
330
+ Boolean(config.partialSync && rawRemote.version !== 3 && rawRemote.version !== 4);
331
+ const apply = !sameHashes(fileHashMap(localRaw), fileHashMap(after));
332
+ if (!publish && !apply) {
333
+ const beforeEvidence = await timings.measure("transfer remote head", () => backend.readHead(options.signal));
334
+ await validate();
335
+ if (!beforeEvidence || !backend.sameRevision(beforeEvidence.revision, head.revision))
336
+ throw new ContinuousError("stale", "Remote changed before baseline acceptance; retry from a fresh observation.");
337
+ progress = await persistProgress();
338
+ await validate();
339
+ const currentLocal = await timings.measure("transfer local snapshot", () => createSnapshot(config.snapshotIdentity, snapshotOptions));
340
+ await validate();
341
+ if (!sameHashes(fileHashMap(currentLocal), fileHashMap(localRaw)) ||
342
+ syncStateFingerprint(await timings.measure("transfer state read", () => readStateForConfig(config))) !==
343
+ syncStateFingerprint(state))
344
+ throw new ContinuousError("stale", "Local content or baseline changed before baseline acceptance; retry from a fresh observation.");
345
+ await validate();
346
+ const currentHead = await timings.measure("transfer remote head", () => backend.readHead(options.signal));
347
+ await validate();
348
+ if (!currentHead || !backend.sameRevision(currentHead.revision, head.revision))
349
+ throw new ContinuousError("stale", "Remote changed before baseline acceptance; retry from a fresh observation.");
350
+ await options.agentAcceptance?.commitCandidate?.();
351
+ await validate();
352
+ await timings.measure("transfer baseline write", () => writeAcceptedState(config, head, accepted, validate, progress));
353
+ await timings.measure("transfer cleanup", () => pruneMergeBaselines(config, acceptedState(config, head, accepted, progress), captureMutationOwner(ctx, options.signal)));
354
+ await validate();
355
+ await timings.measure("transfer cleanup", () => pruneCompletedConflicts(config, backend.identity, acceptedState(config, head, accepted, progress), accepted, remote, captureMutationOwner(ctx, options.signal)));
356
+ await validate();
357
+ if (!options.silent)
358
+ ctx.ui.notify(progress
359
+ ? `No independent transfer required; ${groups.length} conflict groups remain withheld. Review /sync conflicts.`
360
+ : "Pi Sync is already up to date.", progress ? "warning" : "info");
361
+ return "applied";
362
+ }
363
+ await timings.measure("transfer preflight", () => preflightMergedTargets(localRaw, after, snapshotOptions, [
364
+ ...(ctx.protectedSessionFiles ?? []),
365
+ ...[ctx.sessionManager.getSessionFile?.()].filter((file) => Boolean(file)),
366
+ ]));
367
+ await validate();
368
+ if (!config.skipSecretScan && scanSnapshot(upload).length)
369
+ throw new ContinuousError("unsafe", "Refusing to merge possible secrets. Review managed content before syncing.");
370
+ if (!options.yes && !config.agentMode) {
371
+ const summary = mergedSyncSummary({
372
+ setupName: config.setupName,
373
+ destination: backend.destination,
374
+ localBefore: localRaw,
375
+ localAfter: after,
376
+ remoteBefore: rawRemote,
377
+ remoteAfter: upload,
378
+ publish,
379
+ sessions: syncSessionsSelected(config),
380
+ groups,
381
+ decisions: plan.decisions,
382
+ capability: backend.capability,
383
+ });
384
+ if (!(await confirmMergeReview(ctx, summary.title, summary.content, options.signal, isCurrent, summary.confirmationLabel, summary.lines)))
385
+ return "cancelled";
386
+ }
387
+ await validate();
388
+ const refreshed = await timings.measure("transfer local snapshot", () => createSnapshot(config.snapshotIdentity, snapshotOptions));
389
+ if (!sameHashes(fileHashMap(refreshed), fileHashMap(localRaw)))
390
+ throw new ContinuousError("stale", "Local content changed during review; no merged transfer was performed.");
391
+ if (syncStateFingerprint(await timings.measure("transfer state read", () => readStateForConfig(config))) !==
392
+ syncStateFingerprint(state))
393
+ throw new ContinuousError("stale", "Sync baseline changed during review; retry from a fresh observation.");
394
+ await validate();
395
+ const refreshedHead = await timings.measure("transfer remote head", () => backend.readHead(options.signal));
396
+ await validate();
397
+ if (!refreshedHead || !backend.sameRevision(refreshedHead.revision, head.revision))
398
+ throw new ContinuousError("stale", "Remote changed during review; no merged transfer was performed.");
399
+ await options.agentAcceptance?.commitCandidate?.();
400
+ await validate();
401
+ progress = await persistProgress();
402
+ await validate();
403
+ const backup = await timings.measure("transfer backup", () => backupLocal(config.snapshotIdentity, snapshotOptions, options.signal));
404
+ await validate();
405
+ const journal = {
406
+ version: 1,
407
+ identity: mergeJournalIdentity(config, backend.identity),
408
+ before: localRaw,
409
+ after,
410
+ accepted,
411
+ ...(progress ? { progress } : {}),
412
+ upload: publish ? upload : rawRemote,
413
+ expectedHead: head,
414
+ backup,
415
+ stateIdentity: syncStateFingerprint(state),
416
+ ...(sessionRoot !== undefined ? { sessionRoot } : {}),
417
+ ...(!publish ? { committedHead: head, applyOnly: true } : {}),
418
+ };
419
+ await timings.measure("transfer journal write", () => writeMergeJournal(config, journal));
420
+ // No backend call has begun: a stale candidate can be retired without ambiguous publication.
421
+ const atCommitState = syncStateFingerprint(await timings.measure("transfer state read", () => readStateForConfig(config)));
422
+ await validate();
423
+ const atCommit = await timings.measure("transfer local snapshot", () => createSnapshot(config.snapshotIdentity, snapshotOptions));
424
+ await validate();
425
+ if (!sameHashes(fileHashMap(atCommit), fileHashMap(localRaw)) || atCommitState !== journal.stateIdentity) {
426
+ await validate();
427
+ await clearMergeJournal(config);
428
+ throw new ContinuousError("stale", "Local content or baseline changed before publication; candidate retired without transfer. Review a fresh sync.");
429
+ }
430
+ // Backup/journal awaits can also change physical identity without changing any bytes.
431
+ try {
432
+ await timings.measure("transfer preflight", () => preflightMergedTargets(atCommit, after, snapshotOptions, [
433
+ ...(ctx.protectedSessionFiles ?? []),
434
+ ...[ctx.sessionManager.getSessionFile?.()].filter((file) => Boolean(file)),
435
+ ]));
436
+ await validate();
437
+ }
438
+ catch (error) {
439
+ await validate();
440
+ await clearMergeJournal(config);
441
+ throw error;
442
+ }
443
+ try {
444
+ if (publish) {
445
+ const result = await timings.measure("transfer remote publication", () => backend.publishSnapshot(upload, expectedRemoteHead(head), {
446
+ signal: options.signal,
447
+ onCommit: options.onCommit,
448
+ }));
449
+ journal.committedHead = result.head;
450
+ journal.warnings = result.warnings;
451
+ await timings.measure("transfer journal write", () => writeMergeJournal(config, journal));
452
+ }
453
+ else
454
+ options.onCommit?.();
455
+ }
456
+ catch (error) {
457
+ if (error instanceof SyncBackendConflictError &&
458
+ error.phase === "before-commit" &&
459
+ !error.candidateMayHaveBeenActive) {
460
+ await clearMergeJournal(config);
461
+ if (attempt + 1 < MAX_ATTEMPTS)
462
+ continue;
463
+ throw new Error("Remote changed before commit in all three attempts; retry later.", { cause: error });
464
+ }
465
+ // Cancellation before publication is safe only if no backend attempt began.
466
+ // Every uncertain/after-commit outcome retains evidence and is never blindly retried.
467
+ throw mergeTransferError(error, config.backend);
468
+ }
469
+ const completed = await timings.measure("transfer journal recovery", () => completeJournal(ctx, config, backend, journal, validate, timings, options.signal, options.auto, options.background?.validate));
470
+ if (!completed) {
471
+ if (!options.signal?.aborted && (options.auto || !options.silent))
472
+ ctx.ui.notify("Remote changed before local apply; candidate retired without transfer. Run sync again.", "warning");
473
+ return "cancelled";
474
+ }
475
+ if (!options.signal?.aborted && (options.auto || !options.silent))
476
+ ctx.ui.notify([
477
+ `Synced independent changes for “${safeTerminalText(config.setupName)}”. ${apply ? "Local files changed; reload or restart Pi when ready to use changed resources." : "Remote updated."} No automatic reload.`,
478
+ ...(progress
479
+ ? [
480
+ `Partial progress: ${groups.length} dependency groups remain unresolved; neither side's withheld versions or baseline hashes were replaced. Review /sync conflicts.`,
481
+ ]
482
+ : []),
483
+ ...(journal.warnings ?? []).map(safeTerminalText),
484
+ ].join("\n"), progress || journal.warnings?.length ? "warning" : "info");
485
+ return "applied";
486
+ }
487
+ }
488
+ finally {
489
+ await timings.measure("transfer cleanup", () => releaseConflictArtifacts(config, ownedStatePath, createdArtifacts));
490
+ }
491
+ }
492
+ async function completeJournal(ctx, config, backend, journal, validate, timings, signal, auto = false, validateBackground) {
493
+ if (journal.identity !== mergeJournalIdentity(config, backend.identity) ||
494
+ !sameLocalFields(journal.upload.localFields, config.localFields))
495
+ throw new Error("Merge journal belongs to a different setup, selection or local-field policy; preserve it for reviewed recovery.");
496
+ await validate();
497
+ const sessionRoot = syncSessionsSelected(config) ? await effectiveSessionRoot(ctx) : undefined;
498
+ await validate();
499
+ if (sessionRoot !== undefined && journal.sessionRoot !== sessionRoot) {
500
+ throw new Error("Merge journal session root is missing or differs from this context; preserve evidence and use reviewed directional recovery.");
501
+ }
502
+ const snapshotOptions = { ...snapshotOptionsForContext(ctx, config), sessionDir: sessionRoot, signal };
503
+ const head = await timings.measure("transfer remote head", () => backend.readHead(signal));
504
+ if (!journal.committedHead &&
505
+ head &&
506
+ (backend.sameRevision(head.revision, journal.expectedHead.revision) ||
507
+ backend.matchesUncommittedRecoveryHead?.(head, journal.expectedHead))) {
508
+ await validate();
509
+ const local = await timings.measure("transfer local snapshot", () => createSnapshot(config.snapshotIdentity, snapshotOptions));
510
+ if (!sameHashes(fileHashMap(local), fileHashMap(journal.before)) ||
511
+ syncStateFingerprint(await timings.measure("transfer state read", () => readStateForConfig(config))) !==
512
+ journal.stateIdentity) {
513
+ throw new Error("Uncertain publication is not active, but local content or baseline changed; keep the journal for reviewed recovery.");
514
+ }
515
+ await clearMergeJournal(config);
516
+ return false;
517
+ }
518
+ await validate();
519
+ // Baseline publication is the durable completion boundary. A later remote revision
520
+ // cannot undo that acceptance; retire only the journal for the recorded commit.
521
+ if (journal.committedHead && (!head || !backend.sameRevision(head.revision, journal.committedHead.revision))) {
522
+ const state = await timings.measure("transfer state read", () => readStateForConfig(config));
523
+ await validate();
524
+ if (matchesAcceptedState(state, config, journal.committedHead, journal.accepted ?? journal.after, journal.progress)) {
525
+ await clearMergeJournal(config);
526
+ await validate();
527
+ await pruneMergeBaselines(config, state, captureMutationOwner(ctx, signal));
528
+ await validate();
529
+ return true;
530
+ }
531
+ }
532
+ if (journal.applyOnly && (!head || !backend.sameRevision(head.revision, journal.expectedHead.revision))) {
533
+ const local = await timings.measure("transfer local snapshot", () => createSnapshot(config.snapshotIdentity, snapshotOptions));
534
+ const state = await timings.measure("transfer state read", () => readStateForConfig(config));
535
+ await validate();
536
+ if (sameHashes(fileHashMap(local), fileHashMap(journal.before)) &&
537
+ syncStateFingerprint(state) === journal.stateIdentity) {
538
+ await clearMergeJournal(config);
539
+ return false;
540
+ }
541
+ throw new Error("Apply-only remote head advanced after local changes; preserve the journal for reviewed recovery.");
542
+ }
543
+ if (!head ||
544
+ head.snapshotId !== journal.upload.id ||
545
+ (journal.committedHead && !backend.sameRevision(head.revision, journal.committedHead.revision))) {
546
+ throw new Error("Publication outcome cannot be reconciled with the current remote head. Journal and backup retained; do not retry publication or restore old bytes blindly.");
547
+ }
548
+ const observed = await timings.measure("transfer snapshot download", () => readSnapshotForHead(backend, head, signal));
549
+ requireCompatibleRemoteSelection(config, observed);
550
+ if (!sameHashes(fileHashMap(observed), fileHashMap(journal.upload)) ||
551
+ JSON.stringify(observed.selection) !== JSON.stringify(journal.upload.selection))
552
+ throw new Error("Remote snapshot does not match the recorded merge publication.");
553
+ const state = await timings.measure("transfer state read", () => readStateForConfig(config));
554
+ if (matchesAcceptedState(state, config, head, journal.accepted ?? journal.after, journal.progress)) {
555
+ await validate();
556
+ await clearMergeJournal(config);
557
+ await validate();
558
+ await pruneMergeBaselines(config, state, captureMutationOwner(ctx, signal));
559
+ await validate();
560
+ return true;
561
+ }
562
+ if (syncStateFingerprint(state) !== journal.stateIdentity) {
563
+ throw new Error("Sync baseline changed after the interrupted merge; preserve its journal and review recovery.");
564
+ }
565
+ if (inspectRemoteSelection(config.include, observed, config.exclude).kind !== "same")
566
+ throw new Error("Pending merge has unavailable remote selection metadata; preserve its journal and choose a reviewed explicit direction.");
567
+ if (syncSessionsSelected(config))
568
+ requireStableMergeSessionRoot(journal.before, journal.after);
569
+ await validate();
570
+ const validateOwner = captureMutationOwner(ctx, signal);
571
+ const validateMutation = () => {
572
+ validateOwner();
573
+ validateBackground?.();
574
+ if (auto && !ctx.isIdle())
575
+ throw new Error("Automatic file apply is no longer idle; evidence retained.");
576
+ };
577
+ await timings.measure("transfer local apply", () => applyMergedSnapshot(journal.before, journal.after, protectedSessionPaths(ctx, sessionRoot), { ...snapshotOptions, validateMutation }, validate, ctx.sessionManager.getSessionFile?.()));
578
+ await validate();
579
+ const headAtAcceptance = await timings.measure("transfer remote head", () => backend.readHead(signal));
580
+ await validate();
581
+ if (!headAtAcceptance || !backend.sameRevision(headAtAcceptance.revision, head.revision))
582
+ throw new Error("Remote changed during merged apply; journal and backup retained for review.");
583
+ await timings.measure("transfer baseline write", () => writeAcceptedState(config, head, journal.accepted ?? journal.after, validate, journal.progress));
584
+ await validate();
585
+ await clearMergeJournal(config);
586
+ await validate();
587
+ await timings.measure("transfer cleanup", () => pruneMergeBaselines(config, acceptedState(config, head, journal.accepted ?? journal.after, journal.progress), captureMutationOwner(ctx, signal)));
588
+ await validate();
589
+ await timings.measure("transfer cleanup", () => pruneCompletedConflicts(config, backend.identity, acceptedState(config, head, journal.accepted ?? journal.after, journal.progress), journal.accepted ?? journal.after, journal.upload, captureMutationOwner(ctx, signal)));
590
+ await validate();
591
+ return true;
592
+ }
593
+ // Older valid journals may have accepted noncanonical JSON before projection normalization.
594
+ function matchesAcceptedState(state, config, head, snapshot, progress) {
595
+ return [true, false].some((canonical) => syncStateFingerprint(state) === syncStateFingerprint(acceptedState(config, head, snapshot, progress, canonical)));
596
+ }
597
+ function acceptedState(config, head, snapshot, progress, canonical = true) {
598
+ if (progress)
599
+ return progressState(config, head, snapshot, progress);
600
+ return {
601
+ version: 1,
602
+ profile: config.snapshotIdentity,
603
+ lastAppliedSnapshot: head.snapshotId,
604
+ lastRemoteRevision: head.revision,
605
+ lastFileHashes: fileHashMap(canonical ? portableSnapshot(snapshot, config.localFields) : snapshot),
606
+ include: [...config.include],
607
+ ...(config.exclude === undefined ? {} : { exclude: [...config.exclude] }),
608
+ ...(config.localFields !== undefined ? { localFields: config.localFields } : {}),
609
+ };
610
+ }
611
+ async function writeAcceptedState(config, head, snapshot, validate, progress) {
612
+ const accepted = portableSnapshot(snapshot, config.localFields);
613
+ const state = acceptedState(config, head, accepted, progress);
614
+ await stageMergeBaseline(config, accepted, state, progress?.previous);
615
+ await validate();
616
+ await writeStateForConfig(config, state);
617
+ await validate();
618
+ }
@@ -0,0 +1,2 @@
1
+ import type { EngineContext as ExtensionCommandContext, EngineContext as ExtensionContext } from "../host.js";
2
+ export declare function captureMutationOwner(ctx: ExtensionContext | ExtensionCommandContext, signal?: AbortSignal): () => void;
@@ -0,0 +1,18 @@
1
+ import { agentDir } from "../snapshot/session-paths.js";
2
+ import { throwIfAborted } from "./signals.js";
3
+ export function captureMutationOwner(ctx, signal) {
4
+ const manager = ctx.sessionManager;
5
+ const file = manager.getSessionFile?.();
6
+ const id = manager.getSessionId?.();
7
+ const cwd = manager.getCwd?.();
8
+ const root = agentDir();
9
+ return () => {
10
+ throwIfAborted(signal);
11
+ if (ctx.sessionManager !== manager ||
12
+ manager.getSessionFile?.() !== file ||
13
+ manager.getSessionId?.() !== id ||
14
+ manager.getCwd?.() !== cwd ||
15
+ agentDir() !== root)
16
+ throw new Error("Session changed during file mutation; evidence retained for review.");
17
+ };
18
+ }
@@ -0,0 +1,3 @@
1
+ import { type JsonValue } from "./json-document.js";
2
+ /** Compare only explicit npm versions; do not resolve ranges, tags, Git refs or registry state. */
3
+ export declare function mergePackageVersions(base: JsonValue | undefined, local: JsonValue | undefined, remote: JsonValue | undefined): JsonValue[] | undefined;