night-orch 0.17.0 → 0.18.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 (64) hide show
  1. package/dist/fileloop/publish.js +1 -1
  2. package/dist/fileloop/publish.js.map +1 -1
  3. package/dist/loop/step-executor.d.ts.map +1 -1
  4. package/dist/loop/step-executor.js +3 -1
  5. package/dist/loop/step-executor.js.map +1 -1
  6. package/dist/loop/types.d.ts +2 -2
  7. package/dist/loop/types.d.ts.map +1 -1
  8. package/dist/ops/conflict-snapshot.d.ts +23 -0
  9. package/dist/ops/conflict-snapshot.d.ts.map +1 -0
  10. package/dist/ops/conflict-snapshot.js +37 -0
  11. package/dist/ops/conflict-snapshot.js.map +1 -0
  12. package/dist/ops/conflict-types.d.ts +27 -0
  13. package/dist/ops/conflict-types.d.ts.map +1 -1
  14. package/dist/ops/conflict-types.js +18 -1
  15. package/dist/ops/conflict-types.js.map +1 -1
  16. package/dist/ops/continue.d.ts.map +1 -1
  17. package/dist/ops/continue.js +13 -6
  18. package/dist/ops/continue.js.map +1 -1
  19. package/dist/ops/rebase-and-check.d.ts +2 -0
  20. package/dist/ops/rebase-and-check.d.ts.map +1 -1
  21. package/dist/ops/rebase-and-check.js +5 -2
  22. package/dist/ops/rebase-and-check.js.map +1 -1
  23. package/dist/ops/rebase.d.ts +2 -0
  24. package/dist/ops/rebase.d.ts.map +1 -1
  25. package/dist/ops/rebase.js +47 -2
  26. package/dist/ops/rebase.js.map +1 -1
  27. package/dist/poller/attempt-dispatcher.d.ts.map +1 -1
  28. package/dist/poller/attempt-dispatcher.js +145 -33
  29. package/dist/poller/attempt-dispatcher.js.map +1 -1
  30. package/dist/publishing/publisher.js +1 -1
  31. package/dist/publishing/publisher.js.map +1 -1
  32. package/dist/publishing/push.d.ts +5 -3
  33. package/dist/publishing/push.d.ts.map +1 -1
  34. package/dist/publishing/push.js +30 -15
  35. package/dist/publishing/push.js.map +1 -1
  36. package/dist/reactions/handler.d.ts +4 -3
  37. package/dist/reactions/handler.d.ts.map +1 -1
  38. package/dist/reactions/handler.js +5 -4
  39. package/dist/reactions/handler.js.map +1 -1
  40. package/dist/reactions/scanner.js +1 -1
  41. package/dist/reactions/scanner.js.map +1 -1
  42. package/dist/runner/helpers.d.ts +2 -0
  43. package/dist/runner/helpers.d.ts.map +1 -1
  44. package/dist/runner/helpers.js +7 -3
  45. package/dist/runner/helpers.js.map +1 -1
  46. package/dist/runner/run-finalizer.d.ts.map +1 -1
  47. package/dist/runner/run-finalizer.js +26 -0
  48. package/dist/runner/run-finalizer.js.map +1 -1
  49. package/dist/state/attempts.d.ts +2 -1
  50. package/dist/state/attempts.d.ts.map +1 -1
  51. package/dist/state/attempts.js +2 -0
  52. package/dist/state/attempts.js.map +1 -1
  53. package/dist/state/runs.d.ts +1 -1
  54. package/dist/state/runs.d.ts.map +1 -1
  55. package/dist/state/runs.js +3 -1
  56. package/dist/state/runs.js.map +1 -1
  57. package/dist/workers/prompt/compiler.d.ts.map +1 -1
  58. package/dist/workers/prompt/compiler.js +66 -0
  59. package/dist/workers/prompt/compiler.js.map +1 -1
  60. package/dist/workers/types.d.ts +2 -0
  61. package/dist/workers/types.d.ts.map +1 -1
  62. package/package.json +1 -1
  63. package/web/dist/assets/{index-CfOxmeH3.js → index-CYJJ3jvA.js} +1 -1
  64. package/web/dist/index.html +1 -1
@@ -11,7 +11,7 @@ export async function publishFileLoopSession(args) {
11
11
  verifyPassed: args.verifyPassed,
12
12
  deferredNotes,
13
13
  });
