@on-par/factory-core 0.9.7-next.29 → 0.9.7-next.30
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/phases/check.d.ts +4 -3
- package/dist/phases/check.d.ts.map +1 -1
- package/dist/phases/check.js +3 -4
- package/dist/phases/check.js.map +1 -1
- package/dist/phases/plan-routes.d.ts +11 -0
- package/dist/phases/plan-routes.d.ts.map +1 -1
- package/dist/phases/plan-routes.js +33 -0
- package/dist/phases/plan-routes.js.map +1 -1
- package/dist/run/outcome.d.ts +3 -3
- package/dist/run/outcome.d.ts.map +1 -1
- package/dist/run/outcome.js +3 -3
- package/dist/run/outcome.js.map +1 -1
- package/package.json +5 -5
package/dist/phases/check.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { type LifecycleBus } from '../bus/index.js';
|
|
|
2
2
|
import { type BaselineReport, runBaselineCheckers } from '../checkers/baseline.js';
|
|
3
3
|
import { type FlakeRerun } from '../checkers/flaky-rerun.js';
|
|
4
4
|
import { type CheckerContext, runAllCheckers } from '../checkers/index.js';
|
|
5
|
+
import type { BuildRoutePin } from '../config/repo.js';
|
|
5
6
|
import type { EventKind } from '../events/kinds.js';
|
|
6
7
|
import type { ModelRouter } from '../router/index.js';
|
|
7
8
|
import type { SandboxPolicy } from '../sandbox/index.js';
|
|
@@ -102,8 +103,8 @@ declare function checkPhaseImpl(opts: {
|
|
|
102
103
|
diffBase?: string;
|
|
103
104
|
/** Parent ref of a stacked slice (#2716); forwarded to CheckerContext.parentBaseRef. */
|
|
104
105
|
parentBaseRef?: string;
|
|
105
|
-
/** Worker route that completed BUILD; direct callers retain Claude rework by default. */
|
|
106
|
-
reworkRoute?:
|
|
106
|
+
/** Worker route that completed BUILD (`command` included, #2873); direct callers retain Claude rework by default. */
|
|
107
|
+
reworkRoute?: BuildRoutePin;
|
|
107
108
|
/** Worker model that completed BUILD, retained as the compatible rework override. */
|
|
108
109
|
reworkModel?: string;
|
|
109
110
|
/** Lane id stamped onto emitted lifecycle events; defaults to `issue-<issue>` (#591). */
|
|
@@ -141,7 +142,7 @@ export interface ReworkWorkerOptions {
|
|
|
141
142
|
appPort?: number;
|
|
142
143
|
appBaseUrl?: string;
|
|
143
144
|
onPgid?: (pgid: number) => void;
|
|
144
|
-
reworkRoute?:
|
|
145
|
+
reworkRoute?: BuildRoutePin;
|
|
145
146
|
reworkModel?: string;
|
|
146
147
|
runId?: string;
|
|
147
148
|
extraInstructions?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/phases/check.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,KAAK,cAAc,EAA2B,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC5G,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,4BAA4B,CAAC;AAChF,OAAO,EACL,KAAK,cAAc,EAInB,cAAc,EAEf,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/phases/check.ts"],"names":[],"mappings":"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"}
|
package/dist/phases/check.js
CHANGED
|
@@ -10,7 +10,7 @@ import { laneEnv } from '../environment/index.js';
|
|
|
10
10
|
import { routerFailureOf } from '../router/executor-error.js';
|
|
11
11
|
import { failoversFrom } from '../router/index.js';
|
|
12
12
|
import { applySteering, describeSteering } from '../steering/index.js';
|
|
13
|
-
import {
|
|
13
|
+
import { resolveReworkRoute } from './plan-routes.js';
|
|
14
14
|
export const MAX_REWORK_ROUNDS = 3;
|
|
15
15
|
/** Checker name of the model-judged showstopper review (#2236); signed by file:line, not prose (#2238). */
|
|
16
16
|
export const LENS_REVIEW_CHECKER = 'lens_review';
|
|
@@ -503,7 +503,7 @@ Do not push, do not open a PR. Just fix and commit. The checker will re-verify.`
|
|
|
503
503
|
let reworkResult = null;
|
|
504
504
|
let failureReason;
|
|
505
505
|
let attempts = [];
|
|
506
|
-
const { route, rerouted } =
|
|
506
|
+
const { route, rerouted, modelOverride } = resolveReworkRoute(router, reworkRoute, reworkModel);
|
|
507
507
|
if (rerouted) {
|
|
508
508
|
log('model-override', `rework route ${reworkRoute} has no runnable model on this machine, rerouting to ${route}`);
|
|
509
509
|
}
|
|
@@ -517,8 +517,7 @@ Do not push, do not open a PR. Just fix and commit. The checker will re-verify.`
|
|
|
517
517
|
env: laneEnv(appPort, process.env, appBaseUrl, worktree, runId),
|
|
518
518
|
onPgid,
|
|
519
519
|
retryCause: 'checker',
|
|
520
|
-
|
|
521
|
-
modelOverride: rerouted ? undefined : reworkModel,
|
|
520
|
+
modelOverride,
|
|
522
521
|
});
|
|
523
522
|
attempts = reworkResult.attempts;
|
|
524
523
|
}
|
package/dist/phases/check.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/phases/check.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/phases/check.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type BuildRoutePin } from '../config/repo.js';
|
|
1
2
|
import type { ModelRouter } from '../router/index.js';
|
|
2
3
|
export type BuildRouteName = 'codex' | 'claude' | 'opencode';
|
|
3
4
|
/** Order PLAN falls back through when its chosen route cannot run here. */
|
|
@@ -12,6 +13,16 @@ export declare function resolveRunnableBuildRoute(requested: BuildRouteName, run
|
|
|
12
13
|
route: BuildRouteName;
|
|
13
14
|
rerouted: boolean;
|
|
14
15
|
};
|
|
16
|
+
/** The route and pin CHECK/CI rework runs on (#2873). codex/claude/opencode follow
|
|
17
|
+
* resolveRunnableBuildRoute and keep the pin unless rerouted (the pin belongs to the old route's
|
|
18
|
+
* harness). `command` is pin-only, so it is not in ROUTE_FALLBACK_ORDER: it stays when the pin sits
|
|
19
|
+
* on a declared agentic harness (pin kept) or build_command resolves a runnable model (router
|
|
20
|
+
* picks), and otherwise falls back without the pin. */
|
|
21
|
+
export declare function resolveReworkRoute(router: Pick<ModelRouter, 'resolveAll'> & Partial<Pick<ModelRouter, 'registryRef'>>, requested: BuildRoutePin, pinnedModel: string | undefined): {
|
|
22
|
+
route: BuildRoutePin;
|
|
23
|
+
rerouted: boolean;
|
|
24
|
+
modelOverride?: string;
|
|
25
|
+
};
|
|
15
26
|
/** Step-3 route bullets, in display order. */
|
|
16
27
|
export declare const ROUTE_BULLETS: Record<BuildRouteName, string>;
|
|
17
28
|
//# 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;AAE7D,2EAA2E;AAC3E,eAAO,MAAM,oBAAoB,EAAE,SAAS,cAAc,EAAoC,CAAC;AAE/F;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,8CAA8C;AAC9C,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,CAQxD,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,CAAC;AAE7D,2EAA2E;AAC3E,eAAO,MAAM,oBAAoB,EAAE,SAAS,cAAc,EAAoC,CAAC;AAE/F;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;;;;wDAIwD;AACxD,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,CAQxD,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
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
4
|
export const ROUTE_FALLBACK_ORDER = ['claude', 'codex', 'opencode'];
|
|
4
5
|
/** Build routes whose task resolves to at least one runnable model, in fallback order.
|
|
@@ -21,6 +22,38 @@ export function resolveRunnableBuildRoute(requested, runnable) {
|
|
|
21
22
|
return { route: requested, rerouted: false };
|
|
22
23
|
return { route: defaultBuildRoute(runnable), rerouted: true };
|
|
23
24
|
}
|
|
25
|
+
/** The route and pin CHECK/CI rework runs on (#2873). codex/claude/opencode follow
|
|
26
|
+
* resolveRunnableBuildRoute and keep the pin unless rerouted (the pin belongs to the old route's
|
|
27
|
+
* harness). `command` is pin-only, so it is not in ROUTE_FALLBACK_ORDER: it stays when the pin sits
|
|
28
|
+
* on a declared agentic harness (pin kept) or build_command resolves a runnable model (router
|
|
29
|
+
* picks), and otherwise falls back without the pin. */
|
|
30
|
+
export function resolveReworkRoute(router, requested, pinnedModel) {
|
|
31
|
+
if (requested !== 'command') {
|
|
32
|
+
const { route, rerouted } = resolveRunnableBuildRoute(requested, runnableBuildRoutes(router));
|
|
33
|
+
return rerouted ? { route, rerouted } : { route, rerouted, modelOverride: pinnedModel };
|
|
34
|
+
}
|
|
35
|
+
if (pinFitsCommand(router, pinnedModel))
|
|
36
|
+
return { route: 'command', rerouted: false, modelOverride: pinnedModel };
|
|
37
|
+
if (commandResolves(router))
|
|
38
|
+
return { route: 'command', rerouted: false };
|
|
39
|
+
return { route: defaultBuildRoute(runnableBuildRoutes(router)), rerouted: true };
|
|
40
|
+
}
|
|
41
|
+
function pinFitsCommand(router, model) {
|
|
42
|
+
try {
|
|
43
|
+
return !!model && !!router.registryRef && routeForBuildModel(router.registryRef, model) === 'command';
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
function commandResolves(router) {
|
|
50
|
+
try {
|
|
51
|
+
return router.resolveAll('build_command').length > 0;
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
24
57
|
/** Step-3 route bullets, in display order. */
|
|
25
58
|
export const ROUTE_BULLETS = {
|
|
26
59
|
codex: ` - route: codex — when the implementation from a frozen spec is bounded and mechanical
|
|
@@ -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":"AAAA,gFAAgF;AAEhF,OAAO,EAAsB,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAK3E,2EAA2E;AAC3E,MAAM,CAAC,MAAM,oBAAoB,GAA8B,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AAE/F;yFACyF;AACzF,MAAM,UAAU,mBAAmB,CAAC,MAAuC;IACzE,IAAI,CAAC;QACH,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,KAAK,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAChG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,iBAAiB,CAAC,QAAmC;IACnE,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;AACjC,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,yBAAyB,CACvC,SAAyB,EACzB,QAAmC;IAEnC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACxG,OAAO,EAAE,KAAK,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AAChE,CAAC;AAED;;;;wDAIwD;AACxD,MAAM,UAAU,kBAAkB,CAChC,MAAmF,EACnF,SAAwB,EACxB,WAA+B;IAE/B,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,yBAAyB,CAAC,SAAS,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9F,OAAO,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC;IAC1F,CAAC;IACD,IAAI,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,CAAC;IAClH,IAAI,eAAe,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC1E,OAAO,EAAE,KAAK,EAAE,iBAAiB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AACnF,CAAC;AAED,SAAS,cAAc,CAAC,MAAiD,EAAE,KAAyB;IAClG,IAAI,CAAC;QACH,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,WAAW,IAAI,kBAAkB,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC;IACxG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,MAAuC;IAC9D,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,8CAA8C;AAC9C,MAAM,CAAC,MAAM,aAAa,GAAmC;IAC3D,KAAK,EAAE;oFAC2E;IAClF,MAAM,EAAE;;8FAEoF;IAC5F,QAAQ,EAAE;wFAC4E;CACvF,CAAC"}
|
package/dist/run/outcome.d.ts
CHANGED
|
@@ -2,10 +2,10 @@ import type { EventKind } from '../events/kinds.js';
|
|
|
2
2
|
export type ParkReason = Extract<EventKind, 'escalate' | 'timeout' | 'fail' | 'conflict' | 'ci-failed' | 'ci-infra' | 'held' | 'config' | 'blocked'>;
|
|
3
3
|
import type { BuildRoutePin } from '../config/repo.js';
|
|
4
4
|
export type BuildRoute = BuildRoutePin;
|
|
5
|
-
/** CHECK/CI rework
|
|
6
|
-
*
|
|
5
|
+
/** CHECK/CI rework reruns on the route BUILD completed on, `command` included (#2873):
|
|
6
|
+
* reworkWorker keeps it when its model can run and reroutes otherwise. */
|
|
7
7
|
export declare function reworkRouteFor(route: BuildRoute, model: string | undefined): {
|
|
8
|
-
reworkRoute?:
|
|
8
|
+
reworkRoute?: BuildRoutePin;
|
|
9
9
|
reworkModel?: string;
|
|
10
10
|
};
|
|
11
11
|
/** A run's terminal outcome. `parked` is produced by the CLI's LaneParkError and `released`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../../src/run/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,UAAU,GAAG,OAAO,CAC9B,SAAS,EACT,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,CACxG,CAAC;AAEF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,MAAM,UAAU,GAAG,aAAa,CAAC;AAEvC;
|
|
1
|
+
{"version":3,"file":"outcome.d.ts","sourceRoot":"","sources":["../../src/run/outcome.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,MAAM,UAAU,GAAG,OAAO,CAC9B,SAAS,EACT,UAAU,GAAG,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,GAAG,QAAQ,GAAG,SAAS,CACxG,CAAC;AAEF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,MAAM,UAAU,GAAG,aAAa,CAAC;AAEvC;2EAC2E;AAC3E,wBAAgB,cAAc,CAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB;IAAE,WAAW,CAAC,EAAE,aAAa,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,CAEvD;AAED;;;8CAG8C;AAC9C,MAAM,MAAM,UAAU,GAClB;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC/F;IACE,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0CAA0C;IAC1C,KAAK,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1C,GACD;IACE,KAAK,EAAE,QAAQ,CAAC;IAChB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yHAAyH;IACzH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,6FAA6F;IAC7F,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,GACD;IACE,KAAK,EAAE,UAAU,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACD;IAAE,KAAK,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvG;;iFAEiF;AACjF,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAOtD;AAED;;;+EAG+E;AAC/E,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EAAE,CAQ3E"}
|
package/dist/run/outcome.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
/** CHECK/CI rework
|
|
2
|
-
*
|
|
1
|
+
/** CHECK/CI rework reruns on the route BUILD completed on, `command` included (#2873):
|
|
2
|
+
* reworkWorker keeps it when its model can run and reroutes otherwise. */
|
|
3
3
|
export function reworkRouteFor(route, model) {
|
|
4
|
-
return
|
|
4
|
+
return { reworkRoute: route, reworkModel: model };
|
|
5
5
|
}
|
|
6
6
|
/** Core classifies structurally — via a parked RunOutcome on `err.outcome` or a
|
|
7
7
|
* `parkReason` marker property — rather than `instanceof`, because core cannot import
|
package/dist/run/outcome.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outcome.js","sourceRoot":"","sources":["../../src/run/outcome.ts"],"names":[],"mappings":"AAWA;
|
|
1
|
+
{"version":3,"file":"outcome.js","sourceRoot":"","sources":["../../src/run/outcome.ts"],"names":[],"mappings":"AAWA;2EAC2E;AAC3E,MAAM,UAAU,cAAc,CAC5B,KAAiB,EACjB,KAAyB;IAEzB,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;AACpD,CAAC;AA4CD;;iFAEiF;AACjF,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,MAAM,OAAO,GAAI,GAAmD,EAAE,OAAO,CAAC;IAC9E,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,QAAQ;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC;IACjE,MAAM,MAAM,GAAI,GAAsD,EAAE,UAAU,CAAC;IACnF,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAC1B,IAAK,GAA+C,EAAE,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC7F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;+EAG+E;AAC/E,MAAM,UAAU,UAAU,CAAC,GAAY;IACrC,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAuC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,wDAAwD,GAAG,EAAE,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@on-par/factory-core",
|
|
3
|
-
"version": "0.9.7-next.
|
|
3
|
+
"version": "0.9.7-next.30",
|
|
4
4
|
"description": "Core engine: model router, constitutions, checkers, and pipeline phases for the Software Factory.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -54,10 +54,10 @@
|
|
|
54
54
|
"prepack": "node ../../scripts/pack-hygiene-cli.ts prepack"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@on-par/adr-kit": "0.9.7-next.
|
|
58
|
-
"@on-par/contracts": "0.9.7-next.
|
|
59
|
-
"@on-par/factory-config": "0.9.7-next.
|
|
60
|
-
"@on-par/repo-context": "0.9.7-next.
|
|
57
|
+
"@on-par/adr-kit": "0.9.7-next.30",
|
|
58
|
+
"@on-par/contracts": "0.9.7-next.30",
|
|
59
|
+
"@on-par/factory-config": "0.9.7-next.30",
|
|
60
|
+
"@on-par/repo-context": "0.9.7-next.30",
|
|
61
61
|
"@octokit/rest": "^22.0.0",
|
|
62
62
|
"execa": "^10.1.0",
|
|
63
63
|
"gray-matter": "^4.0.3",
|