@paradigma-inc/flywheel 0.1.147 → 0.1.148

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 (53) hide show
  1. package/package.json +1 -1
  2. package/src/runtime/vendor/flywheel-cli-dist/commands/registry/repository.js +4 -3
  3. package/src/runtime/vendor/flywheel-cli-dist/commands/registry/repository.js.map +1 -1
  4. package/src/runtime/vendor/flywheel-cli-dist/commands/repository-output.js +34 -0
  5. package/src/runtime/vendor/flywheel-cli-dist/commands/repository-output.js.map +1 -1
  6. package/src/runtime/vendor/flywheel-cli-dist/local/domain/invariants.js +24 -8
  7. package/src/runtime/vendor/flywheel-cli-dist/local/domain/invariants.js.map +1 -1
  8. package/src/runtime/vendor/flywheel-cli-dist/local/domain/models/operation-identity.js +22 -0
  9. package/src/runtime/vendor/flywheel-cli-dist/local/domain/models/operation-identity.js.map +1 -0
  10. package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/context.js +1 -1
  11. package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/context.js.map +1 -1
  12. package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/pull.js +2 -5
  13. package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/pull.js.map +1 -1
  14. package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/replay.js +55 -62
  15. package/src/runtime/vendor/flywheel-cli-dist/local/domain/rebase/replay.js.map +1 -1
  16. package/src/runtime/vendor/flywheel-cli-dist/local/domain/service/commit.js +7 -4
  17. package/src/runtime/vendor/flywheel-cli-dist/local/domain/service/commit.js.map +1 -1
  18. package/src/runtime/vendor/flywheel-cli-dist/local/domain/service/revert.js +8 -11
  19. package/src/runtime/vendor/flywheel-cli-dist/local/domain/service/revert.js.map +1 -1
  20. package/src/runtime/vendor/flywheel-cli-dist/local/domain/service/writes.js +9 -183
  21. package/src/runtime/vendor/flywheel-cli-dist/local/domain/service/writes.js.map +1 -1
  22. package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/history.js +18 -1
  23. package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/history.js.map +1 -1
  24. package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/projections.js +3 -3
  25. package/src/runtime/vendor/flywheel-cli-dist/local/runtime/operations/projections.js.map +1 -1
  26. package/src/runtime/vendor/flywheel-cli-dist/local/runtime/snapshot-diff.js +183 -0
  27. package/src/runtime/vendor/flywheel-cli-dist/local/runtime/snapshot-diff.js.map +1 -0
  28. package/src/runtime/vendor/flywheel-cli-dist/local/store/apply.js +2 -3
  29. package/src/runtime/vendor/flywheel-cli-dist/local/store/apply.js.map +1 -1
  30. package/src/runtime/vendor/flywheel-cli-dist/local/store/contract.js.map +1 -1
  31. package/src/runtime/vendor/flywheel-cli-dist/local/store/history-validation.js +21 -14
  32. package/src/runtime/vendor/flywheel-cli-dist/local/store/history-validation.js.map +1 -1
  33. package/src/runtime/vendor/flywheel-cli-dist/local/store/latest-values.js +170 -8
  34. package/src/runtime/vendor/flywheel-cli-dist/local/store/latest-values.js.map +1 -1
  35. package/src/runtime/vendor/flywheel-cli-dist/local/store/pending.js +58 -100
  36. package/src/runtime/vendor/flywheel-cli-dist/local/store/pending.js.map +1 -1
  37. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/apply.js +52 -15
  38. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/apply.js.map +1 -1
  39. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/artifacts.js.map +1 -1
  40. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/context.js +2 -0
  41. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/context.js.map +1 -0
  42. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/nodes.js +1 -1
  43. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/nodes.js.map +1 -1
  44. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/relations.js +3 -5
  45. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/relations.js.map +1 -1
  46. package/src/runtime/vendor/flywheel-cli-dist/local/store/projection/tags.js.map +1 -1
  47. package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/store.js +30 -28
  48. package/src/runtime/vendor/flywheel-cli-dist/local/store/sqlite/store.js.map +1 -1
  49. package/src/runtime/vendor/flywheel-cli-dist/local/store/sync-commits.js +12 -70
  50. package/src/runtime/vendor/flywheel-cli-dist/local/store/sync-commits.js.map +1 -1
  51. package/src/runtime/vendor/flywheel-cli-dist/local/store/sync.js +5 -11
  52. package/src/runtime/vendor/flywheel-cli-dist/local/store/sync.js.map +1 -1
  53. package/src/runtime/vendor/manifest.json +7 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@paradigma-inc/flywheel",
3
- "version": "0.1.147",
3
+ "version": "0.1.148",
4
4
  "description": "One-command setup for Flywheel MCP hosts",
5
5
  "type": "module",
6
6
  "files": [
@@ -218,10 +218,11 @@ const OPERATION_COMMANDS = [
218
218
  integerParam("limit", "Commit limit from 1 through 256."),
219
219
  ],
220
220
  }),