14
- await pushBranch(args.session.worktreePath, args.session.branch);
14
+ await pushBranch(args.session.worktreePath, args.session.branch, args.repoConfig.updateStrategy);
15
15
  if (!args.verifyPassed && args.onFailure === 'no-pr') {
16
16
  logger.warn({ repo: args.repoConfig.repo, sessionId: args.session.id }, 'Finalize verification failed and policy is no-pr');
17
17
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/fileloop/publish.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAO3C,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAQ5C;IACC,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IACzF,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAChD,MAAM,IAAI,GAAG,mBAAmB,CAAC;QAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,aAAa;KACd,CAAC,CAAA;IAEF,MAAM,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAEhE,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,kDAAkD,CAAC,CAAA;QAC3H,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ;QACpC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACrE,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,KAAK,UAAU;SAC3D,CAAC;QACJ,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;YAC9C,KAAK;YACL,IAAI;YACJ,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;YACtC,KAAK,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,KAAK,UAAU;SAC3D,CAAC,CAAA;IAEN,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,CAAA;QAC5B,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACzD,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,kCAAkC,CAAC,CAAA;IACjH,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,QAAQ,CAAC,MAAM;QACzB,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/fileloop/publish.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAO3C,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,IAQ5C;IACC,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;IACzF,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAChD,MAAM,IAAI,GAAG,mBAAmB,CAAC;QAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,aAAa;KACd,CAAC,CAAA;IAEF,MAAM,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;IAEhG,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;QACrD,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,kDAAkD,CAAC,CAAA;QAC3H,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ;QACpC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACrE,KAAK;YACL,IAAI;YACJ,KAAK,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,KAAK,UAAU;SAC3D,CAAC;QACJ,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;YAC9C,KAAK;YACL,IAAI;YACJ,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;YACtC,KAAK,EAAE,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,SAAS,KAAK,UAAU;SAC3D,CAAC,CAAA;IAEN,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,CAAC,WAAW,CAAC,CAAA;QAC5B,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACzD,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3E,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,kCAAkC,CAAC,CAAA;IACjH,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,QAAQ,CAAC,MAAM;QACzB,YAAY,EAAE,IAAI,CAAC,YAAY;KAChC,CAAA;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"step-executor.d.ts","sourceRoot":"","sources":["../../src/loop/step-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACrF,OAAO,KAAK,EAAE,aAAa,EAAmB,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAC1G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAoBpD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IACvC,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;CAC3C;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,UAAU,CAAA;IACf,UAAU,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;IAC3C,eAAe,CAAC,EAAE;QAChB,IAAI,EAAE,MAAM,CAAA;QACZ,UAAU,EAAE,MAAM,CAAA;QAClB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;QAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;KACjC,CAAA;IACD,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,YAAY,CAAA;CACxB;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,UAAU,CAAC,CASrB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,UAAU,CAAC,CAyIrB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,UAAU,CAAC,CAmBrB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,UAAU,CAAC,CAMrB;AA0BD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CA2B/E;AAmBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,gBAAgB;;;;;;;;;;EAkBvB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAmC5G;AAgGD,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,yBAAyB,EACzB,8BAA8B,EAC9B,kBAAkB,GACnB,MAAM,gCAAgC,CAAA"}
1
+ {"version":3,"file":"step-executor.d.ts","sourceRoot":"","sources":["../../src/loop/step-executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AACrF,OAAO,KAAK,EAAE,aAAa,EAAmB,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAC1G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAqBpD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;IACvC,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAA;CAC3C;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,UAAU,CAAA;IACf,UAAU,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAA;IAC3C,eAAe,CAAC,EAAE;QAChB,IAAI,EAAE,MAAM,CAAA;QACZ,UAAU,EAAE,MAAM,CAAA;QAClB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;QAC3B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAA;KACjC,CAAA;IACD,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,YAAY,CAAA;CACxB;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,UAAU,CAAC,CASrB;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,UAAU,CAAC,CAyIrB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,UAAU,EACjB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,UAAU,CAAC,CAmBrB;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,UAAU,CAAC,CAMrB;AA0BD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,aAAa,CA2B/E;AAoBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,UAAU,EACf,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,gBAAgB;;;;;;;;;;EAkBvB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAmC5G;AAgGD,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,yBAAyB,EACzB,8BAA8B,EAC9B,kBAAkB,GACnB,MAAM,gCAAgC,CAAA"}
@@ -11,6 +11,7 @@ import { createHash } from 'node:crypto';
11
11
  import { getRemediation } from '../workers/auth-check.js';
12
12
  import { logger } from '../utils/logger.js';
13
13
  import { buildPlanningPrdPath, isPlanningIssue } from '../planning/mode.js';
14
+ import { coerceConflictSnapshot } from '../ops/conflict-types.js';
14
15
  /**
15
16
  * Dispatch a workflow step to the appropriate executor based on step type.
16
17
  */
@@ -220,7 +221,8 @@ function parseFollowupContext(value) {
220
221
  const summary = typeof candidate['summary'] === 'string' && candidate['summary'].trim().length > 0
221
222
  ? candidate['summary']
222
223
  : null;
223
- return { type, summary, context };
224
+ const conflictSnapshot = coerceConflictSnapshot(candidate['conflictSnapshot']);
225
+ return { type, summary, context, conflictSnapshot };
224
226
  }
225
227
  /**
226
228
  * Resolve the worker profile configuration for a role.
@@ -1 +1 @@
1
- {"version":3,"file":"step-executor.js","sourceRoot":"","sources":["../../src/loop/step-executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"step-executor.js","sourceRoot":"","sources":["../../src/loop/step-executor.ts"],"names":[],"mappings":"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"}
@@ -7,8 +7,8 @@ import type { IterationSnapshot } from './progress.js';
7
7
  import type { BlockedState } from './state.js';
8
8
  /** Why a run was blocked — used for reporting and retry eligibility. */
9
9
  export type BlockReason = 'cost_limit' | 'iteration_limit' | 'agent_pass_limit' | 'reviewer_blocked' | 'ambiguous_review' | 'verify_config' | 'merge_conflict' | 'auth_failure' | 'empty_diff';
10
- /** How this run was initiated: new work, PR feedback follow-up, or rebase after merge conflict. */
11
- export type RunMode = 'fresh' | 'followup' | 'rebase';
10
+ /** How this run was initiated: new work, PR feedback follow-up, automatic refresh, or explicit rebase. */
11
+ export type RunMode = 'fresh' | 'followup' | 'refresh' | 'rebase';
12
12
  export type LoopPhase = string;
13
13
  export interface PhaseRecord {
14
14
  phase: LoopPhase;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/loop/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/loop/types.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ import type { ConflictResolutionMetadata, ConflictSnapshot, ConflictSnapshotExcerpt, ConflictSnapshotKind, ConflictSnapshotSource } from './conflict-types.js';
2
+ import type { UpdateStrategy } from '../git/worktree.js';
3
+ interface BuildConflictSnapshotInput {
4
+ source: ConflictSnapshotSource;
5
+ kind: ConflictSnapshotKind;
6
+ strategy: UpdateStrategy;
7
+ summary: string;
8
+ branchName: string;
9
+ baseBranch: string;
10
+ files?: string[];
11
+ excerpts?: ConflictSnapshotExcerpt[];
12
+ resolution?: ConflictResolutionMetadata;
13
+ branchHeadSha?: string | null;
14
+ baseHeadSha?: string | null;
15
+ capturedAt?: string;
16
+ }
17
+ export declare function buildConflictSnapshot(input: BuildConflictSnapshotInput): ConflictSnapshot;
18
+ export declare function resolveConflictSnapshotRefs(worktreePath: string, baseBranch: string): Promise<{
19
+ branchHeadSha: string | null;
20
+ baseHeadSha: string | null;
21
+ }>;
22
+ export {};
23
+ //# sourceMappingURL=conflict-snapshot.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"conflict-snapshot.d.ts","sourceRoot":"","sources":["../../src/ops/conflict-snapshot.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,0BAA0B,EAC1B,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,UAAU,0BAA0B;IAClC,MAAM,EAAE,sBAAsB,CAAA;IAC9B,IAAI,EAAE,oBAAoB,CAAA;IAC1B,QAAQ,EAAE,cAAc,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,QAAQ,CAAC,EAAE,uBAAuB,EAAE,CAAA;IACpC,UAAU,CAAC,EAAE,0BAA0B,CAAA;IACvC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,0BAA0B,GAChC,gBAAgB,CAgBlB;AAED,wBAAsB,2BAA2B,CAC/C,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAMvE"}
@@ -0,0 +1,37 @@
1
+ import { nowUtcIso } from '../utils/time.js';
2
+ import { runGit } from '../git/process.js';
3
+ export function buildConflictSnapshot(input) {
4
+ return {
5
+ schemaVersion: 1,
6
+ capturedAt: input.capturedAt ?? nowUtcIso(),
7
+ source: input.source,
8
+ kind: input.kind,
9
+ strategy: input.strategy,
10
+ summary: input.summary,
11
+ branchName: input.branchName,
12
+ baseBranch: input.baseBranch,
13
+ branchHeadSha: input.branchHeadSha ?? null,
14
+ baseHeadSha: input.baseHeadSha ?? null,
15
+ files: input.files ?? [],
16
+ excerpts: input.excerpts ?? [],
17
+ ...(input.resolution ? { resolution: input.resolution } : {}),
18
+ };
19
+ }
20
+ export async function resolveConflictSnapshotRefs(worktreePath, baseBranch) {
21
+ const [branchHeadSha, baseHeadSha] = await Promise.all([
22
+ revParse(worktreePath, 'HEAD'),
23
+ revParse(worktreePath, `origin/${baseBranch}`),
24
+ ]);
25
+ return { branchHeadSha, baseHeadSha };
26
+ }
27
+ async function revParse(cwd, ref) {
28
+ try {
29
+ const { stdout } = await runGit(['rev-parse', ref], { cwd, timeout: 30_000 });
30
+ const sha = stdout.trim();
31
+ return sha.length > 0 ? sha : null;
32
+ }
33
+ catch {
34
+ return null;
35
+ }
36
+ }
37
+ //# sourceMappingURL=conflict-snapshot.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"conflict-snapshot.js","sourceRoot":"","sources":["../../src/ops/conflict-snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAyB1C,MAAM,UAAU,qBAAqB,CACnC,KAAiC;IAEjC,OAAO;QACL,aAAa,EAAE,CAAC;QAChB,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,SAAS,EAAE;QAC3C,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI;QAC1C,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,IAAI;QACtC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,EAAE;QACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,EAAE;QAC9B,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9D,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,YAAoB,EACpB,UAAkB;IAElB,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,YAAY,EAAE,UAAU,UAAU,EAAE,CAAC;KAC/C,CAAC,CAAA;IACF,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,CAAA;AACvC,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,GAAW,EAAE,GAAW;IAC9C,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;QAC7E,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;QACzB,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAA;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC"}
@@ -1,3 +1,4 @@
1
+ import type { UpdateStrategy } from '../git/worktree.js';
1
2
  export interface FullConflictSource {
2
3
  path: string;
3
4
  mergedWithMarkers: string;
@@ -19,6 +20,30 @@ export interface ConflictResolutionMetadata {
19
20
  outcome: ConflictResolutionOutcome;
20
21
  files?: string[];
21
22
  }
23
+ export type ConflictSnapshotSource = 'branch_refresh' | 'manual_rebase' | 'publish_push';
24
+ export type ConflictSnapshotKind = 'merge' | 'rebase' | 'unknown';
25
+ export interface ConflictSnapshotExcerpt {
26
+ path: string;
27
+ preview: string;
28
+ base?: string;
29
+ ours?: string;
30
+ theirs?: string;
31
+ }
32
+ export interface ConflictSnapshot {
33
+ schemaVersion: 1;
34
+ capturedAt: string;
35
+ source: ConflictSnapshotSource;
36
+ kind: ConflictSnapshotKind;
37
+ strategy: UpdateStrategy;
38
+ summary: string;
39
+ branchName: string;
40
+ baseBranch: string;
41
+ branchHeadSha: string | null;
42
+ baseHeadSha: string | null;
43
+ files: string[];
44
+ excerpts: ConflictSnapshotExcerpt[];
45
+ resolution?: ConflictResolutionMetadata;
46
+ }
22
47
  export type ConflictResolutionFailureOutcome = Exclude<ConflictResolutionOutcome, 'resolved'>;
23
48
  export type ConflictResolverResult = {
24
49
  ok: true;
@@ -39,4 +64,6 @@ export interface ConflictResolver {
39
64
  readonly maxFiles: number;
40
65
  resolveConflicts(sources: FullConflictSource[], context: ConflictResolutionContext, invocation: ConflictResolverInvocation): Promise<ConflictResolverResult>;
41
66
  }
67
+ export declare function isConflictSnapshot(value: unknown): value is ConflictSnapshot;
68
+ export declare function coerceConflictSnapshot(value: unknown): ConflictSnapshot | null;
42
69
  //# sourceMappingURL=conflict-types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"conflict-types.d.ts","sourceRoot":"","sources":["../../src/ops/conflict-types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,iBAAiB,EAAE,MAAM,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,yBAAyB,GACjC,UAAU,GACV,YAAY,GACZ,mBAAmB,GACnB,OAAO,CAAA;AAEX,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,EAAE,yBAAyB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CACjB;AAED,MAAM,MAAM,gCAAgC,GAAG,OAAO,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAA;AAE7F,MAAM,MAAM,sBAAsB,GAC9B;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,oBAAoB,EAAE,CAAA;CAC9B,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,OAAO,EAAE,gCAAgC,CAAA;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CACjB,CAAA;AAEL,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,gBAAgB,CACd,OAAO,EAAE,kBAAkB,EAAE,EAC7B,OAAO,EAAE,yBAAyB,EAClC,UAAU,EAAE,0BAA0B,GACrC,OAAO,CAAC,sBAAsB,CAAC,CAAA;CACnC"}
1
+ {"version":3,"file":"conflict-types.d.ts","sourceRoot":"","sources":["../../src/ops/conflict-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,iBAAiB,EAAE,MAAM,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,yBAAyB,GACjC,UAAU,GACV,YAAY,GACZ,mBAAmB,GACnB,OAAO,CAAA;AAEX,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,OAAO,CAAA;IAClB,OAAO,EAAE,yBAAyB,CAAA;IAClC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CACjB;AAED,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG,eAAe,GAAG,cAAc,CAAA;AACxF,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAA;AAEjE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,aAAa,EAAE,CAAC,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,sBAAsB,CAAA;IAC9B,IAAI,EAAE,oBAAoB,CAAA;IAC1B,QAAQ,EAAE,cAAc,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,QAAQ,EAAE,uBAAuB,EAAE,CAAA;IACnC,UAAU,CAAC,EAAE,0BAA0B,CAAA;CACxC;AAED,MAAM,MAAM,gCAAgC,GAAG,OAAO,CAAC,yBAAyB,EAAE,UAAU,CAAC,CAAA;AAE7F,MAAM,MAAM,sBAAsB,GAC9B;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,oBAAoB,EAAE,CAAA;CAC9B,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,OAAO,EAAE,gCAAgC,CAAA;IACzC,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;CACjB,CAAA;AAEL,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,gBAAgB,CACd,OAAO,EAAE,kBAAkB,EAAE,EAC7B,OAAO,EAAE,yBAAyB,EAClC,UAAU,EAAE,0BAA0B,GACrC,OAAO,CAAC,sBAAsB,CAAC,CAAA;CACnC;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAa5E;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,gBAAgB,GAAG,IAAI,CAE9E"}
@@ -1,2 +1,19 @@
1
- export {};
1
+ export function isConflictSnapshot(value) {
2
+ if (typeof value !== 'object' || value === null || Array.isArray(value))
3
+ return false;
4
+ const candidate = value;
5
+ return candidate['schemaVersion'] === 1
6
+ && typeof candidate['capturedAt'] === 'string'
7
+ && typeof candidate['source'] === 'string'
8
+ && typeof candidate['kind'] === 'string'
9
+ && typeof candidate['strategy'] === 'string'
10
+ && typeof candidate['summary'] === 'string'
11
+ && typeof candidate['branchName'] === 'string'
12
+ && typeof candidate['baseBranch'] === 'string'
13
+ && Array.isArray(candidate['files'])
14
+ && Array.isArray(candidate['excerpts']);
15
+ }
16
+ export function coerceConflictSnapshot(value) {
17
+ return isConflictSnapshot(value) ? value : null;
18
+ }
2
19
  //# sourceMappingURL=conflict-types.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"conflict-types.js","sourceRoot":"","sources":["../../src/ops/conflict-types.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"conflict-types.js","sourceRoot":"","sources":["../../src/ops/conflict-types.ts"],"names":[],"mappings":"AAyFA,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACrF,MAAM,SAAS,GAAG,KAAgC,CAAA;IAClD,OAAO,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC;WAClC,OAAO,SAAS,CAAC,YAAY,CAAC,KAAK,QAAQ;WAC3C,OAAO,SAAS,CAAC,QAAQ,CAAC,KAAK,QAAQ;WACvC,OAAO,SAAS,CAAC,MAAM,CAAC,KAAK,QAAQ;WACrC,OAAO,SAAS,CAAC,UAAU,CAAC,KAAK,QAAQ;WACzC,OAAO,SAAS,CAAC,SAAS,CAAC,KAAK,QAAQ;WACxC,OAAO,SAAS,CAAC,YAAY,CAAC,KAAK,QAAQ;WAC3C,OAAO,SAAS,CAAC,YAAY,CAAC,KAAK,QAAQ;WAC3C,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;WACjC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAA;AAC3C,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;AACjD,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"continue.d.ts","sourceRoot":"","sources":["../../src/ops/continue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,mBAAmB,CAAA;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AA2BxD,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,wBAAsB,aAAa,CACjC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAoI9C"}
1
+ {"version":3,"file":"continue.d.ts","sourceRoot":"","sources":["../../src/ops/continue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,mBAAmB,CAAA;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AA4BxD,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,gBAAgB,CAAC,EAAE,cAAc,CAAA;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,wBAAsB,aAAa,CACjC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAqI9C"}
@@ -1,3 +1,4 @@
1
+ import { coerceConflictSnapshot } from './conflict-types.js';
1
2
  import { clearResumeDecisionArtifacts } from '../loop/checkpoint.js';
2
3
  import { RunManager } from '../state/runs.js';
3
4
  import { LeaseManager } from '../state/leases.js';
@@ -70,6 +71,7 @@ export async function queueContinue(db, forge, repoConfig, issueNumber, botUser,
70
71
  reactionType: followup.primaryType,
71
72
  reactionSummary: followup.summary,
72
73
  reactionContext: followup.context,
74
+ reactionConflictSnapshot: followup.conflictSnapshot,
73
75
  continueRequestedAt: nowUtcIso(),
74
76
  },
75
77
  controlPayload: {
@@ -154,8 +156,9 @@ async function buildFollowupContext(params) {
154
156
  }
155
157
  if (manualState === 'awaiting_rebase_resolution') {
156
158
  const rebaseContext = formatRebaseResolutionContext(controlPayload);
159
+ const snapshot = coerceConflictSnapshot(controlPayload?.['conflictSnapshot']);
157
160
  sections.push(rebaseContext);
158
- summaryParts.push('rebase conflict resolution');
161
+ summaryParts.push(snapshot?.source === 'branch_refresh' ? 'branch refresh conflict resolution' : 'rebase conflict resolution');
159
162
  }
160
163
  const reactions = await collectReactions({
161
164
  forge,
@@ -189,13 +192,19 @@ async function buildFollowupContext(params) {
189
192
  primaryType: manualState === 'awaiting_rebase_resolution' ? 'rebase_conflict_resolution' : 'continue',
190
193
  summary,
191
194
  context: sections.join('\n\n'),
195
+ conflictSnapshot: coerceConflictSnapshot(controlPayload?.['conflictSnapshot']),
192
196
  };
193
197
  }
194
198
  function formatRebaseResolutionContext(controlPayload) {
199
+ const snapshot = coerceConflictSnapshot(controlPayload?.['conflictSnapshot']);
200
+ const contextLabel = snapshot?.source === 'branch_refresh' ? 'Branch Refresh Conflict Analysis' : 'Rebase Conflict Analysis';
201
+ const guidance = snapshot?.source === 'branch_refresh'
202
+ ? 'A prior branch refresh attempt hit conflicts. Continue should keep the existing branch and reconcile the upstream changes instead of starting fresh.'
203
+ : 'A prior explicit rebase attempt hit conflicts. Continue should keep the existing branch and resolve the upstream changes manually instead of starting fresh.';
195
204
  const lines = [
196
- '## Rebase Conflict Analysis',
205
+ `## ${contextLabel}`,
197
206
  '',
198
- 'A prior explicit rebase attempt hit conflicts. Continue should keep the existing branch and resolve the upstream changes manually instead of starting fresh.',
207
+ guidance,
199
208
  ];
200
209
  const summary = typeof controlPayload?.conflictSummary === 'string' ? controlPayload.conflictSummary.trim() : '';
201
210
  if (summary) {
@@ -220,9 +229,7 @@ function formatRebaseResolutionContext(controlPayload) {
220
229
  const preview = typeof entry['preview'] === 'string' ? entry['preview'] : '';
221
230
  lines.push(`- ${path}`);
222
231
  if (preview.trim()) {
223
- lines.push('```text');
224
- lines.push(preview.trim());
225
- lines.push('```');
232
+ lines.push(` Preview: ${preview.trim()}`);
226
233
  }
227
234
  }
228
235
  }
@@ -1 +1 @@
1
- {"version":3,"file":"continue.js","sourceRoot":"","sources":["../../src/ops/continue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"continue.js","sourceRoot":"","sources":["../../src/ops/continue.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAyB,MAAM,qBAAqB,CAAA;AAEnF,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AACzC,MAAM,kBAAkB,GAAG,+BAA+B,CAAA;AAC1D,MAAM,YAAY,GAAmB;IACnC,YAAY,EAAE,CAAC;IACf,aAAa,EAAE,CAAC;IAChB,mBAAmB,EAAE,IAAI;IACzB,kBAAkB,EAAE,IAAI;CACzB,CAAA;AAED,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAA;AAC1E,MAAM,+BAA+B,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAU,CAAA;AAS/F,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,EAAqB,EACrB,KAAmB,EACnB,UAAsB,EACtB,WAAmB,EACnB,OAAe,EACf,UAAgC,EAAE;IAElC,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAA;IACrC,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,EAAE,CAAC,CAAA;IAEzC,MAAM,GAAG,GAAG,UAAU,CAAC,iBAAiB,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IACtE,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAA;IACjE,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAkB,GAAG,CAAC,MAAM,EAAE,EAAE,CAAA;IAClE,CAAC;IAED,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,+DAA+D,GAAG,CAAC,MAAM,GAAG,EAAE,CAAA;IAChH,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,CAAA;IACvF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,2CAA2C,EAAE,CAAA;IAC9E,CAAC;IAED,MAAM,yBAAyB,GAAG,GAAG,CAAC,WAAW,KAAK,4BAA4B,IAAI,OAAO,CAAC,gBAAgB,KAAK,SAAS,CAAA;IAC5H,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC;QAC1C,KAAK;QACL,SAAS;QACT,WAAW;QACX,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,UAAU,EAAE,GAAG,CAAC,OAAO;QACvB,aAAa,EAAE,GAAG,CAAC,SAAS;QAC5B,OAAO;QACP,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,cAAc,EAAE,GAAG,CAAC,cAAc;KACnC,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,4BAA4B,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACrE,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,EAAE,GAAG,CAAC,WAAW,CAAC,CAAA;IAE5F,oEAAoE;IACpE,uEAAuE;IACvE,kEAAkE;IAClE,uEAAuE;IACvE,oEAAoE;IACpE,mEAAmE;IACnE,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;QACzB,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,GAAW,EAAE;gBACrC,MAAM,MAAM,GAAG,qBAAqB,CAAC,EAAE,EAAE;oBACvC,iBAAiB,EAAE,GAAG,CAAC,EAAE;oBACzB,MAAM,EAAE,UAAU;oBAClB,WAAW,EAAE,KAAK;oBAClB,SAAS,EAAE;wBACT,GAAG,iBAAiB;wBACpB,SAAS;wBACT,YAAY,EAAE,QAAQ,CAAC,WAAW;wBAClC,eAAe,EAAE,QAAQ,CAAC,OAAO;wBACjC,eAAe,EAAE,QAAQ,CAAC,OAAO;wBACjC,wBAAwB,EAAE,QAAQ,CAAC,gBAAgB;wBACnD,mBAAmB,EAAE,SAAS,EAAE;qBACjC;oBACD,cAAc,EAAE;wBACd,MAAM,EAAE,GAAG,CAAC,WAAW,KAAK,4BAA4B,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB;wBAChG,SAAS;wBACT,mBAAmB,EAAE,yBAAyB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;wBAC7D,WAAW,EAAE,SAAS,EAAE;wBACxB,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAClF;iBACF,CAAC,CAAA;gBACF,kEAAkE;gBAClE,gEAAgE;gBAChE,qDAAqD;gBACrD,IAAI,WAAW,EAAE,CAAC;oBAChB,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;gBAC1E,CAAC;gBACD,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;gBAC5C,IAAI,SAAS,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;oBAClC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;gBACpD,CAAC;gBACD,OAAO,MAAM,CAAC,SAAS,CAAA;YACzB,CAAC,CAAC,CAAA;YACF,OAAO,EAAE,EAAE,CAAA;QACb,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,kCAAkC,CAAC,CAAA;YACvE,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IAEJ,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;QAC1B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,0CAA0C,EAAE,CAAA;IAC9E,CAAC;IAED,gBAAgB,CAAC,EAAE,EAAE;QACnB,KAAK,EAAE,YAAY;QACnB,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,QAAQ;QAChC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,IAAI;KAClF,CAAC,CAAA;IAEF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;QAC1D,MAAM,gBAAgB,CACpB,KAAK,EACL,SAAS,EACT,WAAW,EACX,KAAK,CAAC,MAAM,EACZ,GAAG,CAAC,MAAM,EACV,QAAQ,EACR,gBAAgB,CAAC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAC3C,CAAA;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,gDAAgD,CAAC,CAAA;IACtG,CAAC;IAED,MAAM,aAAa,CACjB,KAAK,EACL,SAAS,EACT,WAAW,EACX,OAAO,EACP,yBAAyB,QAAQ,CAAC,OAAO,EAAE,CAC5C,CAAA;IAED,MAAM,CAAC,IAAI,CACT;QACE,IAAI,EAAE,SAAS;QACf,WAAW;QACX,KAAK,EAAE,GAAG,CAAC,EAAE;QACb,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;KAC3C,EACD,gCAAgC,CACjC,CAAA;IAED,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,6BAA6B,QAAQ,CAAC,OAAO,GAAG,EAAE,CAAA;AACnF,CAAC;AAED,SAAS,kBAAkB,CACzB,YAA2B,EAC3B,SAAkC,EAClC,WAAkD;IAElD,IAAI,WAAW,KAAK,4BAA4B,EAAE,CAAC;QACjD,OAAO,oBAAoB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAA;IAClE,CAAC;IAED,IACE,OAAO,YAAY,KAAK,QAAQ;WAC7B,YAAY,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;WAC9B,YAAY,KAAK,SAAS;WAC1B,YAAY,KAAK,WAAW,EAC/B,CAAC;QACD,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,+BAA+B,EAAE,CAAC;QACpD,IAAI,oBAAoB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC3C,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC7E,CAAC;AAqBD,KAAK,UAAU,oBAAoB,CAAC,MAAkC;IACpE,MAAM,EACJ,KAAK,EACL,SAAS,EACT,WAAW,EACX,QAAQ,EACR,UAAU,EACV,aAAa,EACb,OAAO,EACP,WAAW,EACX,cAAc,GACf,GAAG,MAAM,CAAA;IAEV,MAAM,QAAQ,GAAa,EAAE,CAAA;IAC7B,MAAM,YAAY,GAAa,EAAE,CAAA;IAEjC,IAAI,aAAa,EAAE,IAAI,EAAE,EAAE,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC,4BAA4B,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACnE,CAAC;IAED,IAAI,WAAW,KAAK,4BAA4B,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,6BAA6B,CAAC,cAAc,CAAC,CAAA;QACnE,MAAM,QAAQ,GAAG,sBAAsB,CAAC,cAAc,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAA;QAC7E,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC5B,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,KAAK,gBAAgB,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAA;IAChI,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC;QACvC,KAAK;QACL,SAAS;QACT,WAAW;QACX,QAAQ;KACT,CAAC,CAAA;IACF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAA;QAC/C,YAAY,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC1F,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,2BAA2B,CAAC;QACjD,KAAK;QACL,SAAS;QACT,WAAW;QACX,UAAU;QACV,OAAO;KACR,CAAC,CAAA;IACF,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,CAAC,CAAA;QACnD,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IACtC,CAAC;IAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,QAAQ,CAAC,IAAI,CACX,2HAA2H,CAC5H,CAAA;IACH,CAAC;IAED,MAAM,mBAAmB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC,CAAA;IACtD,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,GAAG,CAAC;QAC5C,CAAC,CAAC,2BAA2B,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC7D,CAAC,CAAC,sDAAsD,CAAA;IAE1D,OAAO;QACL,WAAW,EAAE,WAAW,KAAK,4BAA4B,CAAC,CAAC,CAAC,4BAA4B,CAAC,CAAC,CAAC,UAAU;QACrG,OAAO;QACP,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAC9B,gBAAgB,EAAE,sBAAsB,CAAC,cAAc,EAAE,CAAC,kBAAkB,CAAC,CAAC;KAC/E,CAAA;AACH,CAAC;AAED,SAAS,6BAA6B,CAAC,cAA8C;IACnF,MAAM,QAAQ,GAAG,sBAAsB,CAAC,cAAc,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAA;IAC7E,MAAM,YAAY,GAAG,QAAQ,EAAE,MAAM,KAAK,gBAAgB,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAC,CAAC,0BAA0B,CAAA;IAC5H,MAAM,QAAQ,GAAG,QAAQ,EAAE,MAAM,KAAK,gBAAgB;QACpD,CAAC,CAAC,sJAAsJ;QACxJ,CAAC,CAAC,8JAA8J,CAAA;IAClK,MAAM,KAAK,GAAG;QACZ,MAAM,YAAY,EAAE;QACpB,EAAE;QACF,QAAQ;KACT,CAAA;IAED,MAAM,OAAO,GAAG,OAAO,cAAc,EAAE,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAChH,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9F,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAA;QACpC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;YACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzD,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE,CAAC,CAAA;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAA;IACvG,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAA;QACpC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACzC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAAE,SAAQ;YACjF,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC,MAAM,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;YAC5E,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YAC5E,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;YACvB,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBACnB,KAAK,CAAC,IAAI,CAAC,cAAc,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YAC5C,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AASD,KAAK,UAAU,gBAAgB,CAAC,MAA8B;IAC5D,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IAC1D,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAA;IAExB,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,gBAAgB,CACvC,KAAK,EACL,SAAS,EACT,QAAQ,EACR,WAAW,EACX,YAAY,CACb,CAAA;QACD,OAAO,UAAU,CAAC,SAAS,CAAA;IAC7B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,6CAA6C,CAAC,CAAA;QAC3G,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAUD,KAAK,UAAU,2BAA2B,CAAC,MAAyC;IAClF,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;IAErE,IAAI,QAAwB,CAAA;IAC5B,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;IAClE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,kDAAkD,CAAC,CAAA;QACtG,OAAO,EAAE,CAAA;IACX,CAAC;IAED,MAAM,YAAY,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAA;IACpD,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;IAEnD,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;YAAE,OAAO,KAAK,CAAA;QACtC,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,KAAK,CAAA;QAC1C,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAA;QAEvD,IAAI,CAAC,aAAa;YAAE,OAAO,IAAI,CAAA;QAC/B,MAAM,WAAW,GAAG,mBAAmB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC1D,OAAO,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,WAAW,GAAG,YAAY,CAAA;IACnE,CAAC,CAAC,CAAA;IAEF,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC;QAClC,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,QAAQ;aACP,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;YAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;gBAAE,OAAO,KAAK,CAAA;YACtC,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;gBAAE,OAAO,KAAK,CAAA;YAC1C,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAC/C,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAEd,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAA;AAC5B,CAAC;AAED,SAAS,qBAAqB,CAAC,SAAqB;IAClD,MAAM,KAAK,GAAG,CAAC,+BAA+B,CAAC,CAAA;IAE/C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACd,KAAK,CAAC,IAAI,CAAC,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;QACrC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AAED,SAAS,0BAA0B,CAAC,QAAwB;IAC1D,MAAM,KAAK,GAAG,CAAC,iCAAiC,CAAC,CAAA;IAEjD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACd,KAAK,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,SAAS,GAAG,CAAC,CAAA;QACxD,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACjC,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAqB;IACnD,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;IAClC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACzB,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,gBAAgB;gBACnB,OAAO,iBAAiB,CAAA;YAC1B,KAAK,YAAY;gBACf,OAAO,mBAAmB,CAAA;YAC5B,KAAK,cAAc;gBACjB,OAAO,0BAA0B,CAAA;YACnC,KAAK,gBAAgB;gBACnB,OAAO,wBAAwB,CAAA;QACnC,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,KAAmB,EACnB,IAAY,EACZ,WAAmB,EACnB,OAAe,EACf,OAAe;IAEf,IAAI,CAAC;QACH,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,gBAAgB,CAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,mBAAmB,OAAO,EAAE,EAAE,OAAO,CAAC,CAAA;QACxG,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,mBAAmB,OAAO,EAAE,CAAC,CAAA;QAC7E,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,wCAAwC,CAAC,CAAA;IACnF,CAAC;AACH,CAAC"}
@@ -3,6 +3,7 @@ import type { ForgeAdapter } from '../forge/types.js';
3
3
  import type { Config, RepoConfig } from '../config/schema.js';
4
4
  import { type RebaseConflictAnalysis } from './rebase.js';
5
5
  import type { UpdateStrategy } from '../git/worktree.js';
6
+ import type { VerifyResult } from '../workers/types.js';
6
7
  import type { MetricsService } from '../metrics/service.js';
7
8
  import type { ConflictResolutionMetadata } from './conflict-types.js';
8
9
  /**
@@ -44,6 +45,7 @@ export declare function executeRebase(repoLocalPath: string, worktreePath: strin
44
45
  }): Promise<{
45
46
  rebased: boolean;
46
47
  verifyPassed: boolean;
48
+ verifyResults?: VerifyResult[];
47
49
  conflict: boolean;
48
50
  conflictAnalysis?: RebaseConflictAnalysis;
49
51
  resolution?: ConflictResolutionMetadata;
@@ -1 +1 @@
1
- {"version":3,"file":"rebase-and-check.d.ts","sourceRoot":"","sources":["../../src/ops/rebase-and-check.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,EAAc,KAAK,sBAAsB,EAAqB,MAAM,aAAa,CAAA;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAYxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAA;AAIrE;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GACnF,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAyE9C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EACxC,UAAU,UAAO,EACjB,QAAQ,GAAE,cAAyB,EACnC,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,cAAc,CAAA;CACpB,GACL,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,OAAO,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;IACjB,gBAAgB,CAAC,EAAE,sBAAsB,CAAA;IACzC,UAAU,CAAC,EAAE,0BAA0B,CAAA;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAC,CAyED"}
1
+ {"version":3,"file":"rebase-and-check.d.ts","sourceRoot":"","sources":["../../src/ops/rebase-and-check.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,EAAc,KAAK,sBAAsB,EAAqB,MAAM,aAAa,CAAA;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAGxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAUvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAA;AAIrE;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GACnF,OAAO,CAAC;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAyE9C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EACxC,UAAU,UAAO,EACjB,QAAQ,GAAE,cAAyB,EACnC,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,EAAE,CAAC,EAAE,QAAQ,CAAC,QAAQ,CAAA;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,cAAc,CAAA;CACpB,GACL,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,OAAO,CAAA;IACrB,aAAa,CAAC,EAAE,YAAY,EAAE,CAAA;IAC9B,QAAQ,EAAE,OAAO,CAAA;IACjB,gBAAgB,CAAC,EAAE,sBAAsB,CAAA;IACzC,UAAU,CAAC,EAAE,0BAA0B,CAAA;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAC,CA4ED"}
@@ -129,12 +129,13 @@ export async function executeRebase(repoLocalPath, worktreePath, branchName, bas
129
129
  metrics: options.metrics,
130
130
  });
131
131
  if (rebaseResult.result === 'up_to_date') {
132
- return { rebased: false, verifyPassed: true, conflict: false, resolution: rebaseResult.resolution };
132
+ return { rebased: false, verifyPassed: true, verifyResults: [], conflict: false, resolution: rebaseResult.resolution };
133
133
  }
134
134
  if (rebaseResult.result === 'conflict') {
135
135
  return {
136
136
  rebased: false,
137
137
  verifyPassed: false,
138
+ verifyResults: [],
138
139
  conflict: true,
139
140
  conflictAnalysis: rebaseResult.conflictAnalysis,
140
141
  resolution: rebaseResult.resolution,
@@ -144,6 +145,7 @@ export async function executeRebase(repoLocalPath, worktreePath, branchName, bas
144
145
  return {
145
146
  rebased: false,
146
147
  verifyPassed: false,
148
+ verifyResults: [],
147
149
  conflict: false,
148
150
  resolution: rebaseResult.resolution,
149
151
  error: rebaseResult.error,
@@ -151,12 +153,13 @@ export async function executeRebase(repoLocalPath, worktreePath, branchName, bas
151
153
  }
152
154
  // Rebased successfully — run verify
153
155
  if (!checkAfter || verifyCommands.length === 0) {
154
- return { rebased: true, verifyPassed: true, conflict: false, resolution: rebaseResult.resolution };
156
+ return { rebased: true, verifyPassed: true, verifyResults: [], conflict: false, resolution: rebaseResult.resolution };
155
157
  }
156
158
  const verifyResults = await runVerifyCommands(worktreePath, verifyCommands, buildVerifierEnv());
157
159
  return {
158
160
  rebased: true,
159
161
  verifyPassed: allVerifyPassed(verifyResults),
162
+ verifyResults,
160
163
  conflict: false,
161
164
  resolution: rebaseResult.resolution,
162
165
  };
@@ -1 +1 @@
1
- {"version":3,"file":"rebase-and-check.js","sourceRoot":"","sources":["../../src/ops/rebase-and-check.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rebase-and-check.js","sourceRoot":"","sources":["../../src/ops/rebase-and-check.ts"],"names":[],"mappings":"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"}
@@ -21,6 +21,8 @@ export interface RebaseConflictAnalysis {
21
21
  files: string[];
22
22
  summary: string;
23
23
  excerpts: RebaseConflictExcerpt[];
24
+ branchHeadSha: string | null;
25
+ baseHeadSha: string | null;
24
26
  }
25
27
  export interface AutoRebaseResult {
26
28
  result: RebaseResult;
@@ -1 +1 @@
1
- {"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../../src/ops/rebase.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAE5B,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,UAAU,GAAG,OAAO,CAAA;AAE1E,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,qBAAqB,EAAE,CAAA;CAClC;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,YAAY,CAAA;IACpB,gBAAgB,CAAC,EAAE,sBAAsB,CAAA;IACzC,UAAU,CAAC,EAAE,0BAA0B,CAAA;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,gBAAgB,CAAA;IAC3B,OAAO,CAAC,EAAE,yBAAyB,CAAA;IACnC,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB;AAcD;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EACrB,QAAQ,GAAE,cAAwB,EAClC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CA4F3B;AA2ID,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,YAAY,GAAG,QAAQ,GAAG,WAAW,GAAG,IAAI,CAK9C;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,kBAAkB,GACzB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,QAAQ,GAAG,WAAW,CAAA;CAAE,GAAG,IAAI,CAgBzD;AAmCD,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IACT,OAAO,EAAE,kBAAkB,EAAE,CAAA;IAC7B,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,GAAG,WAAW,CAAA;KAAE,CAAA;CACvE,CAAC,CA4CD"}
1
+ {"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../../src/ops/rebase.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAG3D,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAE5B,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,UAAU,GAAG,OAAO,CAAA;AAE1E,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,qBAAqB,EAAE,CAAA;IACjC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,YAAY,CAAA;IACpB,gBAAgB,CAAC,EAAE,sBAAsB,CAAA;IACzC,UAAU,CAAC,EAAE,0BAA0B,CAAA;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,gBAAgB,CAAA;IAC3B,OAAO,CAAC,EAAE,yBAAyB,CAAA;IACnC,OAAO,CAAC,EAAE,cAAc,CAAA;CACzB;AAcD;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EACrB,QAAQ,GAAE,cAAwB,EAClC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CAgG3B;AAoLD,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,YAAY,GAAG,QAAQ,GAAG,WAAW,GAAG,IAAI,CAK9C;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,kBAAkB,GACzB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,QAAQ,GAAG,WAAW,CAAA;CAAE,GAAG,IAAI,CAgBzD;AAsCD,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IACT,OAAO,EAAE,kBAAkB,EAAE,CAAA;IAC7B,IAAI,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,YAAY,GAAG,QAAQ,GAAG,WAAW,CAAA;KAAE,CAAA;CACvE,CAAC,CA4CD"}