@on-par/factory-cli 0.9.18-next.2 → 0.9.18-next.21
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.
- package/dist/cli/awaiting-ci-recheck.d.ts +31 -0
- package/dist/cli/awaiting-ci-recheck.d.ts.map +1 -0
- package/dist/cli/awaiting-ci-recheck.js +61 -0
- package/dist/cli/awaiting-ci-recheck.js.map +1 -0
- package/dist/cli/awaiting-ci-wiring.d.ts +6 -0
- package/dist/cli/awaiting-ci-wiring.d.ts.map +1 -0
- package/dist/cli/awaiting-ci-wiring.js +45 -0
- package/dist/cli/awaiting-ci-wiring.js.map +1 -0
- package/dist/cli/daemon.d.ts.map +1 -1
- package/dist/cli/daemon.js +3 -3
- package/dist/cli/daemon.js.map +1 -1
- package/dist/cli/detect-checks.d.ts +2 -0
- package/dist/cli/detect-checks.d.ts.map +1 -1
- package/dist/cli/detect-checks.js +13 -2
- package/dist/cli/detect-checks.js.map +1 -1
- package/dist/cli/doctor-verify.d.ts +3 -1
- package/dist/cli/doctor-verify.d.ts.map +1 -1
- package/dist/cli/doctor-verify.js +13 -8
- package/dist/cli/doctor-verify.js.map +1 -1
- package/dist/cli/errors.d.ts +6 -0
- package/dist/cli/errors.d.ts.map +1 -0
- package/dist/cli/errors.js +11 -0
- package/dist/cli/errors.js.map +1 -0
- package/dist/cli/host-claim-guards.d.ts +9 -0
- package/dist/cli/host-claim-guards.d.ts.map +1 -0
- package/dist/cli/host-claim-guards.js +11 -0
- package/dist/cli/host-claim-guards.js.map +1 -0
- package/dist/cli/host-slot.d.ts +15 -2
- package/dist/cli/host-slot.d.ts.map +1 -1
- package/dist/cli/host-slot.js +33 -3
- package/dist/cli/host-slot.js.map +1 -1
- package/dist/cli/index.d.ts +6 -16
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +52 -78
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/json-contract.d.ts +7 -0
- package/dist/cli/json-contract.d.ts.map +1 -1
- package/dist/cli/json-contract.js +3 -0
- package/dist/cli/json-contract.js.map +1 -1
- package/dist/cli/land-behind.d.ts +8 -0
- package/dist/cli/land-behind.d.ts.map +1 -0
- package/dist/cli/land-behind.js +21 -0
- package/dist/cli/land-behind.js.map +1 -0
- package/dist/cli/land-pr.d.ts +24 -0
- package/dist/cli/land-pr.d.ts.map +1 -1
- package/dist/cli/land-pr.js +143 -51
- package/dist/cli/land-pr.js.map +1 -1
- package/dist/cli/land.d.ts +9 -0
- package/dist/cli/land.d.ts.map +1 -1
- package/dist/cli/land.js +24 -23
- package/dist/cli/land.js.map +1 -1
- package/dist/cli/lane-heartbeat.d.ts +31 -3
- package/dist/cli/lane-heartbeat.d.ts.map +1 -1
- package/dist/cli/lane-heartbeat.js +74 -6
- package/dist/cli/lane-heartbeat.js.map +1 -1
- package/dist/cli/lane-park-comment.d.ts.map +1 -1
- package/dist/cli/lane-park-comment.js +2 -1
- package/dist/cli/lane-park-comment.js.map +1 -1
- package/dist/cli/lane-pause.d.ts +6 -1
- package/dist/cli/lane-pause.d.ts.map +1 -1
- package/dist/cli/lane-pause.js +30 -0
- package/dist/cli/lane-pause.js.map +1 -1
- package/dist/cli/model-override-messages.d.ts +5 -1
- package/dist/cli/model-override-messages.d.ts.map +1 -1
- package/dist/cli/model-override-messages.js +9 -1
- package/dist/cli/model-override-messages.js.map +1 -1
- package/dist/cli/notify.d.ts +12 -0
- package/dist/cli/notify.d.ts.map +1 -1
- package/dist/cli/notify.js +28 -0
- package/dist/cli/notify.js.map +1 -1
- package/dist/cli/queue-preflight.d.ts +4 -2
- package/dist/cli/queue-preflight.d.ts.map +1 -1
- package/dist/cli/queue-preflight.js +1 -1
- package/dist/cli/queue-preflight.js.map +1 -1
- package/dist/cli/queue-startup.d.ts +57 -0
- package/dist/cli/queue-startup.d.ts.map +1 -1
- package/dist/cli/queue-startup.js +64 -1
- package/dist/cli/queue-startup.js.map +1 -1
- package/dist/cli/repo-live-run-lock.d.ts +7 -0
- package/dist/cli/repo-live-run-lock.d.ts.map +1 -0
- package/dist/cli/repo-live-run-lock.js +14 -0
- package/dist/cli/repo-live-run-lock.js.map +1 -0
- package/dist/cli/repo-run-lock.d.ts +14 -0
- package/dist/cli/repo-run-lock.d.ts.map +1 -0
- package/dist/cli/repo-run-lock.js +27 -0
- package/dist/cli/repo-run-lock.js.map +1 -0
- package/dist/cli/reset.d.ts.map +1 -1
- package/dist/cli/reset.js +2 -2
- package/dist/cli/reset.js.map +1 -1
- package/dist/cli/run-branch.js +1 -1
- package/dist/cli/run-branch.js.map +1 -1
- package/dist/cli/run-lane-deps.d.ts +16 -1
- package/dist/cli/run-lane-deps.d.ts.map +1 -1
- package/dist/cli/run-lane-disk-hold.d.ts +14 -0
- package/dist/cli/run-lane-disk-hold.d.ts.map +1 -0
- package/dist/cli/run-lane-disk-hold.js +25 -0
- package/dist/cli/run-lane-disk-hold.js.map +1 -0
- package/dist/cli/run-lane-load-hold.d.ts +14 -0
- package/dist/cli/run-lane-load-hold.d.ts.map +1 -0
- package/dist/cli/run-lane-load-hold.js +22 -0
- package/dist/cli/run-lane-load-hold.js.map +1 -0
- package/dist/cli/run-lane-restack.d.ts +13 -0
- package/dist/cli/run-lane-restack.d.ts.map +1 -0
- package/dist/cli/run-lane-restack.js +21 -0
- package/dist/cli/run-lane-restack.js.map +1 -0
- package/dist/cli/run-lane.d.ts.map +1 -1
- package/dist/cli/run-lane.js +77 -61
- package/dist/cli/run-lane.js.map +1 -1
- package/dist/cli/run.d.ts +1 -0
- package/dist/cli/run.d.ts.map +1 -1
- package/dist/cli/run.js +19 -15
- package/dist/cli/run.js.map +1 -1
- package/dist/cli/self-update-apply.d.ts +1 -1
- package/dist/cli/self-update-apply.d.ts.map +1 -1
- package/dist/cli/self-update-apply.js +4 -5
- package/dist/cli/self-update-apply.js.map +1 -1
- package/dist/cli/ship-run-state.d.ts +5 -0
- package/dist/cli/ship-run-state.d.ts.map +1 -1
- package/dist/cli/ship-run-state.js +18 -1
- package/dist/cli/ship-run-state.js.map +1 -1
- package/dist/cli/ship-steps.d.ts +4 -2
- package/dist/cli/ship-steps.d.ts.map +1 -1
- package/dist/cli/ship-steps.js +3 -1
- package/dist/cli/ship-steps.js.map +1 -1
- package/dist/cli/ship.d.ts +4 -2
- package/dist/cli/ship.d.ts.map +1 -1
- package/dist/cli/ship.js +11 -17
- package/dist/cli/ship.js.map +1 -1
- package/dist/cli/status-json.d.ts +1 -0
- package/dist/cli/status-json.d.ts.map +1 -1
- package/dist/cli/status-json.js +1 -0
- package/dist/cli/status-json.js.map +1 -1
- package/dist/cli/status.d.ts.map +1 -1
- package/dist/cli/status.js +16 -1
- package/dist/cli/status.js.map +1 -1
- package/dist/cli/steer.js +3 -3
- package/dist/cli/steer.js.map +1 -1
- package/dist/cli/unpark.d.ts.map +1 -1
- package/dist/cli/unpark.js +4 -2
- package/dist/cli/unpark.js.map +1 -1
- package/package.json +4 -4
- package/schemas/logs-line.schema.json +10 -0
- package/schemas/status.schema.json +24 -0
|
@@ -73,6 +73,11 @@ export declare const statusJsonSchema: z.ZodObject<{
|
|
|
73
73
|
count: z.ZodNumber;
|
|
74
74
|
oldestHours: z.ZodNullable<z.ZodNumber>;
|
|
75
75
|
}, z.core.$strip>>;
|
|
76
|
+
disk: z.ZodNullable<z.ZodObject<{
|
|
77
|
+
freeGb: z.ZodNumber;
|
|
78
|
+
thresholdGb: z.ZodNumber;
|
|
79
|
+
low: z.ZodBoolean;
|
|
80
|
+
}, z.core.$strip>>;
|
|
76
81
|
providers: z.ZodArray<z.ZodObject<{
|
|
77
82
|
id: z.ZodString;
|
|
78
83
|
plan: z.ZodEnum<{
|
|
@@ -139,11 +144,13 @@ export declare const logsLineJsonSchema: z.ZodObject<{
|
|
|
139
144
|
lanePaused: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
140
145
|
park: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
141
146
|
providerCapped: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
147
|
+
providerFailover: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
142
148
|
allProvidersDown: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
143
149
|
providerRefused: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
144
150
|
providerAuthRejected: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
145
151
|
providerBreakerClose: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
146
152
|
providerRestored: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
153
|
+
claimLost: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
147
154
|
stewardTriggered: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
148
155
|
flakyTests: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
149
156
|
attribution: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodAny>>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-contract.d.ts","sourceRoot":"","sources":["../../src/cli/json-contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,2FAA2F;AAC3F,eAAO,MAAM,2BAA2B;;;kBAE3B,CAAC;AAEd,eAAO,MAAM,gBAAgB
|
|
1
|
+
{"version":3,"file":"json-contract.d.ts","sourceRoot":"","sources":["../../src/cli/json-contract.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,7 @@ export const statusJsonSchema = z.object({
|
|
|
57
57
|
})
|
|
58
58
|
.nullable(),
|
|
59
59
|
openFactoryDrafts: openFactoryDraftsJsonSchema,
|
|
60
|
+
disk: z.object({ freeGb: z.number(), thresholdGb: z.number(), low: z.boolean() }).nullable(),
|
|
60
61
|
providers: z.array(z.object({
|
|
61
62
|
id: z.string(),
|
|
62
63
|
plan: z.enum(['subscription', 'api', 'unknown']),
|
|
@@ -101,11 +102,13 @@ export const logsLineJsonSchema = z.object({
|
|
|
101
102
|
lanePaused: loosePayloadSchema.optional(),
|
|
102
103
|
park: loosePayloadSchema.optional(),
|
|
103
104
|
providerCapped: loosePayloadSchema.optional(),
|
|
105
|
+
providerFailover: loosePayloadSchema.optional(),
|
|
104
106
|
allProvidersDown: loosePayloadSchema.optional(),
|
|
105
107
|
providerRefused: loosePayloadSchema.optional(),
|
|
106
108
|
providerAuthRejected: loosePayloadSchema.optional(),
|
|
107
109
|
providerBreakerClose: loosePayloadSchema.optional(),
|
|
108
110
|
providerRestored: loosePayloadSchema.optional(),
|
|
111
|
+
claimLost: loosePayloadSchema.optional(),
|
|
109
112
|
stewardTriggered: loosePayloadSchema.optional(),
|
|
110
113
|
flakyTests: loosePayloadSchema.optional(),
|
|
111
114
|
attribution: loosePayloadSchema.optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-contract.js","sourceRoot":"","sources":["../../src/cli/json-contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;AAE1D,2FAA2F;AAC3F,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC;KACzC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;KACjE,QAAQ,EAAE,CAAC;AAEd,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;IACjB,QAAQ,EAAE,CAAC;SACR,MAAM,CAAC;QACN,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QACtE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC7B,CAAC;SACD,QAAQ,EAAE;IACb,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;QAChB,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;QACjB,SAAS,EAAE,CAAC,CAAC,KAAK,CAChB,CAAC,CAAC,MAAM,CAAC;YACP,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;YACpB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;YAClB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;YACpB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;YACxB,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE;SAClD,CAAC,CACH;KACF,CAAC;IACF,MAAM,EAAE,CAAC,CAAC,KAAK,CACb,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;KACnB,CAAC,CACH;IACD,MAAM,EAAE,CAAC;SACN,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;QAChD,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC9C,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACxD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;QACnB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAChC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAClC,UAAU,EAAE,CAAC;aACV,MAAM,CAAC;YACN,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;YACd,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;YACnB,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAChE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAC7B,CAAC;aACD,QAAQ,EAAE;QACb,QAAQ,EAAE,CAAC;aACR,MAAM,CAAC;YACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;YACjB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;YAClB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;SAC1C,CAAC;aACD,QAAQ,EAAE;KACd,CAAC;SACD,QAAQ,EAAE;IACb,iBAAiB,EAAE,2BAA2B;IAC9C,SAAS,EAAE,CAAC,CAAC,KAAK,CAChB,CAAC,CAAC,MAAM,CAAC;QACP,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;QACd,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACnC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACnC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC/B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC/B,CAAC,CACH;IACD,YAAY,EAAE,CAAC,CAAC,KAAK,CACnB,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,wBAAwB,EAAE,oBAAoB,CAAC,CAAC;QAC9D,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC/B,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC3C,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;KACnB,CAAC,CACH;CACF,CAAC,CAAC;AAEH,qCAAqC;AACrC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAE,kBAAkB;IACxB,iBAAiB,EAAE,2BAA2B;CAC/C,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;IACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;IACf,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IACrC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE;IACxC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC5D,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACvC,MAAM,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACrC,SAAS,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACxC,qBAAqB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACpD,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC/C,UAAU,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACzC,IAAI,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACnC,cAAc,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC7C,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC/C,eAAe,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC9C,oBAAoB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACnD,oBAAoB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACnD,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC/C,gBAAgB,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC/C,UAAU,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACzC,WAAW,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC1C,YAAY,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC3C,SAAS,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACxC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3E,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE;IACtE,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;IACrD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAChD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE;CACtD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC1B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE;IAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;QACxB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;KAC5D,CAAC,CACH;IACD,IAAI,EAAE,oBAAoB;CAC3B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,KAAK,EAAE,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,MAAM,CAAC;YACP,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;YACjB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC5B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;YACnD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;YACjB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SACjC,CAAC,CACH;KACF,CAAC,CACH;IACD,cAAc,EAAE,CAAC,CAAC,KAAK,CACrB,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC5B,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC3B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,qBAAqB,EAAE,uBAAuB,EAAE,uBAAuB,CAAC,CAAC,CAAC,QAAQ,EAAE;KACrG,CAAC,CACH;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IAC5D,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACrC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;IACvB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,IAAI,EAAE,CAAC;SACJ,IAAI,CAAC,CAAC,cAAc,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;SACxC,QAAQ,CACP,+PAA+P,CAChQ;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAE,CAAC,CAAC,KAAK,CACX,CAAC,CAAC,MAAM,CAAC;QACP,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;QACd,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;QACvB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;QACxB,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACrC,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACtC,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC1C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAC5B,CAAC,CACH;IACD,QAAQ,EAAE,CAAC,CAAC,KAAK,CACf,CAAC,CAAC,MAAM,CAAC;QACP,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE;QACvB,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;QACxB,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE;QAC1B,eAAe,EAAE,CAAC,CAAC,MAAM,EAAE;QAC3B,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE;QAC/B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;QACzB,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE;KACnC,CAAC,CACH;IACD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;QACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;QACzB,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE;QAClC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;YACf,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;YACjB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;YAClB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;YACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;YACrB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;SAC1B,CAAC;KACH,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAE,CAAC,CAAC,KAAK,CACX,CAAC,CAAC,MAAM,CAAC;QACP,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC7B,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE;QAC5D,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC7B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC/B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC5B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC/B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAChC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC,CACH;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5C,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,KAAK,EAAE,CAAC;SACL,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACnG,QAAQ,EAAE;IACb,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC1F,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC3E,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;AAE1F,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE;IACf,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,MAAM,EAAE,CAAC,CAAC,KAAK,CACb,CAAC,CAAC,MAAM,CAAC;QACP,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;QAClB,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;QACvD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC5B,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC7B,SAAS,EAAE,oBAAoB,CAAC,QAAQ,EAAE;KAC3C,CAAC,CACH;IACD,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CACnC,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG;IACvB,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACnB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;CAChE,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3F,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAE/F,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACnB,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IAC3B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,SAAS,EAAE,oBAAoB,CAAC,QAAQ,EAAE;IAC1C,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CACjC,CAAC,CAAC;AAEH,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAE3E,8GAA8G;AAC9G,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IACvB,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,wBAAwB,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC5E,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC;IACnC,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC;IACrC,KAAK,EAAE,CAAC;SACL,MAAM,CAAC;QACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE;QACrB,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;QACnB,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE;QACzB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;KACrB,CAAC;SACD,QAAQ,EAAE;IACb,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IAC1C,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;IACzC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC;IACtC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;IAC1F,QAAQ,EAAE,CAAC;SACR,MAAM,CAAC;QACN,QAAQ,EAAE,CAAC,CAAC,KAAK,CACf,CAAC,CAAC,MAAM,CAAC;YACP,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;YACvB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;YACtD,UAAU,EAAE,CAAC,CAAC,OAAO,EAAE;YACvB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAC5B,CAAC,CACH;QACD,mBAAmB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;QAC3C,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7B,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE;KAClB,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CAAC,UAAU,CAAC;IACvB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;IACjG,MAAM,EAAE,CAAC;SACN,MAAM,CAAC;QACN,QAAQ,EAAE,CAAC,CAAC,KAAK,CACf,CAAC,CAAC,MAAM,CAAC;YACP,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;YAClB,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;YAC/C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;SACnB,CAAC,CACH;KACF,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CAAC,UAAU,CAAC;IACvB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,IAAI,EAAE,CAAC;SACJ,MAAM,CAAC;QACN,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;QACxB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;QACjB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAC3B,QAAQ,EAAE,CAAC,CAAC,OAAO,EAAE;QACrB,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,kBAAkB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;KAC5F,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"json-contract.js","sourceRoot":"","sources":["../../src/cli/json-contract.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { Octokit } from '@octokit/rest';
|
|
2
|
+
/** Max merge-main syncs per land before it refuses as "base kept moving" (ADR-0170; matches MAX_REWORK_ROUNDS). */
|
|
3
|
+
export declare const MAX_LAND_SYNC_ROUNDS = 3;
|
|
4
|
+
/** True when `headSha` is missing commits from `baseRef` (compare `behind_by > 0`). GitHub reports BEHIND
|
|
5
|
+
* only under enforced strict protection, so mergeStateStatus alone cannot answer this (#3645).
|
|
6
|
+
* Undefined when the compare call fails or the response is malformed: the caller decides. */
|
|
7
|
+
export declare function probeHeadBehindBase(octokit: Octokit, owner: string, repoName: string, baseRef: string, headSha: string): Promise<boolean | undefined>;
|
|
8
|
+
//# sourceMappingURL=land-behind.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"land-behind.d.ts","sourceRoot":"","sources":["../../src/cli/land-behind.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,mHAAmH;AACnH,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAEtC;;8FAE8F;AAC9F,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAY9B"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
// packages/cli/src/cli/land-behind.ts — stale-base detection for land (ADR-0170 slice a, #3654)
|
|
2
|
+
/** Max merge-main syncs per land before it refuses as "base kept moving" (ADR-0170; matches MAX_REWORK_ROUNDS). */
|
|
3
|
+
export const MAX_LAND_SYNC_ROUNDS = 3;
|
|
4
|
+
/** True when `headSha` is missing commits from `baseRef` (compare `behind_by > 0`). GitHub reports BEHIND
|
|
5
|
+
* only under enforced strict protection, so mergeStateStatus alone cannot answer this (#3645).
|
|
6
|
+
* Undefined when the compare call fails or the response is malformed: the caller decides. */
|
|
7
|
+
export async function probeHeadBehindBase(octokit, owner, repoName, baseRef, headSha) {
|
|
8
|
+
try {
|
|
9
|
+
const { data } = await octokit.rest.repos.compareCommitsWithBasehead({
|
|
10
|
+
owner,
|
|
11
|
+
repo: repoName,
|
|
12
|
+
basehead: `${baseRef}...${headSha}`,
|
|
13
|
+
});
|
|
14
|
+
const behindBy = data?.behind_by;
|
|
15
|
+
return typeof behindBy === 'number' ? behindBy > 0 : undefined;
|
|
16
|
+
}
|
|
17
|
+
catch {
|
|
18
|
+
return undefined;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=land-behind.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"land-behind.js","sourceRoot":"","sources":["../../src/cli/land-behind.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAIhG,mHAAmH;AACnH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC;;8FAE8F;AAC9F,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAgB,EAChB,KAAa,EACb,QAAgB,EAChB,OAAe,EACf,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC;YACnE,KAAK;YACL,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,GAAG,OAAO,MAAM,OAAO,EAAE;SACpC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAI,IAA4C,EAAE,SAAS,CAAC;QAC1E,OAAO,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
package/dist/cli/land-pr.d.ts
CHANGED
|
@@ -5,12 +5,14 @@ export type CommandRunner = (command: string, options?: {
|
|
|
5
5
|
cwd?: string;
|
|
6
6
|
timeout?: number;
|
|
7
7
|
}) => Promise<unknown>;
|
|
8
|
+
export declare function defaultListIssueLabels(octokit: Octokit, owner: string, repo: string, issue: number): Promise<string[]>;
|
|
8
9
|
export declare function squashMergeAndDelete(octokit: Octokit, owner: string, repoName: string, branch: string, prNumber: number,
|
|
9
10
|
/** `sha`: the CI-verified head commit. GitHub refuses the merge if the PR head has moved. */
|
|
10
11
|
opts?: {
|
|
11
12
|
admin?: boolean;
|
|
12
13
|
run?: CommandRunner;
|
|
13
14
|
sha?: string;
|
|
15
|
+
signal?: AbortSignal;
|
|
14
16
|
}): Promise<void>;
|
|
15
17
|
export declare class MergeGatedError extends Error {
|
|
16
18
|
readonly issue: number;
|
|
@@ -25,6 +27,20 @@ export declare class AwaitingReviewError extends Error {
|
|
|
25
27
|
readonly prNumber: number;
|
|
26
28
|
constructor(message: string, prNumber: number);
|
|
27
29
|
}
|
|
30
|
+
/** Thrown when the CI deadline passed with no check run and no commit status on the PR head (#3208). Not a
|
|
31
|
+
* CiFailedError: the PR stays open, nothing parks, and the runner re-checks it with backoff. */
|
|
32
|
+
export declare class AwaitingCiError extends Error {
|
|
33
|
+
readonly prNumber: number;
|
|
34
|
+
readonly headSha: string;
|
|
35
|
+
constructor(message: string, prNumber: number, headSha: string);
|
|
36
|
+
}
|
|
37
|
+
/** Thrown when STOP ended waitForMerge before the PR merged (#3291). Not a park: the lane
|
|
38
|
+
* re-queues the issue so the next run's preflight adopts and lands the open PR. */
|
|
39
|
+
export declare class AwaitMergeStoppedError extends Error {
|
|
40
|
+
readonly branch: string;
|
|
41
|
+
readonly prNumber: number | null;
|
|
42
|
+
constructor(message: string, branch: string, prNumber: number | null);
|
|
43
|
+
}
|
|
28
44
|
export declare class LandFailureError extends Error {
|
|
29
45
|
readonly code: number;
|
|
30
46
|
constructor(message: string, code: number);
|
|
@@ -49,6 +65,10 @@ export declare class CiUnverifiedError extends CiFailedError {
|
|
|
49
65
|
export declare class CiInfraError extends CiFailedError {
|
|
50
66
|
readonly parkReason: ParkReason;
|
|
51
67
|
}
|
|
68
|
+
/** True for the errors that leave the PR open and unmerged without a land failure: awaiting review, CI red or unverified, or CI not started. */
|
|
69
|
+
export declare function isLandLeftOpen(err: unknown): boolean;
|
|
70
|
+
/** True when CI never reached a green verdict: unverified, or never started. */
|
|
71
|
+
export declare function isCiNotGreen(err: unknown): boolean;
|
|
52
72
|
/** True when GitHub refused a SHA-pinned merge because the PR head moved past the verified
|
|
53
73
|
* commit (REST 409, or gh's "Head branch was modified"). Retrying as-is can never succeed. */
|
|
54
74
|
export declare function isHeadModifiedMergeError(err: unknown): boolean;
|
|
@@ -100,5 +120,9 @@ export declare function landOpenPullRequest(opts: {
|
|
|
100
120
|
ensureWorktree?: () => Promise<void>;
|
|
101
121
|
/** #3324: preflight adopted a DIRTY or still-UNKNOWN PR; sync with main before the first CI watch even when the state is not DIRTY. */
|
|
102
122
|
syncMain?: boolean;
|
|
123
|
+
/** #3654: answers whether a head lacks commits from the base; undefined when unknown. Defaults to the GitHub compare API. */
|
|
124
|
+
behindProbe?: (headSha: string, baseRef: string) => Promise<boolean | undefined>;
|
|
125
|
+
/** #3146: aborts when the lane loses its claim; checked before the merge. */
|
|
126
|
+
signal?: AbortSignal;
|
|
103
127
|
}): Promise<void>;
|
|
104
128
|
//# sourceMappingURL=land-pr.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"land-pr.d.ts","sourceRoot":"","sources":["../../src/cli/land-pr.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAqB,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"land-pr.d.ts","sourceRoot":"","sources":["../../src/cli/land-pr.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAqB,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAWtG,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,EAAE,CAAC,CAGnB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM;AAChB,6FAA6F;AAC7F,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,aAAa,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAO,GACtF,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED,qBAAa,eAAgB,SAAQ,KAAK;IAGtC,QAAQ,CAAC,KAAK,EAAE,MAAM;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAJxB,YACE,OAAO,EAAE,MAAM,EACN,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EAIvB;CACF;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAc;CAC9C;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAG1C,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAF3B,YACE,OAAO,EAAE,MAAM,EACN,QAAQ,EAAE,MAAM,EAG1B;CACF;AAED;iGACiG;AACjG,qBAAa,eAAgB,SAAQ,KAAK;IAGtC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM;IAH1B,YACE,OAAO,EAAE,MAAM,EACN,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAGzB;CACF;AAED;oFACoF;AACpF,qBAAa,sBAAuB,SAAQ,KAAK;IAG7C,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAHlC,YACE,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,IAAI,EAGjC;CACF;AAED,qBAAa,gBAAiB,SAAQ,KAAK;IAGvC,QAAQ,CAAC,IAAI,EAAE,MAAM;IAFvB,YACE,OAAO,EAAE,MAAM,EACN,IAAI,EAAE,MAAM,EAGtB;CACF;AAED;;6DAE6D;AAC7D,qBAAa,aAAc,SAAQ,KAAK;IAKpC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IAJ3B,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAe;IAE9C,YACE,OAAO,EAAE,MAAM,EACN,QAAQ,EAAE,MAAM,EAG1B;CACF;AAED;;;oDAGoD;AACpD,qBAAa,iBAAkB,SAAQ,aAAa;CAAG;AAEvD;;oDAEoD;AACpD,qBAAa,YAAa,SAAQ,aAAa;IAC7C,SAAkB,UAAU,EAAE,UAAU,CAAc;CACvD;AAED,gJAAgJ;AAChJ,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAEpD;AAED,gFAAgF;AAChF,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAElD;AAKD;+FAC+F;AAC/F,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAI9D;AAED,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE;IAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5D,OAAO,CAIT;AAED,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmBjG;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASjG;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1F,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;CACxC,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhB;AAED;+EAC+E;AAC/E,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAE/D,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,MAAM,CAAC,KAAK,IAAI,CAAC;IAC1F,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IACzD,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC9D,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,qGAAqG;IACrG,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,uIAAuI;IACvI,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,6HAA6H;IAC7H,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;IACjF,6EAA6E;IAC7E,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiNhB"}
|
package/dist/cli/land-pr.js
CHANGED
|
@@ -1,10 +1,16 @@
|
|
|
1
1
|
// packages/cli/src/cli/land-pr.ts — PR-level land: CI watch, main sync, SHA-pinned squash merge (#2784)
|
|
2
2
|
import { existsSync } from 'node:fs';
|
|
3
|
-
import { shellEscape, syncLandBranch, watchChecksWithInfraRerun } from '@on-par/factory-core/internal';
|
|
3
|
+
import { hasAnyCiSignal, shellEscape, syncLandBranch, warnNoBranchProtectionOnce, watchChecksWithInfraRerun, } from '@on-par/factory-core/internal';
|
|
4
|
+
import { MAX_LAND_SYNC_ROUNDS, probeHeadBehindBase } from './land-behind.js';
|
|
4
5
|
import { landRuntime } from './land-runtime.js';
|
|
6
|
+
export async function defaultListIssueLabels(octokit, owner, repo, issue) {
|
|
7
|
+
const { data } = await octokit.rest.issues.listLabelsOnIssue({ owner, repo, issue_number: issue });
|
|
8
|
+
return data.map((label) => label.name);
|
|
9
|
+
}
|
|
5
10
|
export async function squashMergeAndDelete(octokit, owner, repoName, branch, prNumber,
|
|
6
11
|
/** `sha`: the CI-verified head commit. GitHub refuses the merge if the PR head has moved. */
|
|
7
12
|
opts = {}) {
|
|
13
|
+
opts.signal?.throwIfAborted(); // #3146: never merge once the claim is lost
|
|
8
14
|
const { sha } = opts;
|
|
9
15
|
if (opts.admin) {
|
|
10
16
|
const run = opts.run ?? landRuntime().shellOps.exec;
|
|
@@ -44,6 +50,28 @@ export class AwaitingReviewError extends Error {
|
|
|
44
50
|
this.prNumber = prNumber;
|
|
45
51
|
}
|
|
46
52
|
}
|
|
53
|
+
/** Thrown when the CI deadline passed with no check run and no commit status on the PR head (#3208). Not a
|
|
54
|
+
* CiFailedError: the PR stays open, nothing parks, and the runner re-checks it with backoff. */
|
|
55
|
+
export class AwaitingCiError extends Error {
|
|
56
|
+
prNumber;
|
|
57
|
+
headSha;
|
|
58
|
+
constructor(message, prNumber, headSha) {
|
|
59
|
+
super(message);
|
|
60
|
+
this.prNumber = prNumber;
|
|
61
|
+
this.headSha = headSha;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
/** Thrown when STOP ended waitForMerge before the PR merged (#3291). Not a park: the lane
|
|
65
|
+
* re-queues the issue so the next run's preflight adopts and lands the open PR. */
|
|
66
|
+
export class AwaitMergeStoppedError extends Error {
|
|
67
|
+
branch;
|
|
68
|
+
prNumber;
|
|
69
|
+
constructor(message, branch, prNumber) {
|
|
70
|
+
super(message);
|
|
71
|
+
this.branch = branch;
|
|
72
|
+
this.prNumber = prNumber;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
47
75
|
export class LandFailureError extends Error {
|
|
48
76
|
code;
|
|
49
77
|
constructor(message, code) {
|
|
@@ -74,6 +102,14 @@ export class CiUnverifiedError extends CiFailedError {
|
|
|
74
102
|
export class CiInfraError extends CiFailedError {
|
|
75
103
|
parkReason = 'ci-infra';
|
|
76
104
|
}
|
|
105
|
+
/** True for the errors that leave the PR open and unmerged without a land failure: awaiting review, CI red or unverified, or CI not started. */
|
|
106
|
+
export function isLandLeftOpen(err) {
|
|
107
|
+
return err instanceof AwaitingReviewError || err instanceof CiFailedError || err instanceof AwaitingCiError;
|
|
108
|
+
}
|
|
109
|
+
/** True when CI never reached a green verdict: unverified, or never started. */
|
|
110
|
+
export function isCiNotGreen(err) {
|
|
111
|
+
return err instanceof CiUnverifiedError || err instanceof AwaitingCiError;
|
|
112
|
+
}
|
|
77
113
|
const MAX_MERGE_ATTEMPTS = 5;
|
|
78
114
|
const MERGE_RETRY_BASE_MS = 5_000;
|
|
79
115
|
/** True when GitHub refused a SHA-pinned merge because the PR head moved past the verified
|
|
@@ -126,7 +162,7 @@ export async function syncDirtyPullRequest(opts) {
|
|
|
126
162
|
}
|
|
127
163
|
}
|
|
128
164
|
export async function landOpenPullRequest(opts) {
|
|
129
|
-
const { octokit, owner, repoName, issue, branch, worktree, prNumber, log, run, pathExists, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), skipCI = false, adminMerge = process.env.FACTORY_MERGE_ADMIN === '1', watch = landRuntime().internalOps.watchChecks, rerun, withLock = (fn) => fn(), ensureWorktree, syncMain = false, } = opts;
|
|
165
|
+
const { octokit, owner, repoName, issue, branch, worktree, prNumber, log, run, pathExists, sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms)), skipCI = false, adminMerge = process.env.FACTORY_MERGE_ADMIN === '1', watch = landRuntime().internalOps.watchChecks, rerun, withLock = (fn) => fn(), ensureWorktree, syncMain = false, behindProbe = (sha, base) => probeHeadBehindBase(octokit, owner, repoName, base, sha), } = opts;
|
|
130
166
|
const { errorDetail } = landRuntime();
|
|
131
167
|
/** Watches CI on the PR's current head commit and returns that SHA once it is green, so the
|
|
132
168
|
* merge can be pinned to exactly the commit CI verified. */
|
|
@@ -145,6 +181,7 @@ export async function landOpenPullRequest(opts) {
|
|
|
145
181
|
watch,
|
|
146
182
|
rerun,
|
|
147
183
|
...(baseRef ? { requiredChecks: { branch: baseRef } } : {}),
|
|
184
|
+
onNoRequiredChecks: ({ branch: b }) => warnNoBranchProtectionOnce(`${owner}/${repoName}`, b, (m) => log('warn', m)),
|
|
148
185
|
onProgress: ({ total, completed, pending, remainingMs, waitingFor }) => log('land', waitingFor?.length
|
|
149
186
|
? `CI for PR #${prNumber}: waiting for required check${waitingFor.length > 1 ? 's' : ''} ${waitingFor.map((w) => `${w.name} (${w.state})`).join(', ')}, ${Math.ceil(remainingMs / 60_000)} min left`
|
|
150
187
|
: `CI for PR #${prNumber}: ${pending} pending, ${completed}/${total} completed, ${Math.ceil(remainingMs / 60_000)} min left before the CI timeout`),
|
|
@@ -169,6 +206,12 @@ export async function landOpenPullRequest(opts) {
|
|
|
169
206
|
log('ci-failed', msg);
|
|
170
207
|
throw new CiFailedError(msg, prNumber);
|
|
171
208
|
}
|
|
209
|
+
// A probe error (undefined) or any run or status keeps the unverified park: only proven silence waits.
|
|
210
|
+
if (outcome === 'timeout' && (await hasAnyCiSignal(octokit, owner, repoName, headSha)) === false) {
|
|
211
|
+
const msg = `no CI run or status registered on ${headSha} for PR #${prNumber} by the CI deadline — leaving the PR open and re-checking later`;
|
|
212
|
+
log('awaiting-ci', msg);
|
|
213
|
+
throw new AwaitingCiError(msg, prNumber, headSha);
|
|
214
|
+
}
|
|
172
215
|
const msg = `CI watch for ${branch} ended ${outcome} — refusing to merge without a green verdict`;
|
|
173
216
|
log('ci-failed', msg);
|
|
174
217
|
throw new CiUnverifiedError(msg, prNumber);
|
|
@@ -176,64 +219,113 @@ export async function landOpenPullRequest(opts) {
|
|
|
176
219
|
// GitHub runs no pull_request CI on a conflicting PR, so a DIRTY head is synced before the
|
|
177
220
|
// first watch. Watching it first would wait out the deadline and park as ci-failed (#3533).
|
|
178
221
|
let state = await getPullRequestLandState(octokit, owner, repoName, prNumber);
|
|
179
|
-
|
|
180
|
-
|
|
222
|
+
const needsSync = (s) => s.mergeStateStatus === 'DIRTY' || s.mergeStateStatus === 'BEHIND';
|
|
223
|
+
let syncRounds = 0;
|
|
224
|
+
/** True when `sha` (default: the PR's current head) lacks commits from the base. GitHub reports BEHIND only
|
|
225
|
+
* under strict protection, which the lander bypasses, so ask the compare API (#3654). An unknown
|
|
226
|
+
* answer warns and falls back to the mergeStateStatus rule. */
|
|
227
|
+
const headIsBehind = async (sha) => {
|
|
228
|
+
let behind;
|
|
229
|
+
try {
|
|
230
|
+
const { data: pr } = await octokit.rest.pulls.get({ owner, repo: repoName, pull_number: prNumber });
|
|
231
|
+
behind = await behindProbe(sha ?? pr.head.sha, pr.base?.ref ?? 'main');
|
|
232
|
+
}
|
|
233
|
+
catch {
|
|
234
|
+
behind = undefined;
|
|
235
|
+
}
|
|
236
|
+
if (behind === undefined)
|
|
237
|
+
log('warn', `behind check for PR #${prNumber} unavailable — falling back to mergeStateStatus`);
|
|
238
|
+
return behind === true;
|
|
239
|
+
};
|
|
240
|
+
/** Why the PR must sync with main now, or undefined when it need not. Reads `state`. */
|
|
241
|
+
const syncReason = async (sha) => {
|
|
242
|
+
if (state.mergeStateStatus === 'DIRTY')
|
|
243
|
+
return 'dirty';
|
|
244
|
+
if (needsSync(state) || (await headIsBehind(sha)))
|
|
245
|
+
return 'behind';
|
|
246
|
+
return undefined;
|
|
247
|
+
};
|
|
248
|
+
/** Merges main into the branch, bounded to MAX_LAND_SYNC_ROUNDS. Call under the land lock. */
|
|
249
|
+
const syncNow = async (reason) => {
|
|
250
|
+
if (syncRounds >= MAX_LAND_SYNC_ROUNDS) {
|
|
251
|
+
const msg = `PR #${prNumber} on ${branch}: base kept moving — synced ${MAX_LAND_SYNC_ROUNDS} times and origin/main moved again; refusing to merge an unverified head`;
|
|
252
|
+
log('ci-failed', msg);
|
|
253
|
+
throw new CiUnverifiedError(msg, prNumber);
|
|
254
|
+
}
|
|
255
|
+
syncRounds++;
|
|
256
|
+
await ensureWorktree?.();
|
|
257
|
+
log('pr_refresh', `PR #${prNumber} refreshed: mergeStateStatus=${state.mergeStateStatus ?? 'UNKNOWN'} action=merge-main reason=${reason} round=${syncRounds}/${MAX_LAND_SYNC_ROUNDS}`);
|
|
258
|
+
await syncDirtyPullRequest({ issue, branch, worktree, prNumber, log, run, pathExists });
|
|
259
|
+
};
|
|
260
|
+
/** Syncs a DIRTY or behind PR with main under the land lock. Returns true when it synced. */
|
|
261
|
+
const syncIfStillBehind = (force = false) => withLock(async () => {
|
|
181
262
|
// Re-check under the lock: a sibling lane may have landed (or synced this branch)
|
|
182
|
-
// while we waited for it, so the
|
|
263
|
+
// while we waited for it, so the verdict read before the lock can be stale.
|
|
183
264
|
state = await getPullRequestLandState(octokit, owner, repoName, prNumber);
|
|
184
|
-
|
|
265
|
+
const reason = await syncReason();
|
|
266
|
+
if (!force && !reason)
|
|
185
267
|
return false;
|
|
186
|
-
await
|
|
187
|
-
log('pr_refresh', `PR #${prNumber} refreshed: mergeStateStatus=${state.mergeStateStatus ?? 'UNKNOWN'} action=merge-main`);
|
|
188
|
-
await syncDirtyPullRequest({ issue, branch, worktree, prNumber, log, run, pathExists });
|
|
268
|
+
await syncNow(reason ?? 'forced');
|
|
189
269
|
return true;
|
|
190
270
|
});
|
|
191
|
-
if (syncMain || state
|
|
192
|
-
await
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
271
|
+
if (syncMain || needsSync(state) || (await headIsBehind()))
|
|
272
|
+
await syncIfStillBehind(syncMain);
|
|
273
|
+
let verifiedSha;
|
|
274
|
+
/** One locked pass: re-checks the CI-verified head against main, then merges it. Returns false when it
|
|
275
|
+
* synced instead (the head changed, so the caller must re-watch CI before merging again). */
|
|
276
|
+
const mergeVerifiedHead = async () => {
|
|
277
|
+
for (let attempt = 1;; attempt++) {
|
|
278
|
+
try {
|
|
279
|
+
const outcome = await withLock(async () => {
|
|
280
|
+
// Whatever we read before taking the lock (or before the backoff sleep) may be stale,
|
|
281
|
+
// so the attempt decides from a fresh read.
|
|
282
|
+
state = await getPullRequestLandState(octokit, owner, repoName, prNumber);
|
|
283
|
+
const reason = await syncReason(verifiedSha);
|
|
284
|
+
if (reason) {
|
|
285
|
+
await syncNow(reason);
|
|
286
|
+
return 'resynced';
|
|
287
|
+
}
|
|
288
|
+
if (state.isDraft && state.id) {
|
|
289
|
+
log('land', `PR #${prNumber} still a draft — re-issuing ready-for-review (attempt ${attempt})`);
|
|
290
|
+
await markPullRequestReady(octokit, state.id).catch((err) => log('warn', `ready-for-review flip failed for PR #${prNumber}: ${errorDetail(err)}`));
|
|
291
|
+
}
|
|
292
|
+
await squashMergeAndDelete(octokit, owner, repoName, branch, prNumber, {
|
|
293
|
+
admin: adminMerge,
|
|
294
|
+
run,
|
|
295
|
+
sha: verifiedSha,
|
|
296
|
+
signal: opts.signal,
|
|
297
|
+
});
|
|
298
|
+
return 'merged';
|
|
217
299
|
});
|
|
218
|
-
|
|
219
|
-
return;
|
|
220
|
-
}
|
|
221
|
-
catch (err) {
|
|
222
|
-
if (verifiedSha && isHeadModifiedMergeError(err)) {
|
|
223
|
-
const msg = `PR #${prNumber} head moved past CI-verified commit ${verifiedSha} — refusing to merge an unverified head`;
|
|
224
|
-
log('ci-failed', msg);
|
|
225
|
-
throw new CiUnverifiedError(msg, prNumber);
|
|
300
|
+
return outcome === 'merged';
|
|
226
301
|
}
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
302
|
+
catch (err) {
|
|
303
|
+
if (err instanceof CiFailedError || err instanceof LandConflictError || opts.signal?.aborted)
|
|
304
|
+
throw err;
|
|
305
|
+
if (verifiedSha && isHeadModifiedMergeError(err)) {
|
|
306
|
+
const msg = `PR #${prNumber} head moved past CI-verified commit ${verifiedSha} — refusing to merge an unverified head`;
|
|
307
|
+
log('ci-failed', msg);
|
|
308
|
+
throw new CiUnverifiedError(msg, prNumber);
|
|
309
|
+
}
|
|
310
|
+
if (isReviewRequiredMergeError(err, state)) {
|
|
311
|
+
log('awaiting-review', `PR #${prNumber} blocked on human review — leaving open for approval`);
|
|
312
|
+
throw new AwaitingReviewError(`PR #${prNumber} awaiting review: ${err.message}`, prNumber);
|
|
313
|
+
}
|
|
314
|
+
if (attempt >= MAX_MERGE_ATTEMPTS)
|
|
315
|
+
throw err;
|
|
316
|
+
log('land', `merge attempt ${attempt}/${MAX_MERGE_ATTEMPTS} failed (${err.message}); mergeStateStatus=${state.mergeStateStatus ?? 'unknown'} — retrying with backoff`);
|
|
317
|
+
// Backoff outside the lock: waiting is not a mutation (#645).
|
|
318
|
+
await sleep(MERGE_RETRY_BASE_MS * 2 ** (attempt - 1));
|
|
230
319
|
}
|
|
231
|
-
if (attempt >= MAX_MERGE_ATTEMPTS)
|
|
232
|
-
throw err;
|
|
233
|
-
log('land', `merge attempt ${attempt}/${MAX_MERGE_ATTEMPTS} failed (${err.message}); mergeStateStatus=${state.mergeStateStatus ?? 'unknown'} — retrying with backoff`);
|
|
234
|
-
// Backoff outside the lock: waiting is not a mutation (#645).
|
|
235
|
-
await sleep(MERGE_RETRY_BASE_MS * 2 ** (attempt - 1));
|
|
236
320
|
}
|
|
321
|
+
};
|
|
322
|
+
// The CI watch is a 10-20 minute wait, not a mutation: it must never run under the land
|
|
323
|
+
// locks, or every other lane's setupWorktree serializes behind it (#645). Main may move while
|
|
324
|
+
// CI runs: a head found behind under the merge lock is synced, then watched again.
|
|
325
|
+
for (;;) {
|
|
326
|
+
verifiedSha = skipCI ? undefined : await watchCi();
|
|
327
|
+
if (await mergeVerifiedHead())
|
|
328
|
+
return;
|
|
237
329
|
}
|
|
238
330
|
}
|
|
239
331
|
//# sourceMappingURL=land-pr.js.map
|
package/dist/cli/land-pr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"land-pr.js","sourceRoot":"","sources":["../../src/cli/land-pr.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"land-pr.js","sourceRoot":"","sources":["../../src/cli/land-pr.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/land.d.ts
CHANGED
|
@@ -9,11 +9,16 @@ export declare function landIssue(issueNum: number, repoRoot: string, ghRepo: st
|
|
|
9
9
|
branch?: string;
|
|
10
10
|
enforceRisk?: boolean;
|
|
11
11
|
syncMain?: boolean;
|
|
12
|
+
signal?: AbortSignal;
|
|
12
13
|
}): Promise<{
|
|
13
14
|
branch: string;
|
|
14
15
|
prNumber: number;
|
|
15
16
|
}>;
|
|
16
17
|
export declare function prLookupFailure(issueNum: number, branch: string, err: unknown): LandFailureError;
|
|
18
|
+
export declare function latestPrForBranch(octokit: Octokit, owner: string, repoName: string, branch: string): Promise<{
|
|
19
|
+
number: number;
|
|
20
|
+
merged: boolean;
|
|
21
|
+
} | null>;
|
|
17
22
|
export declare function isPrMerged(octokit: Octokit, owner: string, repoName: string, branch: string): Promise<boolean>;
|
|
18
23
|
/** queue-preflight only (it must see fork PRs to park them); land uses the core lookup (#3439). */
|
|
19
24
|
export declare function findOpenPRForIssue(octokit: Octokit, owner: string, repoName: string, issueNum: number): Promise<OpenPullRequestEvidence | undefined>;
|
|
@@ -30,12 +35,15 @@ export type WaitForMergeDeps = {
|
|
|
30
35
|
createOctokit?: () => Octokit;
|
|
31
36
|
pathExists?: (path: string) => boolean;
|
|
32
37
|
checkMerged?: typeof isPrMerged;
|
|
38
|
+
/** #3291: final PR lookup when STOP ends the wait, to tell a merged PR from an open one. */
|
|
39
|
+
lookupPr?: typeof latestPrForBranch;
|
|
33
40
|
loadConfig?: (configPath: string) => FactoryConfig;
|
|
34
41
|
land?: (issueNum: number, repoRoot: string, ghRepo: string, paths: ReturnType<typeof getFactoryPaths>, octokit: Octokit, skipCI?: boolean, branchPrefix?: string, opts?: {
|
|
35
42
|
allowGated?: boolean;
|
|
36
43
|
branch?: string;
|
|
37
44
|
enforceRisk?: boolean;
|
|
38
45
|
syncMain?: boolean;
|
|
46
|
+
signal?: AbortSignal;
|
|
39
47
|
}) => Promise<{
|
|
40
48
|
branch: string;
|
|
41
49
|
prNumber: number;
|
|
@@ -44,6 +52,7 @@ export type WaitForMergeDeps = {
|
|
|
44
52
|
landBranch?: string;
|
|
45
53
|
/** #3324: forwarded to land. */
|
|
46
54
|
syncMain?: boolean;
|
|
55
|
+
signal?: AbortSignal;
|
|
47
56
|
listIssueLabels?: (octokit: Octokit, owner: string, repo: string, issue: number) => Promise<string[]>;
|
|
48
57
|
sleep?: (ms: number) => Promise<void>;
|
|
49
58
|
emitEvent?: typeof logEvent;
|