221
- operation("repo:diff", "Show local commit differences and staged work.", "GET /v1/repositories/{repository_id}/diff", {
221
+ operation("repo:diff", "Show committed-history differences or the complete pending staged result.", "GET /v1/repositories/{repository_id}/diff", {
222
222
  optional: [
223
- param("base", "Base commit ID."),
224
- param("head", "Head commit ID."),
223
+ param("base", "Base commit ID; cannot be combined with --staged."),
224
+ param("head", "Head commit ID; cannot be combined with --staged."),
225
+ booleanParam("staged", "Compare the current committed base to the complete pending graph result."),
225
226
  ],
226
227
  }),
227
228
  operation("repo:revert", "Append the inverse of one commit.", "POST /v1/repositories/{repository_id}/reverts", {
@@ -1 +1 @@
1
- {"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/commands/registry/repository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/commands/registry/repository.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { repositoryJsonReplacer } from "../local/domain/models/encoding.js";
1
2
  import { shellQuote, } from "./repository-selection.js";
2
3
  function record(value) {
3
4
  return value !== null && typeof value === "object" && !Array.isArray(value)
@@ -25,8 +26,41 @@ function repositoryArgument(selection) {
25
26
  function arrayCount(value) {
26
27
  return Array.isArray(value) ? value.length : 0;
27
28
  }
29
+ // Human output shows absent node content as "" (matching the ordinary node
30
+ // readers); JSON/CSV/TSV keep the stored null so comparison semantics stay exact.
31
+ function renderStagedValue(value, entityType) {
32
+ const normalized = entityType === "node" && value !== null && typeof value === "object" &&
33
+ !Array.isArray(value) && value.content === null
34
+ ? { ...value, content: "" }
35
+ : value;
36
+ return JSON.stringify(normalized, repositoryJsonReplacer, 2) ?? "undefined";
37
+ }
38
+ function renderStagedDiff(diff, selection) {
39
+ const changes = Array.isArray(diff.changes) ? diff.changes : [];
40
+ const baseHead = diff.base_head === null ? "absent" : string(diff.base_head);
41
+ const lines = [
42
+ "Staged diff",
43
+ `Base head: ${baseHead}`,
44
+ `Staging digest: ${string(diff.staging_digest)}`,
45
+ ];
46
+ if (changes.length === 0) {
47
+ lines.push("", "Staged diff is empty.", "");
48
+ return lines.join("\n");
49
+ }
50
+ for (const change of changes) {
51
+ const entry = record(change);
52
+ const changeType = string(entry.change_type);
53
+ const entityType = string(entry.entity_type);
54
+ const identity = string(entry.identity);
55
+ lines.push("", `${changeType[0]?.toUpperCase() ?? ""}${changeType.slice(1)} ${entityType} ${identity}`, "Before:", entry.before === null ? "absent" : renderStagedValue(entry.before, entityType), "After:", entry.after === null ? "absent" : renderStagedValue(entry.after, entityType));
56
+ }
57
+ lines.push("", `Next: review the staged diff, then run flywheel repo:commit${repositoryArgument(selection)}`, "");
58
+ return lines.join("\n");
59
+ }
28
60
  function renderDiff(payload, selection) {
29
61
  const diff = record(payload);
62
+ if (diff.view === "staged")
63
+ return renderStagedDiff(diff, selection);
30
64
  const operations = arrayCount(diff.operation_changes);
31
65
  const latestValues = arrayCount(diff.latest_field_changes);
32
66
  const staged = count(record(diff.staging).operation_count);
@@ -1 +1 @@
1
- {"version":3,"file":"repository-output.js","sourceRoot":"","sources":["../../src/commands/repository-output.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,GAEX,MAAM,2BAA2B,CAAC;AAInC,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,CAAC,CAAE,KAAoB;QACvB,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;AACpE,CAAC;AAED,SAAS,KAAK,CAAC,KAAc;IAC3B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QACvE,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAS,MAAM,CAAC,UAAkB,EAAE,QAAgB;IAClD,OAAO,GAAG,UAAU,IAAI,QAAQ,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AACnE,CAAC;AAED,SAAS,kBAAkB,CAAC,SAA+B;IACzD,IAAI,SAAS,EAAE,MAAM,KAAK,mBAAmB;QAAE,OAAO,EAAE,CAAC;IACzD,IAAI,SAAS,EAAE,MAAM,KAAK,UAAU;QAAE,OAAO,aAAa,CAAC;IAC3D,OAAO,SAAS,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAClE,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,UAAU,CACjB,OAAgB,EAChB,SAA+B;IAE/B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,KAAK,GACT,MAAM,GAAG,CAAC;QACR,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,UAAU,GAAG,CAAC,IAAI,YAAY,GAAG,CAAC;YAClC,CAAC,CAAC,2DAA2D;YAC7D,CAAC,CAAC,OAAO,CAAC;IAChB,MAAM,IAAI,GACR,MAAM,GAAG,CAAC;QACR,CAAC,CAAC,uBAAuB,IAAI,EAAE;QAC/B,CAAC,CAAC,KAAK,KAAK,OAAO;YACjB,CAAC,CAAC,4BAA4B,IAAI,uBAAuB;YACzD,CAAC,CAAC,qBAAqB,IAAI,EAAE,CAAC;IACpC,OAAO;QACL,UAAU,KAAK,EAAE;QACjB,SAAS,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,KAAK,MAAM,CAAC,YAAY,EAAE,qBAAqB,CAAC,EAAE;QAChG,WAAW,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;QAC9C,SAAS,IAAI,EAAE;QACf,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CACnB,OAAgB,EAChB,SAA+B;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,KAAK,UAAU,CAAC;IACnD,IAAI,KAAa,CAAC;IAClB,IAAI,IAAY,CAAC;IAEjB,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,GAAG,aAAa,MAAM,CAAC,aAAa,EAAE,eAAe,CAAC,GAAG,CAAC;QAC/D,IAAI,GAAG,+BAA+B,IAAI,EAAE,CAAC;IAC/C,CAAC;SAAM,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,GAAG,WAAW,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,CAAC;QACxD,IAAI,GAAG,uBAAuB,IAAI,EAAE,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QAChC,KAAK,GAAG,oCAAoC,CAAC;QAC7C,IAAI,GAAG,4BAA4B,IAAI,uBAAuB,CAAC;IACjE,CAAC;SAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3B,KAAK,GAAG,kDAAkD,CAAC;QAC3D,IAAI,GAAG,qBAAqB,IAAI,kBAAkB,CAAC;IACrD,CAAC;SAAM,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;QACpC,KAAK,GAAG,2DAA2D,CAAC;QACpE,IAAI,GAAG,qBAAqB,IAAI,EAAE,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,OAAO,CAAC;QAChB,IAAI,GAAG,4BAA4B,IAAI,sBAAsB,CAAC;IAChE,CAAC;IAED,OAAO;QACL,eAAe,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC7C,sBAAsB,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE;QACtF,GAAG,CAAC,cAAc;YAChB,CAAC,CAAC;gBACA,mBAAmB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;gBAC/C,mBAAmB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;gBAC3C,qBAAqB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;aAChD;YACD,CAAC,CAAC,EAAE,CAAC;QACP,UAAU,KAAK,EAAE;QACjB,eAAe,SAAS,EAAE;QAC1B,yBAAyB,UAAU,EAAE;QACrC,SAAS,IAAI,EAAE;QACf,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG;QACf,CAAC,SAAS,EAAE,MAAM,CAAC;QACnB,CAAC,QAAQ,EAAE,KAAK,CAAC;QACjB,CAAC,SAAS,EAAE,MAAM,CAAC;QACnB,CAAC,gBAAgB,EAAE,aAAa,CAAC;QACjC,CAAC,aAAa,EAAE,UAAU,CAAC;KAC5B,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC,CAAC;IACvD,OAAO;QACL,yBAAyB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QACnD,SAAS,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC9B,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAClC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,OAAe,EACf,OAAgB,EAChB,SAA+B,EAC/B,YAAY,GAAG,KAAK;IAEpB,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IACD,IACE,OAAO,KAAK,WAAW;QACvB,OAAO,KAAK,YAAY;QACxB,OAAO,KAAK,cAAc,EAC1B,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC3C,OAAO;YACL,OAAO,KAAK,WAAW;gBACrB,CAAC,CAAC,sCAAsC,cAAc,YAAY;gBAClE,CAAC,CAAC,uBAAuB,cAAc,EAAE;YAC3C,GAAG,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;gBAC/B,CAAC,CAAC;oBACA,mBAAmB,IAAI,CAAC,IAAI,gEAAgE;iBAC7F;gBACD,CAAC,CAAC,EAAE,CAAC;YACP,kCAAkC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,cAAc,CAAC,EAAE,uBAAuB;YAC/H,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;QAC9B,OAAO,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;QAC5B,OAAO,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,OAAO,KAAK,kBAAkB,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC;QACtD,OAAO;YACL,WAAW,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;YAC9C,6BAA6B,kBAAkB,CAAC,SAAS,CAAC,EAAE;YAC5D,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"repository-output.js","sourceRoot":"","sources":["../../src/commands/repository-output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAC5E,OAAO,EACL,UAAU,GAEX,MAAM,2BAA2B,CAAC;AAInC,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACzE,CAAC,CAAE,KAAoB;QACvB,CAAC,CAAC,EAAE,CAAC;AACT,CAAC;AAED,SAAS,MAAM,CAAC,KAAc;IAC5B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;AACpE,CAAC;AAED,SAAS,KAAK,CAAC,KAAc;IAC3B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC;QACvE,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAS,MAAM,CAAC,UAAkB,EAAE,QAAgB;IAClD,OAAO,GAAG,UAAU,IAAI,QAAQ,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AACnE,CAAC;AAED,SAAS,kBAAkB,CAAC,SAA+B;IACzD,IAAI,SAAS,EAAE,MAAM,KAAK,mBAAmB;QAAE,OAAO,EAAE,CAAC;IACzD,IAAI,SAAS,EAAE,MAAM,KAAK,UAAU;QAAE,OAAO,aAAa,CAAC;IAC3D,OAAO,SAAS,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AAClE,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,2EAA2E;AAC3E,kFAAkF;AAClF,SAAS,iBAAiB,CAAC,KAAc,EAAE,UAAkB;IAC3D,MAAM,UAAU,GACd,UAAU,KAAK,MAAM,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAClE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAK,KAAoB,CAAC,OAAO,KAAK,IAAI;QAC/D,CAAC,CAAC,EAAE,GAAI,KAAoB,EAAE,OAAO,EAAE,EAAE,EAAE;QAC3C,CAAC,CAAC,KAAK,CAAC;IACZ,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,sBAAsB,EAAE,CAAC,CAAC,IAAI,WAAW,CAAC;AAC9E,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAgB,EAChB,SAA+B;IAE/B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG;QACZ,aAAa;QACb,cAAc,QAAQ,EAAE;QACxB,mBAAmB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;KACjD,CAAC;IACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAC;QAC5C,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxC,KAAK,CAAC,IAAI,CACR,EAAE,EACF,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,QAAQ,EAAE,EACvF,SAAS,EACT,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,EAC9E,QAAQ,EACR,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,EAAE,UAAU,CAAC,CAC7E,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CACR,EAAE,EACF,8DAA8D,kBAAkB,CAAC,SAAS,CAAC,EAAE,EAC7F,EAAE,CACH,CAAC;IACF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,UAAU,CACjB,OAAgB,EAChB,SAA+B;IAE/B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;QAAE,OAAO,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACrE,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC;IAC3D,MAAM,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,KAAK,GACT,MAAM,GAAG,CAAC;QACR,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,UAAU,GAAG,CAAC,IAAI,YAAY,GAAG,CAAC;YAClC,CAAC,CAAC,2DAA2D;YAC7D,CAAC,CAAC,OAAO,CAAC;IAChB,MAAM,IAAI,GACR,MAAM,GAAG,CAAC;QACR,CAAC,CAAC,uBAAuB,IAAI,EAAE;QAC/B,CAAC,CAAC,KAAK,KAAK,OAAO;YACjB,CAAC,CAAC,4BAA4B,IAAI,uBAAuB;YACzD,CAAC,CAAC,qBAAqB,IAAI,EAAE,CAAC;IACpC,OAAO;QACL,UAAU,KAAK,EAAE;QACjB,SAAS,MAAM,CAAC,UAAU,EAAE,iBAAiB,CAAC,KAAK,MAAM,CAAC,YAAY,EAAE,qBAAqB,CAAC,EAAE;QAChG,WAAW,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;QAC9C,SAAS,IAAI,EAAE;QACf,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CACnB,OAAgB,EAChB,SAA+B;IAE/B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,KAAK,UAAU,CAAC;IACnD,IAAI,KAAa,CAAC;IAClB,IAAI,IAAY,CAAC;IAEjB,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,GAAG,aAAa,MAAM,CAAC,aAAa,EAAE,eAAe,CAAC,GAAG,CAAC;QAC/D,IAAI,GAAG,+BAA+B,IAAI,EAAE,CAAC;IAC/C,CAAC;SAAM,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,KAAK,GAAG,WAAW,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,CAAC;QACxD,IAAI,GAAG,uBAAuB,IAAI,EAAE,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QAChC,KAAK,GAAG,oCAAoC,CAAC;QAC7C,IAAI,GAAG,4BAA4B,IAAI,uBAAuB,CAAC;IACjE,CAAC;SAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC3B,KAAK,GAAG,kDAAkD,CAAC;QAC3D,IAAI,GAAG,qBAAqB,IAAI,kBAAkB,CAAC;IACrD,CAAC;SAAM,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;QACpC,KAAK,GAAG,2DAA2D,CAAC;QACpE,IAAI,GAAG,qBAAqB,IAAI,EAAE,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,KAAK,GAAG,OAAO,CAAC;QAChB,IAAI,GAAG,4BAA4B,IAAI,sBAAsB,CAAC;IAChE,CAAC;IAED,OAAO;QACL,eAAe,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC7C,sBAAsB,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE;QACtF,GAAG,CAAC,cAAc;YAChB,CAAC,CAAC;gBACA,mBAAmB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;gBAC/C,mBAAmB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;gBAC3C,qBAAqB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;aAChD;YACD,CAAC,CAAC,EAAE,CAAC;QACP,UAAU,KAAK,EAAE;QACjB,eAAe,SAAS,EAAE;QAC1B,yBAAyB,UAAU,EAAE;QACrC,SAAS,IAAI,EAAE;QACf,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAgB;IAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG;QACf,CAAC,SAAS,EAAE,MAAM,CAAC;QACnB,CAAC,QAAQ,EAAE,KAAK,CAAC;QACjB,CAAC,SAAS,EAAE,MAAM,CAAC;QACnB,CAAC,gBAAgB,EAAE,aAAa,CAAC;QACjC,CAAC,aAAa,EAAE,UAAU,CAAC;KAC5B,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC,CAAC;IACvD,OAAO;QACL,yBAAyB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QACnD,SAAS,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC9B,WAAW,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAClC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,OAAe,EACf,OAAgB,EAChB,SAA+B,EAC/B,YAAY,GAAG,KAAK;IAEpB,IAAI,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IACD,IACE,OAAO,KAAK,WAAW;QACvB,OAAO,KAAK,YAAY;QACxB,OAAO,KAAK,cAAc,EAC1B,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/B,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC3C,OAAO;YACL,OAAO,KAAK,WAAW;gBACrB,CAAC,CAAC,sCAAsC,cAAc,YAAY;gBAClE,CAAC,CAAC,uBAAuB,cAAc,EAAE;YAC3C,GAAG,CAAC,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;gBAC/B,CAAC,CAAC;oBACA,mBAAmB,IAAI,CAAC,IAAI,gEAAgE;iBAC7F;gBACD,CAAC,CAAC,EAAE,CAAC;YACP,kCAAkC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,UAAU,CAAC,cAAc,CAAC,EAAE,uBAAuB;YAC/H,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,IAAI,OAAO,KAAK,aAAa,EAAE,CAAC;QAC9B,OAAO,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,OAAO,KAAK,WAAW,EAAE,CAAC;QAC5B,OAAO,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,OAAO,KAAK,kBAAkB,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC;QACtD,OAAO;YACL,WAAW,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAE;YAC9C,6BAA6B,kBAAkB,CAAC,SAAS,CAAC,EAAE;YAC5D,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
@@ -1,19 +1,35 @@
1
1
  export class RepositoryInvariantError extends Error {
2
2
  name = "RepositoryInvariantError";
3
- }
4
- export function validateOrdinaryOperationBatch(operations, expectedHead) {
5
- if (new Set(operations.map((operation) => operation.operationId)).size !== operations.length) {
6
- throw new RepositoryInvariantError("operation identifiers must be unique");
3
+ operation;
4
+ constructor(message, operation) {
5
+ super(message);
6
+ this.operation = operation;
7
7
  }
8
- if (new Set(operations.map((operation) => operation.repositoryId)).size > 1) {
9
- throw new RepositoryInvariantError("operations must belong to one repository");
8
+ }
9
+ export function validateOrdinaryOperationStructure(operations) {
10
+ const identifiers = new Set();
11
+ for (const operation of operations) {
12
+ if (identifiers.has(operation.operationId)) {
13
+ throw new RepositoryInvariantError("operation identifiers must be unique", operation);
14
+ }
15
+ identifiers.add(operation.operationId);
10
16
  }
17
+ const repositoryId = operations[0]?.repositoryId;
18
+ const foreign = operations.find(operation => operation.repositoryId !== repositoryId);
19
+ if (foreign)
20
+ throw new RepositoryInvariantError("operations must belong to one repository", foreign);
11
21
  for (const operation of operations) {
12
22
  if (operation.type === "imported_baseline.v1") {
13
- throw new RepositoryInvariantError("imported baseline is restricted to the migration service");
23
+ throw new RepositoryInvariantError("imported baseline is restricted to the migration service", operation);
14
24
  }
25
+ }
26
+ }
27
+ /** Direct cross-language batch contract; projection checks heads in operation order. */
28
+ export function validateOrdinaryOperationBatch(operations, expectedHead) {
29
+ validateOrdinaryOperationStructure(operations);
30
+ for (const operation of operations) {
15
31
  if (operation.type === "node.purge.v1" && operation.payload.expected_head !== expectedHead) {
16
- throw new RepositoryInvariantError("purge head does not match commit head");
32
+ throw new RepositoryInvariantError("purge head does not match commit head", operation);
17
33
  }
18
34
  }
19
35
  }
@@ -1 +1 @@
1
- {"version":3,"file":"invariants.js","sourceRoot":"","sources":["../../../src/local/domain/invariants.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IACxC,IAAI,GAAG,0BAA0B,CAAC;CAC5C;AAED,MAAM,UAAU,8BAA8B,CAC5C,UAA0C,EAAE,YAA2B;IAEvE,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;QAC7F,MAAM,IAAI,wBAAwB,CAAC,sCAAsC,CAAC,CAAC;IAC7E,CAAC;IACD,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,wBAAwB,CAAC,0CAA0C,CAAC,CAAC;IACjF,CAAC;IACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,SAAS,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;YAC9C,MAAM,IAAI,wBAAwB,CAAC,0DAA0D,CAAC,CAAC;QACjG,CAAC;QACD,IAAI,SAAS,CAAC,IAAI,KAAK,eAAe,IAAI,SAAS,CAAC,OAAO,CAAC,aAAa,KAAK,YAAY,EAAE,CAAC;YAC3F,MAAM,IAAI,wBAAwB,CAAC,uCAAuC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,YAAoB,EAAE,WAAmB,EAAE,qBAA8B,EAAE,QAAgB;IAE3F,IAAI,YAAY,KAAK,WAAW,IAAI,qBAAqB,EAAE,CAAC;QAC1D,MAAM,IAAI,wBAAwB,CAAC,GAAG,QAAQ,mBAAmB,CAAC,CAAC;IACrE,CAAC;AACH,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,WAAmB,EAAE,qBAAoC;IAEzD,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,wBAAwB,CAAC,8BAA8B,CAAC,CAAC;IACrF,IAAI,qBAAqB,KAAK,IAAI,EAAE,CAAC;QACnC,MAAM,IAAI,wBAAwB,CAAC,qDAAqD,CAAC,CAAC;IAC5F,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,WAAmB,EAAE,YAAoB,EAAE,YAAoB,EAC/D,cAAyD;IAEzD,IAAI,YAAY,KAAK,YAAY;QAAE,MAAM,IAAI,wBAAwB,CAAC,0CAA0C,CAAC,CAAC;IAClH,MAAM,WAAW,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;IACjD,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS;QACxE,WAAW,GAAG,CAAC,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,wBAAwB,CAAC,8DAA8D,CAAC,CAAC;IACrG,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"invariants.js","sourceRoot":"","sources":["../../../src/local/domain/invariants.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,22 @@
1
+ function operationIdentity(operation) {
2
+ const payload = operation.payload;
3
+ if (typeof payload.node_id === "string")
4
+ return payload.node_id;
5
+ if (typeof payload.edge_id === "string")
6
+ return payload.edge_id;
7
+ if (typeof payload.artifact_id === "string")
8
+ return payload.artifact_id;
9
+ if (typeof payload.containment_id === "string")
10
+ return payload.containment_id;
11
+ if (typeof payload.parent_node_id === "string" && typeof payload.child_node_id === "string") {
12
+ return `${payload.parent_node_id}->${payload.child_node_id}`;
13
+ }
14
+ if (typeof payload.scope_node_id === "string" && typeof payload.tag_id === "string") {
15
+ return `${payload.scope_node_id}/${payload.tag_id}`;
16
+ }
17
+ return "repository";
18
+ }
19
+ export function operationFailureMessage(operation, reason) {
20
+ return `operation ${operation.operationId} (${operation.type}) for ${operationIdentity(operation)} failed: ${reason}`;
21
+ }
22
+ //# sourceMappingURL=operation-identity.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"operation-identity.js","sourceRoot":"","sources":["../../../../src/local/domain/models/operation-identity.ts"],"names":[],"mappings":"AAEA,SAAS,iBAAiB,CAAC,SAA8B;IACvD,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IAClC,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC;IAChE,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC;IAChE,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC,WAAW,CAAC;IACxE,IAAI,OAAO,OAAO,CAAC,cAAc,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC,cAAc,CAAC;IAC9E,IAAI,OAAO,OAAO,CAAC,cAAc,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;QAC5F,OAAO,GAAG,OAAO,CAAC,cAAc,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC;IAC/D,CAAC;IACD,IAAI,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACpF,OAAO,GAAG,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IACtD,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,SAA8B,EAAE,MAAc;IACpF,OAAO,aAAa,SAAS,CAAC,WAAW,KAAK,SAAS,CAAC,IAAI,SAAS,iBAAiB,CAAC,SAAS,CAAC,YAAY,MAAM,EAAE,CAAC;AACxH,CAAC"}
@@ -84,7 +84,7 @@ export function parseRebaseContext(repositoryId, value) {
84
84
  localCommits,
85
85
  localSnapshot: {
86
86
  repositoryId,
87
- headCommitId: localCommits.at(-1)?.commitId ?? oldRemoteHead,
87
+ headCommitId: localCommits[0]?.commitId ?? oldRemoteHead,
88
88
  canonicalBytes: decodeBase64(payload.local_snapshot),
89
89
  },
90
90
  };
@@ -1 +1 @@
1
- {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"context.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/context.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,6 @@ import { RepositoryServiceError } from "../errors.js";
2
2
  import { isDigest, isUuid } from "../models/constants.js";
3
3
  import { buildConflicts } from "./conflicts.js";
4
4
  import { loadRebaseLatestValues, rebaseLocalCommits } from "./replay.js";
5
- const EMPTY_MANUAL_VALUES = {};
6
5
  const NO_CONFLICTS = [];
7
6
  export async function applyPull(store, repositoryId, clientId, pullId, sessionManifest, clock = () => new Date()) {
8
7
  if (!isUuid(pullId))
@@ -55,12 +54,11 @@ export async function applyPull(store, repositoryId, clientId, pullId, sessionMa
55
54
  }));
56
55
  return { repositoryId, pullId, rebaseId: pullId, head: workspace.localHeadCommitId, remoteTrackingHead: sessionManifest.targetHead, conflicts };
57
56
  }
58
- const rebased = rebaseLocalCommits(localCommits, sessionManifest.targetHead, clientId, pullId, new Map(), clock, context.remoteSnapshot, await loadRebaseLatestValues(store, repositoryId, localCommits));
57
+ const rebased = rebaseLocalCommits(localCommits, sessionManifest.targetHead, clientId, pullId, new Map(), clock, context.remoteSnapshot, await loadRebaseLatestValues(store, repositoryId, localCommits), context.localSnapshot);
59
58
  const result = await store.applyAtomic(pullBatch({
60
59
  mode: "fast_forward", workspace, context,
61
60
  commits: [...sessionManifest.commits, ...rebased.commits],
62
61
  latestValues: [...sessionManifest.latestValuesByCommit, ...rebased.latestValuesByCommit],
63
- manualValues: rebased.manualValues,
64
62
  resultingHead: rebased.commits.at(-1)?.commitId ?? sessionManifest.targetHead,
65
63
  }));
66
64
  return { repositoryId, pullId, rebaseId: null, head: result.head.commitId, remoteTrackingHead: sessionManifest.targetHead, conflicts: [] };
@@ -126,7 +124,7 @@ export function requirePullTarget(manifest) {
126
124
  return manifest.targetHead;
127
125
  }
128
126
  export function pullBatch(input) {
129
- const { mode, workspace, context, commits, latestValues, resultingHead, manualValues = EMPTY_MANUAL_VALUES, rebase = null, conflicts = NO_CONFLICTS, clearRebase = false, } = input;
127
+ const { mode, workspace, context, commits, latestValues, resultingHead, rebase = null, conflicts = NO_CONFLICTS, clearRebase = false, } = input;
130
128
  return {
131
129
  repositoryId: workspace.repositoryId,
132
130
  expectedHead: workspace.localHeadCommitId,
@@ -146,7 +144,6 @@ export function pullBatch(input) {
146
144
  restoreManifestDigest: context.oldManifestDigest,
147
145
  objectMode: context.objectMode,
148
146
  latestGroups: latestValues,
149
- manualValues,
150
147
  snapshotBytes: context.remoteSnapshot.canonicalBytes,
151
148
  localSnapshotBytes: context.localSnapshot.canonicalBytes,
152
149
  clearRebase,
@@ -1 +1 @@
1
- {"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/pull.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/local/domain/rebase/pull.ts"],"names":[],"mappings":"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"}
@@ -5,8 +5,12 @@ import { RepositoryCommit } from "../models/commits.js";
5
5
  import { RepositoryOperation } from "../models/operations.js";
6
6
  import { artifactReferenceSetDigest, foldArtifactPropertiesOperation, legacyArtifactMetadata, legacyArtifactProperties, parseArtifactProperties } from "../models/artifact-properties.js";
7
7
  import { parseRepositoryJson, valueDigest } from "../models/encoding.js";
8
- import { artifactDigests, associateLatestValueWrites, latestStateDigests } from "../service/writes.js";
8
+ import { artifactDigests, latestStateDigests } from "../service/writes.js";
9
9
  import { LatestValueWrite } from "../../store/contract.js";
10
+ import { latestValueWrites } from "../../store/latest-values.js";
11
+ import { operationFailureMessage } from "../models/operation-identity.js";
12
+ import { snapshotLatestValue } from "../../store/sync-commits.js";
13
+ import { snapshotTables } from "../../store/snapshot/validate.js";
10
14
  import { conflictContext, conflictResolutionByKey } from "./conflicts.js";
11
15
  import { RepositoryRebaseError } from "./context.js";
12
16
  import { operationKey } from "./keys.js";
@@ -36,12 +40,11 @@ export async function continueRebase(store, repositoryId, operationId, rebaseId,
36
40
  const actorId = context.localCommits.at(-1)?.authorId;
37
41
  if (actorId === undefined)
38
42
  throw new RepositoryServiceError("repository rebase is corrupt");
39
- const rebased = rebaseLocalCommits(context.localCommits, context.targetHead, actorId, rebaseId, resolutions, clock, context.remoteSnapshot, await loadRebaseLatestValues(store, repositoryId, context.localCommits));
43
+ const rebased = rebaseLocalCommits(context.localCommits, context.targetHead, actorId, rebaseId, resolutions, clock, context.remoteSnapshot, await loadRebaseLatestValues(store, repositoryId, context.localCommits), context.localSnapshot);
40
44
  const result = await store.applyAtomic(pullBatch({
41
45
  mode: "continue", workspace, context,
42
46
  commits: [...context.remoteCommits, ...rebased.commits],
43
47
  latestValues: [...context.remoteLatestValues, ...rebased.latestValuesByCommit],
44
- manualValues: rebased.manualValues,
45
48
  resultingHead: rebased.commits.at(-1)?.commitId ?? context.targetHead,
46
49
  clearRebase: true,
47
50
  }));
@@ -169,69 +172,46 @@ function latestTarget(operation) {
169
172
  return ["artifact", payload.artifact_id, "properties", payload.new_digest];
170
173
  return undefined;
171
174
  }
172
- function latestGroups(rebased, sourceValuesByOperation, manualValues) {
173
- const writes = [];
174
- for (const operation of rebased.operations) {
175
- const manualValue = manualValues[operation.operationId];
176
- const target = latestTarget(operation);
177
- if (manualValue !== undefined) {
178
- if (!target || valueDigest(manualValue) !== target[3])
179
- throw new RepositoryServiceError("manual rebase value digest is invalid");
180
- writes.push(LatestValueWrite.fromMapping({
181
- owner_type: target[0], owner_id: target[1], field: target[2], value: manualValue, value_digest: target[3],
182
- }).canonicalBytes);
183
- continue;
184
- }
185
- const sourceValues = sourceValuesByOperation.get(operation.operationId) ?? new Map();
186
- if (target) {
187
- const source = sourceValues.get(JSON.stringify(target.slice(0, 3)));
188
- // Empty predecessor sidebands are recovered from the digest-checked pinned snapshot during sync.
189
- if (!source)
190
- continue;
191
- if (source.valueDigest !== target[3]) {
192
- throw new RepositoryServiceError(`local rebase value is missing for operation ${operation.operationId}`);
193
- }
194
- writes.push(source.canonicalBytes);
195
- continue;
196
- }
197
- for (const source of sourceValues.values())
198
- writes.push(source.canonicalBytes);
199
- }
200
- return writes;
201
- }
202
- export function rebaseLocalCommits(localCommitsNewestFirst, targetHead, clientId, rebaseId, resolutions, clock, remoteSnapshot, localLatestValues = new Map()) {
175
+ export function rebaseLocalCommits(localCommitsNewestFirst, targetHead, clientId, rebaseId, resolutions, clock, remoteSnapshot, localLatestValues, localSnapshot) {
203
176
  let parent = targetHead;
204
177
  const commits = [];
205
178
  const latestValuesByCommit = [];
206
- const manualValues = {};
179
+ let localTables;
207
180
  const fieldResolutionHeads = new Map();
208
- const referenceSets = remoteSnapshot === undefined ? undefined : referenceSetsFromSnapshot(remoteSnapshot);
209
- const artifactProperties = remoteSnapshot === undefined ? undefined : artifactPropertiesFromSnapshot(remoteSnapshot);
181
+ const referenceSets = referenceSetsFromSnapshot(remoteSnapshot);
182
+ const artifactProperties = artifactPropertiesFromSnapshot(remoteSnapshot);
210
183
  for (const original of [...localCommitsNewestFirst].reverse()) {
211
- const originalValues = localLatestValues.get(original.commitId) ?? original.operations.map(() => new Map());
212
- const valuesByRebasedOperation = new Map();
184
+ const originalWrites = localLatestValues.get(original.commitId);
185
+ const serializedWrites = [];
213
186
  const operations = [];
214
- for (const [operationIndex, operation] of original.operations.entries()) {
187
+ for (const operation of original.operations) {
215
188
  const key = operationKey(operation);
216
189
  const resolution = resolutionFor(resolutions, key);
217
190
  const [strategy, manualValue, remoteDigest] = resolution ?? ["local", null, null];
218
191
  if (strategy === "remote")
219
192
  continue;
220
193
  const mapping = { ...operation.toMapping(), operation_id: randomUUID() };
194
+ let writes = originalWrites?.get(operation.operationId);
221
195
  if (strategy === "manual") {
222
196
  if (manualValue === null)
223
197
  throw new RepositoryServiceError("manual conflict value is missing");
224
198
  mapping.new_digest = valueDigest(manualValue);
225
- manualValues[mapping.operation_id] = manualValue;
199
+ const target = latestTarget(operation);
200
+ if (!target)
201
+ throw new RepositoryServiceError("manual rebase value target is invalid");
202
+ const write = LatestValueWrite.fromMapping({
203
+ owner_type: target[0], owner_id: target[1], field: target[2], value: manualValue, value_digest: mapping.new_digest,
204
+ });
205
+ writes = new Map([[JSON.stringify(write.key), write]]);
226
206
  }
227
207
  if (resolution !== undefined && (strategy === "local" || strategy === "manual")) {
228
- if (operation.type === "artifact.properties.set.v1" && artifactProperties !== undefined) {
208
+ if (operation.type === "artifact.properties.set.v1") {
229
209
  const current = artifactProperties.get(operation.payload.artifact_id);
230
210
  if (current === undefined)
231
211
  throw new RepositoryServiceError("remote artifact properties are invalid");
232
212
  mapping.expected_digest = valueDigest(current);
233
213
  }
234
- else if (operation.type === "artifact.metadata.set.v1" && artifactProperties !== undefined) {
214
+ else if (operation.type === "artifact.metadata.set.v1") {
235
215
  const current = artifactProperties.get(operation.payload.artifact_id);
236
216
  const field = operation.payload.field;
237
217
  if (current === undefined)
@@ -249,7 +229,7 @@ export function rebaseLocalCommits(localCommitsNewestFirst, targetHead, clientId
249
229
  throw new RepositoryServiceError("field conflict new digest is invalid");
250
230
  fieldResolutionHeads.set(JSON.stringify(key), mapping[newName]);
251
231
  }
252
- if (referenceSets !== undefined && Object.hasOwn(mapping, "expected_reference_digest")) {
232
+ if (Object.hasOwn(mapping, "expected_reference_digest")) {
253
233
  const artifactId = mapping.artifact_id;
254
234
  if (typeof artifactId !== "string")
255
235
  throw new RepositoryServiceError("artifact conflict reference is invalid");
@@ -261,19 +241,34 @@ export function rebaseLocalCommits(localCommitsNewestFirst, targetHead, clientId
261
241
  }
262
242
  }
263
243
  const rebased = RepositoryOperation.fromMapping(mapping);
264
- operations.push(rebased);
265
- valuesByRebasedOperation.set(rebased.operationId, originalValues[operationIndex] ?? new Map());
266
- if (referenceSets !== undefined)
267
- applyReferenceOperation(referenceSets, rebased);
268
- if (artifactProperties !== undefined && rebased.type.startsWith("artifact.")) {
269
- const writes = new Map(valuesByRebasedOperation.get(rebased.operationId));
270
- const manual = manualValues[rebased.operationId];
271
- if (manual !== undefined && rebased.type === "artifact.properties.set.v1") {
272
- writes.set("manual", LatestValueWrite.fromMapping({
273
- owner_type: "artifact", owner_id: rebased.payload.artifact_id, field: "properties",
274
- value: manual, value_digest: rebased.payload.new_digest,
275
- }));
244
+ if (strategy !== "manual" && originalWrites?.size === 0) {
245
+ const target = latestTarget(rebased);
246
+ if (target) {
247
+ try {
248
+ localTables ??= snapshotTables(localSnapshot);
249
+ const value = snapshotLatestValue(localTables, ...target);
250
+ const write = LatestValueWrite.fromMapping({
251
+ owner_type: target[0], owner_id: target[1], field: target[2], value, value_digest: target[3],
252
+ });
253
+ writes = new Map([[JSON.stringify(write.key), write]]);
254
+ }
255
+ catch (error) {
256
+ const reason = error instanceof Error ? error.message : "local rebase latest value is unavailable";
257
+ throw new RepositoryServiceError(operationFailureMessage(operation, reason), { cause: error });
258
+ }
259
+ }
260
+ else {
261
+ writes = new Map();
276
262
  }
263
+ }
264
+ if (writes === undefined) {
265
+ throw new RepositoryServiceError(operationFailureMessage(operation, "original operation latest values are missing"));
266
+ }
267
+ operations.push(rebased);
268
+ for (const write of writes.values())
269
+ serializedWrites.push(write.canonicalBytes);
270
+ applyReferenceOperation(referenceSets, rebased);
271
+ if (rebased.type.startsWith("artifact.")) {
277
272
  const properties = foldArtifactPropertiesOperation(artifactProperties.get(rebased.payload.artifact_id), rebased, writes);
278
273
  if (properties !== undefined)
279
274
  artifactProperties.set(rebased.payload.artifact_id, properties);
@@ -288,19 +283,17 @@ export function rebaseLocalCommits(localCommitsNewestFirst, targetHead, clientId
288
283
  latestStateDigests: latestStateDigests(operations), artifactDigests: artifactDigests(operations), rebasedFrom: original.commitId,
289
284
  });
290
285
  commits.push(commit);
291
- latestValuesByCommit.push(latestGroups(commit, valuesByRebasedOperation, manualValues));
286
+ latestValuesByCommit.push(serializedWrites);
292
287
  parent = commit.commitId;
293
288
  }
294
- return { commits, latestValuesByCommit, manualValues };
289
+ return { commits, latestValuesByCommit };
295
290
  }
296
291
  export async function loadRebaseLatestValues(store, repositoryId, commits) {
297
292
  const values = new Map();
298
293
  try {
299
294
  for (const commit of commits) {
300
- const writes = (await store.loadCommitLatestValues(repositoryId, commit.commitId))
301
- .map(raw => LatestValueWrite.fromCanonicalBytes(raw));
302
- values.set(commit.commitId, writes.length === 0 ? commit.operations.map(() => new Map()) :
303
- [...associateLatestValueWrites(commit.operations, writes)]);
295
+ const raw = await store.loadCommitLatestValues(repositoryId, commit.commitId);
296
+ values.set(commit.commitId, raw.length === 0 ? new Map() : latestValueWrites(commit, raw));
304
297
  }
305
298
  }
306
299
  catch (error) {