@on-par/factory-cli 0.9.25-next.8 → 0.9.25
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/README.md +1 -1
- package/dist/cli/doctor-codex-sandbox.d.ts +8 -4
- package/dist/cli/doctor-codex-sandbox.d.ts.map +1 -1
- package/dist/cli/doctor-codex-sandbox.js +25 -5
- package/dist/cli/doctor-codex-sandbox.js.map +1 -1
- package/dist/cli/doctor-config.d.ts.map +1 -1
- package/dist/cli/doctor-config.js +13 -2
- package/dist/cli/doctor-config.js.map +1 -1
- package/dist/cli/doctor.d.ts +2 -0
- package/dist/cli/doctor.d.ts.map +1 -1
- package/dist/cli/doctor.js +5 -6
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/index.d.ts +3 -9
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +58 -93
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/json-contract.d.ts.map +1 -1
- package/dist/cli/json-contract.js +5 -1
- package/dist/cli/json-contract.js.map +1 -1
- package/dist/cli/land.d.ts +1 -3
- package/dist/cli/land.d.ts.map +1 -1
- package/dist/cli/land.js +2 -9
- package/dist/cli/land.js.map +1 -1
- package/dist/cli/program-run-work.d.ts.map +1 -1
- package/dist/cli/program-run-work.js +5 -4
- package/dist/cli/program-run-work.js.map +1 -1
- package/dist/cli/repo-router.js +3 -1
- package/dist/cli/repo-router.js.map +1 -1
- package/dist/cli/run-branch.d.ts +5 -1
- package/dist/cli/run-branch.d.ts.map +1 -1
- package/dist/cli/run-branch.js +7 -4
- package/dist/cli/run-branch.js.map +1 -1
- package/dist/cli/run-brief.d.ts +0 -7
- package/dist/cli/run-brief.d.ts.map +1 -1
- package/dist/cli/run-brief.js +47 -81
- package/dist/cli/run-brief.js.map +1 -1
- package/dist/cli/run-lane-deps.d.ts +0 -4
- package/dist/cli/run-lane-deps.d.ts.map +1 -1
- package/dist/cli/run-lane.d.ts.map +1 -1
- package/dist/cli/run-lane.js +3 -33
- package/dist/cli/run-lane.js.map +1 -1
- package/dist/cli/ship-options.d.ts +3 -1
- package/dist/cli/ship-options.d.ts.map +1 -1
- package/dist/cli/ship-options.js +3 -3
- package/dist/cli/ship-options.js.map +1 -1
- package/dist/cli/ship-runtime.d.ts +1 -2
- package/dist/cli/ship-runtime.d.ts.map +1 -1
- package/dist/cli/ship-runtime.js.map +1 -1
- package/dist/cli/ship-steps.d.ts +1 -7
- package/dist/cli/ship-steps.d.ts.map +1 -1
- package/dist/cli/ship-steps.js +3 -27
- 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 +17 -6
- package/dist/cli/ship.js.map +1 -1
- package/dist/cli/slice-index.d.ts +1 -1
- package/dist/cli/slice-index.d.ts.map +1 -1
- package/dist/cli/slice-index.js +4 -8
- package/dist/cli/slice-index.js.map +1 -1
- package/dist/cli/stack-run.d.ts +27 -0
- package/dist/cli/stack-run.d.ts.map +1 -0
- package/dist/cli/stack-run.js +109 -0
- package/dist/cli/stack-run.js.map +1 -0
- package/dist/cli/status-json.d.ts +1 -2
- package/dist/cli/status-json.d.ts.map +1 -1
- package/dist/cli/status-json.js +2 -7
- package/dist/cli/status-json.js.map +1 -1
- package/dist/cli/status.d.ts.map +1 -1
- package/dist/cli/status.js +4 -23
- package/dist/cli/status.js.map +1 -1
- package/package.json +4 -4
- package/schemas/status.schema.json +3 -1
- package/dist/cli/run-children.d.ts +0 -24
- package/dist/cli/run-children.d.ts.map +0 -1
- package/dist/cli/run-children.js +0 -73
- package/dist/cli/run-children.js.map +0 -1
- package/dist/cli/run-lane-decompose.d.ts +0 -12
- package/dist/cli/run-lane-decompose.d.ts.map +0 -1
- package/dist/cli/run-lane-decompose.js +0 -27
- package/dist/cli/run-lane-decompose.js.map +0 -1
package/dist/cli/ship-steps.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
// packages/cli/src/cli/ship-steps.ts — named steps of the ship flow: sandbox logging, workspace setup, RunRequest builder (#2788)
|
|
2
2
|
import { exec as execCb } from 'node:child_process';
|
|
3
|
-
import { writeFileSync } from 'node:fs';
|
|
4
3
|
import { homedir } from 'node:os';
|
|
5
4
|
import { join, resolve } from 'node:path';
|
|
6
5
|
import { promisify, styleText } from 'node:util';
|
|
7
|
-
import { listQueuedSteering, localOnlyWorkspace, resolveBuildPublish, resolveDesignRegressionBlock, resolveReadinessUpdateIssueBody, resolveCiWatchDeadlineMs, resolveSizeGateBudget,
|
|
6
|
+
import { listQueuedSteering, localOnlyWorkspace, resolveBuildPublish, resolveDesignRegressionBlock, resolveReadinessUpdateIssueBody, resolveCiWatchDeadlineMs, resolveSizeGateBudget, worktreeWorkspace, } from '@on-par/factory-core';
|
|
8
7
|
import { findOpenPR, isEgressEnforced, resolveFilingPolicy, resolveConfiguredWritablePaths, resolveBaselineCacheTtlHours, resolveHermeticGit, resolveReviewFloorRules, resolveT1SampleRate, resolveTrustTier, withFileLock, withGitLock, } from '@on-par/factory-core/internal';
|
|
9
8
|
import { recordGitPushes, resolveGitHubMode, GITHUB_STUB_CALLS_FILE } from './github-stub.js';
|
|
10
9
|
import { baseRemoteRef } from './ship-options.js';
|
|
@@ -57,7 +56,7 @@ export function logSandboxPolicy(opts, sandboxPolicy, log) {
|
|
|
57
56
|
}
|
|
58
57
|
else if (sandboxPolicy.runtime === 'none') {
|
|
59
58
|
activeSandboxPolicy = sandboxPolicy;
|
|
60
|
-
log('sandbox', 'outer sandbox off;
|
|
59
|
+
log('sandbox', 'outer sandbox off; codex runs without its own sandbox unless sandbox.codexSandbox is workspace-write; harnesses without their own sandbox run unwrapped');
|
|
61
60
|
logConfiguredWritablePaths(sandboxPolicy, log);
|
|
62
61
|
}
|
|
63
62
|
else if (sandboxPolicy.runtime === 'docker-sandbox') {
|
|
@@ -105,26 +104,6 @@ export async function setupRunWorkspace({ ctx, repoRoot, branch, worktree, log,
|
|
|
105
104
|
}
|
|
106
105
|
return workspace;
|
|
107
106
|
}
|
|
108
|
-
/** Rewrites the queue for a decomposed issue, then throws so the lane moves on to the children. */
|
|
109
|
-
export function decomposeQueue({ issueNum, childIssues, paths, planLog, }) {
|
|
110
|
-
const { readTextFileOrEmpty, errorDetail, IssueDecomposedError } = shipRuntime();
|
|
111
|
-
const childList = childIssues.map((n) => `#${n}`).join(', ');
|
|
112
|
-
try {
|
|
113
|
-
const before = readTextFileOrEmpty(paths.queue);
|
|
114
|
-
const rewrite = rewriteQueueForDecomposition(before, { issue: issueNum, childIssues });
|
|
115
|
-
if (rewrite.changed) {
|
|
116
|
-
writeFileSync(paths.queue, rewrite.content);
|
|
117
|
-
planLog('decompose_filed', `queue entry for #${issueNum} replaced with ${childList}`);
|
|
118
|
-
}
|
|
119
|
-
else {
|
|
120
|
-
planLog('decompose_filed', `#${issueNum} had no queue entry to replace — continuing the lane with ${childList}`);
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
catch (err) {
|
|
124
|
-
planLog('decompose_file_failed', `queue rewrite for #${issueNum} failed: ${errorDetail(err)}`);
|
|
125
|
-
}
|
|
126
|
-
throw new IssueDecomposedError(`issue #${issueNum} decomposed into ${childList}`, childIssues);
|
|
127
|
-
}
|
|
128
107
|
/** Maps the core RunOutcome to the shipped branch name, or throws the park/pause error the lane expects. */
|
|
129
108
|
export function finishOutcome({ outcome, opts, ctx, paths, issueNum, worktree, terminalMessage, log, }) {
|
|
130
109
|
const { LaneParkError, LaneEnvironmentPauseError } = shipRuntime();
|
|
@@ -143,10 +122,6 @@ export function finishOutcome({ outcome, opts, ctx, paths, issueNum, worktree, t
|
|
|
143
122
|
}
|
|
144
123
|
return outcome.branch;
|
|
145
124
|
}
|
|
146
|
-
if (outcome.state === 'released' && outcome.reason === 'stack-wait') {
|
|
147
|
-
console.log(styleText('yellow', `⏸ Issue #${issueNum} → waiting for approval or merge of slice ${outcome.slice.index}/${outcome.slice.count} PR #${outcome.prNumber}; released, not parked`));
|
|
148
|
-
return outcome.branch ?? '';
|
|
149
|
-
}
|
|
150
125
|
if (outcome.state === 'released' && outcome.reason === 'file-overlap') {
|
|
151
126
|
console.log(styleText('yellow', `⏸ Issue #${issueNum} → deferred: ${outcome.file} is claimed by in-flight issue #${outcome.holder}; re-queued, not parked`));
|
|
152
127
|
return outcome.branch ?? '';
|
|
@@ -199,6 +174,7 @@ export function buildRunRequest({ issueNum, ghRepo, repoRoot, branch, specPath,
|
|
|
199
174
|
readinessUpdateIssueBody: resolveReadinessUpdateIssueBody(factoryConfig),
|
|
200
175
|
publishFromBuild: resolveBuildPublish(factoryConfig),
|
|
201
176
|
sizeGateMode,
|
|
177
|
+
parkOverBudget: opts.parkOverBudget,
|
|
202
178
|
maxSlices,
|
|
203
179
|
sizeBudget: resolveSizeGateBudget(factoryConfig),
|
|
204
180
|
reviewFloorRules: resolveReviewFloorRules(repoConfig),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-steps.js","sourceRoot":"","sources":["../../src/cli/ship-steps.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ship-steps.js","sourceRoot":"","sources":["../../src/cli/ship-steps.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/ship.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { LocalOnlyPolicy, RunOutcome, WorkRequest, WorkRequestSourceKind } from '@on-par/factory-core';
|
|
2
2
|
import { getFactoryPaths } from '@on-par/factory-core';
|
|
3
3
|
import { shipHostBuildSlot } from './host-slot.js';
|
|
4
|
-
import type { CheckResumeRecord } from '@on-par/factory-core/internal';
|
|
4
|
+
import type { CheckResumeRecord, SlicePlanStore } from '@on-par/factory-core/internal';
|
|
5
5
|
import type { CliDeps, ConfigLoaderKey, CoreOpKey, GitOpKey, ShellOpKey } from './index.js';
|
|
6
6
|
import { type ShipIssueOptions } from './ship-options.js';
|
|
7
7
|
type ShipArgs = Parameters<typeof shipIssueFrom> extends [string, ...infer Rest] ? Rest : never;
|
|
@@ -18,7 +18,7 @@ declare function shipIssueFrom(repoRoot: string, issueNum: number, opts: ShipIss
|
|
|
18
18
|
blockedBehind?: number[];
|
|
19
19
|
workRequest?: WorkRequest;
|
|
20
20
|
/** Receives the core RunOutcome before shipIssue maps it to a return/throw — lets
|
|
21
|
-
*
|
|
21
|
+
* stacked runs and the run lane read the PR number as data (#1747). */
|
|
22
22
|
onOutcome?: (outcome: RunOutcome) => void;
|
|
23
23
|
/** Input source for planPhase to resolve; defaults inside planPhase to this run's GitHub issue. */
|
|
24
24
|
workSource?: {
|
|
@@ -37,6 +37,8 @@ declare function shipIssueFrom(repoRoot: string, issueNum: number, opts: ShipIss
|
|
|
37
37
|
rebuild?: {
|
|
38
38
|
branch: string;
|
|
39
39
|
};
|
|
40
|
+
/** Run-state slice-plan store for a stacked brief (#3813); becomes RunPorts.slicePlanStore. */
|
|
41
|
+
slicePlanStore?: SlicePlanStore;
|
|
40
42
|
}, deps?: Pick<CliDeps, 'octokit' | 'planPhase' | 'buildPhase' | 'checkPhase' | 'shipPhase' | 'checkBaseHealth' | ConfigLoaderKey | GitOpKey | ShellOpKey | CoreOpKey>): Promise<string>;
|
|
41
43
|
export {};
|
|
42
44
|
//# sourceMappingURL=ship.d.ts.map
|
package/dist/cli/ship.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/cli/ship.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,eAAe,EACf,UAAU,EAGV,WAAW,EACX,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,eAAe,EAoBhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAmB,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"ship.d.ts","sourceRoot":"","sources":["../../src/cli/ship.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,eAAe,EACf,UAAU,EAGV,WAAW,EACX,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,eAAe,EAoBhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAmB,MAAM,+BAA+B,CAAC;AAyBxG,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAc5F,OAAO,EAAiB,KAAK,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEzE,KAAK,QAAQ,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEhG;gHACgH;AAChH,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EACrB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,EACjB,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,EACjB,IAAI,GAAE,QAAQ,CAAC,CAAC,CAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,iBAAe,aAAa,CAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,gBAAgB,EACtB,GAAG,CAAC,EAAE;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,0FAA0F;IAC1F,KAAK,CAAC,EAAE,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qFAAqF;IACrF,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B;4EACwE;IACxE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,CAAC;IAC1C,mGAAmG;IACnG,UAAU,CAAC,EAAE;QAAE,IAAI,EAAE,qBAAqB,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAC9D,kHAAkH;IAClH,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,qGAAqG;IACrG,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC5D,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,iGAAiG;IACjG,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7B,+FAA+F;IAC/F,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,EACD,IAAI,GAAE,IAAI,CACR,OAAO,EACL,SAAS,GACT,WAAW,GACX,YAAY,GACZ,YAAY,GACZ,WAAW,GACX,iBAAiB,GACjB,eAAe,GACf,QAAQ,GACR,UAAU,GACV,SAAS,CACP,GACL,OAAO,CAAC,MAAM,CAAC,CA6VjB"}
|
package/dist/cli/ship.js
CHANGED
|
@@ -4,7 +4,7 @@ import { styleText } from 'node:util';
|
|
|
4
4
|
import { applyRepoConfig, closedWorkSkipReason, createDefaultWorkSourceRegistry, createFileApprovalGate, drainSteering, getFactoryPaths, GITHUB_ISSUE_SOURCE, LaneFileGuard, phaseSnapshotFile, workKeyFromIssue, resolveAutoFailover, resolveCodexDisabled, resolveEfficiencyPolicy, resolveEnvironmentPorts, resolveEnvironmentProxy, resolvePlanApproval, resolveProcessGroupGraceMs, resolveSandboxPolicy, resolveSizeGateMaxSlices, resolveSizeGateMode, ReworkHistory, runIssue, summarizeEvent, touchLastEvent, touchRunActivity, } from '@on-par/factory-core';
|
|
5
5
|
import { shipHostBuildSlot } from './host-slot.js';
|
|
6
6
|
import { claimReworkRequests } from './ship-review-rework.js';
|
|
7
|
-
import { createCheckResumeStore, createGithubLaneClaimStalenessProbe, createPlanReuseStore, egressHostMessage, egressSummaryMessage, holdRunConfigSnapshot, logCost, logEvent, readIssueRunState, recordLocalAuthFailure, resolveBaseHealthChecks, resolveDraftPrPolicy, resolveEffectiveConfig, resolvePrClassifierPolicy, runStateFile, shouldProxyEgress, startEgressProxy, worktreeSandboxFor, } from '@on-par/factory-core/internal';
|
|
7
|
+
import { createCheckResumeStore, createGithubLaneClaimStalenessProbe, createPlanReuseStore, egressHostMessage, egressSummaryMessage, holdRunConfigSnapshot, isExplicitStackMode, logCost, logEvent, readIssueRunState, recordLocalAuthFailure, resolveBaseHealthChecks, resolveDraftPrPolicy, resolveEffectiveConfig, resolvePrClassifierPolicy, runStateFile, shouldProxyEgress, startEgressProxy, worktreeSandboxFor, } from '@on-par/factory-core/internal';
|
|
8
8
|
import { baseChecksVerdict, baseHealthWithCi } from './base-health-ci.js';
|
|
9
9
|
import { formatDeprecation } from './octokit.js';
|
|
10
10
|
import { restoredLoggingBreaker } from './provider-restored-log.js';
|
|
@@ -13,7 +13,7 @@ import { shipRuntime } from './ship-runtime.js';
|
|
|
13
13
|
import { phaseRecorder, runStateRecorder } from './ship-run-state.js';
|
|
14
14
|
import { maybeWriteBenchmarkArtifacts, maybeWriteLocalRunReport } from './ship-reports.js';
|
|
15
15
|
import { applyMeteredGuard, modelOverrideMessages, resolveProviderOrder } from './model-override-messages.js';
|
|
16
|
-
import { buildRunRequest,
|
|
16
|
+
import { buildRunRequest, finishOutcome, logSandboxPolicy, setupRunWorkspace, stubAwareShipPhase, TERMINAL_EVENT_KINDS, } from './ship-steps.js';
|
|
17
17
|
import { baseRemoteRef } from './ship-options.js';
|
|
18
18
|
/** Every one-shot entry point (ship, run-issue, run-brief, run lanes, resume --from check) runs here with the source
|
|
19
19
|
* checkout's repo config snapshotted, so CHECK in a worktree without `.factory/` runs its `checks` (#3600). */
|
|
@@ -65,6 +65,7 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
65
65
|
};
|
|
66
66
|
const router = new core.ModelRouter(policy.models, policy.routes, false, undefined, policy.effective.allowExperimental, policy.effective.localOnly);
|
|
67
67
|
router.setCodexFullAccessTasks?.(policy.sandbox.codexFullAccessTasks);
|
|
68
|
+
router.setCodexSandbox?.(policy.sandbox.codexSandbox);
|
|
68
69
|
router.setContextCeilings?.(factoryConfig.build.contextCeiling);
|
|
69
70
|
router.setLocalAuthSink?.(recordLocalAuthFailure);
|
|
70
71
|
router.setProviderHold?.((p) => breaker.isHeldUntilCredentialsChange(p));
|
|
@@ -93,12 +94,22 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
93
94
|
issue: issueNum,
|
|
94
95
|
}));
|
|
95
96
|
const issueTitle = work.title;
|
|
96
|
-
const noPr = opts.pr === false; // --no-pr
|
|
97
|
-
const
|
|
97
|
+
const noPr = opts.pr === false; // --no-pr never files child issues or slice PRs: size gate off; --base-branch keeps stack mode
|
|
98
|
+
const gateOff = noPr || (opts.baseBranch !== undefined && opts.sizeGate !== 'stack');
|
|
99
|
+
const sizeGateMode = gateOff ? 'off' : (opts.sizeGate ?? resolveSizeGateMode(factoryConfig));
|
|
100
|
+
const explicitStack = sizeGateMode === 'stack' &&
|
|
101
|
+
(opts.sizeGate !== undefined ? opts.explicitStack === true : isExplicitStackMode(factoryConfig));
|
|
98
102
|
const maxSlices = opts.maxSlices ?? resolveSizeGateMaxSlices(factoryConfig);
|
|
99
103
|
const { branchPrefix } = policy.effective;
|
|
100
104
|
const claim = { issueNum, issueTitle, ghRepo, sizeGateMode, work, ctx, octokit, baseBranch: opts.baseBranch };
|
|
101
|
-
const branch = await resolveRunBranch({
|
|
105
|
+
const branch = await resolveRunBranch({
|
|
106
|
+
...claim,
|
|
107
|
+
branchPrefix,
|
|
108
|
+
explicitStack,
|
|
109
|
+
noPr,
|
|
110
|
+
parkOverBudget: opts.parkOverBudget,
|
|
111
|
+
eventsFile: paths.events,
|
|
112
|
+
});
|
|
102
113
|
const worktree = ctx?.resumeFrom
|
|
103
114
|
? ctx.resumeFrom.worktree
|
|
104
115
|
: ctx?.localOnly
|
|
@@ -255,6 +266,7 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
255
266
|
laneClaimStaleness: createGithubLaneClaimStalenessProbe({ octokit, branchPrefix: policy.effective.branchPrefix }),
|
|
256
267
|
recordPhase: phaseRecorder(paths.runs, issueNum),
|
|
257
268
|
claimSignal: ctx?.signal,
|
|
269
|
+
...(ctx?.slicePlanStore ? { slicePlanStore: ctx.slicePlanStore } : {}),
|
|
258
270
|
recordRunState: runStateRecorder(paths.runs, {
|
|
259
271
|
issue: issueNum,
|
|
260
272
|
lane: lane ?? '',
|
|
@@ -264,7 +276,6 @@ async function shipIssueFrom(repoRoot, issueNum, opts, ctx, deps = {}) {
|
|
|
264
276
|
startedAt: runStartedAt,
|
|
265
277
|
}),
|
|
266
278
|
onActivity: () => touchRunActivity(phaseSnapshotFile(paths.runs, workKeyFromIssue(issueNum)), new Date().toISOString()),
|
|
267
|
-
onDecomposed: (childIssues) => void decomposeQueue({ issueNum, childIssues, paths, planLog: mkLog('plan') }),
|
|
268
279
|
writeLocalRunReport: (info) => maybeWriteLocalRunReport({
|
|
269
280
|
issueNum,
|
|
270
281
|
paths,
|
package/dist/cli/ship.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship.js","sourceRoot":"","sources":["../../src/cli/ship.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ship.js","sourceRoot":"","sources":["../../src/cli/ship.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Octokit } from '@octokit/rest';
|
|
2
2
|
import type { LocalOnlyPolicy, SizeGateMode, WorkRequest } from '@on-par/factory-core';
|
|
3
3
|
import type { CheckResumeRecord } from '@on-par/factory-core/internal';
|
|
4
|
-
/** ADR-
|
|
4
|
+
/** ADR-0161: slice k >= 2 builds on its own branch, so the slice plan is read before the worktree exists. */
|
|
5
5
|
export declare function findSliceIndex({ sizeGateMode, ctx, work, octokit, ghRepo, issueNum, }: {
|
|
6
6
|
sizeGateMode: SizeGateMode;
|
|
7
7
|
ctx?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slice-index.d.ts","sourceRoot":"","sources":["../../src/cli/slice-index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAIvE,6GAA6G;AAC7G,wBAAsB,cAAc,CAAC,EACnC,YAAY,EACZ,GAAG,EACH,IAAI,EACJ,OAAO,EACP,MAAM,EACN,QAAQ,GACT,EAAE;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;KAAE,CAAC;IACtE,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"slice-index.d.ts","sourceRoot":"","sources":["../../src/cli/slice-index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAIvE,6GAA6G;AAC7G,wBAAsB,cAAc,CAAC,EACnC,YAAY,EACZ,GAAG,EACH,IAAI,EACJ,OAAO,EACP,MAAM,EACN,QAAQ,GACT,EAAE;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,GAAG,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,iBAAiB,CAAA;KAAE,CAAC;IACtE,IAAI,EAAE,WAAW,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkB9B"}
|
package/dist/cli/slice-index.js
CHANGED
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
// packages/cli/src/cli/slice-index.ts — which slice a ship run resumes at (ADR-
|
|
1
|
+
// packages/cli/src/cli/slice-index.ts — which slice a ship run resumes at (ADR-0161)
|
|
2
2
|
import { GITHUB_ISSUE_SOURCE } from '@on-par/factory-core';
|
|
3
3
|
import { currentSlice, findSlicePlanComment, nextStackSlice } from '@on-par/factory-core/internal';
|
|
4
4
|
import { shipRuntime } from './ship-runtime.js';
|
|
5
|
-
/** ADR-
|
|
5
|
+
/** ADR-0161: slice k >= 2 builds on its own branch, so the slice plan is read before the worktree exists. */
|
|
6
6
|
export async function findSliceIndex({ sizeGateMode, ctx, work, octokit, ghRepo, issueNum, }) {
|
|
7
7
|
const { errorDetail, LaneParkError } = shipRuntime();
|
|
8
8
|
let sliceIndex;
|
|
9
9
|
// ADR-0161: stack mode resumes at the lowest pending slice.
|
|
10
|
-
if (
|
|
11
|
-
!ctx?.localOnly &&
|
|
12
|
-
!ctx?.resumeFrom &&
|
|
13
|
-
work.kind === GITHUB_ISSUE_SOURCE) {
|
|
10
|
+
if (sizeGateMode === 'stack' && !ctx?.localOnly && !ctx?.resumeFrom && work.kind === GITHUB_ISSUE_SOURCE) {
|
|
14
11
|
try {
|
|
15
12
|
const lookup = await findSlicePlanComment({ octokit, repo: ghRepo, issue: issueNum });
|
|
16
13
|
if (lookup.status === 'found') {
|
|
17
|
-
|
|
18
|
-
sliceIndex = (next ?? currentSlice(lookup.plan))?.index;
|
|
14
|
+
sliceIndex = (nextStackSlice(lookup.plan) ?? currentSlice(lookup.plan))?.index;
|
|
19
15
|
}
|
|
20
16
|
}
|
|
21
17
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slice-index.js","sourceRoot":"","sources":["../../src/cli/slice-index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"slice-index.js","sourceRoot":"","sources":["../../src/cli/slice-index.ts"],"names":[],"mappings":"AAAA,qFAAqF;AAGrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAGnG,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,6GAA6G;AAC7G,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,YAAY,EACZ,GAAG,EACH,IAAI,EACJ,OAAO,EACP,MAAM,EACN,QAAQ,GAQT;IACC,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,WAAW,EAAE,CAAC;IACrD,IAAI,UAA8B,CAAC;IACnC,4DAA4D;IAC5D,IAAI,YAAY,KAAK,OAAO,IAAI,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,GAAG,EAAE,UAAU,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACzG,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACtF,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC9B,UAAU,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC;YACjF,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,aAAa,CACrB,iCAAiC,QAAQ,KAAK,WAAW,CAAC,GAAG,CAAC,sCAAsC,EACpG,UAAU,CACX,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { type RunOutcome, type StackLogLevel, type StackRunResult } from '@on-par/factory-core';
|
|
2
|
+
import type { BlockedByItem, SlicePlan } from '@on-par/factory-core/internal';
|
|
3
|
+
export declare function consoleStackLog(level: StackLogLevel, line: string): void;
|
|
4
|
+
/** Prints the engine's summary (green when every slice succeeded, yellow otherwise) and throws exit 1 on failure. */
|
|
5
|
+
export declare function printStackResult(result: StackRunResult, failMessage: string): void;
|
|
6
|
+
export interface SliceStackDeps {
|
|
7
|
+
/** The issue's slice plan, or undefined when no valid slice-plan comment exists. */
|
|
8
|
+
readSlicePlan: () => Promise<SlicePlan | undefined>;
|
|
9
|
+
/** One shipIssue run with sizeGate 'stack' and baseBranch = base; throws when the run fails or parks. */
|
|
10
|
+
ship: (base: string | undefined, onOutcome: (outcome: RunOutcome) => void) => Promise<void>;
|
|
11
|
+
}
|
|
12
|
+
export interface IssueStackDeps extends SliceStackDeps {
|
|
13
|
+
repo: string;
|
|
14
|
+
list: (issue: number) => Promise<BlockedByItem[]>;
|
|
15
|
+
shipMember: (issue: number, base: string | undefined, onOutcome: (outcome: RunOutcome) => void) => Promise<void>;
|
|
16
|
+
}
|
|
17
|
+
export declare function orderIssueChain(target: number, repo: string, list: (issue: number) => Promise<BlockedByItem[]>): Promise<number[]>;
|
|
18
|
+
/** `run-issue --stack` (#3798): sizes the issue when it has no slice plan yet, then builds every pending
|
|
19
|
+
* slice in order inside this one run, each slice's PR based on the previous slice's PR head. */
|
|
20
|
+
export declare function runIssueStack(issueNum: number, baseBranch: string | undefined, deps: IssueStackDeps): Promise<void>;
|
|
21
|
+
/** The stack loop shared by `run-issue --stack` and `run-brief <file> --stack` (#3813); `subject` names the work in console text. */
|
|
22
|
+
export declare function runSliceStack(subject: {
|
|
23
|
+
prefix: string;
|
|
24
|
+
label: string;
|
|
25
|
+
failLabel: string;
|
|
26
|
+
}, baseBranch: string | undefined, deps: SliceStackDeps): Promise<void>;
|
|
27
|
+
//# sourceMappingURL=stack-run.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stack-run.d.ts","sourceRoot":"","sources":["../../src/cli/stack-run.ts"],"names":[],"mappings":"AAIA,OAAO,EAAY,KAAK,UAAU,EAAE,KAAK,aAAa,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAI9E,wBAAgB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAGxE;AAED,qHAAqH;AACrH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAKlF;AAED,MAAM,WAAW,cAAc;IAC7B,oFAAoF;IACpF,aAAa,EAAE,MAAM,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC;IACpD,yGAAyG;IACzG,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7F;AAED,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAClD,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClH;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC,GAChD,OAAO,CAAC,MAAM,EAAE,CAAC,CAuBnB;AAED;iGACiG;AACjG,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC,CAwBf;AAED,qIAAqI;AACrI,wBAAsB,aAAa,CACjC,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC7D,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC,CAgDf"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
// packages/cli/src/cli/stack-run.ts — the CLI side of the stack engine: console output and the run-issue --stack slice list (#3798)
|
|
2
|
+
import { styleText } from 'node:util';
|
|
3
|
+
import { runStack } from '@on-par/factory-core';
|
|
4
|
+
import { CliExitError } from './errors.js';
|
|
5
|
+
export function consoleStackLog(level, line) {
|
|
6
|
+
if (level === 'error')
|
|
7
|
+
console.error(styleText('red', line));
|
|
8
|
+
else
|
|
9
|
+
console.log(styleText(level === 'warn' ? 'yellow' : 'cyan', line));
|
|
10
|
+
}
|
|
11
|
+
/** Prints the engine's summary (green when every slice succeeded, yellow otherwise) and throws exit 1 on failure. */
|
|
12
|
+
export function printStackResult(result, failMessage) {
|
|
13
|
+
for (const line of result.summary) {
|
|
14
|
+
console.log(result.ok ? styleText('green', line) : styleText('yellow', line));
|
|
15
|
+
}
|
|
16
|
+
if (!result.ok)
|
|
17
|
+
throw new CliExitError(failMessage, 1);
|
|
18
|
+
}
|
|
19
|
+
export async function orderIssueChain(target, repo, list) {
|
|
20
|
+
const active = new Set();
|
|
21
|
+
const completed = new Set();
|
|
22
|
+
const path = [];
|
|
23
|
+
const ordered = [];
|
|
24
|
+
async function visit(issue) {
|
|
25
|
+
if (active.has(issue)) {
|
|
26
|
+
const cycle = [...path.slice(path.indexOf(issue)), issue].map((n) => `#${n}`).join(' → ');
|
|
27
|
+
throw new CliExitError(`factory: blocked-by cycle: ${cycle}`, 2);
|
|
28
|
+
}
|
|
29
|
+
if (completed.has(issue))
|
|
30
|
+
return;
|
|
31
|
+
active.add(issue);
|
|
32
|
+
path.push(issue);
|
|
33
|
+
for (const item of await list(issue)) {
|
|
34
|
+
if (item.state === 'open' && item.repository.toLowerCase() === repo.toLowerCase())
|
|
35
|
+
await visit(item.number);
|
|
36
|
+
}
|
|
37
|
+
path.pop();
|
|
38
|
+
active.delete(issue);
|
|
39
|
+
completed.add(issue);
|
|
40
|
+
ordered.push(issue);
|
|
41
|
+
}
|
|
42
|
+
await visit(target);
|
|
43
|
+
return ordered;
|
|
44
|
+
}
|
|
45
|
+
/** `run-issue --stack` (#3798): sizes the issue when it has no slice plan yet, then builds every pending
|
|
46
|
+
* slice in order inside this one run, each slice's PR based on the previous slice's PR head. */
|
|
47
|
+
export async function runIssueStack(issueNum, baseBranch, deps) {
|
|
48
|
+
const issues = await orderIssueChain(issueNum, deps.repo, deps.list);
|
|
49
|
+
if (issues.length > 1) {
|
|
50
|
+
const result = await runStack(issues.map((issue) => ({
|
|
51
|
+
title: `issue #${issue}`,
|
|
52
|
+
run: async (base) => {
|
|
53
|
+
let outcome;
|
|
54
|
+
await deps.shipMember(issue, base, (value) => {
|
|
55
|
+
outcome = value;
|
|
56
|
+
});
|
|
57
|
+
return outcome && { prNumber: 'prNumber' in outcome ? outcome.prNumber : undefined, branch: outcome.branch };
|
|
58
|
+
},
|
|
59
|
+
})), { base: baseBranch, chain: true, prefix: 'run-issue', noun: 'issue', log: consoleStackLog });
|
|
60
|
+
printStackResult(result, `Run failed for one or more issues in the stack (listed above)`);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
await runSliceStack({ prefix: 'run-issue', label: `#${issueNum}`, failLabel: `issue #${issueNum}` }, baseBranch, deps);
|
|
64
|
+
}
|
|
65
|
+
/** The stack loop shared by `run-issue --stack` and `run-brief <file> --stack` (#3813); `subject` names the work in console text. */
|
|
66
|
+
export async function runSliceStack(subject, baseBranch, deps) {
|
|
67
|
+
let plan = await deps.readSlicePlan();
|
|
68
|
+
if (plan === undefined) {
|
|
69
|
+
console.log(styleText('cyan', `${subject.prefix}: --stack — sizing ${subject.label}`));
|
|
70
|
+
let sizingError;
|
|
71
|
+
try {
|
|
72
|
+
await deps.ship(baseBranch, () => { });
|
|
73
|
+
}
|
|
74
|
+
catch (err) {
|
|
75
|
+
sizingError = err;
|
|
76
|
+
}
|
|
77
|
+
plan = await deps.readSlicePlan();
|
|
78
|
+
if (plan === undefined) {
|
|
79
|
+
if (sizingError !== undefined)
|
|
80
|
+
throw sizingError;
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
const pending = plan.slices.filter((s) => s.state === 'pending');
|
|
85
|
+
if (pending.length === 0) {
|
|
86
|
+
console.log(styleText('cyan', `${subject.prefix}: every slice of ${subject.label} is already built`));
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const count = plan.slices.length;
|
|
90
|
+
const first = pending[0];
|
|
91
|
+
let base = baseBranch;
|
|
92
|
+
if (first.index > 1) {
|
|
93
|
+
const below = plan.slices[first.index - 2];
|
|
94
|
+
base = below.state === 'merged' ? baseBranch : below.branch;
|
|
95
|
+
}
|
|
96
|
+
console.log(styleText('cyan', `${subject.prefix}: --stack — ${subject.label} has ${count} slices; building ${pending.length} in order, each on the previous slice's PR head`));
|
|
97
|
+
const result = await runStack(pending.map((s) => ({
|
|
98
|
+
title: `slice ${s.index}/${count}`,
|
|
99
|
+
run: async (sliceBase) => {
|
|
100
|
+
let outcome;
|
|
101
|
+
await deps.ship(sliceBase, (o) => {
|
|
102
|
+
outcome = o;
|
|
103
|
+
});
|
|
104
|
+
return outcome && { prNumber: 'prNumber' in outcome ? outcome.prNumber : undefined, branch: outcome.branch };
|
|
105
|
+
},
|
|
106
|
+
})), { base, chain: true, prefix: subject.prefix, noun: 'slice', log: consoleStackLog });
|
|
107
|
+
printStackResult(result, `Run failed for one or more slices of ${subject.failLabel} (listed above)`);
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=stack-run.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stack-run.js","sourceRoot":"","sources":["../../src/cli/stack-run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ActiveQueueClaim } from '@on-par/factory-core';
|
|
2
|
-
import type { OpenFactoryDrafts
|
|
2
|
+
import type { OpenFactoryDrafts } from '@on-par/factory-core/internal';
|
|
3
3
|
import type { StatusJson } from './json-contract.js';
|
|
4
4
|
import type { StatusUpdateJson } from './update-state.js';
|
|
5
5
|
export type { StatusJson } from './json-contract.js';
|
|
@@ -67,7 +67,6 @@ export declare function buildStatusJson(input: {
|
|
|
67
67
|
active: ReadonlyArray<Pick<ActiveQueueClaim, 'lane' | 'issue' | 'phase' | 'lastActivityAt'>>;
|
|
68
68
|
update: StatusUpdateJson | null;
|
|
69
69
|
openFactoryDrafts: OpenFactoryDrafts | null;
|
|
70
|
-
decomposedParents?: ReadonlyArray<ParentCoverage> | null;
|
|
71
70
|
disk: StatusJson['disk'];
|
|
72
71
|
now: number;
|
|
73
72
|
}): StatusJson;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-json.d.ts","sourceRoot":"","sources":["../../src/cli/status-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"status-json.d.ts","sourceRoot":"","sources":["../../src/cli/status-json.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,YAAY,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,4DAA4D;AAC5D,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnF,kGAAkG;AAClG,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;AAEtD,6CAA6C;AAC7C,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;AAErE,uEAAuE;AACvE,MAAM,MAAM,kBAAkB,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE,0EAA0E;AAC1E,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE,KAAK,QAAQ,GAAG,cAAc,GAAG,KAAK,GAAG,SAAS,CAAC;AACnD,KAAK,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAClC,UAAU,aAAa;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;uHACuH;AACvH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE;IACN,WAAW,EAAE;QAAE,IAAI,IAAI,MAAM,EAAE,CAAC;QAAC,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAAA;KAAE,CAAC;IAC9E,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,aAAa,GAAG,MAAM,EAAE,CAAC;CACrE,EACD,IAAI,EAAE;IAAE,eAAe,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,SAAS,KAAK,QAAQ,CAAA;CAAE,GAC1G;IAAE,SAAS,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,EAAE,CAAC;IAAC,MAAM,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,MAAM,EAAE,CAAA;KAAE,EAAE,CAAA;CAAE,CAwBtG;AAED,iHAAiH;AACjH,wBAAgB,eAAe,CAAC,KAAK,EAAE;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,QAAQ,EAAE,aAAa,CAAC;QACtB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,oBAAoB,CAAC;KAC9B,CAAC,CAAC;IACH,SAAS,CAAC,EAAE,aAAa,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAC;IAC1D,MAAM,CAAC,EAAE,aAAa,CAAC;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAC,CAAC;IAC3E,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,gBAAgB,CAAC,CAAC,CAAC;IAC7F,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAChC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAAC;IAC5C,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;CACb,GAAG,UAAU,CAkEb"}
|
package/dist/cli/status-json.js
CHANGED
|
@@ -90,13 +90,8 @@ export function buildStatusJson(input) {
|
|
|
90
90
|
active,
|
|
91
91
|
update: input.update,
|
|
92
92
|
openFactoryDrafts: input.openFactoryDrafts,
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
covered: c.covered.length,
|
|
96
|
-
total: c.criteria.length,
|
|
97
|
-
fullyCovered: c.fullyCovered,
|
|
98
|
-
uncovered: c.uncovered.map(({ id, text }) => ({ id, text })),
|
|
99
|
-
})) ?? null,
|
|
93
|
+
// Deprecated, always empty; a later release removes it (#3834).
|
|
94
|
+
decomposedParents: [],
|
|
100
95
|
disk: input.disk,
|
|
101
96
|
providers,
|
|
102
97
|
activeAlerts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-json.js","sourceRoot":"","sources":["../../src/cli/status-json.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAkCpF;uHACuH;AACvH,MAAM,UAAU,oBAAoB,CAClC,MAGC,EACD,IAA2G;IAE3G,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC/C,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACvC,IAAI,GAAG,EAAE,QAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;YAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,SAAS,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACjF,MAAM,cAAc,GAAG,CAAC,GAAa,EAAY,EAAE;QACjD,MAAM,GAAG,GAAG;YACV,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SACzG,CAAC;QACF,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC;IACF,OAAO;QACL,SAAS;QACT,MAAM,EAAE;YACN,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE;YACvE;gBACE,KAAK,EAAE,OAAO;gBACd,SAAS,EAAE,cAAc,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;aACvG;SACF;KACF,CAAC;AACJ,CAAC;AAED,iHAAiH;AACjH,MAAM,UAAU,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"status-json.js","sourceRoot":"","sources":["../../src/cli/status-json.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/status.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/cli/status.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAc7C,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/cli/status.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAc7C,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,sBAAsB,CAAC;AA6B9E,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAQ3E,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,gHAAgH;AAChH,MAAM,WAAW,aAAa;IAC5B,aAAa,EAAE,QAAQ,CACrB,IAAI,CAAC,OAAO,EAAE,gBAAgB,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,0BAA0B,CAAC,CACvG,CAAC;IACF,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC;IAC9C,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,WAAW,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,aAAa,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,cAAc,EAAE,MAAM,OAAO,CAAC;IAC9B,iBAAiB,EAAE,OAAO,iBAAiB,CAAC;IAC5C,oBAAoB,EAAE,CAAC,WAAW,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;IAC/D,WAAW,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC;IACtC,YAAY,EAAE,OAAO,YAAY,CAAC;IAClC,uGAAuG;IACvG,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAChG;AAkGD,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA6NrF"}
|