@on-par/factory-core 0.9.7-next.9 → 0.9.8-next.1
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/blockers/dependencies.d.ts +19 -0
- package/dist/blockers/dependencies.d.ts.map +1 -0
- package/dist/blockers/dependencies.js +49 -0
- package/dist/blockers/dependencies.js.map +1 -0
- package/dist/blockers/file-blocker.d.ts +44 -0
- package/dist/blockers/file-blocker.d.ts.map +1 -0
- package/dist/blockers/file-blocker.js +203 -0
- package/dist/blockers/file-blocker.js.map +1 -0
- package/dist/blockers/index.d.ts +7 -0
- package/dist/blockers/index.d.ts.map +1 -0
- package/dist/blockers/index.js +5 -0
- package/dist/blockers/index.js.map +1 -0
- package/dist/blockers/poller.d.ts +37 -0
- package/dist/blockers/poller.d.ts.map +1 -0
- package/dist/blockers/poller.js +111 -0
- package/dist/blockers/poller.js.map +1 -0
- package/dist/checkers/index.d.ts +10 -1
- package/dist/checkers/index.d.ts.map +1 -1
- package/dist/checkers/index.js +14 -22
- package/dist/checkers/index.js.map +1 -1
- package/dist/checkers/probe.d.ts.map +1 -1
- package/dist/checkers/probe.js +5 -3
- package/dist/checkers/probe.js.map +1 -1
- package/dist/config/example.d.ts.map +1 -1
- package/dist/config/example.js +18 -0
- package/dist/config/example.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.d.ts.map +1 -1
- package/dist/config/index.js +3 -3
- package/dist/config/index.js.map +1 -1
- package/dist/config/repo-build-pin.d.ts +4 -0
- package/dist/config/repo-build-pin.d.ts.map +1 -0
- package/dist/config/repo-build-pin.js +13 -0
- package/dist/config/repo-build-pin.js.map +1 -0
- package/dist/config/repo-harnesses.d.ts +43 -0
- package/dist/config/repo-harnesses.d.ts.map +1 -0
- package/dist/config/repo-harnesses.js +20 -0
- package/dist/config/repo-harnesses.js.map +1 -0
- package/dist/config/repo.d.ts +44 -11
- package/dist/config/repo.d.ts.map +1 -1
- package/dist/config/repo.js +35 -31
- package/dist/config/repo.js.map +1 -1
- package/dist/daemon/execution-config.d.ts +34 -0
- package/dist/daemon/execution-config.d.ts.map +1 -1
- package/dist/daemon/run-runtime.d.ts +34 -0
- package/dist/daemon/run-runtime.d.ts.map +1 -1
- package/dist/daemon/ship-executor.js +2 -3
- package/dist/daemon/ship-executor.js.map +1 -1
- package/dist/eval/baseline.d.ts.map +1 -1
- package/dist/eval/baseline.js +4 -4
- package/dist/eval/baseline.js.map +1 -1
- package/dist/eval/judge.d.ts.map +1 -1
- package/dist/eval/judge.js +9 -7
- package/dist/eval/judge.js.map +1 -1
- package/dist/eval/regression-report.js +1 -1
- package/dist/eval/regression-report.js.map +1 -1
- package/dist/eval/score.d.ts.map +1 -1
- package/dist/eval/score.js +2 -1
- package/dist/eval/score.js.map +1 -1
- package/dist/events/kinds.d.ts +1 -1
- package/dist/events/kinds.d.ts.map +1 -1
- package/dist/events/kinds.js +3 -0
- package/dist/events/kinds.js.map +1 -1
- package/dist/harness/catalog.d.ts +2 -0
- package/dist/harness/catalog.d.ts.map +1 -1
- package/dist/harness/catalog.js +5 -1
- package/dist/harness/catalog.js.map +1 -1
- package/dist/harness/contract.js +4 -4
- package/dist/harness/contract.js.map +1 -1
- package/dist/harness/index.d.ts +1 -1
- package/dist/harness/index.d.ts.map +1 -1
- package/dist/harness/index.js +1 -0
- package/dist/harness/index.js.map +1 -1
- package/dist/harness/opencode-version.d.ts +7 -0
- package/dist/harness/opencode-version.d.ts.map +1 -0
- package/dist/harness/opencode-version.js +20 -0
- package/dist/harness/opencode-version.js.map +1 -0
- package/dist/harness/opencode.d.ts +10 -2
- package/dist/harness/opencode.d.ts.map +1 -1
- package/dist/harness/opencode.js +26 -5
- package/dist/harness/opencode.js.map +1 -1
- package/dist/hosted/store-contract.js +1 -1
- package/dist/hosted/store-contract.js.map +1 -1
- package/dist/internal.d.ts +4 -4
- package/dist/internal.d.ts.map +1 -1
- package/dist/internal.js +4 -2
- package/dist/internal.js.map +1 -1
- package/dist/kpis/human.d.ts.map +1 -1
- package/dist/kpis/human.js +4 -8
- package/dist/kpis/human.js.map +1 -1
- package/dist/models/index.d.ts +2 -0
- package/dist/models/index.d.ts.map +1 -1
- package/dist/models/index.js +7 -1
- package/dist/models/index.js.map +1 -1
- package/dist/phases/build.d.ts +6 -2
- package/dist/phases/build.d.ts.map +1 -1
- package/dist/phases/build.js +43 -12
- package/dist/phases/build.js.map +1 -1
- package/dist/phases/check.d.ts +32 -2
- package/dist/phases/check.d.ts.map +1 -1
- package/dist/phases/check.js +5 -6
- package/dist/phases/check.js.map +1 -1
- package/dist/phases/plan-route.d.ts +16 -0
- package/dist/phases/plan-route.d.ts.map +1 -0
- package/dist/phases/plan-route.js +38 -0
- package/dist/phases/plan-route.js.map +1 -0
- package/dist/phases/plan-routes.d.ts +16 -1
- package/dist/phases/plan-routes.d.ts.map +1 -1
- package/dist/phases/plan-routes.js +40 -1
- package/dist/phases/plan-routes.js.map +1 -1
- package/dist/phases/plan.d.ts +4 -3
- package/dist/phases/plan.d.ts.map +1 -1
- package/dist/phases/plan.js +15 -30
- package/dist/phases/plan.js.map +1 -1
- package/dist/phases/ship-git.d.ts +52 -0
- package/dist/phases/ship-git.d.ts.map +1 -0
- package/dist/phases/ship-git.js +104 -0
- package/dist/phases/ship-git.js.map +1 -0
- package/dist/phases/ship.d.ts +8 -6
- package/dist/phases/ship.d.ts.map +1 -1
- package/dist/phases/ship.js +71 -121
- package/dist/phases/ship.js.map +1 -1
- package/dist/queue/queue-backend.d.ts +6 -1
- package/dist/queue/queue-backend.d.ts.map +1 -1
- package/dist/queue/queue-backend.js +7 -1
- package/dist/queue/queue-backend.js.map +1 -1
- package/dist/queue/unpark.d.ts +28 -0
- package/dist/queue/unpark.d.ts.map +1 -0
- package/dist/queue/unpark.js +69 -0
- package/dist/queue/unpark.js.map +1 -0
- package/dist/readiness/slice-plan.js +1 -1
- package/dist/readiness/slice-plan.js.map +1 -1
- package/dist/review/backtest.js +2 -2
- package/dist/review/backtest.js.map +1 -1
- package/dist/review/containment.js +1 -1
- package/dist/review/containment.js.map +1 -1
- package/dist/router/index.d.ts.map +1 -1
- package/dist/router/index.js +2 -13
- package/dist/router/index.js.map +1 -1
- package/dist/router/requires.d.ts +4 -0
- package/dist/router/requires.d.ts.map +1 -0
- package/dist/router/requires.js +22 -0
- package/dist/router/requires.js.map +1 -0
- package/dist/run/ci-rework-loop.d.ts +65 -0
- package/dist/run/ci-rework-loop.d.ts.map +1 -0
- package/dist/run/ci-rework-loop.js +169 -0
- package/dist/run/ci-rework-loop.js.map +1 -0
- package/dist/run/ci-rework.d.ts +25 -0
- package/dist/run/ci-rework.d.ts.map +1 -0
- package/dist/run/ci-rework.js +113 -0
- package/dist/run/ci-rework.js.map +1 -0
- package/dist/run/ci-suppression-guard.d.ts +11 -0
- package/dist/run/ci-suppression-guard.d.ts.map +1 -0
- package/dist/run/ci-suppression-guard.js +143 -0
- package/dist/run/ci-suppression-guard.js.map +1 -0
- package/dist/run/outcome.d.ts +9 -2
- package/dist/run/outcome.d.ts.map +1 -1
- package/dist/run/outcome.js +5 -0
- package/dist/run/outcome.js.map +1 -1
- package/dist/run/park-comment.d.ts +73 -0
- package/dist/run/park-comment.d.ts.map +1 -0
- package/dist/run/park-comment.js +211 -0
- package/dist/run/park-comment.js.map +1 -0
- package/dist/run/phase-snapshot.js +2 -2
- package/dist/run/phase-snapshot.js.map +1 -1
- package/dist/run/resume-context.d.ts +3 -2
- package/dist/run/resume-context.d.ts.map +1 -1
- package/dist/run/resume-context.js.map +1 -1
- package/dist/run/run-issue.d.ts +2 -1
- package/dist/run/run-issue.d.ts.map +1 -1
- package/dist/run/run-issue.js +50 -52
- package/dist/run/run-issue.js.map +1 -1
- package/dist/sandbox/index.js +1 -1
- package/dist/sandbox/index.js.map +1 -1
- package/dist/sim/pipeline.d.ts +2 -1
- package/dist/sim/pipeline.d.ts.map +1 -1
- package/dist/sim/pipeline.js.map +1 -1
- package/dist/spec/index.d.ts +3 -2
- package/dist/spec/index.d.ts.map +1 -1
- package/dist/spec/index.js +1 -1
- package/dist/spec/index.js.map +1 -1
- package/dist/steward/detect.d.ts +2 -1
- package/dist/steward/detect.d.ts.map +1 -1
- package/dist/steward/detect.js +3 -2
- package/dist/steward/detect.js.map +1 -1
- package/dist/types/index.d.ts +34 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/usage/index.js +1 -1
- package/dist/usage/index.js.map +1 -1
- package/dist/utils/command-runner.js +2 -2
- package/dist/utils/command-runner.js.map +1 -1
- package/dist/utils/worktree-gc.d.ts.map +1 -1
- package/dist/utils/worktree-gc.js +5 -5
- package/dist/utils/worktree-gc.js.map +1 -1
- package/dist/utils/worktree-location.d.ts +2 -2
- package/dist/utils/worktree-location.d.ts.map +1 -1
- package/dist/utils/worktree-location.js +16 -9
- package/dist/utils/worktree-location.js.map +1 -1
- package/dist/utils/worktree-name.d.ts +6 -0
- package/dist/utils/worktree-name.d.ts.map +1 -1
- package/dist/utils/worktree-name.js +16 -1
- package/dist/utils/worktree-name.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,7 +1,11 @@
|
|
|
1
|
+
import { type BuildRoutePin } from '../config/repo.js';
|
|
1
2
|
import type { ModelRouter } from '../router/index.js';
|
|
2
|
-
export type BuildRouteName = 'codex' | 'claude' | 'opencode';
|
|
3
|
+
export type BuildRouteName = 'codex' | 'claude' | 'opencode' | 'command';
|
|
3
4
|
/** Order PLAN falls back through when its chosen route cannot run here. */
|
|
4
5
|
export declare const ROUTE_FALLBACK_ORDER: readonly BuildRouteName[];
|
|
6
|
+
/** Routes PLAN offers when the runnable set is unknown. `command` needs a declared agentic harness,
|
|
7
|
+
* so it is only offered when known runnable. */
|
|
8
|
+
export declare const CLI_BUILD_ROUTES: readonly BuildRouteName[];
|
|
5
9
|
/** Build routes whose task resolves to at least one runnable model, in fallback order.
|
|
6
10
|
* Returns [] when the router cannot answer, which callers treat as "no restriction". */
|
|
7
11
|
export declare function runnableBuildRoutes(router: Pick<ModelRouter, 'resolveAll'>): BuildRouteName[];
|
|
@@ -12,6 +16,17 @@ export declare function resolveRunnableBuildRoute(requested: BuildRouteName, run
|
|
|
12
16
|
route: BuildRouteName;
|
|
13
17
|
rerouted: boolean;
|
|
14
18
|
};
|
|
19
|
+
/** The route and pin CHECK/CI rework runs on (#2873). codex/claude/opencode follow
|
|
20
|
+
* resolveRunnableBuildRoute and keep the pin unless rerouted (the pin belongs to the old route's
|
|
21
|
+
* harness). `command` is last in ROUTE_FALLBACK_ORDER and runnable when build_command resolves; its
|
|
22
|
+
* own branch decides pin keeping: it stays when the pin sits on a declared agentic harness (pin
|
|
23
|
+
* kept) or build_command resolves a runnable model (router picks), and otherwise falls back
|
|
24
|
+
* without the pin. */
|
|
25
|
+
export declare function resolveReworkRoute(router: Pick<ModelRouter, 'resolveAll'> & Partial<Pick<ModelRouter, 'registryRef'>>, requested: BuildRoutePin, pinnedModel: string | undefined): {
|
|
26
|
+
route: BuildRoutePin;
|
|
27
|
+
rerouted: boolean;
|
|
28
|
+
modelOverride?: string;
|
|
29
|
+
};
|
|
15
30
|
/** Step-3 route bullets, in display order. */
|
|
16
31
|
export declare const ROUTE_BULLETS: Record<BuildRouteName, string>;
|
|
17
32
|
//# sourceMappingURL=plan-routes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-routes.d.ts","sourceRoot":"","sources":["../../src/phases/plan-routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"plan-routes.d.ts","sourceRoot":"","sources":["../../src/phases/plan-routes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,aAAa,EAAsB,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,CAAC;AAEzE,2EAA2E;AAC3E,eAAO,MAAM,oBAAoB,EAAE,SAAS,cAAc,EAA+C,CAAC;AAE1G;iDACiD;AACjD,eAAO,MAAM,gBAAgB,EAAE,SAAS,cAAc,EAAoC,CAAC;AAE3F;yFACyF;AACzF,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,cAAc,EAAE,CAM7F;AAED,uFAAuF;AACvF,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,GAAG,cAAc,CAErF;AAED,qGAAqG;AACrG,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,cAAc,EACzB,QAAQ,EAAE,SAAS,cAAc,EAAE,GAClC;IAAE,KAAK,EAAE,cAAc,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAG9C;AAED;;;;;uBAKuB;AACvB,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,EACnF,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,MAAM,GAAG,SAAS,GAC9B;IAAE,KAAK,EAAE,aAAa,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAQrE;AAkBD,8CAA8C;AAC9C,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAUxD,CAAC"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
// src/phases/plan-routes.ts — build-route helpers shared by PLAN and its prompt
|
|
2
|
+
import { routeForBuildModel } from '../config/repo.js';
|
|
2
3
|
/** Order PLAN falls back through when its chosen route cannot run here. */
|
|
3
|
-
export const ROUTE_FALLBACK_ORDER = ['claude', 'codex', 'opencode'];
|
|
4
|
+
export const ROUTE_FALLBACK_ORDER = ['claude', 'codex', 'opencode', 'command'];
|
|
5
|
+
/** Routes PLAN offers when the runnable set is unknown. `command` needs a declared agentic harness,
|
|
6
|
+
* so it is only offered when known runnable. */
|
|
7
|
+
export const CLI_BUILD_ROUTES = ['codex', 'claude', 'opencode'];
|
|
4
8
|
/** Build routes whose task resolves to at least one runnable model, in fallback order.
|
|
5
9
|
* Returns [] when the router cannot answer, which callers treat as "no restriction". */
|
|
6
10
|
export function runnableBuildRoutes(router) {
|
|
@@ -21,6 +25,39 @@ export function resolveRunnableBuildRoute(requested, runnable) {
|
|
|
21
25
|
return { route: requested, rerouted: false };
|
|
22
26
|
return { route: defaultBuildRoute(runnable), rerouted: true };
|
|
23
27
|
}
|
|
28
|
+
/** The route and pin CHECK/CI rework runs on (#2873). codex/claude/opencode follow
|
|
29
|
+
* resolveRunnableBuildRoute and keep the pin unless rerouted (the pin belongs to the old route's
|
|
30
|
+
* harness). `command` is last in ROUTE_FALLBACK_ORDER and runnable when build_command resolves; its
|
|
31
|
+
* own branch decides pin keeping: it stays when the pin sits on a declared agentic harness (pin
|
|
32
|
+
* kept) or build_command resolves a runnable model (router picks), and otherwise falls back
|
|
33
|
+
* without the pin. */
|
|
34
|
+
export function resolveReworkRoute(router, requested, pinnedModel) {
|
|
35
|
+
if (requested !== 'command') {
|
|
36
|
+
const { route, rerouted } = resolveRunnableBuildRoute(requested, runnableBuildRoutes(router));
|
|
37
|
+
return rerouted ? { route, rerouted } : { route, rerouted, modelOverride: pinnedModel };
|
|
38
|
+
}
|
|
39
|
+
if (pinFitsCommand(router, pinnedModel))
|
|
40
|
+
return { route: 'command', rerouted: false, modelOverride: pinnedModel };
|
|
41
|
+
if (commandResolves(router))
|
|
42
|
+
return { route: 'command', rerouted: false };
|
|
43
|
+
return { route: defaultBuildRoute(runnableBuildRoutes(router)), rerouted: true };
|
|
44
|
+
}
|
|
45
|
+
function pinFitsCommand(router, model) {
|
|
46
|
+
try {
|
|
47
|
+
return !!model && !!router.registryRef && routeForBuildModel(router.registryRef, model) === 'command';
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
function commandResolves(router) {
|
|
54
|
+
try {
|
|
55
|
+
return router.resolveAll('build_command').length > 0;
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
24
61
|
/** Step-3 route bullets, in display order. */
|
|
25
62
|
export const ROUTE_BULLETS = {
|
|
26
63
|
codex: ` - route: codex — when the implementation from a frozen spec is bounded and mechanical
|
|
@@ -30,5 +67,7 @@ export const ROUTE_BULLETS = {
|
|
|
30
67
|
pinned build worker is a claude-cli model (e.g. claude-sonnet-5 in .factory/config.json)`,
|
|
31
68
|
opencode: ` - route: opencode — when the repo's pinned build worker is an opencode-harness model
|
|
32
69
|
(e.g. opencode-deepseek-v4-flash in .factory/config.json); bounded mechanical work`,
|
|
70
|
+
command: ` - route: command — when the repo's build worker is a declared agentic harness
|
|
71
|
+
(harnesses: in .factory/config.yaml); bounded mechanical work`,
|
|
33
72
|
};
|
|
34
73
|
//# sourceMappingURL=plan-routes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-routes.js","sourceRoot":"","sources":["../../src/phases/plan-routes.ts"],"names":[],"mappings":"AAAA,gFAAgF;
|
|
1
|
+
{"version":3,"file":"plan-routes.js","sourceRoot":"","sources":["../../src/phases/plan-routes.ts"],"names":[],"mappings":"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"}
|
package/dist/phases/plan.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import type { ApprovalGate } from '../approvals/index.js';
|
|
|
3
3
|
import { type LifecycleBus } from '../bus/index.js';
|
|
4
4
|
import type { EventKind } from '../events/kinds.js';
|
|
5
5
|
import type { SizeGateMode } from '../config/index.js';
|
|
6
|
+
import type { BuildRoutePin } from '../config/repo.js';
|
|
6
7
|
import { type SlicePlan } from '../readiness/slice-plan.js';
|
|
7
8
|
import type { ModelRouter } from '../router/index.js';
|
|
8
9
|
import { type ConsumedSteering } from '../steering/index.js';
|
|
@@ -14,7 +15,7 @@ export { buildDesignArtifactRetryPrompt, MAX_DESIGN_ARTIFACT_RETRIES };
|
|
|
14
15
|
export { type BuildRouteName, defaultBuildRoute, resolveRunnableBuildRoute, runnableBuildRoutes };
|
|
15
16
|
export interface PlanResult {
|
|
16
17
|
ok: boolean;
|
|
17
|
-
route:
|
|
18
|
+
route: BuildRoutePin;
|
|
18
19
|
specPath: string;
|
|
19
20
|
model: string;
|
|
20
21
|
escalate?: string;
|
|
@@ -45,7 +46,7 @@ export interface PlanPromptOpts {
|
|
|
45
46
|
specPath: string;
|
|
46
47
|
constitutionCtx: string;
|
|
47
48
|
adrCtx?: string;
|
|
48
|
-
/** Build routes with at least one runnable model on this machine. Empty or omitted =
|
|
49
|
+
/** Build routes with at least one runnable model on this machine. Empty or omitted = the CLI routes; command only when listed. */
|
|
49
50
|
runnableRoutes?: readonly BuildRouteName[];
|
|
50
51
|
}
|
|
51
52
|
export declare function buildPlanPrompt(opts: PlanPromptOpts): string;
|
|
@@ -106,7 +107,7 @@ declare function planPhaseImpl(opts: {
|
|
|
106
107
|
localOnly?: boolean;
|
|
107
108
|
/** Repo config pins the build route (`.factory/config.json` → `route`). Forced
|
|
108
109
|
* after plan so the spec frontmatter stays the frozen truth. */
|
|
109
|
-
preferredRoute?:
|
|
110
|
+
preferredRoute?: BuildRoutePin;
|
|
110
111
|
/** Lane id stamped onto emitted lifecycle events; defaults to `issue-<issue>` (#591). */
|
|
111
112
|
laneId?: string;
|
|
112
113
|
/** Lifecycle bus to emit onto; defaults to the process-wide `lifecycleBus` (#591). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/phases/plan.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AAInE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AASpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../src/phases/plan.ts"],"names":[],"mappings":"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"}
|
package/dist/phases/plan.js
CHANGED
|
@@ -9,6 +9,7 @@ import { buildConstitutionContext } from '../constitutions/index.js';
|
|
|
9
9
|
import { findUnresolvedRegressions, parseDesignArtifact, renderDesignArtifact } from '../design/index.js';
|
|
10
10
|
import { buildFastPathSpec, isFastPathEligible } from '../efficiency/fast-path.js';
|
|
11
11
|
import { buildReadinessEnrichmentPrompt, buildReadinessEnrichmentRetryPrompt, composeEnrichedIssueBody, scoreEnrichedIssueReadiness, stripEnrichedBlock, } from '../readiness/enrich.js';
|
|
12
|
+
import { settlePlanRoute } from './plan-route.js';
|
|
12
13
|
import { decomposeOversizedIssue, renderChildIssueBody } from '../readiness/decompose.js';
|
|
13
14
|
import { resolveSliceGate } from '../readiness/slice-gate.js';
|
|
14
15
|
import { DEFAULT_MAX_SLICES } from '../readiness/slice-plan.js';
|
|
@@ -16,13 +17,13 @@ import { MAX_BUILD_CALL_EDGES, MAX_BUILD_SIGNATURES, MAX_BUILD_TARGET_TYPES } fr
|
|
|
16
17
|
import { scoreIssueReadiness } from '../readiness/index.js';
|
|
17
18
|
import { failoversFrom } from '../router/index.js';
|
|
18
19
|
import { applySteering, describeSteering } from '../steering/index.js';
|
|
19
|
-
import { archiveSpec, readSpec,
|
|
20
|
+
import { archiveSpec, readSpec, writeSpec } from '../spec/index.js';
|
|
20
21
|
import { escalationLine, isEscalation } from '../utils/index.js';
|
|
21
22
|
import { UNTRUSTED_ISSUE_BODY_NOTICE, wrapUntrustedIssueBody } from '../utils/untrusted-input.js';
|
|
22
23
|
import { GITHUB_ISSUE_SOURCE } from '../work/github-issue.js';
|
|
23
24
|
import { createDefaultWorkSourceRegistry } from '../work/index.js';
|
|
24
25
|
import { buildDesignArtifactRetryPrompt, designArtifactInvalidMessage, MAX_DESIGN_ARTIFACT_RETRIES, } from './plan-design-retry.js';
|
|
25
|
-
import { defaultBuildRoute, ROUTE_BULLETS, resolveRunnableBuildRoute,
|
|
26
|
+
import { CLI_BUILD_ROUTES, defaultBuildRoute, ROUTE_BULLETS, resolveRunnableBuildRoute, runnableBuildRoutes, } from './plan-routes.js';
|
|
26
27
|
export { buildDesignArtifactRetryPrompt, MAX_DESIGN_ARTIFACT_RETRIES };
|
|
27
28
|
export { defaultBuildRoute, resolveRunnableBuildRoute, runnableBuildRoutes };
|
|
28
29
|
/**
|
|
@@ -35,8 +36,8 @@ export function buildPlanPrompt(opts) {
|
|
|
35
36
|
const { issue, issueTitle, issueBody, specPath, constitutionCtx, adrCtx } = opts;
|
|
36
37
|
const runnable = opts.runnableRoutes ?? [];
|
|
37
38
|
const fallbackRoute = defaultBuildRoute(runnable);
|
|
38
|
-
const offered = runnable.length > 0 ? runnable :
|
|
39
|
-
const routeBullets = ['codex', 'claude', 'opencode']
|
|
39
|
+
const offered = runnable.length > 0 ? runnable : CLI_BUILD_ROUTES;
|
|
40
|
+
const routeBullets = ['codex', 'claude', 'opencode', 'command']
|
|
40
41
|
.filter((r) => offered.includes(r))
|
|
41
42
|
.map((r) => ROUTE_BULLETS[r])
|
|
42
43
|
.join('\n');
|
|
@@ -46,7 +47,7 @@ export function buildPlanPrompt(opts) {
|
|
|
46
47
|
: offered.length > 1
|
|
47
48
|
? `(Set route: in the frontmatter to the route you chose.)\n`
|
|
48
49
|
: '';
|
|
49
|
-
const runnableNote = runnable.length > 0 &&
|
|
50
|
+
const runnableNote = runnable.length > 0 && CLI_BUILD_ROUTES.some((r) => !runnable.includes(r))
|
|
50
51
|
? `\n Only these routes can run on this machine: ${runnable.join(', ')}. Choose one of them.`
|
|
51
52
|
: '';
|
|
52
53
|
return `You are the PLAN phase of a multi-agent software factory for issue #${issue}.
|
|
@@ -524,31 +525,15 @@ async function planPhaseImpl(opts) {
|
|
|
524
525
|
}
|
|
525
526
|
// Re-read after the PLAN call: a CLI that failed sign-in during PLAN is no longer runnable (#2495).
|
|
526
527
|
const runnableNow = runnableBuildRoutes(router);
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
log
|
|
535
|
-
|
|
536
|
-
// Keep the persisted spec's frontmatter in sync with the actual route,
|
|
537
|
-
// since it's the frozen artifact downstream consumers (eval scoring, PR review) read.
|
|
538
|
-
await updateSpecRoute(specPath, 'claude', 'codex-disabled');
|
|
539
|
-
}
|
|
540
|
-
const resolved = resolveRunnableBuildRoute(route, runnableNow);
|
|
541
|
-
if (resolved.rerouted) {
|
|
542
|
-
const next = resolved.route;
|
|
543
|
-
log('model-override', `route ${route} has no runnable model on this machine, rerouting to ${next}`);
|
|
544
|
-
route = next;
|
|
545
|
-
await updateSpecRoute(specPath, next, 'route-unavailable');
|
|
546
|
-
}
|
|
547
|
-
if (opts.preferredRoute && route !== opts.preferredRoute) {
|
|
548
|
-
log('model-override', `pinned build route ${opts.preferredRoute} — overriding plan's ${route}`);
|
|
549
|
-
route = opts.preferredRoute;
|
|
550
|
-
await updateSpecRoute(specPath, opts.preferredRoute, 'repo-config-pin');
|
|
551
|
-
}
|
|
528
|
+
const route = await settlePlanRoute({
|
|
529
|
+
parsedRoute: parsed.route,
|
|
530
|
+
runnableNow,
|
|
531
|
+
localOnly,
|
|
532
|
+
isCodexDisabled,
|
|
533
|
+
preferredRoute: opts.preferredRoute,
|
|
534
|
+
specPath,
|
|
535
|
+
log,
|
|
536
|
+
});
|
|
552
537
|
const { artifact: designArtifact, errors: designErrors, coerced: designCoerced } = designParse;
|
|
553
538
|
if (designCoerced.length > 0) {
|
|
554
539
|
log('design_artifact_coerced', `coerced ${designCoerced.length} non-string design list item(s) to text: ${designCoerced.join(', ')}`);
|
package/dist/phases/plan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/phases/plan.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plan.js","sourceRoot":"","sources":["../../src/phases/plan.ts"],"names":[],"mappings":"AAAA,oGAAoG;AAEpG,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAqB,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEnF,OAAO,EACL,8BAA8B,EAC9B,mCAAmC,EACnC,wBAAwB,EACxB,2BAA2B,EAC3B,kBAAkB,GAEnB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAkB,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC1G,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAyB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAA0B,MAAM,yBAAyB,CAAC;AACtF,OAAO,EAAE,+BAA+B,EAAuD,MAAM,kBAAkB,CAAC;AAExH,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,2BAA2B,GAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,gBAAgB,EAChB,iBAAiB,EACjB,aAAa,EACb,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,8BAA8B,EAAE,2BAA2B,EAAE,CAAC;AACvE,OAAO,EAAuB,iBAAiB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,CAAC;AAElG;;;;GAIG;AACH,MAAM,+BAA+B,GAAG,YAAY,CAAC;AAiCrD,MAAM,UAAU,eAAe,CAAC,IAAoB;IAClD,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACjF,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;IAC3C,MAAM,aAAa,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAClE,MAAM,YAAY,GAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAW;SACvE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAC5B,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;IACzE,MAAM,WAAW,GACf,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACrD,CAAC,CAAC,qFAAqF;QACvF,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAClB,CAAC,CAAC,2DAA2D;YAC7D,CAAC,CAAC,EAAE,CAAC;IACX,MAAM,YAAY,GAChB,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC,CAAC,mDAAmD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,uBAAuB;QAC/F,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,uEAAuE,KAAK;;;EAGnF,eAAe;EACf,MAAM,IAAI,EAAE;YACF,KAAK,KAAK,UAAU;;EAE9B,2BAA2B;;EAE3B,sBAAsB,CAAC,SAAS,CAAC;;;;;;;;;;EAUjC,YAAY;;qDAEuC,aAAa,0BAA0B,YAAY;;;;;;;;EAQtG,eAAe,CAAC,CAAC,CAAC,0GAA0G,CAAC,CAAC,CAAC,qDAAqD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BA8BzJ,QAAQ;;SAE5B,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UA0DX,UAAU,MAAM,KAAK;;;;;;;;EAQ7B,eAAe,CAAC,CAAC,CAAC,oGAAoG,CAAC,CAAC,CAAC,mDAAmD;;;;EAI5K,WAAW;;;;;;;;;;;;mBAYM,QAAQ,GAAG,CAAC;AAC/B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAAyC;IACvE,OAAO,aAAa,CAClB;QACE,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,KAAK;QACnB,YAAY,EAAE,IAAI,CAAC,QAAQ;QAC3B,GAAG,EAAE,IAAI,CAAC,GAAG;KACd,EACD,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,EACzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EACX,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,KAAK,WAAW,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,QAAQ,IAAI,SAAS,EAAE,CAAC,CACpH,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAY;IAC7C,MAAM,YAAY,GAAG,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAE/B,MAAM,aAAa,GAAG,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,iCAAiC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpH,MAAM,eAAe,GACnB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,uDAAuD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClG,IAAI,CAAC,aAAa,IAAI,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IAEpD,OAAO,iEAAiE,CAAC;AAC3E,CAAC;AAED;uFACuF;AACvF,SAAS,kBAAkB,CACzB,WAAqB,EACrB,SAAwB,EACxB,QAAgB,EAChB,KAAqB,EACrB,GAAkF,EAClF,MAAM,GAAG,EAAE;IAEX,MAAM,MAAM,GACV,MAAM;QACN,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;YACrB,CAAC,CAAC,gCAAgC,SAAS,CAAC,UAAU,IAAI,SAAS,uBAAuB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACtI,CAAC,CAAC,gCAAgC,SAAS,CAAC,UAAU,IAAI,SAAS,8BAA8B,CAAC,CAAC;IACvG,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,qBAAqB,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;IACpG,OAAO;QACL,EAAE,EAAE,KAAK;QACT,KAAK;QACL,QAAQ;QACR,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,MAAM;QAChB,cAAc,EAAE,IAAI;QACpB,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,IAuD5B;IACC,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,MAAM,EACN,OAAO,EACP,GAAG,EACH,cAAc,EACd,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,MAAM,EACN,YAAY,EACZ,aAAa,GACd,GAAG,IAAI,CAAC;IACT,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;IACxC,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC;IACrD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC;IAC1C,MAAM,eAAe,GAAG,IAAI,CAAC,aAAa,IAAI,KAAK,CAAC;IAEpD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,+BAA+B,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACrF,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,IAAI;QAChC,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAA8B;KACpD,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACnE,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC;IAC5B,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC;IAC3B,GAAG,CACD,cAAc,EACd,yBAAyB,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,kBAAkB,CAAC,MAAM,uBAAuB,CACzG,CAAC;IAEF,MAAM,eAAe,GAAG,wBAAwB,CAAC,YAAY,CAAC,CAAC;IAC/D,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,YAAY,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAEvD,IAAI,SAAS,GAAG,2BAA2B,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IACpF,IACE,IAAI,CAAC,gBAAgB;QACrB,MAAM,CAAC,IAAI,KAAK,mBAAmB;QACnC,SAAS,CAAC,QAAQ,KAAK,cAAc;QACrC,CAAC,SAAS,CAAC,IAAI,EACf,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAA2B,CAAC;QAClD,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,eAAe,GAAG,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC;QAC7D,MAAM,qBAAqB,GAAG,CAAC,CAAC,CAAC,sEAAsE;QACvG,GAAG,CAAC,8BAA8B,EAAE,4CAA4C,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAChG,IAAI,CAAC;YACH,IAAI,QAAQ,GAA2C,IAAI,CAAC;YAC5D,IAAI,SAAS,GAAG,EAAE,CAAC;YACnB,IAAI,UAAU,GAAG,EAAE,CAAC;YACpB,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,qBAAqB,EAAE,OAAO,EAAE,EAAE,CAAC;gBAClE,MAAM,KAAK,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;gBACrG,MAAM,MAAM,GACV,QAAQ,KAAK,IAAI;oBACf,CAAC,CAAC,8BAA8B,CAAC,KAAK,CAAC;oBACvC,CAAC,CAAC,mCAAmC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAC3D,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,EAAE;oBAC9D,QAAQ;oBACR,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,EAAE,GAAG,CAAC;oBACrD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;iBACnC,CAAC,CAAC;gBACH,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC;gBAC7B,MAAM,SAAS,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;gBACtF,IAAI,SAAS,CAAC,QAAQ,KAAK,cAAc,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;oBAC5D,MAAM,QAAQ,GAAG,wBAAwB,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;oBACxE,IAAI,eAAe,EAAE,CAAC;wBACpB,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;4BAC/B,KAAK;4BACL,IAAI,EAAE,IAAI;4BACV,YAAY,EAAE,MAAM,CAAC,KAAK;4BAC1B,IAAI,EAAE,QAAQ;4BACd,OAAO,EAAE,EAAE,sBAAsB,EAAE,+BAA+B,EAAE;yBACrE,CAAC,CAAC;oBACL,CAAC;oBACD,SAAS,GAAG,QAAQ,CAAC;oBACrB,SAAS,GAAG,SAAS,CAAC;oBACtB,GAAG,CACD,gCAAgC,EAChC,eAAe;wBACb,CAAC,CAAC,gCAAgC,MAAM,CAAC,KAAK,SAAS,UAAU,CAAC,KAAK,mPAAmP;wBAC1T,CAAC,CAAC,gCAAgC,MAAM,CAAC,KAAK,SAAS,UAAU,CAAC,KAAK,wHAAwH,EACjM;wBACE,KAAK,EAAE,UAAU,CAAC,KAAK;qBACxB,CACF,CAAC;oBACF,QAAQ,GAAG,IAAI,CAAC;oBAChB,MAAM;gBACR,CAAC;gBACD,UAAU,GAAG,uCAAuC,SAAS,CAAC,QAAQ,cAAc,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,GAAG,CAAC;gBAC9H,GAAG,CACD,6BAA6B,EAC7B,OAAO,GAAG,qBAAqB;oBAC7B,CAAC,CAAC,GAAG,UAAU,0DAA0D,OAAO,IAAI,qBAAqB,GAAG;oBAC5G,CAAC,CAAC,GAAG,UAAU,YAAY,qBAAqB,aAAa,CAChE,CAAC;gBACF,QAAQ,GAAG,EAAE,cAAc,EAAE,UAAU,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;YAClH,CAAC;YACD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,YAAY;oBACnB,QAAQ;oBACR,KAAK,EAAE,SAAS;oBAChB,QAAQ,EAAE,UAAU;oBACpB,cAAc,EAAE,IAAI;iBACrB,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtE,GAAG,CAAC,6BAA6B,EAAE,sBAAsB,MAAM,EAAE,CAAC,CAAC;YACnE,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,YAAY;gBACnB,QAAQ;gBACR,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,gCAAgC,MAAM,EAAE;gBAClD,cAAc,EAAE,IAAI;aACrB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,yFAAyF;IACzF,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,KAAK,OAAO,IAAI,IAAI,CAAC,YAAY,KAAK,OAAO,CAAC;IACjF,IAAI,eAAe,IAAI,IAAI,CAAC,YAAY,KAAK,OAAO,EAAE,CAAC;QACrD,GAAG,CAAC,MAAM,EAAE,uEAAuE,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,aAAa,GAAG,KAAK,CAAC;IAC1B,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,YAAiC,CAAC;IACtC,IAAI,eAAe,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,CAAC,MAA2B,CAAC;QAClD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC;YAClC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,UAAU;YACjB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,SAAS,CAAC,QAAQ,KAAK,cAAc,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK;YAC9E,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,kBAAkB;YAC/C,QAAQ;YACR,MAAM;YACN,OAAO;YACP,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC;YAClC,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,EAAE,GAAG,CAAC;YACrD,iBAAiB;SAClB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,CAAC,MAAc,EAAc,EAAE,CAAC,CAAC;YAC5C,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,YAAY;YACnB,QAAQ;YACR,KAAK,EAAE,EAAE;YACT,QAAQ,EAAE,MAAM;YAChB,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACzB,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YAC5D,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC1B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAC7B,UAAU,GAAG,GAAG,UAAU,YAAY,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;YAC1F,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5D,SAAS,GAAG,mBAAmB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YACxE,aAAa,GAAG,IAAI,CAAC;YACrB,YAAY,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;YAC5C,UAAU,GAAG,SAAS,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC;YAC9E,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,QAAQ,MAAM,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YACvG,IAAI,SAAS,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBAC/B,MAAM,MAAM,GAAG,SAAS,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,QAAQ,MAAM,CAAC,KAAK,2BAA2B,SAAS,CAAC,UAAU,IAAI,SAAS,2CAA2C,CAAC;gBACrL,GAAG,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;gBACnC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAED,IACE,eAAe;QACf,CAAC,SAAS;QACV,MAAM,CAAC,IAAI,KAAK,mBAAmB;QACnC,SAAS,CAAC,QAAQ,KAAK,cAAc;QACrC,SAAS,CAAC,MAAM,KAAK,KAAK,EAC1B,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAA2B,CAAC;QAClD,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC;YACpD,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,KAAK,EAAE,UAAU;YACjB,IAAI,EAAE,SAAS;YACf,QAAQ;YACR,MAAM;YACN,OAAO;YACP,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC;YAClC,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,EAAE,GAAG,CAAC;YACrD,iBAAiB;YACjB,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,kBAAkB,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC;IACjG,CAAC;IAED,6FAA6F;IAC7F,gGAAgG;IAChG,MAAM,eAAe,GAAG,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,cAAc,KAAK,OAAO,CAAC;IAChF,IACE,IAAI,CAAC,QAAQ;QACb,CAAC,eAAe;QAChB,eAAe;QACf,kBAAkB,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,EAClE,CAAC;QACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5E,MAAM,SAAS,CAAC,QAAQ,EAAE;YACxB,IAAI,EAAE,QAAQ,CAAC,QAAQ;YACvB,IAAI,EAAE,QAAQ,CAAC,WAAW;YAC1B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAChE,QAAQ,EAAE,oBAAoB,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC;SACnE,CAAC,CAAC;QACH,GAAG,CAAC,WAAW,EAAE,6EAA6E,CAAC,CAAC;QAChG,OAAO;YACL,EAAE,EAAE,IAAI;YACR,KAAK,EAAE,OAAO;YACd,QAAQ;YACR,KAAK,EAAE,WAAW;YAClB,cAAc,EAAE,QAAQ,CAAC,WAAW,CAAC,MAAM;YAC3C,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjD,CAAC;IACJ,CAAC;IAED,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAEnC,GAAG,CACD,WAAW,EACX,mBAAmB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,SAAS,CAAC,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EACrJ,EAAE,SAAS,EAAE,CACd,CAAC;IAEF,GAAG,CAAC,oBAAoB,EAAE,uDAAuD,CAAC,CAAC;IACnF,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACtC,MAAM,SAAS,GAAG,cAAc,CAAC;QAC/B,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACnB,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW;gBAAE,OAAO,CAAC,oCAAoC;YAC9E,GAAG,CAAC,mBAAmB,EAAE,sBAAsB,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QACpG,CAAC;KACF,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;IAChD,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM;aAC5B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;aACpG,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,GAAG,CACD,aAAa,EACb,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,oDAAoD,KAAK,EAAE;YACpF,CAAC,UAAU,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,SAAS,qCAAqC,CAAC,CAAC,CAAC,EAAE,CAAC,CACnG,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,mBAAmB,EAAE,6BAA6B,UAAU,CAAC,GAAG,qCAAqC,CAAC,CAAC;IAC7G,CAAC;IACD,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxF,GAAG,CAAC,aAAa,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,yBAAyB,WAAW,EAAE,CAAC,CAAC;IACzF,CAAC;IACD,GAAG,CAAC,sBAAsB,EAAE,2BAA2B,UAAU,CAAC,MAAM,CAAC,MAAM,UAAU,EAAE;QACzF,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB;KAC5C,CAAC,CAAC;IAEH,IAAI,QAAsC,CAAC;IAC3C,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,aAAa,CAC9B,eAAe,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,EACpG,QAAQ,CACT,CAAC;QAEF,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,EAAE,gDAAgD,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,MAAM,GAAG,UAAU,CAAC;QACxB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,MAA+C,CAAC;QACpD,IAAI,MAA4C,CAAC;QACjD,IAAI,WAAmD,CAAC;QACxD,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC7C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,GAAG,CAAC,MAAM,EAAE,2CAA2C,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAChF,CAAC;YAED,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE;gBACxC,QAAQ;gBACR,cAAc,EAAE,cAAc,IAAI,IAAI;gBACtC,aAAa;gBACb,cAAc;gBACd,iBAAiB;gBACjB,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC;aACnC,CAAC,CAAC;YAEH,KAAK,MAAM,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/C,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE;oBACjG,cAAc,EAAE,CAAC,CAAC,MAAM;iBACzB,CAAC,CAAC;YACL,CAAC;YAED,uBAAuB;YACvB,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChC,MAAM,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACnD,GAAG,CAAC,UAAU,EAAE,YAAY,IAAI,gBAAgB,CAAC,CAAC;gBAClD,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,YAAY;oBACnB,QAAQ;oBACR,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,QAAQ,EAAE,YAAY;oBACtB,cAAc,EAAE,IAAI;iBACrB,CAAC;YACJ,CAAC;YAED,4EAA4E;YAC5E,6EAA6E;YAC7E,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1B,MAAM,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YACrD,CAAC;YAED,0EAA0E;YAC1E,MAAM,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAClC,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/C,IACE,CAAC,WAAW,CAAC,QAAQ;gBACrB,yBAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI;gBAC/C,aAAa,GAAG,2BAA2B,EAC3C,CAAC;gBACD,aAAa,EAAE,CAAC;gBAChB,GAAG,CACD,MAAM,EACN,uDAAuD,WAAW,CAAC,MAAM,CAAC,MAAM,+BAA+B,aAAa,IAAI,2BAA2B,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACjM,CAAC;gBACF,MAAM,GAAG,8BAA8B,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;gBACxE,SAAS;YACX,CAAC;YACD,MAAM;QACR,CAAC;QACD,oGAAoG;QACpG,MAAM,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC;YAClC,WAAW,EAAE,MAAM,CAAC,KAAK;YACzB,WAAW;YACX,SAAS;YACT,eAAe;YACf,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,QAAQ;YACR,GAAG;SACJ,CAAC,CAAC;QAEH,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,WAAW,CAAC;QAC/F,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,GAAG,CACD,yBAAyB,EACzB,WAAW,aAAa,CAAC,MAAM,4CAA4C,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtG,CAAC;QACJ,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,SAAS,CAAC,QAAQ,EAAE;gBACxB,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;gBACnD,QAAQ,EAAE,oBAAoB,CAAC,cAAc,EAAE,KAAK,CAAC;aACtD,CAAC,CAAC;YACH,GAAG,CACD,yBAAyB,EACzB,0DAA0D,cAAc,CAAC,aAAa,CAAC,MAAM,IAAI;gBAC/F,iBAAiB,cAAc,CAAC,WAAW,CAAC,MAAM,IAAI;gBACtD,eAAe,cAAc,CAAC,UAAU,CAAC,MAAM,IAAI;gBACnD,eAAe,cAAc,CAAC,SAAS,CAAC,MAAM,GAAG,CACpD,CAAC;YACF,IACE,cAAc,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC;gBACvC,cAAc,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;gBACtC,cAAc,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EACrC,CAAC;gBACD,GAAG,CACD,gBAAgB,EAChB,wGAAwG,CACzG,CAAC;YACJ,CAAC;YACD,IAAI,cAAc,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5C,MAAM,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC/E,GAAG,CAAC,uBAAuB,EAAE,YAAY,cAAc,CAAC,aAAa,CAAC,MAAM,sBAAsB,SAAS,EAAE,CAAC,CAAC;YACjH,CAAC;YAED,0EAA0E;YAC1E,qEAAqE;YACrE,uEAAuE;YACvE,2EAA2E;YAC3E,8EAA8E;YAC9E,IACE,eAAe;gBACf,MAAM,CAAC,IAAI,KAAK,mBAAmB;gBACnC,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,GAAG,sBAAsB;oBACzD,cAAc,CAAC,UAAU,CAAC,MAAM,GAAG,oBAAoB;oBACvD,cAAc,CAAC,SAAS,CAAC,MAAM,GAAG,oBAAoB,CAAC,EACzD,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAA2B,CAAC;gBAClD,MAAM,KAAK,GACT,GAAG,cAAc,CAAC,WAAW,CAAC,MAAM,kBAAkB,cAAc,CAAC,UAAU,CAAC,MAAM,eAAe;oBACrG,GAAG,cAAc,CAAC,SAAS,CAAC,MAAM,aAAa,CAAC;gBAClD,MAAM,UAAU,GAAG,gDAAgD,KAAK,8BAA8B,CAAC;gBACvG,MAAM,IAAI,GAAG,CAAC,MAAc,EAAc,EAAE,CAAC,CAAC;oBAC5C,EAAE,EAAE,KAAK;oBACT,KAAK;oBACL,QAAQ;oBACR,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,QAAQ,EAAE,MAAM;oBAChB,cAAc,EAAE,IAAI;iBACrB,CAAC,CAAC;gBACH,kGAAkG;gBAClG,IAAI,SAAS,EAAE,CAAC;oBACd,IAAI,aAAa,EAAE,CAAC;wBAClB,MAAM,MAAM,GAAG,GAAG,UAAU,sCAAsC,KAAK,2CAA2C,CAAC;wBACnH,GAAG,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;wBACnC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;oBACtB,CAAC;oBACD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC;wBAClC,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,KAAK,EAAE,UAAU;wBACjB,IAAI,EAAE,SAAS;wBACf,SAAS,EAAE,IAAI;wBACf,UAAU,EAAE,gDAAgD,KAAK,EAAE;wBACnE,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,kBAAkB;wBAC/C,QAAQ;wBACR,MAAM;wBACN,OAAO;wBACP,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC;wBAClC,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,EAAE,GAAG,CAAC;wBACrD,iBAAiB;qBAClB,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBAC1B,MAAM,MAAM,GAAG,gDAAgD,KAAK,mBAAmB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,uCAAuC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;wBACxK,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;oBAC9E,CAAC;oBACD,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;wBAC5D,GAAG,CAAC,qBAAqB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBACxC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC3B,CAAC;oBACD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC;oBAC/D,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;oBACxB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;gBACtB,CAAC;gBACD,gGAAgG;gBAChG,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC;oBACpD,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,KAAK,EAAE,UAAU;oBACjB,IAAI,EAAE,SAAS;oBACf,QAAQ;oBACR,MAAM;oBACN,OAAO;oBACP,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC;oBAClC,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,EAAE,GAAG,CAAC;oBACrD,iBAAiB;oBACjB,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAC;gBACH,MAAM,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC;gBACxC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,MAAM,GAAG,gDAAgD,KAAK,uBAAuB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxI,GAAG,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;oBACpC,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC;gBAC1D,CAAC;gBACD,GAAG,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;gBACvC,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC;YAC1B,CAAC;YACD,MAAM,UAAU,GAAG,yBAAyB,CAAC,cAAc,CAAC,CAAC;YAC7D,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;gBAC7B,GAAG,CACD,8BAA8B,EAC9B,sBAAsB,GAAG,CAAC,KAAK,MAAM,GAAG,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAO,qCAAqC,CACjH,CAAC;YACJ,CAAC;YACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,0BAA0B,EAAE,CAAC;gBAC7D,MAAM,MAAM,GAAG,YAAY,UAAU,CAAC,MAAM,qIAAqI,CAAC;gBAClL,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBACxB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YACrG,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,GAAG,yBAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC7D,IAAI,aAAa,EAAE,CAAC;gBAClB,GAAG,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;gBAC/B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YAC5G,CAAC;YACD,GAAG,CAAC,yBAAyB,EAAE,4BAA4B,CAAC,YAAY,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC;QAChG,CAAC;QAED,GAAG,CAAC,MAAM,EAAE,4BAA4B,MAAM,CAAC,KAAK,YAAY,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAElG,MAAM,UAAU,GAAe;YAC7B,EAAE,EAAE,IAAI;YACR,KAAK;YACL,QAAQ;YACR,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,cAAc;YACd,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjD,CAAC;QAEF,IAAI,CAAC,YAAY;YAAE,OAAO,UAAU,CAAC;QAErC,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,WAAW,GACf,eAAe,CAAC,MAAM,GAAG,uBAAuB;YAC9C,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,uBAAuB,CAAC;YACnD,CAAC,CAAC,eAAe,CAAC;QAEtB,GAAG,CAAC,yBAAyB,EAAE,qCAAqC,KAAK,YAAY,KAAK,GAAG,CAAC,CAAC;QAC/F,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC;YAClC,KAAK;YACL,MAAM,EAAE,MAAM,IAAI,EAAE;YACpB,QAAQ;YACR,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,MAAM;YACZ,WAAW;SACZ,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACtB,GAAG,CAAC,uBAAuB,EAAE,4BAA4B,KAAK,EAAE,CAAC,CAAC;YAClE,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,MAAM,QAAQ,GAAG,aAAa,EAAE,EAAE,CAAC;QACnC,IAAI,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7C,IAAI,OAAO,IAAI,UAAU,EAAE,CAAC;gBAC1B,MAAM,MAAM,GAAG,gCAAgC,UAAU,aAAa,CAAC;gBACvE,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;gBAC7B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YACrG,CAAC;YACD,OAAO,EAAE,CAAC;YACV,QAAQ,GAAG,QAAQ,CAAC;YACpB,GAAG,CAAC,eAAe,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACjD,SAAS,CAAC,kDAAkD;QAC9D,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,2BAA2B,CAAC;QAC9D,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC7B,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK;YACL,QAAQ;YACR,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,QAAQ,EAAE,kBAAkB,MAAM,EAAE;YACpC,cAAc,EAAE,IAAI;SACrB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
export type CommandRunner = (command: string, options?: {
|
|
2
|
+
cwd?: string;
|
|
3
|
+
timeout?: number;
|
|
4
|
+
}) => Promise<{
|
|
5
|
+
stdout: string;
|
|
6
|
+
}>;
|
|
7
|
+
/** Why a `git push` was refused, as far as git's own stderr says (#733). */
|
|
8
|
+
type PushFailureKind = 'non-fast-forward' | 'network' | 'unknown';
|
|
9
|
+
/**
|
|
10
|
+
* The real reason a push failed, from git's own stderr when the runner exposes it
|
|
11
|
+
* (node's promisified `exec` rejection carries `stderr`), else the Error message, else the
|
|
12
|
+
* value's string form. Flattened to one line and bounded so a single event row stays
|
|
13
|
+
* greppable in `.factory/events.ndjson`.
|
|
14
|
+
*/
|
|
15
|
+
export declare function describePushFailure(err: unknown): {
|
|
16
|
+
kind: PushFailureKind;
|
|
17
|
+
detail: string;
|
|
18
|
+
};
|
|
19
|
+
/** The result of comparing the pushed branch's remote head against local HEAD (#735). */
|
|
20
|
+
type RemoteHeadCheck = {
|
|
21
|
+
status: 'match';
|
|
22
|
+
localSha: string;
|
|
23
|
+
remoteSha: string;
|
|
24
|
+
} | {
|
|
25
|
+
status: 'mismatch';
|
|
26
|
+
localSha: string;
|
|
27
|
+
remoteSha: string;
|
|
28
|
+
} | {
|
|
29
|
+
status: 'unreadable';
|
|
30
|
+
localSha?: string;
|
|
31
|
+
remoteSha?: string;
|
|
32
|
+
detail: string;
|
|
33
|
+
};
|
|
34
|
+
/** Same flatten-and-bound shaping as {@link describePushFailure}, kept separate so that
|
|
35
|
+
* function's asserted output never changes. */
|
|
36
|
+
export declare function shortDetail(err: unknown): string;
|
|
37
|
+
/** origin/<branch>'s current SHA, `null` when the branch is absent, or the failure detail (#1869). */
|
|
38
|
+
export declare function readRemoteBranchSha(run: CommandRunner, worktree: string, branch: string): Promise<{
|
|
39
|
+
status: 'ok';
|
|
40
|
+
sha: string | null;
|
|
41
|
+
} | {
|
|
42
|
+
status: 'unreadable';
|
|
43
|
+
detail: string;
|
|
44
|
+
}>;
|
|
45
|
+
/**
|
|
46
|
+
* A zero-exit push is not proof the remote branch actually carries this run's commits — a
|
|
47
|
+
* concurrent push or an update that silently applied nothing leaves the remote head elsewhere,
|
|
48
|
+
* and a PR opened against it would advertise work that is not there (#735).
|
|
49
|
+
*/
|
|
50
|
+
export declare function verifyRemoteHead(run: CommandRunner, worktree: string, branch: string): Promise<RemoteHeadCheck>;
|
|
51
|
+
export {};
|
|
52
|
+
//# sourceMappingURL=ship-git.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ship-git.d.ts","sourceRoot":"","sources":["../../src/phases/ship-git.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,aAAa,GAAG,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,KACzC,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjC,4EAA4E;AAC5E,KAAK,eAAe,GAAG,kBAAkB,GAAG,SAAS,GAAG,SAAS,CAAC;AA8BlE;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAM3F;AAKD,yFAAyF;AACzF,KAAK,eAAe,GAChB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACxD;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC3D;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpF;gDACgD;AAChD,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAKhD;AAaD,sGAAsG;AACtG,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAO1F;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAuBrH"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
// packages/core/src/phases/ship-git.ts — push-failure and remote-head helpers for SHIP
|
|
2
|
+
import { shellEscape } from '../utils/index.js';
|
|
3
|
+
/** Bound on the failure text copied into one NDJSON event row. */
|
|
4
|
+
const MAX_PUSH_ERROR_DETAIL = 400;
|
|
5
|
+
const NON_FAST_FORWARD_MARKERS = [
|
|
6
|
+
'non-fast-forward',
|
|
7
|
+
'! [rejected]',
|
|
8
|
+
'fetch first',
|
|
9
|
+
'updates were rejected',
|
|
10
|
+
'stale info',
|
|
11
|
+
];
|
|
12
|
+
const NETWORK_MARKERS = [
|
|
13
|
+
'could not resolve host',
|
|
14
|
+
'failed to connect',
|
|
15
|
+
'connection timed out',
|
|
16
|
+
'connection refused',
|
|
17
|
+
'network is unreachable',
|
|
18
|
+
'operation timed out',
|
|
19
|
+
'the remote end hung up unexpectedly',
|
|
20
|
+
];
|
|
21
|
+
function classifyPushFailure(text) {
|
|
22
|
+
const t = text.toLowerCase();
|
|
23
|
+
if (NON_FAST_FORWARD_MARKERS.some((m) => t.includes(m)))
|
|
24
|
+
return 'non-fast-forward';
|
|
25
|
+
if (NETWORK_MARKERS.some((m) => t.includes(m)))
|
|
26
|
+
return 'network';
|
|
27
|
+
return 'unknown';
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* The real reason a push failed, from git's own stderr when the runner exposes it
|
|
31
|
+
* (node's promisified `exec` rejection carries `stderr`), else the Error message, else the
|
|
32
|
+
* value's string form. Flattened to one line and bounded so a single event row stays
|
|
33
|
+
* greppable in `.factory/events.ndjson`.
|
|
34
|
+
*/
|
|
35
|
+
export function describePushFailure(err) {
|
|
36
|
+
const raw = err?.stderr;
|
|
37
|
+
const stderr = typeof raw === 'string' ? raw : '';
|
|
38
|
+
const text = stderr.trim() || (err instanceof Error ? err.message : String(err));
|
|
39
|
+
const detail = text.replace(/\s+/g, ' ').trim().slice(0, MAX_PUSH_ERROR_DETAIL);
|
|
40
|
+
return { kind: classifyPushFailure(detail), detail: detail || 'no error output' };
|
|
41
|
+
}
|
|
42
|
+
/** Bound on the ls-remote failure text copied into one NDJSON event row (#735). */
|
|
43
|
+
const MAX_REMOTE_HEAD_DETAIL = 200;
|
|
44
|
+
/** Same flatten-and-bound shaping as {@link describePushFailure}, kept separate so that
|
|
45
|
+
* function's asserted output never changes. */
|
|
46
|
+
export function shortDetail(err) {
|
|
47
|
+
const raw = err?.stderr;
|
|
48
|
+
const stderr = typeof raw === 'string' ? raw : '';
|
|
49
|
+
const text = stderr.trim() || (err instanceof Error ? err.message : String(err));
|
|
50
|
+
return text.replace(/\s+/g, ' ').trim().slice(0, MAX_REMOTE_HEAD_DETAIL) || 'no error output';
|
|
51
|
+
}
|
|
52
|
+
/** The SHA on the `refs/heads/<branch>` line of `git ls-remote` output. `--heads origin <branch>`
|
|
53
|
+
* is a suffix pattern, so it can list more than one ref — match the ref name exactly rather than
|
|
54
|
+
* trusting the first line. */
|
|
55
|
+
function parseRemoteHeadSha(stdout, branch) {
|
|
56
|
+
for (const line of stdout.split('\n')) {
|
|
57
|
+
const [sha, ref] = line.trim().split(/\s+/);
|
|
58
|
+
if (ref === `refs/heads/${branch}` && sha)
|
|
59
|
+
return sha;
|
|
60
|
+
}
|
|
61
|
+
return undefined;
|
|
62
|
+
}
|
|
63
|
+
/** origin/<branch>'s current SHA, `null` when the branch is absent, or the failure detail (#1869). */
|
|
64
|
+
export async function readRemoteBranchSha(run, worktree, branch) {
|
|
65
|
+
try {
|
|
66
|
+
const { stdout } = await run(`git ls-remote --heads origin ${shellEscape(branch)}`, { cwd: worktree });
|
|
67
|
+
return { status: 'ok', sha: parseRemoteHeadSha(stdout, branch) ?? null };
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
return { status: 'unreadable', detail: shortDetail(err) };
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* A zero-exit push is not proof the remote branch actually carries this run's commits — a
|
|
75
|
+
* concurrent push or an update that silently applied nothing leaves the remote head elsewhere,
|
|
76
|
+
* and a PR opened against it would advertise work that is not there (#735).
|
|
77
|
+
*/
|
|
78
|
+
export async function verifyRemoteHead(run, worktree, branch) {
|
|
79
|
+
let localSha;
|
|
80
|
+
try {
|
|
81
|
+
const { stdout } = await run('git rev-parse HEAD', { cwd: worktree });
|
|
82
|
+
localSha = stdout.trim();
|
|
83
|
+
}
|
|
84
|
+
catch (err) {
|
|
85
|
+
return { status: 'unreadable', detail: shortDetail(err) };
|
|
86
|
+
}
|
|
87
|
+
if (!localSha)
|
|
88
|
+
return { status: 'unreadable', detail: 'git rev-parse HEAD produced no SHA' };
|
|
89
|
+
let listing;
|
|
90
|
+
try {
|
|
91
|
+
const { stdout } = await run(`git ls-remote --heads origin ${shellEscape(branch)}`, { cwd: worktree });
|
|
92
|
+
listing = stdout;
|
|
93
|
+
}
|
|
94
|
+
catch (err) {
|
|
95
|
+
return { status: 'unreadable', localSha, detail: shortDetail(err) };
|
|
96
|
+
}
|
|
97
|
+
const remoteSha = parseRemoteHeadSha(listing, branch);
|
|
98
|
+
if (!remoteSha)
|
|
99
|
+
return { status: 'unreadable', localSha, detail: `no refs/heads/${branch} on origin` };
|
|
100
|
+
return remoteSha === localSha
|
|
101
|
+
? { status: 'match', localSha, remoteSha }
|
|
102
|
+
: { status: 'mismatch', localSha, remoteSha };
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=ship-git.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ship-git.js","sourceRoot":"","sources":["../../src/phases/ship-git.ts"],"names":[],"mappings":"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"}
|
package/dist/phases/ship.d.ts
CHANGED
|
@@ -3,15 +3,10 @@ import type { ApprovalGate } from '../approvals/index.js';
|
|
|
3
3
|
import { type LifecycleBus } from '../bus/index.js';
|
|
4
4
|
import type { EventKind } from '../events/kinds.js';
|
|
5
5
|
import type { ReviewRouting } from '../review/routing.js';
|
|
6
|
+
import { type CommandRunner } from './ship-git.js';
|
|
6
7
|
import type { CheckSummary, CiFailureEvidence } from '../types/index.js';
|
|
7
8
|
import { type InfraRerunOutcome } from '../utils/ci-watch.js';
|
|
8
9
|
import type { WorkRequest } from '../work/index.js';
|
|
9
|
-
type CommandRunner = (command: string, options?: {
|
|
10
|
-
cwd?: string;
|
|
11
|
-
timeout?: number;
|
|
12
|
-
}) => Promise<{
|
|
13
|
-
stdout: string;
|
|
14
|
-
}>;
|
|
15
10
|
export interface ShipResult {
|
|
16
11
|
ok: boolean;
|
|
17
12
|
prNumber?: number;
|
|
@@ -24,6 +19,8 @@ export interface ShipResult {
|
|
|
24
19
|
/** True when the branch's content had already landed on main (e.g. a retry after a
|
|
25
20
|
* squash merge) — nothing was pushed and no PR was created (#520). */
|
|
26
21
|
alreadyDelivered?: boolean;
|
|
22
|
+
/** The head SHA watched on a CI rework re-entry (#2816). */
|
|
23
|
+
headSha?: string;
|
|
27
24
|
}
|
|
28
25
|
export declare function shipPhase(opts: Parameters<typeof shipPhaseImpl>[0]): Promise<ShipResult>;
|
|
29
26
|
declare function shipPhaseImpl(opts: {
|
|
@@ -67,6 +64,11 @@ declare function shipPhaseImpl(opts: {
|
|
|
67
64
|
/** origin/<branch> SHA recorded at worktree creation (#1868). When set, the new-PR push
|
|
68
65
|
* replaces that stale head under a lease on this SHA, and fails closed if the remote moved (#1869). */
|
|
69
66
|
recordedRemoteSha?: string;
|
|
67
|
+
/** SHIP re-entry after a CI rework round (#2816): same open PR, plain push, watch the pushed SHA. */
|
|
68
|
+
reentry?: {
|
|
69
|
+
prNumber: number;
|
|
70
|
+
previousHeadSha?: string;
|
|
71
|
+
};
|
|
70
72
|
}): Promise<ShipResult>;
|
|
71
73
|
export declare function findOpenPR(octokit: Octokit, owner: string, repo: string, branch: string): Promise<PrLookup>;
|
|
72
74
|
export declare function findMergedPR(octokit: Octokit, owner: string, repo: string, branch: string): Promise<PrLookup>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/phases/ship.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/phases/ship.ts"],"names":[],"mappings":"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"}
|