mandrel 2.89.0 → 2.91.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.agents/README.md +47 -7
- package/.agents/agents/story-worker.md +20 -0
- package/.agents/audit-checklists/lean.md +26 -0
- package/.agents/docs/agentrc-reference.json +5 -6
- package/.agents/docs/configuration.md +38 -30
- package/.agents/docs/workflows.md +7 -1
- package/.agents/instructions.md +3 -1
- package/.agents/runtime-deps.json +0 -2
- package/.agents/schemas/agentrc.schema.json +46 -45
- package/.agents/schemas/audit-rules.json +19 -0
- package/.agents/scripts/acceptance-eval.js +2 -6
- package/.agents/scripts/audit-exceptions.js +2 -4
- package/.agents/scripts/board-backfill.js +253 -0
- package/.agents/scripts/check-arch-cycles.js +1 -5
- package/.agents/scripts/check-context-budget.js +1 -5
- package/.agents/scripts/check-cyclomatic.js +1 -5
- package/.agents/scripts/check-dead-exports.js +23 -14
- package/.agents/scripts/check-doc-links.js +4 -4
- package/.agents/scripts/check-test-temp-hygiene.js +29 -33
- package/.agents/scripts/coverage-capture.js +14 -6
- package/.agents/scripts/diagnose-friction.js +8 -10
- package/.agents/scripts/generate-workflows-doc.js +5 -0
- package/.agents/scripts/lib/audit-exceptions/adapters/index.js +2 -0
- package/.agents/scripts/lib/audit-exceptions/adapters/inline-suppressions.js +36 -27
- package/.agents/scripts/lib/audit-exceptions/adapters/shortcut-markers.js +70 -0
- package/.agents/scripts/lib/audit-exceptions/adapters/source-scan.js +26 -0
- package/.agents/scripts/lib/audit-to-stories/audit-lenses.js +1 -0
- package/.agents/scripts/lib/baseline-schema-registry.js +3 -5
- package/.agents/scripts/lib/baselines/bundle-size-scorer.js +11 -28
- package/.agents/scripts/lib/baselines/components.js +5 -5
- package/.agents/scripts/lib/baselines/crap-preview-scan.js +4 -1
- package/.agents/scripts/lib/baselines/crap-updater-cli.js +6 -4
- package/.agents/scripts/lib/baselines/duplication-scanner.js +4 -10
- package/.agents/scripts/lib/baselines/kinds/crap.js +4 -2
- package/.agents/scripts/lib/baselines/kinds/duplication.js +4 -2
- package/.agents/scripts/lib/baselines/kinds/kind-factory.js +13 -6
- package/.agents/scripts/lib/baselines/refresh-service.js +10 -13
- package/.agents/scripts/lib/baselines/writer.js +4 -4
- package/.agents/scripts/lib/bdd-scenario-scanner.js +26 -31
- package/.agents/scripts/lib/bootstrap/gh-list.js +4 -5
- package/.agents/scripts/lib/bootstrap/gh-preflight.js +13 -8
- package/.agents/scripts/lib/child-exec.js +4 -4
- package/.agents/scripts/lib/claude/agents-projection.js +170 -0
- package/.agents/scripts/lib/claude/commands-projection.js +184 -0
- package/.agents/scripts/lib/close-validation/commands.js +28 -117
- package/.agents/scripts/lib/close-validation/gates.js +54 -48
- package/.agents/scripts/lib/close-validation/process.js +5 -1
- package/.agents/scripts/lib/close-validation/projections/crap.js +2 -1
- package/.agents/scripts/lib/close-validation/projections/maintainability.js +50 -15
- package/.agents/scripts/lib/config/agentrc-overlay.js +4 -7
- package/.agents/scripts/lib/config/commands.js +82 -7
- package/.agents/scripts/lib/config/explain.js +2 -1
- package/.agents/scripts/lib/config/gates/coverage.schema.js +39 -3
- package/.agents/scripts/lib/config/gates/crap-incremental-coverage.schema.js +1 -1
- package/.agents/scripts/lib/config/gates/crap.schema.js +5 -3
- package/.agents/scripts/lib/config/gates/duplication.schema.js +6 -11
- package/.agents/scripts/lib/config/gates/shared.js +2 -2
- package/.agents/scripts/lib/config/git-roots.js +120 -0
- package/.agents/scripts/lib/config/quality.js +46 -50
- package/.agents/scripts/lib/config/review-chain-default.js +4 -3
- package/.agents/scripts/lib/config/review-provider-clis.js +11 -0
- package/.agents/scripts/lib/config/temp-paths.js +3 -37
- package/.agents/scripts/lib/config-resolver.js +5 -9
- package/.agents/scripts/lib/config-settings-schema-delivery.js +2 -2
- package/.agents/scripts/lib/config-settings-schema-quality.js +3 -2
- package/.agents/scripts/lib/config-settings-schema.js +6 -7
- package/.agents/scripts/lib/coverage-baseline.js +2 -1
- package/.agents/scripts/lib/coverage-capture-affected.js +4 -3
- package/.agents/scripts/lib/coverage-capture-fullscope.js +3 -1
- package/.agents/scripts/lib/coverage-capture-passes.js +119 -34
- package/.agents/scripts/lib/coverage-capture-usage.js +1 -1
- package/.agents/scripts/lib/coverage-capture.js +80 -43
- package/.agents/scripts/lib/coverage-utils.js +34 -16
- package/.agents/scripts/lib/cpu-pool.js +2 -4
- package/.agents/scripts/lib/crap-engine.js +19 -1
- package/.agents/scripts/lib/crap-utils.js +2 -1
- package/.agents/scripts/lib/dead-exports-knip.js +29 -11
- package/.agents/scripts/lib/detect-package-manager.js +13 -0
- package/.agents/scripts/lib/feedback-loop/graduator-gh.js +4 -2
- package/.agents/scripts/lib/full-suite-lock.js +25 -9
- package/.agents/scripts/lib/gates/baseline-store.js +2 -10
- package/.agents/scripts/lib/generated/agentrc-validator.js +4 -1
- package/.agents/scripts/lib/gh-env.js +72 -0
- package/.agents/scripts/lib/gh-exec.js +26 -1
- package/.agents/scripts/lib/maintainability-utils.js +8 -8
- package/.agents/scripts/lib/npm-scripts.js +1 -1
- package/.agents/scripts/lib/observability/signal-validator.js +2 -6
- package/.agents/scripts/lib/observability/source-classifier.js +1 -0
- package/.agents/scripts/lib/observability/terse-result.js +2 -6
- package/.agents/scripts/lib/orchestration/board-access-latch.js +112 -0
- package/.agents/scripts/lib/orchestration/ci-rerun-guard.js +10 -13
- package/.agents/scripts/lib/orchestration/column-sync.js +107 -52
- package/.agents/scripts/lib/orchestration/deliver-recover.js +2 -1
- package/.agents/scripts/lib/orchestration/git-cleanup/phases/git-probes.js +3 -3
- package/.agents/scripts/lib/orchestration/lifecycle/emit-ledger-event.js +2 -6
- package/.agents/scripts/lib/orchestration/light-suitability.js +5 -7
- package/.agents/scripts/lib/orchestration/pr-watch.js +7 -7
- package/.agents/scripts/lib/orchestration/project-meta-cache.js +2 -11
- package/.agents/scripts/lib/orchestration/project-meta-resolver.js +44 -17
- package/.agents/scripts/lib/orchestration/review-deposit.js +2 -9
- package/.agents/scripts/lib/orchestration/review-providers/callers-context.js +219 -0
- package/.agents/scripts/lib/orchestration/review-providers/code-review.js +53 -5
- package/.agents/scripts/lib/orchestration/review-providers/codex-cli.js +2 -2
- package/.agents/scripts/lib/orchestration/review-providers/llm-review.js +96 -0
- package/.agents/scripts/lib/orchestration/review-providers/mi-exemptions.js +2 -2
- package/.agents/scripts/lib/orchestration/review-providers/native.js +13 -19
- package/.agents/scripts/lib/orchestration/review-providers/review-depth.js +3 -2
- package/.agents/scripts/lib/orchestration/review-providers/review-provider-factory.js +2 -0
- package/.agents/scripts/lib/orchestration/review-providers/security-review.js +11 -3
- package/.agents/scripts/lib/orchestration/story-close/baseline-upward-writeback.js +2 -3
- package/.agents/scripts/lib/orchestration/story-close/format-autofix.js +41 -15
- package/.agents/scripts/lib/orchestration/story-deliver-terminal-schema.js +2 -4
- package/.agents/scripts/lib/orchestration/story-deliver-terminal.js +2 -13
- package/.agents/scripts/lib/orchestration/story-handoff.js +27 -6
- package/.agents/scripts/lib/orchestration/story-progress.js +3 -11
- package/.agents/scripts/lib/orchestration/ticketing/bulk.js +3 -5
- package/.agents/scripts/lib/orchestration/verify-credit.js +52 -28
- package/.agents/scripts/lib/single-story-sweep/protection-ctx.js +11 -11
- package/.agents/scripts/lib/single-story-sweep/protection.js +1 -9
- package/.agents/scripts/lib/single-story-sweep/sweep-lock.js +1 -5
- package/.agents/scripts/lib/source-extensions.js +30 -15
- package/.agents/scripts/lib/test-run-credit.js +1 -9
- package/.agents/scripts/lib/test-temp.js +22 -21
- package/.agents/scripts/lib/util/ajv.js +111 -0
- package/.agents/scripts/lib/util/atomic-write.js +30 -0
- package/.agents/scripts/lib/util/paths.js +51 -0
- package/.agents/scripts/lib/util/sleep.js +6 -0
- package/.agents/scripts/lib/util/slug.js +12 -0
- package/.agents/scripts/lib/validation-evidence.js +19 -40
- package/.agents/scripts/lib/worktree/lifecycle/force-drain.js +2 -1
- package/.agents/scripts/lib/worktree/lifecycle/pending-cleanup.js +10 -28
- package/.agents/scripts/lib/worktree/lifecycle/reap.js +2 -2
- package/.agents/scripts/lib/worktree/node-modules-strategy.js +21 -14
- package/.agents/scripts/lint-issue-body.js +2 -2
- package/.agents/scripts/plan-context.js +2 -7
- package/.agents/scripts/providers/github/auth.js +3 -3
- package/.agents/scripts/providers/github/board-add.js +18 -9
- package/.agents/scripts/providers/github/errors.js +3 -1
- package/.agents/scripts/providers/github/gh-token-diagnostics.js +10 -7
- package/.agents/scripts/providers/github/issues.js +6 -2
- package/.agents/scripts/providers/github/mappers.js +1 -5
- package/.agents/scripts/providers/github/projects-v2-graphql.js +26 -6
- package/.agents/scripts/providers/github/search-budget.js +3 -1
- package/.agents/scripts/resolve-doc-tiers.js +7 -20
- package/.agents/scripts/sync-agentrc.js +5 -14
- package/.agents/scripts/sync-claude-agents.js +38 -150
- package/.agents/scripts/sync-claude-commands.js +35 -218
- package/.agents/scripts/update-coverage-baseline.js +1 -1
- package/.agents/scripts/update-crap-baseline.js +1 -1
- package/.agents/scripts/update-duplication-baseline.js +2 -16
- package/.agents/scripts/validate-skills.js +6 -10
- package/.agents/skills/core/code-review-and-quality/SKILL.md +3 -18
- package/.agents/skills/core/documentation-and-adrs/SKILL.md +4 -14
- package/.agents/workflows/audit-exceptions.md +9 -0
- package/.agents/workflows/audit-lean.md +129 -0
- package/.agents/workflows/helpers/audit-lens-core.md +7 -0
- package/.agents/workflows/helpers/code-quality-guardrails.md +21 -0
- package/.agents/workflows/helpers/code-review.md +15 -1
- package/.agents/workflows/helpers/deliver-digest.md +1 -1
- package/.agents/workflows/helpers/deliver-reference.md +2 -2
- package/.agents/workflows/mandrel-plan.md +2 -2
- package/docs/CHANGELOG.md +48 -0
- package/lib/cli/doctor-checks/codex.js +6 -5
- package/lib/cli/doctor-checks/llm-review.js +102 -0
- package/lib/cli/doctor-checks/project-access.js +124 -0
- package/lib/cli/doctor-checks/sync-parity.js +65 -140
- package/lib/cli/doctor-checks/test-credit-path.js +69 -28
- package/lib/cli/doctor-checks/toolchain.js +5 -3
- package/lib/cli/registry.js +11 -0
- package/lib/migrations/helpers/retire-agentrc-key.js +3 -3
- package/lib/migrations/index.js +6 -0
- package/lib/migrations/steps/2.91.0-move-shared-crap-capture-script.js +84 -0
- package/lib/migrations/steps/2.91.0-retire-duplication-formats.js +23 -0
- package/lib/migrations/steps/2.91.0-unset-null-lint-command.js +54 -0
- package/package.json +1 -3
|
@@ -2,25 +2,25 @@
|
|
|
2
2
|
* single-story-sweep/protection-ctx.js
|
|
3
3
|
*
|
|
4
4
|
* The one builder of the `evaluateProtection` ctx for every sweep caller.
|
|
5
|
-
* `ghRunner` stays
|
|
6
|
-
* because the checks run inside a synchronous candidate-filter loop.
|
|
5
|
+
* `ghRunner` stays synchronous (gh-exec's `runGh`, not the async `exec()`
|
|
6
|
+
* facade) because the checks run inside a synchronous candidate-filter loop.
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
|
-
import {
|
|
9
|
+
import { runGh } from '../gh-exec.js';
|
|
10
10
|
import { gitSpawn } from '../git-utils.js';
|
|
11
11
|
|
|
12
12
|
/**
|
|
13
13
|
* @param {string} cwd Repo root used as the default spawn cwd.
|
|
14
|
-
* @param {
|
|
14
|
+
* @param {Function} [spawnImpl] - `spawnSync`-shaped; defaults to `spawnSync`.
|
|
15
15
|
* @returns {(args: string[], opts?: { cwd?: string }) => string}
|
|
16
16
|
*/
|
|
17
|
-
export function makeGhRunner(cwd, spawnImpl
|
|
17
|
+
export function makeGhRunner(cwd, spawnImpl) {
|
|
18
18
|
return (args, opts) => {
|
|
19
|
-
const result =
|
|
20
|
-
|
|
21
|
-
encoding: 'utf-8',
|
|
22
|
-
|
|
23
|
-
|
|
19
|
+
const result = runGh(
|
|
20
|
+
args,
|
|
21
|
+
{ cwd: opts?.cwd ?? cwd, encoding: 'utf-8', shell: false },
|
|
22
|
+
spawnImpl,
|
|
23
|
+
);
|
|
24
24
|
if (result.status !== 0) {
|
|
25
25
|
throw new Error(
|
|
26
26
|
`gh ${args.join(' ')} exit ${result.status}: ${result.stderr ?? ''}`,
|
|
@@ -34,7 +34,7 @@ export function makeGhRunner(cwd, spawnImpl = defaultSpawnSync) {
|
|
|
34
34
|
* @param {{
|
|
35
35
|
* cwd: string,
|
|
36
36
|
* provider: { getTicket: (id: number) => Promise<object> },
|
|
37
|
-
* spawnImpl?:
|
|
37
|
+
* spawnImpl?: Function,
|
|
38
38
|
* }} args
|
|
39
39
|
* @returns {{
|
|
40
40
|
* repoRoot: string,
|
|
@@ -12,14 +12,6 @@ import { parseStoryBranch } from '../git-utils.js';
|
|
|
12
12
|
|
|
13
13
|
const DONE_LABEL = 'agent::done';
|
|
14
14
|
|
|
15
|
-
/**
|
|
16
|
-
* @param {string} branch
|
|
17
|
-
* @returns {number|null}
|
|
18
|
-
*/
|
|
19
|
-
export function storyIdFromBranch(branch) {
|
|
20
|
-
return parseStoryBranch(branch);
|
|
21
|
-
}
|
|
22
|
-
|
|
23
15
|
/**
|
|
24
16
|
* Closed, or carrying `agent::done`.
|
|
25
17
|
*
|
|
@@ -135,7 +127,7 @@ export function checkDirtyTree({ candidate, ctx }) {
|
|
|
135
127
|
|
|
136
128
|
/** Non-`story-<n>` branches have no parent ticket and bypass this guard. */
|
|
137
129
|
export async function checkTicketNotDone({ candidate, ctx }) {
|
|
138
|
-
const storyId =
|
|
130
|
+
const storyId = parseStoryBranch(candidate.branch);
|
|
139
131
|
if (storyId === null) return { protected: false };
|
|
140
132
|
if (typeof ctx.getTicket !== 'function') {
|
|
141
133
|
return { protected: true, reason: 'provider-unavailable' };
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
|
|
11
11
|
import fs from 'node:fs';
|
|
12
12
|
import path from 'node:path';
|
|
13
|
-
import { defaultSleep } from '../util/sleep.js';
|
|
13
|
+
import { defaultSleep, sleepSync } from '../util/sleep.js';
|
|
14
14
|
|
|
15
15
|
const DEFAULT_TIMEOUT_MS = 60_000;
|
|
16
16
|
|
|
@@ -458,10 +458,6 @@ function guardedRelease(lockPath, fsImpl, removeOwn) {
|
|
|
458
458
|
}
|
|
459
459
|
}
|
|
460
460
|
|
|
461
|
-
function sleepSync(ms) {
|
|
462
|
-
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
|
|
463
|
-
}
|
|
464
|
-
|
|
465
461
|
function buildAcquired(holder) {
|
|
466
462
|
const { lockPath, ownerId, fsImpl, processImpl = process } = holder;
|
|
467
463
|
const stopHeartbeat = startHeartbeat(holder);
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* SSOT for the extensions the CRAP/MI scanners score. The scanner walk, the
|
|
3
|
-
* coverage-freshness check
|
|
4
|
-
*
|
|
5
|
-
*
|
|
3
|
+
* coverage-freshness check, the refresh scope predicates, the close-time
|
|
4
|
+
* CRAP/MI projections, native review and the duplication scanner's jscpd
|
|
5
|
+
* formats must all agree: a narrower selector makes a gate green while
|
|
6
|
+
* measuring nothing. Not configurable, for the same reason.
|
|
6
7
|
*
|
|
7
8
|
* MUST import only `node:` builtins — it runs on the pre-push path and must
|
|
8
9
|
* not drag the scoring engines in.
|
|
@@ -10,20 +11,24 @@
|
|
|
10
11
|
import path from 'node:path';
|
|
11
12
|
|
|
12
13
|
/**
|
|
13
|
-
* What the engines can parse (not `.vue`/`.svelte`/`.astro`)
|
|
14
|
-
*
|
|
14
|
+
* What the engines can parse (not `.vue`/`.svelte`/`.astro`), each mapped to
|
|
15
|
+
* the jscpd format that reads it — jscpd's `javascript` alone reads only
|
|
16
|
+
* `.js`/`.mjs`/`.cjs`. Private: select via the exported regex or predicate.
|
|
15
17
|
*
|
|
16
|
-
* @type {
|
|
18
|
+
* @type {Readonly<Record<string, string>>}
|
|
17
19
|
*/
|
|
18
|
-
const
|
|
19
|
-
'.js',
|
|
20
|
-
'.mjs',
|
|
21
|
-
'.cjs',
|
|
22
|
-
'.
|
|
23
|
-
'.
|
|
24
|
-
'.
|
|
25
|
-
'.
|
|
26
|
-
|
|
20
|
+
const SCORABLE_SOURCES = Object.freeze({
|
|
21
|
+
'.js': 'javascript',
|
|
22
|
+
'.mjs': 'javascript',
|
|
23
|
+
'.cjs': 'javascript',
|
|
24
|
+
'.jsx': 'jsx',
|
|
25
|
+
'.ts': 'typescript',
|
|
26
|
+
'.tsx': 'tsx',
|
|
27
|
+
'.mts': 'typescript',
|
|
28
|
+
'.cts': 'typescript',
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
const SCORABLE_SOURCE_EXTENSIONS = Object.keys(SCORABLE_SOURCES);
|
|
27
32
|
|
|
28
33
|
/**
|
|
29
34
|
* For paths arriving as raw text (git output lines).
|
|
@@ -43,3 +48,13 @@ export function isScorableSourceFile(filePath) {
|
|
|
43
48
|
path.extname(String(filePath)).toLowerCase(),
|
|
44
49
|
);
|
|
45
50
|
}
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* The jscpd formats covering the scorable list. Derived, never declared: the
|
|
54
|
+
* duplication gate scans exactly the files the other gates score.
|
|
55
|
+
*
|
|
56
|
+
* @returns {string[]}
|
|
57
|
+
*/
|
|
58
|
+
export function jscpdFormatsFor() {
|
|
59
|
+
return [...new Set(Object.values(SCORABLE_SOURCES))];
|
|
60
|
+
}
|
|
@@ -72,14 +72,6 @@ function gitLine(gitSpawnFn, cwd, args) {
|
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
-
/**
|
|
76
|
-
* @param {string|null} branch
|
|
77
|
-
* @returns {number|null}
|
|
78
|
-
*/
|
|
79
|
-
export function storyIdFromBranch(branch) {
|
|
80
|
-
return parseStoryBranch(branch);
|
|
81
|
-
}
|
|
82
|
-
|
|
83
75
|
/**
|
|
84
76
|
* The main checkout (where close reads evidence), via `--git-common-dir`.
|
|
85
77
|
*
|
|
@@ -118,7 +110,7 @@ export function depositTestRunCredit({
|
|
|
118
110
|
} = {}) {
|
|
119
111
|
if (status !== 0) return { deposited: false, reason: 'run-not-green' };
|
|
120
112
|
if (tier !== 'full') return { deposited: false, reason: 'not-full-tier' };
|
|
121
|
-
const storyId =
|
|
113
|
+
const storyId = parseStoryBranch(
|
|
122
114
|
gitLine(gitSpawnFn, cwd, ['rev-parse', '--abbrev-ref', 'HEAD']),
|
|
123
115
|
);
|
|
124
116
|
if (storyId === null)
|
|
@@ -8,6 +8,7 @@ import fs from 'node:fs';
|
|
|
8
8
|
import os from 'node:os';
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import picomatch from 'picomatch';
|
|
11
|
+
import { toPosix, walkFiles } from './util/paths.js';
|
|
11
12
|
|
|
12
13
|
/** Suite-root name prefix; the guard matches on it. */
|
|
13
14
|
export const SUITE_ROOT_PREFIX = 'mandrel-suite-';
|
|
@@ -207,14 +208,23 @@ export function reapOnExit(
|
|
|
207
208
|
export function listSuiteTempRoots(tmpDir, { fsImpl = fs } = {}) {
|
|
208
209
|
if (!fsImpl.existsSync(tmpDir)) return [];
|
|
209
210
|
return fsImpl
|
|
210
|
-
.readdirSync(tmpDir
|
|
211
|
+
.readdirSync(tmpDir)
|
|
211
212
|
.filter(
|
|
212
|
-
(
|
|
213
|
+
(name) =>
|
|
214
|
+
name.startsWith(SUITE_ROOT_PREFIX) &&
|
|
215
|
+
isDirectory(path.join(tmpDir, name), fsImpl),
|
|
213
216
|
)
|
|
214
|
-
.map((ent) => ent.name)
|
|
215
217
|
.sort();
|
|
216
218
|
}
|
|
217
219
|
|
|
220
|
+
function isDirectory(p, fsImpl) {
|
|
221
|
+
try {
|
|
222
|
+
return fsImpl.statSync(p).isDirectory();
|
|
223
|
+
} catch {
|
|
224
|
+
return false;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
|
|
218
228
|
/**
|
|
219
229
|
* Suite roots created since the snapshot and still on disk. Diffing against
|
|
220
230
|
* the snapshot keeps a concurrent suite from failing this one.
|
|
@@ -259,7 +269,7 @@ export function findRawTmpdirMkdtemp(repoRoot, globs, { fsImpl = fs } = {}) {
|
|
|
259
269
|
const isIncluded = picomatch(include);
|
|
260
270
|
const isExcluded = exclude.length > 0 ? picomatch(exclude) : () => false;
|
|
261
271
|
const findings = [];
|
|
262
|
-
for (const rel of
|
|
272
|
+
for (const rel of listJsSources(repoRoot, fsImpl)) {
|
|
263
273
|
if (!isIncluded(rel) || isExcluded(rel)) continue;
|
|
264
274
|
const lines = fsImpl
|
|
265
275
|
.readFileSync(path.join(repoRoot, rel), 'utf8')
|
|
@@ -282,21 +292,12 @@ export function findRawTmpdirMkdtemp(repoRoot, globs, { fsImpl = fs } = {}) {
|
|
|
282
292
|
* @param {typeof fs} fsImpl
|
|
283
293
|
* @returns {string[]}
|
|
284
294
|
*/
|
|
285
|
-
function
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
if (ent.isDirectory()) {
|
|
294
|
-
walk(path.join(dir, ent.name), rel);
|
|
295
|
-
} else if (/\.(?:js|mjs|cjs)$/.test(ent.name)) {
|
|
296
|
-
out.push(rel);
|
|
297
|
-
}
|
|
298
|
-
}
|
|
299
|
-
};
|
|
300
|
-
walk(root, '');
|
|
301
|
-
return out.sort();
|
|
295
|
+
function listJsSources(root, fsImpl) {
|
|
296
|
+
return walkFiles(root, {
|
|
297
|
+
skipDirs: ['node_modules', '.worktrees', '.git', 'temp'],
|
|
298
|
+
filter: (_abs, dirent) => /\.(?:js|mjs|cjs)$/.test(dirent.name),
|
|
299
|
+
fsImpl,
|
|
300
|
+
})
|
|
301
|
+
.map((abs) => toPosix(path.relative(root, abs)))
|
|
302
|
+
.sort();
|
|
302
303
|
}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The one Ajv factory for validators that need string formats. Mandrel's
|
|
3
|
+
* schemas declare only `date-time` and `date`, so those two are registered by
|
|
4
|
+
* hand (a port of the Ajv formats plugin's full-mode RFC 3339 checks) instead
|
|
5
|
+
* of loading that whole plugin.
|
|
6
|
+
*/
|
|
7
|
+
|
|
8
|
+
import AjvDraft07 from 'ajv';
|
|
9
|
+
import AjvDraft2020 from 'ajv/dist/2020.js';
|
|
10
|
+
|
|
11
|
+
const DATE = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
|
|
12
|
+
const TIME = /^(\d\d):(\d\d):(\d\d(?:\.\d+)?)(z|([+-])(\d\d)(?::?(\d\d))?)?$/i;
|
|
13
|
+
const DATE_TIME_SEPARATOR = /t|\s/i;
|
|
14
|
+
const DAYS = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* @param {number} year
|
|
18
|
+
* @returns {boolean}
|
|
19
|
+
*/
|
|
20
|
+
function isLeapYear(year) {
|
|
21
|
+
return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0);
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* RFC 3339 full-date on a real calendar day.
|
|
26
|
+
*
|
|
27
|
+
* @param {string} str
|
|
28
|
+
* @returns {boolean}
|
|
29
|
+
*/
|
|
30
|
+
function isDate(str) {
|
|
31
|
+
const m = DATE.exec(str);
|
|
32
|
+
if (!m) return false;
|
|
33
|
+
const year = +m[1];
|
|
34
|
+
const month = +m[2];
|
|
35
|
+
const day = +m[3];
|
|
36
|
+
if (month < 1 || month > 12 || day < 1) return false;
|
|
37
|
+
return day <= (month === 2 && isLeapYear(year) ? 29 : DAYS[month]);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* A `:60` second is valid only at 23:59 UTC once the offset is applied.
|
|
42
|
+
*
|
|
43
|
+
* @param {RegExpExecArray} m
|
|
44
|
+
* @returns {boolean}
|
|
45
|
+
*/
|
|
46
|
+
function isLeapSecond(m) {
|
|
47
|
+
const sign = m[5] === '-' ? -1 : 1;
|
|
48
|
+
const utcMin = +m[2] - +(m[7] || 0) * sign;
|
|
49
|
+
const utcHr = +m[1] - +(m[6] || 0) * sign - (utcMin < 0 ? 1 : 0);
|
|
50
|
+
const atLastHour = utcHr === 23 || utcHr === -1;
|
|
51
|
+
return atLastHour && (utcMin === 59 || utcMin === -1) && +m[3] < 61;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* RFC 3339 full-time with a required `Z` or `±hh:mm` offset.
|
|
56
|
+
*
|
|
57
|
+
* @param {string} str
|
|
58
|
+
* @returns {boolean}
|
|
59
|
+
*/
|
|
60
|
+
function isTime(str) {
|
|
61
|
+
const m = TIME.exec(str);
|
|
62
|
+
if (!m || !m[4]) return false;
|
|
63
|
+
if (+(m[6] || 0) > 23 || +(m[7] || 0) > 59) return false;
|
|
64
|
+
if (+m[1] <= 23 && +m[2] <= 59 && +m[3] < 60) return true;
|
|
65
|
+
return isLeapSecond(m);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* RFC 3339 date-time: full-date, a `T`/`t`/space separator, full-time.
|
|
70
|
+
*
|
|
71
|
+
* @param {string} str
|
|
72
|
+
* @returns {boolean}
|
|
73
|
+
*/
|
|
74
|
+
function isDateTime(str) {
|
|
75
|
+
const parts = str.split(DATE_TIME_SEPARATOR);
|
|
76
|
+
return parts.length === 2 && isDate(parts[0]) && isTime(parts[1]);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/**
|
|
80
|
+
* @template {import('ajv').default} T
|
|
81
|
+
* @param {T} ajv
|
|
82
|
+
* @returns {T}
|
|
83
|
+
*/
|
|
84
|
+
function withFormats(ajv) {
|
|
85
|
+
ajv.addFormat('date-time', isDateTime);
|
|
86
|
+
ajv.addFormat('date', isDate);
|
|
87
|
+
return ajv;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
const Draft07 = AjvDraft07.default ?? AjvDraft07;
|
|
91
|
+
const Draft2020 = AjvDraft2020.default ?? AjvDraft2020;
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* Draft-07 Ajv with the `date-time` and `date` formats registered.
|
|
95
|
+
*
|
|
96
|
+
* @param {import('ajv').Options} [options]
|
|
97
|
+
* @returns {import('ajv').default}
|
|
98
|
+
*/
|
|
99
|
+
export function createAjv(options = {}) {
|
|
100
|
+
return withFormats(new Draft07(options));
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/**
|
|
104
|
+
* Draft 2020-12 Ajv with the `date-time` and `date` formats registered.
|
|
105
|
+
*
|
|
106
|
+
* @param {import('ajv').Options} [options]
|
|
107
|
+
* @returns {import('ajv/dist/2020.js').default}
|
|
108
|
+
*/
|
|
109
|
+
export function createAjv2020(options = {}) {
|
|
110
|
+
return withFormats(new Draft2020(options));
|
|
111
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import fs from 'node:fs';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Tmp-then-rename via a pid-scoped sibling; reaps the tmp and rethrows on
|
|
6
|
+
* failure.
|
|
7
|
+
*
|
|
8
|
+
* @param {string} target
|
|
9
|
+
* @param {string} contents
|
|
10
|
+
* @param {{ fsImpl?: typeof fs }} [opts]
|
|
11
|
+
*/
|
|
12
|
+
export function writeFileAtomic(target, contents, { fsImpl = fs } = {}) {
|
|
13
|
+
const tmp = `${target}.${process.pid}.tmp`;
|
|
14
|
+
try {
|
|
15
|
+
fsImpl.mkdirSync(path.dirname(target), { recursive: true });
|
|
16
|
+
fsImpl.writeFileSync(tmp, contents, 'utf8');
|
|
17
|
+
fsImpl.renameSync(tmp, target);
|
|
18
|
+
} catch (err) {
|
|
19
|
+
reapTmp(fsImpl, tmp);
|
|
20
|
+
throw err;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
function reapTmp(fsImpl, tmp) {
|
|
25
|
+
try {
|
|
26
|
+
if (typeof fsImpl.rmSync === 'function')
|
|
27
|
+
fsImpl.rmSync(tmp, { force: true });
|
|
28
|
+
else fsImpl.unlinkSync(tmp);
|
|
29
|
+
} catch {}
|
|
30
|
+
}
|
|
@@ -29,3 +29,54 @@ export function dirExists(dir) {
|
|
|
29
29
|
return false;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Non-directory entries under `dir` passing `filter`, pruning `skipDirs`
|
|
35
|
+
* before descent. A missing root is `[]`; any other readdir error throws,
|
|
36
|
+
* or, given `onError(err, dir)`, is reported and that directory skipped.
|
|
37
|
+
*
|
|
38
|
+
* @param {string} dir
|
|
39
|
+
* @param {{ skipDirs?: Iterable<string> | ((name: string) => boolean), filter?: (absPath: string, dirent: fs.Dirent) => boolean, onError?: (err: Error, dir: string) => void, fsImpl?: typeof fs }} [opts]
|
|
40
|
+
* @returns {string[]}
|
|
41
|
+
*/
|
|
42
|
+
export function walkFiles(
|
|
43
|
+
dir,
|
|
44
|
+
{ skipDirs = [], filter, onError, fsImpl = fs } = {},
|
|
45
|
+
) {
|
|
46
|
+
const skip = toSkipPredicate(skipDirs);
|
|
47
|
+
const out = [];
|
|
48
|
+
const visit = (current) => {
|
|
49
|
+
for (const dirent of readEntries(
|
|
50
|
+
fsImpl,
|
|
51
|
+
current,
|
|
52
|
+
current === dir,
|
|
53
|
+
onError,
|
|
54
|
+
)) {
|
|
55
|
+
const abs = path.join(current, dirent.name);
|
|
56
|
+
if (dirent.isDirectory()) {
|
|
57
|
+
if (!skip(dirent.name)) visit(abs);
|
|
58
|
+
} else if (!filter || filter(abs, dirent)) {
|
|
59
|
+
out.push(abs);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
visit(dir);
|
|
64
|
+
return out;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
function toSkipPredicate(skipDirs) {
|
|
68
|
+
if (typeof skipDirs === 'function') return skipDirs;
|
|
69
|
+
const names = new Set(skipDirs);
|
|
70
|
+
return (name) => names.has(name);
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
function readEntries(fsImpl, dir, isRoot, onError) {
|
|
74
|
+
try {
|
|
75
|
+
return fsImpl.readdirSync(dir, { withFileTypes: true });
|
|
76
|
+
} catch (err) {
|
|
77
|
+
if (isRoot && err?.code === 'ENOENT') return [];
|
|
78
|
+
if (!onError) throw err;
|
|
79
|
+
onError(err, dir);
|
|
80
|
+
return [];
|
|
81
|
+
}
|
|
82
|
+
}
|
|
@@ -13,3 +13,9 @@ export function defaultSleep(ms) {
|
|
|
13
13
|
setTimeout(resolve, ms);
|
|
14
14
|
});
|
|
15
15
|
}
|
|
16
|
+
|
|
17
|
+
/** Blocks without spinning; a no-op for a non-finite or non-positive `ms`. */
|
|
18
|
+
export function sleepSync(ms) {
|
|
19
|
+
if (!Number.isFinite(ms) || ms <= 0) return;
|
|
20
|
+
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
|
|
21
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `[a-z0-9]` dash slug, capped at `max`; `fallback` when nothing survives.
|
|
3
|
+
* `git-utils.js` `slugify` keeps a wider charset.
|
|
4
|
+
*/
|
|
5
|
+
export function slugifyLabel(text, { max, fallback }) {
|
|
6
|
+
let slug = String(text ?? '')
|
|
7
|
+
.toLowerCase()
|
|
8
|
+
.replace(/[^a-z0-9]+/g, '-')
|
|
9
|
+
.replace(/^-+|-+$/g, '');
|
|
10
|
+
if (max !== undefined) slug = slug.slice(0, max).replace(/-+$/, '');
|
|
11
|
+
return slug === '' ? fallback : slug;
|
|
12
|
+
}
|
|
@@ -17,9 +17,9 @@ import {
|
|
|
17
17
|
} from 'node:fs';
|
|
18
18
|
import path from 'node:path';
|
|
19
19
|
import { fileURLToPath } from 'node:url';
|
|
20
|
-
import Ajv from 'ajv/dist/2020.js';
|
|
21
|
-
import addFormats from 'ajv-formats';
|
|
22
20
|
import { storyTempDir } from './config/temp-paths.js';
|
|
21
|
+
import { createAjv2020 } from './util/ajv.js';
|
|
22
|
+
import { writeFileAtomic } from './util/atomic-write.js';
|
|
23
23
|
|
|
24
24
|
export const SCHEMA_VERSION = 1;
|
|
25
25
|
const DEFAULT_TEMP_DIR = 'temp';
|
|
@@ -44,8 +44,7 @@ let cachedValidator = null;
|
|
|
44
44
|
*/
|
|
45
45
|
function getEvidenceValidator() {
|
|
46
46
|
if (cachedValidator) return cachedValidator;
|
|
47
|
-
const ajv =
|
|
48
|
-
addFormats(ajv);
|
|
47
|
+
const ajv = createAjv2020({ allErrors: true, strict: false });
|
|
49
48
|
const schema = JSON.parse(defaultReadFileSync(SCHEMA_PATH, 'utf8'));
|
|
50
49
|
cachedValidator = ajv.compile(schema);
|
|
51
50
|
return cachedValidator;
|
|
@@ -199,50 +198,33 @@ export function recordPass(
|
|
|
199
198
|
commandConfigHash: configHash,
|
|
200
199
|
exitCode,
|
|
201
200
|
durationMs,
|
|
202
|
-
inputFingerprint:
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
: null,
|
|
201
|
+
inputFingerprint: isNonEmptyString(inputFingerprint)
|
|
202
|
+
? inputFingerprint
|
|
203
|
+
: null,
|
|
206
204
|
timestamp: resolved.now().toISOString(),
|
|
207
205
|
};
|
|
208
206
|
doc.records = [...doc.records.filter((r) => r.gateName !== gateName), record];
|
|
209
207
|
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
const detail = (validator.errors || [])
|
|
213
|
-
.map((e) => `${e.instancePath || '(root)'} ${e.message}`)
|
|
214
|
-
.join('; ');
|
|
215
|
-
throw new Error(`Evidence document failed schema validation: ${detail}`);
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
writeEvidenceAtomically(
|
|
219
|
-
resolved.fs,
|
|
208
|
+
assertValidEvidence(doc);
|
|
209
|
+
writeFileAtomic(
|
|
220
210
|
evidencePath(storyId, evidenceOpts),
|
|
221
211
|
JSON.stringify(doc, null, 2),
|
|
212
|
+
{ fsImpl: resolved.fs },
|
|
222
213
|
);
|
|
223
214
|
return record;
|
|
224
215
|
}
|
|
225
216
|
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
const
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
} catch (err) {
|
|
234
|
-
reapTmp(fsImpl, tmpPath);
|
|
235
|
-
throw err;
|
|
236
|
-
}
|
|
217
|
+
function assertValidEvidence(doc) {
|
|
218
|
+
const validator = getEvidenceValidator();
|
|
219
|
+
if (validator(doc)) return;
|
|
220
|
+
const detail = (validator.errors || [])
|
|
221
|
+
.map((e) => `${e.instancePath || '(root)'} ${e.message}`)
|
|
222
|
+
.join('; ');
|
|
223
|
+
throw new Error(`Evidence document failed schema validation: ${detail}`);
|
|
237
224
|
}
|
|
238
225
|
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
try {
|
|
242
|
-
if (fsImpl.existsSync(tmpPath)) fsImpl.unlinkSync(tmpPath);
|
|
243
|
-
} catch {
|
|
244
|
-
// A leftover tmp is never read as evidence.
|
|
245
|
-
}
|
|
226
|
+
function isNonEmptyString(value) {
|
|
227
|
+
return typeof value === 'string' && value.length > 0;
|
|
246
228
|
}
|
|
247
229
|
|
|
248
230
|
/**
|
|
@@ -291,10 +273,7 @@ export function shouldSkip(
|
|
|
291
273
|
return { skip: true, reason: 'evidence-match', record: match };
|
|
292
274
|
}
|
|
293
275
|
if (
|
|
294
|
-
|
|
295
|
-
inputFingerprint.length > 0 &&
|
|
296
|
-
typeof match.inputFingerprint === 'string' &&
|
|
297
|
-
match.inputFingerprint.length > 0 &&
|
|
276
|
+
isNonEmptyString(inputFingerprint) &&
|
|
298
277
|
match.inputFingerprint === inputFingerprint
|
|
299
278
|
) {
|
|
300
279
|
return { skip: true, reason: 'fingerprint-match', record: match };
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
import { spawnSync } from 'node:child_process';
|
|
9
9
|
import path from 'node:path';
|
|
10
10
|
import { NOOP_LOGGER } from '../../Logger.js';
|
|
11
|
+
import { defaultSleep } from '../../util/sleep.js';
|
|
11
12
|
import { drainPendingCleanup, readManifest } from './pending-cleanup.js';
|
|
12
13
|
|
|
13
14
|
const SETTLE_MS = 1500;
|
|
@@ -233,7 +234,7 @@ export async function forceDrainPendingCleanup({
|
|
|
233
234
|
logger = NOOP_LOGGER,
|
|
234
235
|
findHolders = findHoldersInPath,
|
|
235
236
|
killHolders = terminateHolders,
|
|
236
|
-
sleep =
|
|
237
|
+
sleep = defaultSleep,
|
|
237
238
|
escalate = true,
|
|
238
239
|
} = {}) {
|
|
239
240
|
const first = await drainPendingCleanup({
|
|
@@ -13,6 +13,7 @@ import { rm as fsPromisesRm } from 'node:fs/promises';
|
|
|
13
13
|
import path from 'node:path';
|
|
14
14
|
import { NOOP_LOGGER } from '../../Logger.js';
|
|
15
15
|
import { acquireSweepLock } from '../../single-story-sweep/sweep-lock.js';
|
|
16
|
+
import { writeFileAtomic } from '../../util/atomic-write.js';
|
|
16
17
|
|
|
17
18
|
const MANIFEST_FILENAME = '.pending-cleanup.json';
|
|
18
19
|
const MANIFEST_LOCK_FILENAME = '.pending-cleanup.lock';
|
|
@@ -87,34 +88,18 @@ function writeManifest(worktreeRoot, entries) {
|
|
|
87
88
|
}
|
|
88
89
|
return;
|
|
89
90
|
}
|
|
90
|
-
fs.mkdirSync(worktreeRoot, { recursive: true });
|
|
91
91
|
writeFileAtomic(p, `${JSON.stringify(entries, null, 2)}\n`);
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
* @param {string} targetPath
|
|
99
|
-
* @param {string} contents
|
|
100
|
-
*/
|
|
101
|
-
function writeFileAtomic(targetPath, contents) {
|
|
102
|
-
const tmp = `${targetPath}.${process.pid}.tmp`;
|
|
103
|
-
try {
|
|
104
|
-
fs.writeFileSync(tmp, contents, 'utf8');
|
|
105
|
-
fs.renameSync(tmp, targetPath);
|
|
106
|
-
} catch (err) {
|
|
107
|
-
reapTempFile(tmp);
|
|
108
|
-
throw err;
|
|
94
|
+
function gitWorktreeRemove(wtPath, { git, repoRoot }) {
|
|
95
|
+
const rm = git.gitSpawn(repoRoot, 'worktree', 'remove', wtPath);
|
|
96
|
+
if (rm.status !== 0) {
|
|
97
|
+
git.gitSpawn(repoRoot, 'worktree', 'remove', '--force', wtPath);
|
|
109
98
|
}
|
|
110
99
|
}
|
|
111
100
|
|
|
112
|
-
function
|
|
113
|
-
|
|
114
|
-
fs.unlinkSync(tmp);
|
|
115
|
-
} catch {
|
|
116
|
-
// Already gone.
|
|
117
|
-
}
|
|
101
|
+
function spawnOutput(result) {
|
|
102
|
+
return (result.stderr || result.stdout || '').trim();
|
|
118
103
|
}
|
|
119
104
|
|
|
120
105
|
/**
|
|
@@ -164,10 +149,7 @@ export function removePendingCleanup(worktreeRoot, storyId) {
|
|
|
164
149
|
|
|
165
150
|
async function removeStuckWorktreePath(wtPath, { git, repoRoot, fsRm }) {
|
|
166
151
|
if (!fs.existsSync(wtPath)) return { ok: true };
|
|
167
|
-
|
|
168
|
-
if (rm.status !== 0) {
|
|
169
|
-
rm = git.gitSpawn(repoRoot, 'worktree', 'remove', '--force', wtPath);
|
|
170
|
-
}
|
|
152
|
+
gitWorktreeRemove(wtPath, { git, repoRoot });
|
|
171
153
|
if (fs.existsSync(wtPath)) {
|
|
172
154
|
try {
|
|
173
155
|
await fsRm(wtPath, { recursive: true, force: true });
|
|
@@ -189,7 +171,7 @@ async function removeStuckWorktreePath(wtPath, { git, repoRoot, fsRm }) {
|
|
|
189
171
|
function sweepBranchLocal(branch, { git, repoRoot, logger }) {
|
|
190
172
|
const localDel = git.gitSpawn(repoRoot, 'branch', '-D', branch);
|
|
191
173
|
if (localDel.status === 0) return true;
|
|
192
|
-
const stderr = (localDel
|
|
174
|
+
const stderr = spawnOutput(localDel);
|
|
193
175
|
if (/not found|no such|not match/i.test(stderr)) return true;
|
|
194
176
|
logger.warn(
|
|
195
177
|
`worktree-sweep: branch -D ${branch} failed: ${stderr || 'unknown'} (continuing)`,
|
|
@@ -207,7 +189,7 @@ function sweepBranchRemote(branch, { git, repoRoot, logger }) {
|
|
|
207
189
|
branch,
|
|
208
190
|
);
|
|
209
191
|
if (remoteDel.status === 0) return true;
|
|
210
|
-
const stderr = (remoteDel
|
|
192
|
+
const stderr = spawnOutput(remoteDel);
|
|
211
193
|
if (/remote ref does not exist|not found/i.test(stderr)) return true;
|
|
212
194
|
logger.warn(
|
|
213
195
|
`worktree-sweep: push --delete ${branch} failed: ${stderr || 'unknown'} (continuing)`,
|